# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1363968212 -3600
# Node ID ecbd252fd3a78dfa522d16b8a7ed75a9134f8c8b
# Parent  3392f250c78450c461baa282d066c2784aaf2903# Parent  6168fb585ab4f20cbcfd38252e6a0d9a6b10a5f9
Need to merge in default branch: It contains automatic conversion of boxed types to primitive values which is needed by Knockout to display elements of arrays properly.

diff -r 3392f250c784 -r ecbd252fd3a7 .hgtags
--- a/.hgtags	Fri Mar 22 16:59:47 2013 +0100
+++ b/.hgtags	Fri Mar 22 17:03:32 2013 +0100
@@ -1,1 +1,3 @@
 0a115f1c6f3c70458fc479ae82b4d7fcdeb7e95a jdk7-b147_base
+7367a296a9ec4a88e0292a41244c96283818e563 bck2brwsr-0.3
+caf1e66268fd4100d57922d973ae09a6bf3be847 release-${releaseVersion}
diff -r 3392f250c784 -r ecbd252fd3a7 benchmarks/matrix-multiplication/pom.xml
--- a/benchmarks/matrix-multiplication/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/benchmarks/matrix-multiplication/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -1,16 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>matrix.multiplication</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
     <artifactId>benchmarks</artifactId>
     <groupId>org.apidesign.bck2brwsr</groupId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
 
   <name>Matrix multiplication</name>
@@ -38,6 +37,36 @@
                   <skip>true</skip>
               </configuration>
           </plugin>      
+          <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>xml-maven-plugin</artifactId>
+              <version>1.0</version>
+              <executions>
+                  <execution>
+                      <goals>
+                          <goal>transform</goal>
+                      </goals>
+                      <phase>install</phase>
+                  </execution>
+              </executions>
+              <configuration>
+                  <transformationSets>
+                      <transformationSet>
+                          <dir>target/surefire-reports</dir>
+                          <outputDir>target/surefire-reports</outputDir>
+                          <includes>
+                              <include>TEST*.xml</include>
+                          </includes>
+                          <stylesheet>src/main/select-time.xsl</stylesheet>
+                          <fileMappers>
+                              <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+                                  <targetExtension>.csv</targetExtension>
+                              </fileMapper>
+                          </fileMappers>                          
+                      </transformationSet>
+                  </transformationSets>
+              </configuration>
+          </plugin>
       </plugins>
   </build>
   
@@ -45,7 +74,7 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>emul.mini</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -62,7 +91,7 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>vmtest</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff -r 3392f250c784 -r ecbd252fd3a7 benchmarks/matrix-multiplication/src/main/select-time.xsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/matrix-multiplication/src/main/select-time.xsl	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Back 2 Browser Bytecode Translator
+    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. Look for COPYING file in the top folder.
+    If not, see http://opensource.org/licenses/GPL-2.0.
+
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+    <xsl:output method="text"/>
+
+    <xsl:template match="/">
+        <xsl:apply-templates mode="header" select="testsuite/testcase"/><xsl:text>End
+</xsl:text>
+        <xsl:apply-templates mode="value" select="testsuite/testcase"/><xsl:text>NaN
+</xsl:text>
+    </xsl:template>
+        
+    
+    <xsl:template match="testcase" mode="header">
+      <xsl:if test="contains(@name,'tenThousand')">
+        <xsl:if test="not(contains(@name, '[Java]'))">
+          <xsl:if test="not(contains(@name, '[Compare'))">
+              <xsl:value-of select="@name"/>
+              <xsl:text>,</xsl:text>
+          </xsl:if>
+        </xsl:if>
+      </xsl:if>
+    </xsl:template>
+
+    <xsl:template match="testcase" mode="value">
+      <xsl:if test="contains(@name,'tenThousand')">
+        <xsl:if test="not(contains(@name, '[Java]'))">
+          <xsl:if test="not(contains(@name, '[Compare'))">
+            <xsl:value-of select="@time"/>
+            <xsl:text>,</xsl:text>
+          </xsl:if>
+        </xsl:if>
+      </xsl:if>
+    </xsl:template>
+
+</xsl:stylesheet>
diff -r 3392f250c784 -r ecbd252fd3a7 benchmarks/matrix-multiplication/src/test/java/org/apidesign/benchmark/matrixmul/MatrixTest.java
--- a/benchmarks/matrix-multiplication/src/test/java/org/apidesign/benchmark/matrixmul/MatrixTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/benchmarks/matrix-multiplication/src/test/java/org/apidesign/benchmark/matrixmul/MatrixTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -31,6 +31,22 @@
     }
 
     @Compare(scripting = false) 
+    public String oneIteration() throws IOException {
+    
+        Matrix m1 = new Matrix(5);
+        Matrix m2 = new Matrix(5);
+        
+        m1.generateData();
+        m2.generateData();
+        
+        Matrix res = m1.multiply(m2);
+        
+        StringBuilder sb = new StringBuilder();
+        res.printOn(sb);
+        return sb.toString();
+    }
+    
+    @Compare(scripting = false) 
     public String tenThousandIterations() throws IOException {
     
         Matrix m1 = new Matrix(5);
@@ -50,6 +66,27 @@
         return sb.toString();
     }
     
+    @Compare(scripting = false) 
+    public String tenUselessIterations() throws IOException {
+    
+        Matrix m1 = new Matrix(5);
+        Matrix m2 = new Matrix(5);
+        
+        m1.generateData();
+        m2.generateData();
+        
+        Matrix res = null;
+        for (int i = 0; i < 10; i++) {
+            res = m1.multiply(m2);
+            m1 = res;
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        res.printOn(sb);
+        return sb.toString();
+    }
+
+    
     @Factory
     public static Object[] create() {
         return VMTest.create(MatrixTest.class);
diff -r 3392f250c784 -r ecbd252fd3a7 benchmarks/pom.xml
--- a/benchmarks/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/benchmarks/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -4,11 +4,11 @@
   <parent>
     <artifactId>bck2brwsr</artifactId>
     <groupId>org.apidesign</groupId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>benchmarks</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Performance benchmarks</name>
   <modules>
diff -r 3392f250c784 -r ecbd252fd3a7 core/pom.xml
--- a/core/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign</groupId>
-    <artifactId>bck2brwsr</artifactId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>core</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <name>Core JS Annotations</name>
-  <url>http://maven.apache.org</url>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.netbeans.api</groupId>
-      <artifactId>org-openide-util-lookup</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-    <description>Contains esential annotations for associating JavaScript code with
-methods and classes.</description>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 core/src/main/java/org/apidesign/bck2brwsr/core/ExtraJavaScript.java
--- a/core/src/main/java/org/apidesign/bck2brwsr/core/ExtraJavaScript.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.core;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.CLASS)
-@Target(ElementType.TYPE)
-public @interface ExtraJavaScript {
-    /** location of a script to load */
-    String resource();
-    /** should the class file still be processed or not? */
-    boolean processByteCode() default true;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptBody.java
--- a/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptBody.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.core;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Put this method on a method in case it should have a special
- * body in the <em>JavaScript</em>.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({ ElementType.METHOD, ElementType.CONSTRUCTOR })
-public @interface JavaScriptBody {
-    /** Names of parameters for the method. 
-     * 
-     * <!--
-     * If not specified
-     * it will be <code>arg0, arg1, arg2</code>. In case of
-     * instance methods, the <code>arg0</code> is reference
-     * to <code>this</code>.
-     * -->
-     * 
-     * @return array of the names of parameters for the method
-     *    in JavaScript
-     */
-    public String[] args();
-    
-    /** The actual body of the method in JavaScript. This string will be
-     * put into generated header (ends with '{') and footer (ends with '}').
-     */
-    public String body();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptOnly.java
--- a/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptOnly.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.core;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Don't include given field or method in generated JavaScript. Rather
- * generate completely independent JavaScript code.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({ ElementType.METHOD, ElementType.FIELD })
-public @interface JavaScriptOnly {
-    /** name of the variable to assign given value to */
-    String name() default "";
-    /** value to assign to given field */
-    String value() default "";
-}
diff -r 3392f250c784 -r ecbd252fd3a7 core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptPrototype.java
--- a/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptPrototype.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.core;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Controls how JavaScript inheritance should be handled.
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({ ElementType.TYPE })
-public @interface JavaScriptPrototype {
-    /** Expression that identifies the function where all methods
-     * should be added into. If this attribute is unspecified
-     * all methods are added to the same object specified by
-     * {@link #prototype()}.
-     * 
-     * @return name of function to contain methods found in given class
-     */
-    String container() default "";
-    /** Expression that defines the way to construct prototype for this
-     * class.
-     * @return expression to construct prototype
-     */
-    String prototype();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 core/src/main/java/org/apidesign/bck2brwsr/core/impl/JavaScriptProcesor.java
--- a/core/src/main/java/org/apidesign/bck2brwsr/core/impl/JavaScriptProcesor.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.core.impl;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Completion;
-import javax.annotation.processing.Completions;
-import javax.annotation.processing.Processor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.tools.Diagnostic;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.openide.util.lookup.ServiceProvider;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service = Processor.class)
-public final class JavaScriptProcesor extends AbstractProcessor {
-    @Override
-    public Set<String> getSupportedAnnotationTypes() {
-        Set<String> set = new HashSet<>();
-        set.add(JavaScriptBody.class.getName());
-        return set;
-    }
-    
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        for (Element e : roundEnv.getElementsAnnotatedWith(JavaScriptBody.class)) {
-            if (e.getKind() != ElementKind.METHOD && e.getKind() != ElementKind.CONSTRUCTOR) {
-                continue;
-            }
-            ExecutableElement ee = (ExecutableElement)e;
-            List<? extends VariableElement> params = ee.getParameters();
-            
-            JavaScriptBody jsb = e.getAnnotation(JavaScriptBody.class);
-            if (jsb == null) {
-                continue;
-            }
-            String[] arr = jsb.args();
-            if (params.size() != arr.length) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Number of args arguments does not match real arguments!", e);
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Iterable<? extends Completion> getCompletions(Element e, 
-        AnnotationMirror annotation, ExecutableElement member, String userText
-    ) {
-        StringBuilder sb = new StringBuilder();
-        if (e.getKind() == ElementKind.METHOD && member.getSimpleName().contentEquals("args")) {
-            ExecutableElement ee = (ExecutableElement) e;
-            String sep = "";
-            sb.append("{ ");
-            for (VariableElement ve : ee.getParameters()) {
-                sb.append(sep).append('"').append(ve.getSimpleName())
-                    .append('"');
-                sep = ", ";
-            }
-            sb.append(" }");
-            return Collections.nCopies(1, Completions.of(sb.toString()));
-        }
-        return null;
-    }
-
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 dew/pom.xml
--- a/dew/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/dew/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apidesign</groupId>
     <artifactId>bck2brwsr</artifactId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>dew</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <name>Development Environment for Web</name>
   <url>http://maven.apache.org</url>
     <build>
@@ -38,11 +37,19 @@
                     <executable>java</executable>
                      <arguments>
                         <argument>-classpath</argument>
-                        <classpath/>
+                        <classpath />
                         <argument>org.apidesign.bck2brwsr.dew.Dew</argument>
                     </arguments>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>      
         </plugins>
     </build>
     <properties>
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/pom.xml
--- a/emul/compact/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign.bck2brwsr</groupId>
-    <artifactId>emul.pom</artifactId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>emul</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <name>Bck2Brwsr API Profile</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>emul.mini</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vmtest</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.netbeans.api</groupId>
-      <artifactId>org-openide-util-lookup</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>2.5.1</version>
-              <configuration>
-                  <compilerArguments>
-                      <bootclasspath>netbeans.ignore.jdk.bootclasspath</bootclasspath>
-                  </compilerArguments>
-                 <source>1.7</source>
-                 <target>1.7</target>
-              </configuration>
-          </plugin>
-         <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
-                <executions>
-                    <execution>
-                        <id>rt</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/rt.xml</descriptor>
-                            </descriptors>
-                            <finalName>bck2brwsr-${project.version}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>                
-            </plugin>      
-      </plugins>
-  </build>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/assembly/rt.xml
--- a/emul/compact/src/main/assembly/rt.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>rt</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <useProjectArtifact>true</useProjectArtifact>
-      <unpack>true</unpack>
-      <scope>provided</scope>
-      <unpackOptions>
-        <excludes>
-          <exclude>META-INF/maven/**</exclude>
-        </excludes>
-      </unpackOptions>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.outputDirectory}</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/ChangeListenerMap.java
--- a/emul/compact/src/main/java/java/beans/ChangeListenerMap.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.beans;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EventListener;
-import java.util.EventListenerProxy;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * This is an abstract class that provides base functionality
- * for the {@link PropertyChangeSupport PropertyChangeSupport} class
- * and the {@link VetoableChangeSupport VetoableChangeSupport} class.
- *
- * @see PropertyChangeListenerMap
- * @see VetoableChangeListenerMap
- *
- * @author Sergey A. Malenkov
- */
-abstract class ChangeListenerMap<L extends EventListener> {
-    private Map<String, L[]> map;
-
-    /**
-     * Creates an array of listeners.
-     * This method can be optimized by using
-     * the same instance of the empty array
-     * when {@code length} is equal to {@code 0}.
-     *
-     * @param length  the array length
-     * @return        an array with specified length
-     */
-    protected abstract L[] newArray(int length);
-
-    /**
-     * Creates a proxy listener for the specified property.
-     *
-     * @param name      the name of the property to listen on
-     * @param listener  the listener to process events
-     * @return          a proxy listener
-     */
-    protected abstract L newProxy(String name, L listener);
-
-    /**
-     * Adds a listener to the list of listeners for the specified property.
-     * This listener is called as many times as it was added.
-     *
-     * @param name      the name of the property to listen on
-     * @param listener  the listener to process events
-     */
-    public final synchronized void add(String name, L listener) {
-        if (this.map == null) {
-            this.map = new HashMap<String, L[]>();
-        }
-        L[] array = this.map.get(name);
-        int size = (array != null)
-                ? array.length
-                : 0;
-
-        L[] clone = newArray(size + 1);
-        clone[size] = listener;
-        if (array != null) {
-            System.arraycopy(array, 0, clone, 0, size);
-        }
-        this.map.put(name, clone);
-    }
-
-    /**
-     * Removes a listener from the list of listeners for the specified property.
-     * If the listener was added more than once to the same event source,
-     * this listener will be notified one less time after being removed.
-     *
-     * @param name      the name of the property to listen on
-     * @param listener  the listener to process events
-     */
-    public final synchronized void remove(String name, L listener) {
-        if (this.map != null) {
-            L[] array = this.map.get(name);
-            if (array != null) {
-                for (int i = 0; i < array.length; i++) {
-                    if (listener.equals(array[i])) {
-                        int size = array.length - 1;
-                        if (size > 0) {
-                            L[] clone = newArray(size);
-                            System.arraycopy(array, 0, clone, 0, i);
-                            System.arraycopy(array, i + 1, clone, i, size - i);
-                            this.map.put(name, clone);
-                        }
-                        else {
-                            this.map.remove(name);
-                            if (this.map.isEmpty()) {
-                                this.map = null;
-                            }
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the list of listeners for the specified property.
-     *
-     * @param name  the name of the property
-     * @return      the corresponding list of listeners
-     */
-    public final synchronized L[] get(String name) {
-        return (this.map != null)
-                ? this.map.get(name)
-                : null;
-    }
-
-    /**
-     * Sets new list of listeners for the specified property.
-     *
-     * @param name       the name of the property
-     * @param listeners  new list of listeners
-     */
-    public final void set(String name, L[] listeners) {
-        if (listeners != null) {
-            if (this.map == null) {
-                this.map = new HashMap<String, L[]>();
-            }
-            this.map.put(name, listeners);
-        }
-        else if (this.map != null) {
-            this.map.remove(name);
-            if (this.map.isEmpty()) {
-                this.map = null;
-            }
-        }
-    }
-
-    /**
-     * Returns all listeners in the map.
-     *
-     * @return an array of all listeners
-     */
-    public final synchronized L[] getListeners() {
-        if (this.map == null) {
-            return newArray(0);
-        }
-        List<L> list = new ArrayList<L>();
-
-        L[] listeners = this.map.get(null);
-        if (listeners != null) {
-            for (L listener : listeners) {
-                list.add(listener);
-            }
-        }
-        for (Entry<String, L[]> entry : this.map.entrySet()) {
-            String name = entry.getKey();
-            if (name != null) {
-                for (L listener : entry.getValue()) {
-                    list.add(newProxy(name, listener));
-                }
-            }
-        }
-        return list.toArray(newArray(list.size()));
-    }
-
-    /**
-     * Returns listeners that have been associated with the named property.
-     *
-     * @param name  the name of the property
-     * @return an array of listeners for the named property
-     */
-    public final L[] getListeners(String name) {
-        if (name != null) {
-            L[] listeners = get(name);
-            if (listeners != null) {
-                return listeners.clone();
-            }
-        }
-        return newArray(0);
-    }
-
-    /**
-     * Indicates whether the map contains
-     * at least one listener to be notified.
-     *
-     * @param name  the name of the property
-     * @return      {@code true} if at least one listener exists or
-     *              {@code false} otherwise
-     */
-    public final synchronized boolean hasListeners(String name) {
-        if (this.map == null) {
-            return false;
-        }
-        L[] array = this.map.get(null);
-        return (array != null) || ((name != null) && (null != this.map.get(name)));
-    }
-
-    /**
-     * Returns a set of entries from the map.
-     * Each entry is a pair consisted of the property name
-     * and the corresponding list of listeners.
-     *
-     * @return a set of entries from the map
-     */
-    public final Set<Entry<String, L[]>> getEntries() {
-        return (this.map != null)
-                ? this.map.entrySet()
-                : Collections.<Entry<String, L[]>>emptySet();
-    }
-
-    /**
-     * Extracts a real listener from the proxy listener.
-     * It is necessary because default proxy class is not serializable.
-     *
-     * @return a real listener
-     */
-    public final L extract(L listener) {
-        while (listener instanceof EventListenerProxy) {
-            EventListenerProxy<L> proxy = (EventListenerProxy<L>) listener;
-            listener = proxy.getListener();
-        }
-        return listener;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/IndexedPropertyChangeEvent.java
--- a/emul/compact/src/main/java/java/beans/IndexedPropertyChangeEvent.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.beans;
-
-/**
- * An "IndexedPropertyChange" event gets delivered whenever a component that
- * conforms to the JavaBeans&trade; specification (a "bean") changes a bound
- * indexed property. This class is an extension of <code>PropertyChangeEvent</code>
- * but contains the index of the property that has changed.
- * <P>
- * Null values may be provided for the old and the new values if their
- * true values are not known.
- * <P>
- * An event source may send a null object as the name to indicate that an
- * arbitrary set of if its properties have changed.  In this case the
- * old and new values should also be null.
- *
- * @since 1.5
- * @author Mark Davidson
- */
-public class IndexedPropertyChangeEvent extends PropertyChangeEvent {
-    private static final long serialVersionUID = -320227448495806870L;
-
-    private int index;
-
-    /**
-     * Constructs a new <code>IndexedPropertyChangeEvent</code> object.
-     *
-     * @param source  The bean that fired the event.
-     * @param propertyName  The programmatic name of the property that
-     *             was changed.
-     * @param oldValue      The old value of the property.
-     * @param newValue      The new value of the property.
-     * @param index index of the property element that was changed.
-     */
-    public IndexedPropertyChangeEvent(Object source, String propertyName,
-                                      Object oldValue, Object newValue,
-                                      int index) {
-        super (source, propertyName, oldValue, newValue);
-        this.index = index;
-    }
-
-    /**
-     * Gets the index of the property that was changed.
-     *
-     * @return The index specifying the property element that was
-     *         changed.
-     */
-    public int getIndex() {
-        return index;
-    }
-
-    void appendTo(StringBuilder sb) {
-        sb.append("; index=").append(getIndex());
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/PropertyChangeEvent.java
--- a/emul/compact/src/main/java/java/beans/PropertyChangeEvent.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.beans;
-
-/**
- * A "PropertyChange" event gets delivered whenever a bean changes a "bound"
- * or "constrained" property.  A PropertyChangeEvent object is sent as an
- * argument to the PropertyChangeListener and VetoableChangeListener methods.
- * <P>
- * Normally PropertyChangeEvents are accompanied by the name and the old
- * and new value of the changed property.  If the new value is a primitive
- * type (such as int or boolean) it must be wrapped as the
- * corresponding java.lang.* Object type (such as Integer or Boolean).
- * <P>
- * Null values may be provided for the old and the new values if their
- * true values are not known.
- * <P>
- * An event source may send a null object as the name to indicate that an
- * arbitrary set of if its properties have changed.  In this case the
- * old and new values should also be null.
- */
-
-public class PropertyChangeEvent extends java.util.EventObject {
-    private static final long serialVersionUID = 7042693688939648123L;
-
-    /**
-     * Constructs a new <code>PropertyChangeEvent</code>.
-     *
-     * @param source  The bean that fired the event.
-     * @param propertyName  The programmatic name of the property
-     *          that was changed.
-     * @param oldValue  The old value of the property.
-     * @param newValue  The new value of the property.
-     */
-    public PropertyChangeEvent(Object source, String propertyName,
-                                     Object oldValue, Object newValue) {
-        super(source);
-        this.propertyName = propertyName;
-        this.newValue = newValue;
-        this.oldValue = oldValue;
-    }
-
-    /**
-     * Gets the programmatic name of the property that was changed.
-     *
-     * @return  The programmatic name of the property that was changed.
-     *          May be null if multiple properties have changed.
-     */
-    public String getPropertyName() {
-        return propertyName;
-    }
-
-    /**
-     * Gets the new value for the property, expressed as an Object.
-     *
-     * @return  The new value for the property, expressed as an Object.
-     *          May be null if multiple properties have changed.
-     */
-    public Object getNewValue() {
-        return newValue;
-    }
-
-    /**
-     * Gets the old value for the property, expressed as an Object.
-     *
-     * @return  The old value for the property, expressed as an Object.
-     *          May be null if multiple properties have changed.
-     */
-    public Object getOldValue() {
-        return oldValue;
-    }
-
-    /**
-     * Sets the propagationId object for the event.
-     *
-     * @param propagationId  The propagationId object for the event.
-     */
-    public void setPropagationId(Object propagationId) {
-        this.propagationId = propagationId;
-    }
-
-    /**
-     * The "propagationId" field is reserved for future use.  In Beans 1.0
-     * the sole requirement is that if a listener catches a PropertyChangeEvent
-     * and then fires a PropertyChangeEvent of its own, then it should
-     * make sure that it propagates the propagationId field from its
-     * incoming event to its outgoing event.
-     *
-     * @return the propagationId object associated with a bound/constrained
-     *          property update.
-     */
-    public Object getPropagationId() {
-        return propagationId;
-    }
-
-    /**
-     * name of the property that changed.  May be null, if not known.
-     * @serial
-     */
-    private String propertyName;
-
-    /**
-     * New value for property.  May be null if not known.
-     * @serial
-     */
-    private Object newValue;
-
-    /**
-     * Previous value for property.  May be null if not known.
-     * @serial
-     */
-    private Object oldValue;
-
-    /**
-     * Propagation ID.  May be null.
-     * @serial
-     * @see #getPropagationId
-     */
-    private Object propagationId;
-
-    /**
-     * Returns a string representation of the object.
-     *
-     * @return a string representation of the object
-     *
-     * @since 1.7
-     */
-    public String toString() {
-        StringBuilder sb = new StringBuilder(getClass().getName());
-        sb.append("[propertyName=").append(getPropertyName());
-        appendTo(sb);
-        sb.append("; oldValue=").append(getOldValue());
-        sb.append("; newValue=").append(getNewValue());
-        sb.append("; propagationId=").append(getPropagationId());
-        sb.append("; source=").append(getSource());
-        return sb.append("]").toString();
-    }
-
-    void appendTo(StringBuilder sb) {
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/PropertyChangeListener.java
--- a/emul/compact/src/main/java/java/beans/PropertyChangeListener.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.beans;
-
-/**
- * A "PropertyChange" event gets fired whenever a bean changes a "bound"
- * property.  You can register a PropertyChangeListener with a source
- * bean so as to be notified of any bound property updates.
- */
-
-public interface PropertyChangeListener extends java.util.EventListener {
-
-    /**
-     * This method gets called when a bound property is changed.
-     * @param evt A PropertyChangeEvent object describing the event source
-     *          and the property that has changed.
-     */
-
-    void propertyChange(PropertyChangeEvent evt);
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/PropertyChangeListenerProxy.java
--- a/emul/compact/src/main/java/java/beans/PropertyChangeListenerProxy.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.beans;
-
-import java.util.EventListenerProxy;
-
-/**
- * A class which extends the {@code EventListenerProxy}
- * specifically for adding a {@code PropertyChangeListener}
- * with a "bound" property.
- * Instances of this class can be added
- * as {@code PropertyChangeListener}s to a bean
- * which supports firing property change events.
- * <p>
- * If the object has a {@code getPropertyChangeListeners} method
- * then the array returned could be a mixture of {@code PropertyChangeListener}
- * and {@code PropertyChangeListenerProxy} objects.
- *
- * @see java.util.EventListenerProxy
- * @see PropertyChangeSupport#getPropertyChangeListeners
- * @since 1.4
- */
-public class PropertyChangeListenerProxy
-        extends EventListenerProxy<PropertyChangeListener>
-        implements PropertyChangeListener {
-
-    private final String propertyName;
-
-    /**
-     * Constructor which binds the {@code PropertyChangeListener}
-     * to a specific property.
-     *
-     * @param propertyName  the name of the property to listen on
-     * @param listener      the listener object
-     */
-    public PropertyChangeListenerProxy(String propertyName, PropertyChangeListener listener) {
-        super(listener);
-        this.propertyName = propertyName;
-    }
-
-    /**
-     * Forwards the property change event to the listener delegate.
-     *
-     * @param event  the property change event
-     */
-    public void propertyChange(PropertyChangeEvent event) {
-        getListener().propertyChange(event);
-    }
-
-    /**
-     * Returns the name of the named property associated with the listener.
-     *
-     * @return the name of the named property associated with the listener
-     */
-    public String getPropertyName() {
-        return this.propertyName;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/PropertyChangeSupport.java
--- a/emul/compact/src/main/java/java/beans/PropertyChangeSupport.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,536 +0,0 @@
-/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.beans;
-
-import java.io.Serializable;
-import java.io.ObjectStreamField;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Map.Entry;
-
-/**
- * This is a utility class that can be used by beans that support bound
- * properties.  It manages a list of listeners and dispatches
- * {@link PropertyChangeEvent}s to them.  You can use an instance of this class
- * as a member field of your bean and delegate these types of work to it.
- * The {@link PropertyChangeListener} can be registered for all properties
- * or for a property specified by name.
- * <p>
- * Here is an example of {@code PropertyChangeSupport} usage that follows
- * the rules and recommendations laid out in the JavaBeans&trade; specification:
- * <pre>
- * public class MyBean {
- *     private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
- *
- *     public void addPropertyChangeListener(PropertyChangeListener listener) {
- *         this.pcs.addPropertyChangeListener(listener);
- *     }
- *
- *     public void removePropertyChangeListener(PropertyChangeListener listener) {
- *         this.pcs.removePropertyChangeListener(listener);
- *     }
- *
- *     private String value;
- *
- *     public String getValue() {
- *         return this.value;
- *     }
- *
- *     public void setValue(String newValue) {
- *         String oldValue = this.value;
- *         this.value = newValue;
- *         this.pcs.firePropertyChange("value", oldValue, newValue);
- *     }
- *
- *     [...]
- * }
- * </pre>
- * <p>
- * A {@code PropertyChangeSupport} instance is thread-safe.
- * <p>
- * This class is serializable.  When it is serialized it will save
- * (and restore) any listeners that are themselves serializable.  Any
- * non-serializable listeners will be skipped during serialization.
- *
- * @see VetoableChangeSupport
- */
-public class PropertyChangeSupport implements Serializable {
-    private PropertyChangeListenerMap map = new PropertyChangeListenerMap();
-
-    /**
-     * Constructs a <code>PropertyChangeSupport</code> object.
-     *
-     * @param sourceBean  The bean to be given as the source for any events.
-     */
-    public PropertyChangeSupport(Object sourceBean) {
-        if (sourceBean == null) {
-            throw new NullPointerException();
-        }
-        source = sourceBean;
-    }
-
-    /**
-     * Add a PropertyChangeListener to the listener list.
-     * The listener is registered for all properties.
-     * The same listener object may be added more than once, and will be called
-     * as many times as it is added.
-     * If <code>listener</code> is null, no exception is thrown and no action
-     * is taken.
-     *
-     * @param listener  The PropertyChangeListener to be added
-     */
-    public void addPropertyChangeListener(PropertyChangeListener listener) {
-        if (listener == null) {
-            return;
-        }
-        if (listener instanceof PropertyChangeListenerProxy) {
-            PropertyChangeListenerProxy proxy =
-                   (PropertyChangeListenerProxy)listener;
-            // Call two argument add method.
-            addPropertyChangeListener(proxy.getPropertyName(),
-                                      proxy.getListener());
-        } else {
-            this.map.add(null, listener);
-        }
-    }
-
-    /**
-     * Remove a PropertyChangeListener from the listener list.
-     * This removes a PropertyChangeListener that was registered
-     * for all properties.
-     * If <code>listener</code> was added more than once to the same event
-     * source, it will be notified one less time after being removed.
-     * If <code>listener</code> is null, or was never added, no exception is
-     * thrown and no action is taken.
-     *
-     * @param listener  The PropertyChangeListener to be removed
-     */
-    public void removePropertyChangeListener(PropertyChangeListener listener) {
-        if (listener == null) {
-            return;
-        }
-        if (listener instanceof PropertyChangeListenerProxy) {
-            PropertyChangeListenerProxy proxy =
-                    (PropertyChangeListenerProxy)listener;
-            // Call two argument remove method.
-            removePropertyChangeListener(proxy.getPropertyName(),
-                                         proxy.getListener());
-        } else {
-            this.map.remove(null, listener);
-        }
-    }
-
-    /**
-     * Returns an array of all the listeners that were added to the
-     * PropertyChangeSupport object with addPropertyChangeListener().
-     * <p>
-     * If some listeners have been added with a named property, then
-     * the returned array will be a mixture of PropertyChangeListeners
-     * and <code>PropertyChangeListenerProxy</code>s. If the calling
-     * method is interested in distinguishing the listeners then it must
-     * test each element to see if it's a
-     * <code>PropertyChangeListenerProxy</code>, perform the cast, and examine
-     * the parameter.
-     *
-     * <pre>
-     * PropertyChangeListener[] listeners = bean.getPropertyChangeListeners();
-     * for (int i = 0; i < listeners.length; i++) {
-     *   if (listeners[i] instanceof PropertyChangeListenerProxy) {
-     *     PropertyChangeListenerProxy proxy =
-     *                    (PropertyChangeListenerProxy)listeners[i];
-     *     if (proxy.getPropertyName().equals("foo")) {
-     *       // proxy is a PropertyChangeListener which was associated
-     *       // with the property named "foo"
-     *     }
-     *   }
-     * }
-     *</pre>
-     *
-     * @see PropertyChangeListenerProxy
-     * @return all of the <code>PropertyChangeListeners</code> added or an
-     *         empty array if no listeners have been added
-     * @since 1.4
-     */
-    public PropertyChangeListener[] getPropertyChangeListeners() {
-        return this.map.getListeners();
-    }
-
-    /**
-     * Add a PropertyChangeListener for a specific property.  The listener
-     * will be invoked only when a call on firePropertyChange names that
-     * specific property.
-     * The same listener object may be added more than once.  For each
-     * property,  the listener will be invoked the number of times it was added
-     * for that property.
-     * If <code>propertyName</code> or <code>listener</code> is null, no
-     * exception is thrown and no action is taken.
-     *
-     * @param propertyName  The name of the property to listen on.
-     * @param listener  The PropertyChangeListener to be added
-     */
-    public void addPropertyChangeListener(
-                String propertyName,
-                PropertyChangeListener listener) {
-        if (listener == null || propertyName == null) {
-            return;
-        }
-        listener = this.map.extract(listener);
-        if (listener != null) {
-            this.map.add(propertyName, listener);
-        }
-    }
-
-    /**
-     * Remove a PropertyChangeListener for a specific property.
-     * If <code>listener</code> was added more than once to the same event
-     * source for the specified property, it will be notified one less time
-     * after being removed.
-     * If <code>propertyName</code> is null,  no exception is thrown and no
-     * action is taken.
-     * If <code>listener</code> is null, or was never added for the specified
-     * property, no exception is thrown and no action is taken.
-     *
-     * @param propertyName  The name of the property that was listened on.
-     * @param listener  The PropertyChangeListener to be removed
-     */
-    public void removePropertyChangeListener(
-                String propertyName,
-                PropertyChangeListener listener) {
-        if (listener == null || propertyName == null) {
-            return;
-        }
-        listener = this.map.extract(listener);
-        if (listener != null) {
-            this.map.remove(propertyName, listener);
-        }
-    }
-
-    /**
-     * Returns an array of all the listeners which have been associated
-     * with the named property.
-     *
-     * @param propertyName  The name of the property being listened to
-     * @return all of the <code>PropertyChangeListeners</code> associated with
-     *         the named property.  If no such listeners have been added,
-     *         or if <code>propertyName</code> is null, an empty array is
-     *         returned.
-     * @since 1.4
-     */
-    public PropertyChangeListener[] getPropertyChangeListeners(String propertyName) {
-        return this.map.getListeners(propertyName);
-    }
-
-    /**
-     * Reports a bound property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * No event is fired if old and new values are equal and non-null.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #firePropertyChange(PropertyChangeEvent)} method.
-     *
-     * @param propertyName  the programmatic name of the property that was changed
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     */
-    public void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
-        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
-            firePropertyChange(new PropertyChangeEvent(this.source, propertyName, oldValue, newValue));
-        }
-    }
-
-    /**
-     * Reports an integer bound property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * No event is fired if old and new values are equal.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #firePropertyChange(String, Object, Object)}  method.
-     *
-     * @param propertyName  the programmatic name of the property that was changed
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     */
-    public void firePropertyChange(String propertyName, int oldValue, int newValue) {
-        if (oldValue != newValue) {
-            firePropertyChange(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
-        }
-    }
-
-    /**
-     * Reports a boolean bound property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * No event is fired if old and new values are equal.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #firePropertyChange(String, Object, Object)}  method.
-     *
-     * @param propertyName  the programmatic name of the property that was changed
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     */
-    public void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) {
-        if (oldValue != newValue) {
-            firePropertyChange(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
-        }
-    }
-
-    /**
-     * Fires a property change event to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * No event is fired if the given event's old and new values are equal and non-null.
-     *
-     * @param event  the {@code PropertyChangeEvent} to be fired
-     */
-    public void firePropertyChange(PropertyChangeEvent event) {
-        Object oldValue = event.getOldValue();
-        Object newValue = event.getNewValue();
-        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
-            String name = event.getPropertyName();
-
-            PropertyChangeListener[] common = this.map.get(null);
-            PropertyChangeListener[] named = (name != null)
-                        ? this.map.get(name)
-                        : null;
-
-            fire(common, event);
-            fire(named, event);
-        }
-    }
-
-    private static void fire(PropertyChangeListener[] listeners, PropertyChangeEvent event) {
-        if (listeners != null) {
-            for (PropertyChangeListener listener : listeners) {
-                listener.propertyChange(event);
-            }
-        }
-    }
-
-    /**
-     * Reports a bound indexed property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * No event is fired if old and new values are equal and non-null.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #firePropertyChange(PropertyChangeEvent)} method.
-     *
-     * @param propertyName  the programmatic name of the property that was changed
-     * @param index         the index of the property element that was changed
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     * @since 1.5
-     */
-    public void fireIndexedPropertyChange(String propertyName, int index, Object oldValue, Object newValue) {
-        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
-            firePropertyChange(new IndexedPropertyChangeEvent(source, propertyName, oldValue, newValue, index));
-        }
-    }
-
-    /**
-     * Reports an integer bound indexed property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * No event is fired if old and new values are equal.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #fireIndexedPropertyChange(String, int, Object, Object)} method.
-     *
-     * @param propertyName  the programmatic name of the property that was changed
-     * @param index         the index of the property element that was changed
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     * @since 1.5
-     */
-    public void fireIndexedPropertyChange(String propertyName, int index, int oldValue, int newValue) {
-        if (oldValue != newValue) {
-            fireIndexedPropertyChange(propertyName, index, Integer.valueOf(oldValue), Integer.valueOf(newValue));
-        }
-    }
-
-    /**
-     * Reports a boolean bound indexed property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * No event is fired if old and new values are equal.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #fireIndexedPropertyChange(String, int, Object, Object)} method.
-     *
-     * @param propertyName  the programmatic name of the property that was changed
-     * @param index         the index of the property element that was changed
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     * @since 1.5
-     */
-    public void fireIndexedPropertyChange(String propertyName, int index, boolean oldValue, boolean newValue) {
-        if (oldValue != newValue) {
-            fireIndexedPropertyChange(propertyName, index, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
-        }
-    }
-
-    /**
-     * Check if there are any listeners for a specific property, including
-     * those registered on all properties.  If <code>propertyName</code>
-     * is null, only check for listeners registered on all properties.
-     *
-     * @param propertyName  the property name.
-     * @return true if there are one or more listeners for the given property
-     */
-    public boolean hasListeners(String propertyName) {
-        return this.map.hasListeners(propertyName);
-    }
-
-    /**
-     * @serialData Null terminated list of <code>PropertyChangeListeners</code>.
-     * <p>
-     * At serialization time we skip non-serializable listeners and
-     * only serialize the serializable listeners.
-     */
-    private void writeObject(ObjectOutputStream s) throws IOException {
-        Hashtable<String, PropertyChangeSupport> children = null;
-        PropertyChangeListener[] listeners = null;
-        synchronized (this.map) {
-            for (Entry<String, PropertyChangeListener[]> entry : this.map.getEntries()) {
-                String property = entry.getKey();
-                if (property == null) {
-                    listeners = entry.getValue();
-                } else {
-                    if (children == null) {
-                        children = new Hashtable<String, PropertyChangeSupport>();
-                    }
-                    PropertyChangeSupport pcs = new PropertyChangeSupport(this.source);
-                    pcs.map.set(null, entry.getValue());
-                    children.put(property, pcs);
-                }
-            }
-        }
-        ObjectOutputStream.PutField fields = s.putFields();
-        fields.put("children", children);
-        fields.put("source", this.source);
-        fields.put("propertyChangeSupportSerializedDataVersion", 2);
-        s.writeFields();
-
-        if (listeners != null) {
-            for (PropertyChangeListener l : listeners) {
-                if (l instanceof Serializable) {
-                    s.writeObject(l);
-                }
-            }
-        }
-        s.writeObject(null);
-    }
-
-    private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
-        this.map = new PropertyChangeListenerMap();
-
-        ObjectInputStream.GetField fields = s.readFields();
-
-        Hashtable<String, PropertyChangeSupport> children = (Hashtable<String, PropertyChangeSupport>) fields.get("children", null);
-        this.source = fields.get("source", null);
-        fields.get("propertyChangeSupportSerializedDataVersion", 2);
-
-        Object listenerOrNull;
-        while (null != (listenerOrNull = s.readObject())) {
-            this.map.add(null, (PropertyChangeListener)listenerOrNull);
-        }
-        if (children != null) {
-            for (Entry<String, PropertyChangeSupport> entry : children.entrySet()) {
-                for (PropertyChangeListener listener : entry.getValue().getPropertyChangeListeners()) {
-                    this.map.add(entry.getKey(), listener);
-                }
-            }
-        }
-    }
-
-    /**
-     * The object to be provided as the "source" for any generated events.
-     */
-    private Object source;
-
-    /**
-     * @serialField children                                   Hashtable
-     * @serialField source                                     Object
-     * @serialField propertyChangeSupportSerializedDataVersion int
-     */
-    private static final ObjectStreamField[] serialPersistentFields = {
-            new ObjectStreamField("children", Hashtable.class),
-            new ObjectStreamField("source", Object.class),
-            new ObjectStreamField("propertyChangeSupportSerializedDataVersion", Integer.TYPE)
-    };
-
-    /**
-     * Serialization version ID, so we're compatible with JDK 1.1
-     */
-    static final long serialVersionUID = 6401253773779951803L;
-
-    /**
-     * This is a {@link ChangeListenerMap ChangeListenerMap} implementation
-     * that works with {@link PropertyChangeListener PropertyChangeListener} objects.
-     */
-    private static final class PropertyChangeListenerMap extends ChangeListenerMap<PropertyChangeListener> {
-        private static final PropertyChangeListener[] EMPTY = {};
-
-        /**
-         * Creates an array of {@link PropertyChangeListener PropertyChangeListener} objects.
-         * This method uses the same instance of the empty array
-         * when {@code length} equals {@code 0}.
-         *
-         * @param length  the array length
-         * @return        an array with specified length
-         */
-        @Override
-        protected PropertyChangeListener[] newArray(int length) {
-            return (0 < length)
-                    ? new PropertyChangeListener[length]
-                    : EMPTY;
-        }
-
-        /**
-         * Creates a {@link PropertyChangeListenerProxy PropertyChangeListenerProxy}
-         * object for the specified property.
-         *
-         * @param name      the name of the property to listen on
-         * @param listener  the listener to process events
-         * @return          a {@code PropertyChangeListenerProxy} object
-         */
-        @Override
-        protected PropertyChangeListener newProxy(String name, PropertyChangeListener listener) {
-            return new PropertyChangeListenerProxy(name, listener);
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/PropertyVetoException.java
--- a/emul/compact/src/main/java/java/beans/PropertyVetoException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.beans;
-
-
-/**
- * A PropertyVetoException is thrown when a proposed change to a
- * property represents an unacceptable value.
- */
-
-public
-class PropertyVetoException extends Exception {
-    private static final long serialVersionUID = 129596057694162164L;
-
-    /**
-     * Constructs a <code>PropertyVetoException</code> with a
-     * detailed message.
-     *
-     * @param mess Descriptive message
-     * @param evt A PropertyChangeEvent describing the vetoed change.
-     */
-    public PropertyVetoException(String mess, PropertyChangeEvent evt) {
-        super(mess);
-        this.evt = evt;
-    }
-
-     /**
-     * Gets the vetoed <code>PropertyChangeEvent</code>.
-     *
-     * @return A PropertyChangeEvent describing the vetoed change.
-     */
-    public PropertyChangeEvent getPropertyChangeEvent() {
-        return evt;
-    }
-
-    /**
-     * A PropertyChangeEvent describing the vetoed change.
-     * @serial
-     */
-    private PropertyChangeEvent evt;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/VetoableChangeListener.java
--- a/emul/compact/src/main/java/java/beans/VetoableChangeListener.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1996, 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.beans;
-
-/**
- * A VetoableChange event gets fired whenever a bean changes a "constrained"
- * property.  You can register a VetoableChangeListener with a source bean
- * so as to be notified of any constrained property updates.
- */
-public interface VetoableChangeListener extends java.util.EventListener {
-    /**
-     * This method gets called when a constrained property is changed.
-     *
-     * @param     evt a <code>PropertyChangeEvent</code> object describing the
-     *                event source and the property that has changed.
-     * @exception PropertyVetoException if the recipient wishes the property
-     *              change to be rolled back.
-     */
-    void vetoableChange(PropertyChangeEvent evt)
-                                throws PropertyVetoException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/VetoableChangeListenerProxy.java
--- a/emul/compact/src/main/java/java/beans/VetoableChangeListenerProxy.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.beans;
-
-import java.util.EventListenerProxy;
-
-/**
- * A class which extends the {@code EventListenerProxy}
- * specifically for adding a {@code VetoableChangeListener}
- * with a "constrained" property.
- * Instances of this class can be added
- * as {@code VetoableChangeListener}s to a bean
- * which supports firing vetoable change events.
- * <p>
- * If the object has a {@code getVetoableChangeListeners} method
- * then the array returned could be a mixture of {@code VetoableChangeListener}
- * and {@code VetoableChangeListenerProxy} objects.
- *
- * @see java.util.EventListenerProxy
- * @see VetoableChangeSupport#getVetoableChangeListeners
- * @since 1.4
- */
-public class VetoableChangeListenerProxy
-        extends EventListenerProxy<VetoableChangeListener>
-        implements VetoableChangeListener {
-
-    private final String propertyName;
-
-    /**
-     * Constructor which binds the {@code VetoableChangeListener}
-     * to a specific property.
-     *
-     * @param propertyName  the name of the property to listen on
-     * @param listener      the listener object
-     */
-    public VetoableChangeListenerProxy(String propertyName, VetoableChangeListener listener) {
-        super(listener);
-        this.propertyName = propertyName;
-    }
-
-    /**
-    * Forwards the property change event to the listener delegate.
-    *
-    * @param event  the property change event
-    *
-    * @exception PropertyVetoException if the recipient wishes the property
-    *                                  change to be rolled back
-    */
-    public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException{
-        getListener().vetoableChange(event);
-    }
-
-    /**
-     * Returns the name of the named property associated with the listener.
-     *
-     * @return the name of the named property associated with the listener
-     */
-    public String getPropertyName() {
-        return this.propertyName;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/beans/VetoableChangeSupport.java
--- a/emul/compact/src/main/java/java/beans/VetoableChangeSupport.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,526 +0,0 @@
-/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.beans;
-
-import java.io.Serializable;
-import java.io.ObjectStreamField;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Map.Entry;
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * This is a utility class that can be used by beans that support constrained
- * properties.  It manages a list of listeners and dispatches
- * {@link PropertyChangeEvent}s to them.  You can use an instance of this class
- * as a member field of your bean and delegate these types of work to it.
- * The {@link VetoableChangeListener} can be registered for all properties
- * or for a property specified by name.
- * <p>
- * Here is an example of {@code VetoableChangeSupport} usage that follows
- * the rules and recommendations laid out in the JavaBeans&trade; specification:
- * <pre>
- * public class MyBean {
- *     private final VetoableChangeSupport vcs = new VetoableChangeSupport(this);
- *
- *     public void addVetoableChangeListener(VetoableChangeListener listener) {
- *         this.vcs.addVetoableChangeListener(listener);
- *     }
- *
- *     public void removeVetoableChangeListener(VetoableChangeListener listener) {
- *         this.vcs.removeVetoableChangeListener(listener);
- *     }
- *
- *     private String value;
- *
- *     public String getValue() {
- *         return this.value;
- *     }
- *
- *     public void setValue(String newValue) throws PropertyVetoException {
- *         String oldValue = this.value;
- *         this.vcs.fireVetoableChange("value", oldValue, newValue);
- *         this.value = newValue;
- *     }
- *
- *     [...]
- * }
- * </pre>
- * <p>
- * A {@code VetoableChangeSupport} instance is thread-safe.
- * <p>
- * This class is serializable.  When it is serialized it will save
- * (and restore) any listeners that are themselves serializable.  Any
- * non-serializable listeners will be skipped during serialization.
- *
- * @see PropertyChangeSupport
- */
-public class VetoableChangeSupport implements Serializable {
-    private VetoableChangeListenerMap map = new VetoableChangeListenerMap();
-
-    /**
-     * Constructs a <code>VetoableChangeSupport</code> object.
-     *
-     * @param sourceBean  The bean to be given as the source for any events.
-     */
-    public VetoableChangeSupport(Object sourceBean) {
-        if (sourceBean == null) {
-            throw new NullPointerException();
-        }
-        source = sourceBean;
-    }
-
-    /**
-     * Add a VetoableChangeListener to the listener list.
-     * The listener is registered for all properties.
-     * The same listener object may be added more than once, and will be called
-     * as many times as it is added.
-     * If <code>listener</code> is null, no exception is thrown and no action
-     * is taken.
-     *
-     * @param listener  The VetoableChangeListener to be added
-     */
-    public void addVetoableChangeListener(VetoableChangeListener listener) {
-        if (listener == null) {
-            return;
-        }
-        if (listener instanceof VetoableChangeListenerProxy) {
-            VetoableChangeListenerProxy proxy =
-                    (VetoableChangeListenerProxy)listener;
-            // Call two argument add method.
-            addVetoableChangeListener(proxy.getPropertyName(),
-                                      proxy.getListener());
-        } else {
-            this.map.add(null, listener);
-        }
-    }
-
-    /**
-     * Remove a VetoableChangeListener from the listener list.
-     * This removes a VetoableChangeListener that was registered
-     * for all properties.
-     * If <code>listener</code> was added more than once to the same event
-     * source, it will be notified one less time after being removed.
-     * If <code>listener</code> is null, or was never added, no exception is
-     * thrown and no action is taken.
-     *
-     * @param listener  The VetoableChangeListener to be removed
-     */
-    public void removeVetoableChangeListener(VetoableChangeListener listener) {
-        if (listener == null) {
-            return;
-        }
-        if (listener instanceof VetoableChangeListenerProxy) {
-            VetoableChangeListenerProxy proxy =
-                    (VetoableChangeListenerProxy)listener;
-            // Call two argument remove method.
-            removeVetoableChangeListener(proxy.getPropertyName(),
-                                         proxy.getListener());
-        } else {
-            this.map.remove(null, listener);
-        }
-    }
-
-    /**
-     * Returns an array of all the listeners that were added to the
-     * VetoableChangeSupport object with addVetoableChangeListener().
-     * <p>
-     * If some listeners have been added with a named property, then
-     * the returned array will be a mixture of VetoableChangeListeners
-     * and <code>VetoableChangeListenerProxy</code>s. If the calling
-     * method is interested in distinguishing the listeners then it must
-     * test each element to see if it's a
-     * <code>VetoableChangeListenerProxy</code>, perform the cast, and examine
-     * the parameter.
-     *
-     * <pre>
-     * VetoableChangeListener[] listeners = bean.getVetoableChangeListeners();
-     * for (int i = 0; i < listeners.length; i++) {
-     *        if (listeners[i] instanceof VetoableChangeListenerProxy) {
-     *     VetoableChangeListenerProxy proxy =
-     *                    (VetoableChangeListenerProxy)listeners[i];
-     *     if (proxy.getPropertyName().equals("foo")) {
-     *       // proxy is a VetoableChangeListener which was associated
-     *       // with the property named "foo"
-     *     }
-     *   }
-     * }
-     *</pre>
-     *
-     * @see VetoableChangeListenerProxy
-     * @return all of the <code>VetoableChangeListeners</code> added or an
-     *         empty array if no listeners have been added
-     * @since 1.4
-     */
-    public VetoableChangeListener[] getVetoableChangeListeners(){
-        return this.map.getListeners();
-    }
-
-    /**
-     * Add a VetoableChangeListener for a specific property.  The listener
-     * will be invoked only when a call on fireVetoableChange names that
-     * specific property.
-     * The same listener object may be added more than once.  For each
-     * property,  the listener will be invoked the number of times it was added
-     * for that property.
-     * If <code>propertyName</code> or <code>listener</code> is null, no
-     * exception is thrown and no action is taken.
-     *
-     * @param propertyName  The name of the property to listen on.
-     * @param listener  The VetoableChangeListener to be added
-     */
-    public void addVetoableChangeListener(
-                                String propertyName,
-                VetoableChangeListener listener) {
-        if (listener == null || propertyName == null) {
-            return;
-        }
-        listener = this.map.extract(listener);
-        if (listener != null) {
-            this.map.add(propertyName, listener);
-        }
-    }
-
-    /**
-     * Remove a VetoableChangeListener for a specific property.
-     * If <code>listener</code> was added more than once to the same event
-     * source for the specified property, it will be notified one less time
-     * after being removed.
-     * If <code>propertyName</code> is null, no exception is thrown and no
-     * action is taken.
-     * If <code>listener</code> is null, or was never added for the specified
-     * property, no exception is thrown and no action is taken.
-     *
-     * @param propertyName  The name of the property that was listened on.
-     * @param listener  The VetoableChangeListener to be removed
-     */
-    public void removeVetoableChangeListener(
-                                String propertyName,
-                VetoableChangeListener listener) {
-        if (listener == null || propertyName == null) {
-            return;
-        }
-        listener = this.map.extract(listener);
-        if (listener != null) {
-            this.map.remove(propertyName, listener);
-        }
-    }
-
-    /**
-     * Returns an array of all the listeners which have been associated
-     * with the named property.
-     *
-     * @param propertyName  The name of the property being listened to
-     * @return all the <code>VetoableChangeListeners</code> associated with
-     *         the named property.  If no such listeners have been added,
-     *         or if <code>propertyName</code> is null, an empty array is
-     *         returned.
-     * @since 1.4
-     */
-    public VetoableChangeListener[] getVetoableChangeListeners(String propertyName) {
-        return this.map.getListeners(propertyName);
-    }
-
-    /**
-     * Reports a constrained property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * Any listener can throw a {@code PropertyVetoException} to veto the update.
-     * If one of the listeners vetoes the update, this method passes
-     * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
-     * to all listeners that already confirmed this update
-     * and throws the {@code PropertyVetoException} again.
-     * <p>
-     * No event is fired if old and new values are equal and non-null.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #fireVetoableChange(PropertyChangeEvent)} method.
-     *
-     * @param propertyName  the programmatic name of the property that is about to change
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     * @throws PropertyVetoException if one of listeners vetoes the property update
-     */
-    public void fireVetoableChange(String propertyName, Object oldValue, Object newValue)
-            throws PropertyVetoException {
-        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
-            fireVetoableChange(new PropertyChangeEvent(this.source, propertyName, oldValue, newValue));
-        }
-    }
-
-    /**
-     * Reports an integer constrained property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * Any listener can throw a {@code PropertyVetoException} to veto the update.
-     * If one of the listeners vetoes the update, this method passes
-     * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
-     * to all listeners that already confirmed this update
-     * and throws the {@code PropertyVetoException} again.
-     * <p>
-     * No event is fired if old and new values are equal.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #fireVetoableChange(String, Object, Object)} method.
-     *
-     * @param propertyName  the programmatic name of the property that is about to change
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     * @throws PropertyVetoException if one of listeners vetoes the property update
-     */
-    public void fireVetoableChange(String propertyName, int oldValue, int newValue)
-            throws PropertyVetoException {
-        if (oldValue != newValue) {
-            fireVetoableChange(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
-        }
-    }
-
-    /**
-     * Reports a boolean constrained property update to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * Any listener can throw a {@code PropertyVetoException} to veto the update.
-     * If one of the listeners vetoes the update, this method passes
-     * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
-     * to all listeners that already confirmed this update
-     * and throws the {@code PropertyVetoException} again.
-     * <p>
-     * No event is fired if old and new values are equal.
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * {@link #fireVetoableChange(String, Object, Object)} method.
-     *
-     * @param propertyName  the programmatic name of the property that is about to change
-     * @param oldValue      the old value of the property
-     * @param newValue      the new value of the property
-     * @throws PropertyVetoException if one of listeners vetoes the property update
-     */
-    public void fireVetoableChange(String propertyName, boolean oldValue, boolean newValue)
-            throws PropertyVetoException {
-        if (oldValue != newValue) {
-            fireVetoableChange(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
-        }
-    }
-
-    /**
-     * Fires a property change event to listeners
-     * that have been registered to track updates of
-     * all properties or a property with the specified name.
-     * <p>
-     * Any listener can throw a {@code PropertyVetoException} to veto the update.
-     * If one of the listeners vetoes the update, this method passes
-     * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
-     * to all listeners that already confirmed this update
-     * and throws the {@code PropertyVetoException} again.
-     * <p>
-     * No event is fired if the given event's old and new values are equal and non-null.
-     *
-     * @param event  the {@code PropertyChangeEvent} to be fired
-     * @throws PropertyVetoException if one of listeners vetoes the property update
-     */
-    public void fireVetoableChange(PropertyChangeEvent event)
-            throws PropertyVetoException {
-        Object oldValue = event.getOldValue();
-        Object newValue = event.getNewValue();
-        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
-            String name = event.getPropertyName();
-
-            VetoableChangeListener[] common = this.map.get(null);
-            VetoableChangeListener[] named = (name != null)
-                        ? this.map.get(name)
-                        : null;
-
-            VetoableChangeListener[] listeners;
-            if (common == null) {
-                listeners = named;
-            }
-            else if (named == null) {
-                listeners = common;
-            }
-            else {
-                listeners = new VetoableChangeListener[common.length + named.length];
-                System.arraycopy(common, 0, listeners, 0, common.length);
-                System.arraycopy(named, 0, listeners, common.length, named.length);
-            }
-            if (listeners != null) {
-                int current = 0;
-                try {
-                    while (current < listeners.length) {
-                        listeners[current].vetoableChange(event);
-                        current++;
-                    }
-                }
-                catch (PropertyVetoException veto) {
-                    event = new PropertyChangeEvent(this.source, name, newValue, oldValue);
-                    for (int i = 0; i < current; i++) {
-                        try {
-                            listeners[i].vetoableChange(event);
-                        }
-                        catch (PropertyVetoException exception) {
-                            // ignore exceptions that occur during rolling back
-                        }
-                    }
-                    throw veto; // rethrow the veto exception
-                }
-            }
-        }
-    }
-
-    /**
-     * Check if there are any listeners for a specific property, including
-     * those registered on all properties.  If <code>propertyName</code>
-     * is null, only check for listeners registered on all properties.
-     *
-     * @param propertyName  the property name.
-     * @return true if there are one or more listeners for the given property
-     */
-    public boolean hasListeners(String propertyName) {
-        return this.map.hasListeners(propertyName);
-    }
-
-    /**
-     * @serialData Null terminated list of <code>VetoableChangeListeners</code>.
-     * <p>
-     * At serialization time we skip non-serializable listeners and
-     * only serialize the serializable listeners.
-     */
-    private void writeObject(ObjectOutputStream s) throws IOException {
-        Hashtable<String, VetoableChangeSupport> children = null;
-        VetoableChangeListener[] listeners = null;
-        synchronized (this.map) {
-            for (Entry<String, VetoableChangeListener[]> entry : this.map.getEntries()) {
-                String property = entry.getKey();
-                if (property == null) {
-                    listeners = entry.getValue();
-                } else {
-                    if (children == null) {
-                        children = new Hashtable<String, VetoableChangeSupport>();
-                    }
-                    VetoableChangeSupport vcs = new VetoableChangeSupport(this.source);
-                    vcs.map.set(null, entry.getValue());
-                    children.put(property, vcs);
-                }
-            }
-        }
-        ObjectOutputStream.PutField fields = s.putFields();
-        fields.put("children", children);
-        fields.put("source", this.source);
-        fields.put("vetoableChangeSupportSerializedDataVersion", 2);
-        s.writeFields();
-
-        if (listeners != null) {
-            for (VetoableChangeListener l : listeners) {
-                if (l instanceof Serializable) {
-                    s.writeObject(l);
-                }
-            }
-        }
-        s.writeObject(null);
-    }
-
-    private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
-        this.map = new VetoableChangeListenerMap();
-
-        ObjectInputStream.GetField fields = s.readFields();
-
-        Hashtable<String, VetoableChangeSupport> children = (Hashtable<String, VetoableChangeSupport>) fields.get("children", null);
-        this.source = fields.get("source", null);
-        fields.get("vetoableChangeSupportSerializedDataVersion", 2);
-
-        Object listenerOrNull;
-        while (null != (listenerOrNull = s.readObject())) {
-            this.map.add(null, (VetoableChangeListener)listenerOrNull);
-        }
-        if (children != null) {
-            for (Entry<String, VetoableChangeSupport> entry : children.entrySet()) {
-                for (VetoableChangeListener listener : entry.getValue().getVetoableChangeListeners()) {
-                    this.map.add(entry.getKey(), listener);
-                }
-            }
-        }
-    }
-
-    /**
-     * The object to be provided as the "source" for any generated events.
-     */
-    private Object source;
-
-    /**
-     * @serialField children                                   Hashtable
-     * @serialField source                                     Object
-     * @serialField vetoableChangeSupportSerializedDataVersion int
-     */
-    private static final ObjectStreamField[] serialPersistentFields = {
-            new ObjectStreamField("children", Hashtable.class),
-            new ObjectStreamField("source", Object.class),
-            new ObjectStreamField("vetoableChangeSupportSerializedDataVersion", Integer.TYPE)
-    };
-
-    /**
-     * Serialization version ID, so we're compatible with JDK 1.1
-     */
-    static final long serialVersionUID = -5090210921595982017L;
-
-    /**
-     * This is a {@link ChangeListenerMap ChangeListenerMap} implementation
-     * that works with {@link VetoableChangeListener VetoableChangeListener} objects.
-     */
-    private static final class VetoableChangeListenerMap extends ChangeListenerMap<VetoableChangeListener> {
-        private static final VetoableChangeListener[] EMPTY = {};
-
-        /**
-         * Creates an array of {@link VetoableChangeListener VetoableChangeListener} objects.
-         * This method uses the same instance of the empty array
-         * when {@code length} equals {@code 0}.
-         *
-         * @param length  the array length
-         * @return        an array with specified length
-         */
-        @Override
-        protected VetoableChangeListener[] newArray(int length) {
-            return (0 < length)
-                    ? new VetoableChangeListener[length]
-                    : EMPTY;
-        }
-
-        /**
-         * Creates a {@link VetoableChangeListenerProxy VetoableChangeListenerProxy}
-         * object for the specified property.
-         *
-         * @param name      the name of the property to listen on
-         * @param listener  the listener to process events
-         * @return          a {@code VetoableChangeListenerProxy} object
-         */
-        @Override
-        protected VetoableChangeListener newProxy(String name, VetoableChangeListener listener) {
-            return new VetoableChangeListenerProxy(name, listener);
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/Bits.java
--- a/emul/compact/src/main/java/java/io/Bits.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Utility methods for packing/unpacking primitive values in/out of byte arrays
- * using big-endian byte ordering.
- */
-class Bits {
-
-    /*
-     * Methods for unpacking primitive values from byte arrays starting at
-     * given offsets.
-     */
-
-    static boolean getBoolean(byte[] b, int off) {
-        return b[off] != 0;
-    }
-
-    static char getChar(byte[] b, int off) {
-        return (char) ((b[off + 1] & 0xFF) +
-                       (b[off] << 8));
-    }
-
-    static short getShort(byte[] b, int off) {
-        return (short) ((b[off + 1] & 0xFF) +
-                        (b[off] << 8));
-    }
-
-    static int getInt(byte[] b, int off) {
-        return ((b[off + 3] & 0xFF)      ) +
-               ((b[off + 2] & 0xFF) <<  8) +
-               ((b[off + 1] & 0xFF) << 16) +
-               ((b[off    ]       ) << 24);
-    }
-
-    static float getFloat(byte[] b, int off) {
-        return Float.intBitsToFloat(getInt(b, off));
-    }
-
-    static long getLong(byte[] b, int off) {
-        return ((b[off + 7] & 0xFFL)      ) +
-               ((b[off + 6] & 0xFFL) <<  8) +
-               ((b[off + 5] & 0xFFL) << 16) +
-               ((b[off + 4] & 0xFFL) << 24) +
-               ((b[off + 3] & 0xFFL) << 32) +
-               ((b[off + 2] & 0xFFL) << 40) +
-               ((b[off + 1] & 0xFFL) << 48) +
-               (((long) b[off])      << 56);
-    }
-
-    static double getDouble(byte[] b, int off) {
-        return Double.longBitsToDouble(getLong(b, off));
-    }
-
-    /*
-     * Methods for packing primitive values into byte arrays starting at given
-     * offsets.
-     */
-
-    static void putBoolean(byte[] b, int off, boolean val) {
-        b[off] = (byte) (val ? 1 : 0);
-    }
-
-    static void putChar(byte[] b, int off, char val) {
-        b[off + 1] = (byte) (val      );
-        b[off    ] = (byte) (val >>> 8);
-    }
-
-    static void putShort(byte[] b, int off, short val) {
-        b[off + 1] = (byte) (val      );
-        b[off    ] = (byte) (val >>> 8);
-    }
-
-    static void putInt(byte[] b, int off, int val) {
-        b[off + 3] = (byte) (val       );
-        b[off + 2] = (byte) (val >>>  8);
-        b[off + 1] = (byte) (val >>> 16);
-        b[off    ] = (byte) (val >>> 24);
-    }
-
-    static void putFloat(byte[] b, int off, float val) {
-        putInt(b, off,  Float.floatToIntBits(val));
-    }
-
-    static void putLong(byte[] b, int off, long val) {
-        b[off + 7] = (byte) (val       );
-        b[off + 6] = (byte) (val >>>  8);
-        b[off + 5] = (byte) (val >>> 16);
-        b[off + 4] = (byte) (val >>> 24);
-        b[off + 3] = (byte) (val >>> 32);
-        b[off + 2] = (byte) (val >>> 40);
-        b[off + 1] = (byte) (val >>> 48);
-        b[off    ] = (byte) (val >>> 56);
-    }
-
-    static void putDouble(byte[] b, int off, double val) {
-        putLong(b, off, Double.doubleToLongBits(val));
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/BufferedOutputStream.java
--- a/emul/compact/src/main/java/java/io/BufferedOutputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * The class implements a buffered output stream. By setting up such
- * an output stream, an application can write bytes to the underlying
- * output stream without necessarily causing a call to the underlying
- * system for each byte written.
- *
- * @author  Arthur van Hoff
- * @since   JDK1.0
- */
-public
-class BufferedOutputStream extends FilterOutputStream {
-    /**
-     * The internal buffer where data is stored.
-     */
-    protected byte buf[];
-
-    /**
-     * The number of valid bytes in the buffer. This value is always
-     * in the range <tt>0</tt> through <tt>buf.length</tt>; elements
-     * <tt>buf[0]</tt> through <tt>buf[count-1]</tt> contain valid
-     * byte data.
-     */
-    protected int count;
-
-    /**
-     * Creates a new buffered output stream to write data to the
-     * specified underlying output stream.
-     *
-     * @param   out   the underlying output stream.
-     */
-    public BufferedOutputStream(OutputStream out) {
-        this(out, 8192);
-    }
-
-    /**
-     * Creates a new buffered output stream to write data to the
-     * specified underlying output stream with the specified buffer
-     * size.
-     *
-     * @param   out    the underlying output stream.
-     * @param   size   the buffer size.
-     * @exception IllegalArgumentException if size &lt;= 0.
-     */
-    public BufferedOutputStream(OutputStream out, int size) {
-        super(out);
-        if (size <= 0) {
-            throw new IllegalArgumentException("Buffer size <= 0");
-        }
-        buf = new byte[size];
-    }
-
-    /** Flush the internal buffer */
-    private void flushBuffer() throws IOException {
-        if (count > 0) {
-            out.write(buf, 0, count);
-            count = 0;
-        }
-    }
-
-    /**
-     * Writes the specified byte to this buffered output stream.
-     *
-     * @param      b   the byte to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public synchronized void write(int b) throws IOException {
-        if (count >= buf.length) {
-            flushBuffer();
-        }
-        buf[count++] = (byte)b;
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this buffered output stream.
-     *
-     * <p> Ordinarily this method stores bytes from the given array into this
-     * stream's buffer, flushing the buffer to the underlying output stream as
-     * needed.  If the requested length is at least as large as this stream's
-     * buffer, however, then this method will flush the buffer and write the
-     * bytes directly to the underlying output stream.  Thus redundant
-     * <code>BufferedOutputStream</code>s will not copy data unnecessarily.
-     *
-     * @param      b     the data.
-     * @param      off   the start offset in the data.
-     * @param      len   the number of bytes to write.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public synchronized void write(byte b[], int off, int len) throws IOException {
-        if (len >= buf.length) {
-            /* If the request length exceeds the size of the output buffer,
-               flush the output buffer and then write the data directly.
-               In this way buffered streams will cascade harmlessly. */
-            flushBuffer();
-            out.write(b, off, len);
-            return;
-        }
-        if (len > buf.length - count) {
-            flushBuffer();
-        }
-        System.arraycopy(b, off, buf, count, len);
-        count += len;
-    }
-
-    /**
-     * Flushes this buffered output stream. This forces any buffered
-     * output bytes to be written out to the underlying output stream.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public synchronized void flush() throws IOException {
-        flushBuffer();
-        out.flush();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/BufferedReader.java
--- a/emul/compact/src/main/java/java/io/BufferedReader.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,523 +0,0 @@
-/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-
-
-/**
- * Reads text from a character-input stream, buffering characters so as to
- * provide for the efficient reading of characters, arrays, and lines.
- *
- * <p> The buffer size may be specified, or the default size may be used.  The
- * default is large enough for most purposes.
- *
- * <p> In general, each read request made of a Reader causes a corresponding
- * read request to be made of the underlying character or byte stream.  It is
- * therefore advisable to wrap a BufferedReader around any Reader whose read()
- * operations may be costly, such as FileReaders and InputStreamReaders.  For
- * example,
- *
- * <pre>
- * BufferedReader in
- *   = new BufferedReader(new FileReader("foo.in"));
- * </pre>
- *
- * will buffer the input from the specified file.  Without buffering, each
- * invocation of read() or readLine() could cause bytes to be read from the
- * file, converted into characters, and then returned, which can be very
- * inefficient.
- *
- * <p> Programs that use DataInputStreams for textual input can be localized by
- * replacing each DataInputStream with an appropriate BufferedReader.
- *
- * @see FileReader
- * @see InputStreamReader
- * @see java.nio.file.Files#newBufferedReader
- *
- * @author      Mark Reinhold
- * @since       JDK1.1
- */
-
-public class BufferedReader extends Reader {
-
-    private Reader in;
-
-    private char cb[];
-    private int nChars, nextChar;
-
-    private static final int INVALIDATED = -2;
-    private static final int UNMARKED = -1;
-    private int markedChar = UNMARKED;
-    private int readAheadLimit = 0; /* Valid only when markedChar > 0 */
-
-    /** If the next character is a line feed, skip it */
-    private boolean skipLF = false;
-
-    /** The skipLF flag when the mark was set */
-    private boolean markedSkipLF = false;
-
-    private static int defaultCharBufferSize = 8192;
-    private static int defaultExpectedLineLength = 80;
-
-    /**
-     * Creates a buffering character-input stream that uses an input buffer of
-     * the specified size.
-     *
-     * @param  in   A Reader
-     * @param  sz   Input-buffer size
-     *
-     * @exception  IllegalArgumentException  If sz is <= 0
-     */
-    public BufferedReader(Reader in, int sz) {
-        super(in);
-        if (sz <= 0)
-            throw new IllegalArgumentException("Buffer size <= 0");
-        this.in = in;
-        cb = new char[sz];
-        nextChar = nChars = 0;
-    }
-
-    /**
-     * Creates a buffering character-input stream that uses a default-sized
-     * input buffer.
-     *
-     * @param  in   A Reader
-     */
-    public BufferedReader(Reader in) {
-        this(in, defaultCharBufferSize);
-    }
-
-    /** Checks to make sure that the stream has not been closed */
-    private void ensureOpen() throws IOException {
-        if (in == null)
-            throw new IOException("Stream closed");
-    }
-
-    /**
-     * Fills the input buffer, taking the mark into account if it is valid.
-     */
-    private void fill() throws IOException {
-        int dst;
-        if (markedChar <= UNMARKED) {
-            /* No mark */
-            dst = 0;
-        } else {
-            /* Marked */
-            int delta = nextChar - markedChar;
-            if (delta >= readAheadLimit) {
-                /* Gone past read-ahead limit: Invalidate mark */
-                markedChar = INVALIDATED;
-                readAheadLimit = 0;
-                dst = 0;
-            } else {
-                if (readAheadLimit <= cb.length) {
-                    /* Shuffle in the current buffer */
-                    System.arraycopy(cb, markedChar, cb, 0, delta);
-                    markedChar = 0;
-                    dst = delta;
-                } else {
-                    /* Reallocate buffer to accommodate read-ahead limit */
-                    char ncb[] = new char[readAheadLimit];
-                    System.arraycopy(cb, markedChar, ncb, 0, delta);
-                    cb = ncb;
-                    markedChar = 0;
-                    dst = delta;
-                }
-                nextChar = nChars = delta;
-            }
-        }
-
-        int n;
-        do {
-            n = in.read(cb, dst, cb.length - dst);
-        } while (n == 0);
-        if (n > 0) {
-            nChars = dst + n;
-            nextChar = dst;
-        }
-    }
-
-    /**
-     * Reads a single character.
-     *
-     * @return The character read, as an integer in the range
-     *         0 to 65535 (<tt>0x00-0xffff</tt>), or -1 if the
-     *         end of the stream has been reached
-     * @exception  IOException  If an I/O error occurs
-     */
-    public int read() throws IOException {
-        synchronized (lock) {
-            ensureOpen();
-            for (;;) {
-                if (nextChar >= nChars) {
-                    fill();
-                    if (nextChar >= nChars)
-                        return -1;
-                }
-                if (skipLF) {
-                    skipLF = false;
-                    if (cb[nextChar] == '\n') {
-                        nextChar++;
-                        continue;
-                    }
-                }
-                return cb[nextChar++];
-            }
-        }
-    }
-
-    /**
-     * Reads characters into a portion of an array, reading from the underlying
-     * stream if necessary.
-     */
-    private int read1(char[] cbuf, int off, int len) throws IOException {
-        if (nextChar >= nChars) {
-            /* If the requested length is at least as large as the buffer, and
-               if there is no mark/reset activity, and if line feeds are not
-               being skipped, do not bother to copy the characters into the
-               local buffer.  In this way buffered streams will cascade
-               harmlessly. */
-            if (len >= cb.length && markedChar <= UNMARKED && !skipLF) {
-                return in.read(cbuf, off, len);
-            }
-            fill();
-        }
-        if (nextChar >= nChars) return -1;
-        if (skipLF) {
-            skipLF = false;
-            if (cb[nextChar] == '\n') {
-                nextChar++;
-                if (nextChar >= nChars)
-                    fill();
-                if (nextChar >= nChars)
-                    return -1;
-            }
-        }
-        int n = Math.min(len, nChars - nextChar);
-        System.arraycopy(cb, nextChar, cbuf, off, n);
-        nextChar += n;
-        return n;
-    }
-
-    /**
-     * Reads characters into a portion of an array.
-     *
-     * <p> This method implements the general contract of the corresponding
-     * <code>{@link Reader#read(char[], int, int) read}</code> method of the
-     * <code>{@link Reader}</code> class.  As an additional convenience, it
-     * attempts to read as many characters as possible by repeatedly invoking
-     * the <code>read</code> method of the underlying stream.  This iterated
-     * <code>read</code> continues until one of the following conditions becomes
-     * true: <ul>
-     *
-     *   <li> The specified number of characters have been read,
-     *
-     *   <li> The <code>read</code> method of the underlying stream returns
-     *   <code>-1</code>, indicating end-of-file, or
-     *
-     *   <li> The <code>ready</code> method of the underlying stream
-     *   returns <code>false</code>, indicating that further input requests
-     *   would block.
-     *
-     * </ul> If the first <code>read</code> on the underlying stream returns
-     * <code>-1</code> to indicate end-of-file then this method returns
-     * <code>-1</code>.  Otherwise this method returns the number of characters
-     * actually read.
-     *
-     * <p> Subclasses of this class are encouraged, but not required, to
-     * attempt to read as many characters as possible in the same fashion.
-     *
-     * <p> Ordinarily this method takes characters from this stream's character
-     * buffer, filling it from the underlying stream as necessary.  If,
-     * however, the buffer is empty, the mark is not valid, and the requested
-     * length is at least as large as the buffer, then this method will read
-     * characters directly from the underlying stream into the given array.
-     * Thus redundant <code>BufferedReader</code>s will not copy data
-     * unnecessarily.
-     *
-     * @param      cbuf  Destination buffer
-     * @param      off   Offset at which to start storing characters
-     * @param      len   Maximum number of characters to read
-     *
-     * @return     The number of characters read, or -1 if the end of the
-     *             stream has been reached
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    public int read(char cbuf[], int off, int len) throws IOException {
-        synchronized (lock) {
-            ensureOpen();
-            if ((off < 0) || (off > cbuf.length) || (len < 0) ||
-                ((off + len) > cbuf.length) || ((off + len) < 0)) {
-                throw new IndexOutOfBoundsException();
-            } else if (len == 0) {
-                return 0;
-            }
-
-            int n = read1(cbuf, off, len);
-            if (n <= 0) return n;
-            while ((n < len) && in.ready()) {
-                int n1 = read1(cbuf, off + n, len - n);
-                if (n1 <= 0) break;
-                n += n1;
-            }
-            return n;
-        }
-    }
-
-    /**
-     * Reads a line of text.  A line is considered to be terminated by any one
-     * of a line feed ('\n'), a carriage return ('\r'), or a carriage return
-     * followed immediately by a linefeed.
-     *
-     * @param      ignoreLF  If true, the next '\n' will be skipped
-     *
-     * @return     A String containing the contents of the line, not including
-     *             any line-termination characters, or null if the end of the
-     *             stream has been reached
-     *
-     * @see        java.io.LineNumberReader#readLine()
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    String readLine(boolean ignoreLF) throws IOException {
-        StringBuffer s = null;
-        int startChar;
-
-        synchronized (lock) {
-            ensureOpen();
-            boolean omitLF = ignoreLF || skipLF;
-
-        bufferLoop:
-            for (;;) {
-
-                if (nextChar >= nChars)
-                    fill();
-                if (nextChar >= nChars) { /* EOF */
-                    if (s != null && s.length() > 0)
-                        return s.toString();
-                    else
-                        return null;
-                }
-                boolean eol = false;
-                char c = 0;
-                int i;
-
-                /* Skip a leftover '\n', if necessary */
-                if (omitLF && (cb[nextChar] == '\n'))
-                    nextChar++;
-                skipLF = false;
-                omitLF = false;
-
-            charLoop:
-                for (i = nextChar; i < nChars; i++) {
-                    c = cb[i];
-                    if ((c == '\n') || (c == '\r')) {
-                        eol = true;
-                        break charLoop;
-                    }
-                }
-
-                startChar = nextChar;
-                nextChar = i;
-
-                if (eol) {
-                    String str;
-                    if (s == null) {
-                        str = new String(cb, startChar, i - startChar);
-                    } else {
-                        s.append(cb, startChar, i - startChar);
-                        str = s.toString();
-                    }
-                    nextChar++;
-                    if (c == '\r') {
-                        skipLF = true;
-                    }
-                    return str;
-                }
-
-                if (s == null)
-                    s = new StringBuffer(defaultExpectedLineLength);
-                s.append(cb, startChar, i - startChar);
-            }
-        }
-    }
-
-    /**
-     * Reads a line of text.  A line is considered to be terminated by any one
-     * of a line feed ('\n'), a carriage return ('\r'), or a carriage return
-     * followed immediately by a linefeed.
-     *
-     * @return     A String containing the contents of the line, not including
-     *             any line-termination characters, or null if the end of the
-     *             stream has been reached
-     *
-     * @exception  IOException  If an I/O error occurs
-     *
-     * @see java.nio.file.Files#readAllLines
-     */
-    public String readLine() throws IOException {
-        return readLine(false);
-    }
-
-    /**
-     * Skips characters.
-     *
-     * @param  n  The number of characters to skip
-     *
-     * @return    The number of characters actually skipped
-     *
-     * @exception  IllegalArgumentException  If <code>n</code> is negative.
-     * @exception  IOException  If an I/O error occurs
-     */
-    public long skip(long n) throws IOException {
-        if (n < 0L) {
-            throw new IllegalArgumentException("skip value is negative");
-        }
-        synchronized (lock) {
-            ensureOpen();
-            long r = n;
-            while (r > 0) {
-                if (nextChar >= nChars)
-                    fill();
-                if (nextChar >= nChars) /* EOF */
-                    break;
-                if (skipLF) {
-                    skipLF = false;
-                    if (cb[nextChar] == '\n') {
-                        nextChar++;
-                    }
-                }
-                long d = nChars - nextChar;
-                if (r <= d) {
-                    nextChar += r;
-                    r = 0;
-                    break;
-                }
-                else {
-                    r -= d;
-                    nextChar = nChars;
-                }
-            }
-            return n - r;
-        }
-    }
-
-    /**
-     * Tells whether this stream is ready to be read.  A buffered character
-     * stream is ready if the buffer is not empty, or if the underlying
-     * character stream is ready.
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    public boolean ready() throws IOException {
-        synchronized (lock) {
-            ensureOpen();
-
-            /*
-             * If newline needs to be skipped and the next char to be read
-             * is a newline character, then just skip it right away.
-             */
-            if (skipLF) {
-                /* Note that in.ready() will return true if and only if the next
-                 * read on the stream will not block.
-                 */
-                if (nextChar >= nChars && in.ready()) {
-                    fill();
-                }
-                if (nextChar < nChars) {
-                    if (cb[nextChar] == '\n')
-                        nextChar++;
-                    skipLF = false;
-                }
-            }
-            return (nextChar < nChars) || in.ready();
-        }
-    }
-
-    /**
-     * Tells whether this stream supports the mark() operation, which it does.
-     */
-    public boolean markSupported() {
-        return true;
-    }
-
-    /**
-     * Marks the present position in the stream.  Subsequent calls to reset()
-     * will attempt to reposition the stream to this point.
-     *
-     * @param readAheadLimit   Limit on the number of characters that may be
-     *                         read while still preserving the mark. An attempt
-     *                         to reset the stream after reading characters
-     *                         up to this limit or beyond may fail.
-     *                         A limit value larger than the size of the input
-     *                         buffer will cause a new buffer to be allocated
-     *                         whose size is no smaller than limit.
-     *                         Therefore large values should be used with care.
-     *
-     * @exception  IllegalArgumentException  If readAheadLimit is < 0
-     * @exception  IOException  If an I/O error occurs
-     */
-    public void mark(int readAheadLimit) throws IOException {
-        if (readAheadLimit < 0) {
-            throw new IllegalArgumentException("Read-ahead limit < 0");
-        }
-        synchronized (lock) {
-            ensureOpen();
-            this.readAheadLimit = readAheadLimit;
-            markedChar = nextChar;
-            markedSkipLF = skipLF;
-        }
-    }
-
-    /**
-     * Resets the stream to the most recent mark.
-     *
-     * @exception  IOException  If the stream has never been marked,
-     *                          or if the mark has been invalidated
-     */
-    public void reset() throws IOException {
-        synchronized (lock) {
-            ensureOpen();
-            if (markedChar < 0)
-                throw new IOException((markedChar == INVALIDATED)
-                                      ? "Mark invalid"
-                                      : "Stream not marked");
-            nextChar = markedChar;
-            skipLF = markedSkipLF;
-        }
-    }
-
-    public void close() throws IOException {
-        synchronized (lock) {
-            if (in == null)
-                return;
-            in.close();
-            in = null;
-            cb = null;
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ByteArrayOutputStream.java
--- a/emul/compact/src/main/java/java/io/ByteArrayOutputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.util.Arrays;
-
-/**
- * This class implements an output stream in which the data is
- * written into a byte array. The buffer automatically grows as data
- * is written to it.
- * The data can be retrieved using <code>toByteArray()</code> and
- * <code>toString()</code>.
- * <p>
- * Closing a <tt>ByteArrayOutputStream</tt> has no effect. The methods in
- * this class can be called after the stream has been closed without
- * generating an <tt>IOException</tt>.
- *
- * @author  Arthur van Hoff
- * @since   JDK1.0
- */
-
-public class ByteArrayOutputStream extends OutputStream {
-
-    /**
-     * The buffer where data is stored.
-     */
-    protected byte buf[];
-
-    /**
-     * The number of valid bytes in the buffer.
-     */
-    protected int count;
-
-    /**
-     * Creates a new byte array output stream. The buffer capacity is
-     * initially 32 bytes, though its size increases if necessary.
-     */
-    public ByteArrayOutputStream() {
-        this(32);
-    }
-
-    /**
-     * Creates a new byte array output stream, with a buffer capacity of
-     * the specified size, in bytes.
-     *
-     * @param   size   the initial size.
-     * @exception  IllegalArgumentException if size is negative.
-     */
-    public ByteArrayOutputStream(int size) {
-        if (size < 0) {
-            throw new IllegalArgumentException("Negative initial size: "
-                                               + size);
-        }
-        buf = new byte[size];
-    }
-
-    /**
-     * Increases the capacity if necessary to ensure that it can hold
-     * at least the number of elements specified by the minimum
-     * capacity argument.
-     *
-     * @param minCapacity the desired minimum capacity
-     * @throws OutOfMemoryError if {@code minCapacity < 0}.  This is
-     * interpreted as a request for the unsatisfiably large capacity
-     * {@code (long) Integer.MAX_VALUE + (minCapacity - Integer.MAX_VALUE)}.
-     */
-    private void ensureCapacity(int minCapacity) {
-        // overflow-conscious code
-        if (minCapacity - buf.length > 0)
-            grow(minCapacity);
-    }
-
-    /**
-     * Increases the capacity to ensure that it can hold at least the
-     * number of elements specified by the minimum capacity argument.
-     *
-     * @param minCapacity the desired minimum capacity
-     */
-    private void grow(int minCapacity) {
-        // overflow-conscious code
-        int oldCapacity = buf.length;
-        int newCapacity = oldCapacity << 1;
-        if (newCapacity - minCapacity < 0)
-            newCapacity = minCapacity;
-        if (newCapacity < 0) {
-            if (minCapacity < 0) // overflow
-                throw new OutOfMemoryError();
-            newCapacity = Integer.MAX_VALUE;
-        }
-        buf = Arrays.copyOf(buf, newCapacity);
-    }
-
-    /**
-     * Writes the specified byte to this byte array output stream.
-     *
-     * @param   b   the byte to be written.
-     */
-    public synchronized void write(int b) {
-        ensureCapacity(count + 1);
-        buf[count] = (byte) b;
-        count += 1;
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this byte array output stream.
-     *
-     * @param   b     the data.
-     * @param   off   the start offset in the data.
-     * @param   len   the number of bytes to write.
-     */
-    public synchronized void write(byte b[], int off, int len) {
-        if ((off < 0) || (off > b.length) || (len < 0) ||
-            ((off + len) - b.length > 0)) {
-            throw new IndexOutOfBoundsException();
-        }
-        ensureCapacity(count + len);
-        System.arraycopy(b, off, buf, count, len);
-        count += len;
-    }
-
-    /**
-     * Writes the complete contents of this byte array output stream to
-     * the specified output stream argument, as if by calling the output
-     * stream's write method using <code>out.write(buf, 0, count)</code>.
-     *
-     * @param      out   the output stream to which to write the data.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public synchronized void writeTo(OutputStream out) throws IOException {
-        out.write(buf, 0, count);
-    }
-
-    /**
-     * Resets the <code>count</code> field of this byte array output
-     * stream to zero, so that all currently accumulated output in the
-     * output stream is discarded. The output stream can be used again,
-     * reusing the already allocated buffer space.
-     *
-     * @see     java.io.ByteArrayInputStream#count
-     */
-    public synchronized void reset() {
-        count = 0;
-    }
-
-    /**
-     * Creates a newly allocated byte array. Its size is the current
-     * size of this output stream and the valid contents of the buffer
-     * have been copied into it.
-     *
-     * @return  the current contents of this output stream, as a byte array.
-     * @see     java.io.ByteArrayOutputStream#size()
-     */
-    public synchronized byte toByteArray()[] {
-        return Arrays.copyOf(buf, count);
-    }
-
-    /**
-     * Returns the current size of the buffer.
-     *
-     * @return  the value of the <code>count</code> field, which is the number
-     *          of valid bytes in this output stream.
-     * @see     java.io.ByteArrayOutputStream#count
-     */
-    public synchronized int size() {
-        return count;
-    }
-
-    /**
-     * Converts the buffer's contents into a string decoding bytes using the
-     * platform's default character set. The length of the new <tt>String</tt>
-     * is a function of the character set, and hence may not be equal to the
-     * size of the buffer.
-     *
-     * <p> This method always replaces malformed-input and unmappable-character
-     * sequences with the default replacement string for the platform's
-     * default character set. The {@linkplain java.nio.charset.CharsetDecoder}
-     * class should be used when more control over the decoding process is
-     * required.
-     *
-     * @return String decoded from the buffer's contents.
-     * @since  JDK1.1
-     */
-    public synchronized String toString() {
-        return new String(buf, 0, count);
-    }
-
-    /**
-     * Converts the buffer's contents into a string by decoding the bytes using
-     * the specified {@link java.nio.charset.Charset charsetName}. The length of
-     * the new <tt>String</tt> is a function of the charset, and hence may not be
-     * equal to the length of the byte array.
-     *
-     * <p> This method always replaces malformed-input and unmappable-character
-     * sequences with this charset's default replacement string. The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  charsetName  the name of a supported
-     *              {@linkplain java.nio.charset.Charset </code>charset<code>}
-     * @return String decoded from the buffer's contents.
-     * @exception  UnsupportedEncodingException
-     *             If the named charset is not supported
-     * @since   JDK1.1
-     */
-    public synchronized String toString(String charsetName)
-        throws UnsupportedEncodingException
-    {
-        return new String(buf, 0, count, charsetName);
-    }
-
-    /**
-     * Creates a newly allocated string. Its size is the current size of
-     * the output stream and the valid contents of the buffer have been
-     * copied into it. Each character <i>c</i> in the resulting string is
-     * constructed from the corresponding element <i>b</i> in the byte
-     * array such that:
-     * <blockquote><pre>
-     *     c == (char)(((hibyte &amp; 0xff) &lt;&lt; 8) | (b &amp; 0xff))
-     * </pre></blockquote>
-     *
-     * @deprecated This method does not properly convert bytes into characters.
-     * As of JDK&nbsp;1.1, the preferred way to do this is via the
-     * <code>toString(String enc)</code> method, which takes an encoding-name
-     * argument, or the <code>toString()</code> method, which uses the
-     * platform's default character encoding.
-     *
-     * @param      hibyte    the high byte of each resulting Unicode character.
-     * @return     the current contents of the output stream, as a string.
-     * @see        java.io.ByteArrayOutputStream#size()
-     * @see        java.io.ByteArrayOutputStream#toString(String)
-     * @see        java.io.ByteArrayOutputStream#toString()
-     */
-    @Deprecated
-    public synchronized String toString(int hibyte) {
-        return new String(buf, hibyte, 0, count);
-    }
-
-    /**
-     * Closing a <tt>ByteArrayOutputStream</tt> has no effect. The methods in
-     * this class can be called after the stream has been closed without
-     * generating an <tt>IOException</tt>.
-     * <p>
-     *
-     */
-    public void close() throws IOException {
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/DataOutput.java
--- a/emul/compact/src/main/java/java/io/DataOutput.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * The <code>DataOutput</code> interface provides
- * for converting data from any of the Java
- * primitive types to a series of bytes and
- * writing these bytes to a binary stream.
- * There is  also a facility for converting
- * a <code>String</code> into
- * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
- * format and writing the resulting series
- * of bytes.
- * <p>
- * For all the methods in this interface that
- * write bytes, it is generally true that if
- * a byte cannot be written for any reason,
- * an <code>IOException</code> is thrown.
- *
- * @author  Frank Yellin
- * @see     java.io.DataInput
- * @see     java.io.DataOutputStream
- * @since   JDK1.0
- */
-public
-interface DataOutput {
-    /**
-     * Writes to the output stream the eight
-     * low-order bits of the argument <code>b</code>.
-     * The 24 high-order  bits of <code>b</code>
-     * are ignored.
-     *
-     * @param      b   the byte to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void write(int b) throws IOException;
-
-    /**
-     * Writes to the output stream all the bytes in array <code>b</code>.
-     * If <code>b</code> is <code>null</code>,
-     * a <code>NullPointerException</code> is thrown.
-     * If <code>b.length</code> is zero, then
-     * no bytes are written. Otherwise, the byte
-     * <code>b[0]</code> is written first, then
-     * <code>b[1]</code>, and so on; the last byte
-     * written is <code>b[b.length-1]</code>.
-     *
-     * @param      b   the data.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void write(byte b[]) throws IOException;
-
-    /**
-     * Writes <code>len</code> bytes from array
-     * <code>b</code>, in order,  to
-     * the output stream.  If <code>b</code>
-     * is <code>null</code>, a <code>NullPointerException</code>
-     * is thrown.  If <code>off</code> is negative,
-     * or <code>len</code> is negative, or <code>off+len</code>
-     * is greater than the length of the array
-     * <code>b</code>, then an <code>IndexOutOfBoundsException</code>
-     * is thrown.  If <code>len</code> is zero,
-     * then no bytes are written. Otherwise, the
-     * byte <code>b[off]</code> is written first,
-     * then <code>b[off+1]</code>, and so on; the
-     * last byte written is <code>b[off+len-1]</code>.
-     *
-     * @param      b     the data.
-     * @param      off   the start offset in the data.
-     * @param      len   the number of bytes to write.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void write(byte b[], int off, int len) throws IOException;
-
-    /**
-     * Writes a <code>boolean</code> value to this output stream.
-     * If the argument <code>v</code>
-     * is <code>true</code>, the value <code>(byte)1</code>
-     * is written; if <code>v</code> is <code>false</code>,
-     * the  value <code>(byte)0</code> is written.
-     * The byte written by this method may
-     * be read by the <code>readBoolean</code>
-     * method of interface <code>DataInput</code>,
-     * which will then return a <code>boolean</code>
-     * equal to <code>v</code>.
-     *
-     * @param      v   the boolean to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeBoolean(boolean v) throws IOException;
-
-    /**
-     * Writes to the output stream the eight low-
-     * order bits of the argument <code>v</code>.
-     * The 24 high-order bits of <code>v</code>
-     * are ignored. (This means  that <code>writeByte</code>
-     * does exactly the same thing as <code>write</code>
-     * for an integer argument.) The byte written
-     * by this method may be read by the <code>readByte</code>
-     * method of interface <code>DataInput</code>,
-     * which will then return a <code>byte</code>
-     * equal to <code>(byte)v</code>.
-     *
-     * @param      v   the byte value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeByte(int v) throws IOException;
-
-    /**
-     * Writes two bytes to the output
-     * stream to represent the value of the argument.
-     * The byte values to be written, in the  order
-     * shown, are: <p>
-     * <pre><code>
-     * (byte)(0xff &amp; (v &gt;&gt; 8))
-     * (byte)(0xff &amp; v)
-     * </code> </pre> <p>
-     * The bytes written by this method may be
-     * read by the <code>readShort</code> method
-     * of interface <code>DataInput</code> , which
-     * will then return a <code>short</code> equal
-     * to <code>(short)v</code>.
-     *
-     * @param      v   the <code>short</code> value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeShort(int v) throws IOException;
-
-    /**
-     * Writes a <code>char</code> value, which
-     * is comprised of two bytes, to the
-     * output stream.
-     * The byte values to be written, in the  order
-     * shown, are:
-     * <p><pre><code>
-     * (byte)(0xff &amp; (v &gt;&gt; 8))
-     * (byte)(0xff &amp; v)
-     * </code></pre><p>
-     * The bytes written by this method may be
-     * read by the <code>readChar</code> method
-     * of interface <code>DataInput</code> , which
-     * will then return a <code>char</code> equal
-     * to <code>(char)v</code>.
-     *
-     * @param      v   the <code>char</code> value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeChar(int v) throws IOException;
-
-    /**
-     * Writes an <code>int</code> value, which is
-     * comprised of four bytes, to the output stream.
-     * The byte values to be written, in the  order
-     * shown, are:
-     * <p><pre><code>
-     * (byte)(0xff &amp; (v &gt;&gt; 24))
-     * (byte)(0xff &amp; (v &gt;&gt; 16))
-     * (byte)(0xff &amp; (v &gt;&gt; &#32; &#32;8))
-     * (byte)(0xff &amp; v)
-     * </code></pre><p>
-     * The bytes written by this method may be read
-     * by the <code>readInt</code> method of interface
-     * <code>DataInput</code> , which will then
-     * return an <code>int</code> equal to <code>v</code>.
-     *
-     * @param      v   the <code>int</code> value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeInt(int v) throws IOException;
-
-    /**
-     * Writes a <code>long</code> value, which is
-     * comprised of eight bytes, to the output stream.
-     * The byte values to be written, in the  order
-     * shown, are:
-     * <p><pre><code>
-     * (byte)(0xff &amp; (v &gt;&gt; 56))
-     * (byte)(0xff &amp; (v &gt;&gt; 48))
-     * (byte)(0xff &amp; (v &gt;&gt; 40))
-     * (byte)(0xff &amp; (v &gt;&gt; 32))
-     * (byte)(0xff &amp; (v &gt;&gt; 24))
-     * (byte)(0xff &amp; (v &gt;&gt; 16))
-     * (byte)(0xff &amp; (v &gt;&gt;  8))
-     * (byte)(0xff &amp; v)
-     * </code></pre><p>
-     * The bytes written by this method may be
-     * read by the <code>readLong</code> method
-     * of interface <code>DataInput</code> , which
-     * will then return a <code>long</code> equal
-     * to <code>v</code>.
-     *
-     * @param      v   the <code>long</code> value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeLong(long v) throws IOException;
-
-    /**
-     * Writes a <code>float</code> value,
-     * which is comprised of four bytes, to the output stream.
-     * It does this as if it first converts this
-     * <code>float</code> value to an <code>int</code>
-     * in exactly the manner of the <code>Float.floatToIntBits</code>
-     * method  and then writes the <code>int</code>
-     * value in exactly the manner of the  <code>writeInt</code>
-     * method.  The bytes written by this method
-     * may be read by the <code>readFloat</code>
-     * method of interface <code>DataInput</code>,
-     * which will then return a <code>float</code>
-     * equal to <code>v</code>.
-     *
-     * @param      v   the <code>float</code> value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeFloat(float v) throws IOException;
-
-    /**
-     * Writes a <code>double</code> value,
-     * which is comprised of eight bytes, to the output stream.
-     * It does this as if it first converts this
-     * <code>double</code> value to a <code>long</code>
-     * in exactly the manner of the <code>Double.doubleToLongBits</code>
-     * method  and then writes the <code>long</code>
-     * value in exactly the manner of the  <code>writeLong</code>
-     * method. The bytes written by this method
-     * may be read by the <code>readDouble</code>
-     * method of interface <code>DataInput</code>,
-     * which will then return a <code>double</code>
-     * equal to <code>v</code>.
-     *
-     * @param      v   the <code>double</code> value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeDouble(double v) throws IOException;
-
-    /**
-     * Writes a string to the output stream.
-     * For every character in the string
-     * <code>s</code>,  taken in order, one byte
-     * is written to the output stream.  If
-     * <code>s</code> is <code>null</code>, a <code>NullPointerException</code>
-     * is thrown.<p>  If <code>s.length</code>
-     * is zero, then no bytes are written. Otherwise,
-     * the character <code>s[0]</code> is written
-     * first, then <code>s[1]</code>, and so on;
-     * the last character written is <code>s[s.length-1]</code>.
-     * For each character, one byte is written,
-     * the low-order byte, in exactly the manner
-     * of the <code>writeByte</code> method . The
-     * high-order eight bits of each character
-     * in the string are ignored.
-     *
-     * @param      s   the string of bytes to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeBytes(String s) throws IOException;
-
-    /**
-     * Writes every character in the string <code>s</code>,
-     * to the output stream, in order,
-     * two bytes per character. If <code>s</code>
-     * is <code>null</code>, a <code>NullPointerException</code>
-     * is thrown.  If <code>s.length</code>
-     * is zero, then no characters are written.
-     * Otherwise, the character <code>s[0]</code>
-     * is written first, then <code>s[1]</code>,
-     * and so on; the last character written is
-     * <code>s[s.length-1]</code>. For each character,
-     * two bytes are actually written, high-order
-     * byte first, in exactly the manner of the
-     * <code>writeChar</code> method.
-     *
-     * @param      s   the string value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeChars(String s) throws IOException;
-
-    /**
-     * Writes two bytes of length information
-     * to the output stream, followed
-     * by the
-     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
-     * representation
-     * of  every character in the string <code>s</code>.
-     * If <code>s</code> is <code>null</code>,
-     * a <code>NullPointerException</code> is thrown.
-     * Each character in the string <code>s</code>
-     * is converted to a group of one, two, or
-     * three bytes, depending on the value of the
-     * character.<p>
-     * If a character <code>c</code>
-     * is in the range <code>&#92;u0001</code> through
-     * <code>&#92;u007f</code>, it is represented
-     * by one byte:<p>
-     * <pre>(byte)c </pre>  <p>
-     * If a character <code>c</code> is <code>&#92;u0000</code>
-     * or is in the range <code>&#92;u0080</code>
-     * through <code>&#92;u07ff</code>, then it is
-     * represented by two bytes, to be written
-     * in the order shown:<p> <pre><code>
-     * (byte)(0xc0 | (0x1f &amp; (c &gt;&gt; 6)))
-     * (byte)(0x80 | (0x3f &amp; c))
-     *  </code></pre>  <p> If a character
-     * <code>c</code> is in the range <code>&#92;u0800</code>
-     * through <code>uffff</code>, then it is
-     * represented by three bytes, to be written
-     * in the order shown:<p> <pre><code>
-     * (byte)(0xe0 | (0x0f &amp; (c &gt;&gt; 12)))
-     * (byte)(0x80 | (0x3f &amp; (c &gt;&gt;  6)))
-     * (byte)(0x80 | (0x3f &amp; c))
-     *  </code></pre>  <p> First,
-     * the total number of bytes needed to represent
-     * all the characters of <code>s</code> is
-     * calculated. If this number is larger than
-     * <code>65535</code>, then a <code>UTFDataFormatException</code>
-     * is thrown. Otherwise, this length is written
-     * to the output stream in exactly the manner
-     * of the <code>writeShort</code> method;
-     * after this, the one-, two-, or three-byte
-     * representation of each character in the
-     * string <code>s</code> is written.<p>  The
-     * bytes written by this method may be read
-     * by the <code>readUTF</code> method of interface
-     * <code>DataInput</code> , which will then
-     * return a <code>String</code> equal to <code>s</code>.
-     *
-     * @param      s   the string value to be written.
-     * @throws     IOException  if an I/O error occurs.
-     */
-    void writeUTF(String s) throws IOException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/DataOutputStream.java
--- a/emul/compact/src/main/java/java/io/DataOutputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,416 +0,0 @@
-/*
- * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * A data output stream lets an application write primitive Java data
- * types to an output stream in a portable way. An application can
- * then use a data input stream to read the data back in.
- *
- * @author  unascribed
- * @see     java.io.DataInputStream
- * @since   JDK1.0
- */
-public
-class DataOutputStream extends FilterOutputStream implements DataOutput {
-    /**
-     * The number of bytes written to the data output stream so far.
-     * If this counter overflows, it will be wrapped to Integer.MAX_VALUE.
-     */
-    protected int written;
-
-    /**
-     * bytearr is initialized on demand by writeUTF
-     */
-    private byte[] bytearr = null;
-
-    /**
-     * Creates a new data output stream to write data to the specified
-     * underlying output stream. The counter <code>written</code> is
-     * set to zero.
-     *
-     * @param   out   the underlying output stream, to be saved for later
-     *                use.
-     * @see     java.io.FilterOutputStream#out
-     */
-    public DataOutputStream(OutputStream out) {
-        super(out);
-    }
-
-    /**
-     * Increases the written counter by the specified value
-     * until it reaches Integer.MAX_VALUE.
-     */
-    private void incCount(int value) {
-        int temp = written + value;
-        if (temp < 0) {
-            temp = Integer.MAX_VALUE;
-        }
-        written = temp;
-    }
-
-    /**
-     * Writes the specified byte (the low eight bits of the argument
-     * <code>b</code>) to the underlying output stream. If no exception
-     * is thrown, the counter <code>written</code> is incremented by
-     * <code>1</code>.
-     * <p>
-     * Implements the <code>write</code> method of <code>OutputStream</code>.
-     *
-     * @param      b   the <code>byte</code> to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public synchronized void write(int b) throws IOException {
-        out.write(b);
-        incCount(1);
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to the underlying output stream.
-     * If no exception is thrown, the counter <code>written</code> is
-     * incremented by <code>len</code>.
-     *
-     * @param      b     the data.
-     * @param      off   the start offset in the data.
-     * @param      len   the number of bytes to write.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public synchronized void write(byte b[], int off, int len)
-        throws IOException
-    {
-        out.write(b, off, len);
-        incCount(len);
-    }
-
-    /**
-     * Flushes this data output stream. This forces any buffered output
-     * bytes to be written out to the stream.
-     * <p>
-     * The <code>flush</code> method of <code>DataOutputStream</code>
-     * calls the <code>flush</code> method of its underlying output stream.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     * @see        java.io.OutputStream#flush()
-     */
-    public void flush() throws IOException {
-        out.flush();
-    }
-
-    /**
-     * Writes a <code>boolean</code> to the underlying output stream as
-     * a 1-byte value. The value <code>true</code> is written out as the
-     * value <code>(byte)1</code>; the value <code>false</code> is
-     * written out as the value <code>(byte)0</code>. If no exception is
-     * thrown, the counter <code>written</code> is incremented by
-     * <code>1</code>.
-     *
-     * @param      v   a <code>boolean</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public final void writeBoolean(boolean v) throws IOException {
-        out.write(v ? 1 : 0);
-        incCount(1);
-    }
-
-    /**
-     * Writes out a <code>byte</code> to the underlying output stream as
-     * a 1-byte value. If no exception is thrown, the counter
-     * <code>written</code> is incremented by <code>1</code>.
-     *
-     * @param      v   a <code>byte</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public final void writeByte(int v) throws IOException {
-        out.write(v);
-        incCount(1);
-    }
-
-    /**
-     * Writes a <code>short</code> to the underlying output stream as two
-     * bytes, high byte first. If no exception is thrown, the counter
-     * <code>written</code> is incremented by <code>2</code>.
-     *
-     * @param      v   a <code>short</code> to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public final void writeShort(int v) throws IOException {
-        out.write((v >>> 8) & 0xFF);
-        out.write((v >>> 0) & 0xFF);
-        incCount(2);
-    }
-
-    /**
-     * Writes a <code>char</code> to the underlying output stream as a
-     * 2-byte value, high byte first. If no exception is thrown, the
-     * counter <code>written</code> is incremented by <code>2</code>.
-     *
-     * @param      v   a <code>char</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public final void writeChar(int v) throws IOException {
-        out.write((v >>> 8) & 0xFF);
-        out.write((v >>> 0) & 0xFF);
-        incCount(2);
-    }
-
-    /**
-     * Writes an <code>int</code> to the underlying output stream as four
-     * bytes, high byte first. If no exception is thrown, the counter
-     * <code>written</code> is incremented by <code>4</code>.
-     *
-     * @param      v   an <code>int</code> to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public final void writeInt(int v) throws IOException {
-        out.write((v >>> 24) & 0xFF);
-        out.write((v >>> 16) & 0xFF);
-        out.write((v >>>  8) & 0xFF);
-        out.write((v >>>  0) & 0xFF);
-        incCount(4);
-    }
-
-    private byte writeBuffer[] = new byte[8];
-
-    /**
-     * Writes a <code>long</code> to the underlying output stream as eight
-     * bytes, high byte first. In no exception is thrown, the counter
-     * <code>written</code> is incremented by <code>8</code>.
-     *
-     * @param      v   a <code>long</code> to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public final void writeLong(long v) throws IOException {
-        writeBuffer[0] = (byte)(v >>> 56);
-        writeBuffer[1] = (byte)(v >>> 48);
-        writeBuffer[2] = (byte)(v >>> 40);
-        writeBuffer[3] = (byte)(v >>> 32);
-        writeBuffer[4] = (byte)(v >>> 24);
-        writeBuffer[5] = (byte)(v >>> 16);
-        writeBuffer[6] = (byte)(v >>>  8);
-        writeBuffer[7] = (byte)(v >>>  0);
-        out.write(writeBuffer, 0, 8);
-        incCount(8);
-    }
-
-    /**
-     * Converts the float argument to an <code>int</code> using the
-     * <code>floatToIntBits</code> method in class <code>Float</code>,
-     * and then writes that <code>int</code> value to the underlying
-     * output stream as a 4-byte quantity, high byte first. If no
-     * exception is thrown, the counter <code>written</code> is
-     * incremented by <code>4</code>.
-     *
-     * @param      v   a <code>float</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     * @see        java.lang.Float#floatToIntBits(float)
-     */
-    public final void writeFloat(float v) throws IOException {
-        writeInt(Float.floatToIntBits(v));
-    }
-
-    /**
-     * Converts the double argument to a <code>long</code> using the
-     * <code>doubleToLongBits</code> method in class <code>Double</code>,
-     * and then writes that <code>long</code> value to the underlying
-     * output stream as an 8-byte quantity, high byte first. If no
-     * exception is thrown, the counter <code>written</code> is
-     * incremented by <code>8</code>.
-     *
-     * @param      v   a <code>double</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     * @see        java.lang.Double#doubleToLongBits(double)
-     */
-    public final void writeDouble(double v) throws IOException {
-        writeLong(Double.doubleToLongBits(v));
-    }
-
-    /**
-     * Writes out the string to the underlying output stream as a
-     * sequence of bytes. Each character in the string is written out, in
-     * sequence, by discarding its high eight bits. If no exception is
-     * thrown, the counter <code>written</code> is incremented by the
-     * length of <code>s</code>.
-     *
-     * @param      s   a string of bytes to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public final void writeBytes(String s) throws IOException {
-        int len = s.length();
-        for (int i = 0 ; i < len ; i++) {
-            out.write((byte)s.charAt(i));
-        }
-        incCount(len);
-    }
-
-    /**
-     * Writes a string to the underlying output stream as a sequence of
-     * characters. Each character is written to the data output stream as
-     * if by the <code>writeChar</code> method. If no exception is
-     * thrown, the counter <code>written</code> is incremented by twice
-     * the length of <code>s</code>.
-     *
-     * @param      s   a <code>String</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.DataOutputStream#writeChar(int)
-     * @see        java.io.FilterOutputStream#out
-     */
-    public final void writeChars(String s) throws IOException {
-        int len = s.length();
-        for (int i = 0 ; i < len ; i++) {
-            int v = s.charAt(i);
-            out.write((v >>> 8) & 0xFF);
-            out.write((v >>> 0) & 0xFF);
-        }
-        incCount(len * 2);
-    }
-
-    /**
-     * Writes a string to the underlying output stream using
-     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
-     * encoding in a machine-independent manner.
-     * <p>
-     * First, two bytes are written to the output stream as if by the
-     * <code>writeShort</code> method giving the number of bytes to
-     * follow. This value is the number of bytes actually written out,
-     * not the length of the string. Following the length, each character
-     * of the string is output, in sequence, using the modified UTF-8 encoding
-     * for the character. If no exception is thrown, the counter
-     * <code>written</code> is incremented by the total number of
-     * bytes written to the output stream. This will be at least two
-     * plus the length of <code>str</code>, and at most two plus
-     * thrice the length of <code>str</code>.
-     *
-     * @param      str   a string to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeUTF(String str) throws IOException {
-        writeUTF(str, this);
-    }
-
-    /**
-     * Writes a string to the specified DataOutput using
-     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
-     * encoding in a machine-independent manner.
-     * <p>
-     * First, two bytes are written to out as if by the <code>writeShort</code>
-     * method giving the number of bytes to follow. This value is the number of
-     * bytes actually written out, not the length of the string. Following the
-     * length, each character of the string is output, in sequence, using the
-     * modified UTF-8 encoding for the character. If no exception is thrown, the
-     * counter <code>written</code> is incremented by the total number of
-     * bytes written to the output stream. This will be at least two
-     * plus the length of <code>str</code>, and at most two plus
-     * thrice the length of <code>str</code>.
-     *
-     * @param      str   a string to be written.
-     * @param      out   destination to write to
-     * @return     The number of bytes written out.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    static int writeUTF(String str, DataOutput out) throws IOException {
-        int strlen = str.length();
-        int utflen = 0;
-        int c, count = 0;
-
-        /* use charAt instead of copying String to char array */
-        for (int i = 0; i < strlen; i++) {
-            c = str.charAt(i);
-            if ((c >= 0x0001) && (c <= 0x007F)) {
-                utflen++;
-            } else if (c > 0x07FF) {
-                utflen += 3;
-            } else {
-                utflen += 2;
-            }
-        }
-
-        if (utflen > 65535)
-            throw new UTFDataFormatException(
-                "encoded string too long: " + utflen + " bytes");
-
-        byte[] bytearr = null;
-        if (out instanceof DataOutputStream) {
-            DataOutputStream dos = (DataOutputStream)out;
-            if(dos.bytearr == null || (dos.bytearr.length < (utflen+2)))
-                dos.bytearr = new byte[(utflen*2) + 2];
-            bytearr = dos.bytearr;
-        } else {
-            bytearr = new byte[utflen+2];
-        }
-
-        bytearr[count++] = (byte) ((utflen >>> 8) & 0xFF);
-        bytearr[count++] = (byte) ((utflen >>> 0) & 0xFF);
-
-        int i=0;
-        for (i=0; i<strlen; i++) {
-           c = str.charAt(i);
-           if (!((c >= 0x0001) && (c <= 0x007F))) break;
-           bytearr[count++] = (byte) c;
-        }
-
-        for (;i < strlen; i++){
-            c = str.charAt(i);
-            if ((c >= 0x0001) && (c <= 0x007F)) {
-                bytearr[count++] = (byte) c;
-
-            } else if (c > 0x07FF) {
-                bytearr[count++] = (byte) (0xE0 | ((c >> 12) & 0x0F));
-                bytearr[count++] = (byte) (0x80 | ((c >>  6) & 0x3F));
-                bytearr[count++] = (byte) (0x80 | ((c >>  0) & 0x3F));
-            } else {
-                bytearr[count++] = (byte) (0xC0 | ((c >>  6) & 0x1F));
-                bytearr[count++] = (byte) (0x80 | ((c >>  0) & 0x3F));
-            }
-        }
-        out.write(bytearr, 0, utflen+2);
-        return utflen + 2;
-    }
-
-    /**
-     * Returns the current value of the counter <code>written</code>,
-     * the number of bytes written to this data output stream so far.
-     * If the counter overflows, it will be wrapped to Integer.MAX_VALUE.
-     *
-     * @return  the value of the <code>written</code> field.
-     * @see     java.io.DataOutputStream#written
-     */
-    public final int size() {
-        return written;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/Externalizable.java
--- a/emul/compact/src/main/java/java/io/Externalizable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-
-/**
- * Only the identity of the class of an Externalizable instance is
- * written in the serialization stream and it is the responsibility
- * of the class to save and restore the contents of its instances.
- *
- * The writeExternal and readExternal methods of the Externalizable
- * interface are implemented by a class to give the class complete
- * control over the format and contents of the stream for an object
- * and its supertypes. These methods must explicitly
- * coordinate with the supertype to save its state. These methods supersede
- * customized implementations of writeObject and readObject methods.<br>
- *
- * Object Serialization uses the Serializable and Externalizable
- * interfaces.  Object persistence mechanisms can use them as well.  Each
- * object to be stored is tested for the Externalizable interface. If
- * the object supports Externalizable, the writeExternal method is called. If the
- * object does not support Externalizable and does implement
- * Serializable, the object is saved using
- * ObjectOutputStream. <br> When an Externalizable object is
- * reconstructed, an instance is created using the public no-arg
- * constructor, then the readExternal method called.  Serializable
- * objects are restored by reading them from an ObjectInputStream.<br>
- *
- * An Externalizable instance can designate a substitution object via
- * the writeReplace and readResolve methods documented in the Serializable
- * interface.<br>
- *
- * @author  unascribed
- * @see java.io.ObjectOutputStream
- * @see java.io.ObjectInputStream
- * @see java.io.ObjectOutput
- * @see java.io.ObjectInput
- * @see java.io.Serializable
- * @since   JDK1.1
- */
-public interface Externalizable extends java.io.Serializable {
-    /**
-     * The object implements the writeExternal method to save its contents
-     * by calling the methods of DataOutput for its primitive values or
-     * calling the writeObject method of ObjectOutput for objects, strings,
-     * and arrays.
-     *
-     * @serialData Overriding methods should use this tag to describe
-     *             the data layout of this Externalizable object.
-     *             List the sequence of element types and, if possible,
-     *             relate the element to a public/protected field and/or
-     *             method of this Externalizable class.
-     *
-     * @param out the stream to write the object to
-     * @exception IOException Includes any I/O exceptions that may occur
-     */
-    void writeExternal(ObjectOutput out) throws IOException;
-
-    /**
-     * The object implements the readExternal method to restore its
-     * contents by calling the methods of DataInput for primitive
-     * types and readObject for objects, strings and arrays.  The
-     * readExternal method must read the values in the same sequence
-     * and with the same types as were written by writeExternal.
-     *
-     * @param in the stream to read data from in order to restore the object
-     * @exception IOException if I/O errors occur
-     * @exception ClassNotFoundException If the class for an object being
-     *              restored cannot be found.
-     */
-    void readExternal(ObjectInput in) throws IOException, ClassNotFoundException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/FilterOutputStream.java
--- a/emul/compact/src/main/java/java/io/FilterOutputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * This class is the superclass of all classes that filter output
- * streams. These streams sit on top of an already existing output
- * stream (the <i>underlying</i> output stream) which it uses as its
- * basic sink of data, but possibly transforming the data along the
- * way or providing additional functionality.
- * <p>
- * The class <code>FilterOutputStream</code> itself simply overrides
- * all methods of <code>OutputStream</code> with versions that pass
- * all requests to the underlying output stream. Subclasses of
- * <code>FilterOutputStream</code> may further override some of these
- * methods as well as provide additional methods and fields.
- *
- * @author  Jonathan Payne
- * @since   JDK1.0
- */
-public
-class FilterOutputStream extends OutputStream {
-    /**
-     * The underlying output stream to be filtered.
-     */
-    protected OutputStream out;
-
-    /**
-     * Creates an output stream filter built on top of the specified
-     * underlying output stream.
-     *
-     * @param   out   the underlying output stream to be assigned to
-     *                the field <tt>this.out</tt> for later use, or
-     *                <code>null</code> if this instance is to be
-     *                created without an underlying stream.
-     */
-    public FilterOutputStream(OutputStream out) {
-        this.out = out;
-    }
-
-    /**
-     * Writes the specified <code>byte</code> to this output stream.
-     * <p>
-     * The <code>write</code> method of <code>FilterOutputStream</code>
-     * calls the <code>write</code> method of its underlying output stream,
-     * that is, it performs <tt>out.write(b)</tt>.
-     * <p>
-     * Implements the abstract <tt>write</tt> method of <tt>OutputStream</tt>.
-     *
-     * @param      b   the <code>byte</code>.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void write(int b) throws IOException {
-        out.write(b);
-    }
-
-    /**
-     * Writes <code>b.length</code> bytes to this output stream.
-     * <p>
-     * The <code>write</code> method of <code>FilterOutputStream</code>
-     * calls its <code>write</code> method of three arguments with the
-     * arguments <code>b</code>, <code>0</code>, and
-     * <code>b.length</code>.
-     * <p>
-     * Note that this method does not call the one-argument
-     * <code>write</code> method of its underlying stream with the single
-     * argument <code>b</code>.
-     *
-     * @param      b   the data to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#write(byte[], int, int)
-     */
-    public void write(byte b[]) throws IOException {
-        write(b, 0, b.length);
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified
-     * <code>byte</code> array starting at offset <code>off</code> to
-     * this output stream.
-     * <p>
-     * The <code>write</code> method of <code>FilterOutputStream</code>
-     * calls the <code>write</code> method of one argument on each
-     * <code>byte</code> to output.
-     * <p>
-     * Note that this method does not call the <code>write</code> method
-     * of its underlying input stream with the same arguments. Subclasses
-     * of <code>FilterOutputStream</code> should provide a more efficient
-     * implementation of this method.
-     *
-     * @param      b     the data.
-     * @param      off   the start offset in the data.
-     * @param      len   the number of bytes to write.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#write(int)
-     */
-    public void write(byte b[], int off, int len) throws IOException {
-        if ((off | len | (b.length - (len + off)) | (off + len)) < 0)
-            throw new IndexOutOfBoundsException();
-
-        for (int i = 0 ; i < len ; i++) {
-            write(b[off + i]);
-        }
-    }
-
-    /**
-     * Flushes this output stream and forces any buffered output bytes
-     * to be written out to the stream.
-     * <p>
-     * The <code>flush</code> method of <code>FilterOutputStream</code>
-     * calls the <code>flush</code> method of its underlying output stream.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#out
-     */
-    public void flush() throws IOException {
-        out.flush();
-    }
-
-    /**
-     * Closes this output stream and releases any system resources
-     * associated with the stream.
-     * <p>
-     * The <code>close</code> method of <code>FilterOutputStream</code>
-     * calls its <code>flush</code> method, and then calls the
-     * <code>close</code> method of its underlying output stream.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterOutputStream#flush()
-     * @see        java.io.FilterOutputStream#out
-     */
-    public void close() throws IOException {
-        try {
-          flush();
-        } catch (IOException ignored) {
-        }
-        out.close();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/Flushable.java
--- a/emul/compact/src/main/java/java/io/Flushable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.io.IOException;
-
-/**
- * A <tt>Flushable</tt> is a destination of data that can be flushed.  The
- * flush method is invoked to write any buffered output to the underlying
- * stream.
- *
- * @since 1.5
- */
-
-public interface Flushable {
-
-    /**
-     * Flushes this stream by writing any buffered output to the underlying
-     * stream.
-     *
-     * @throws IOException If an I/O error occurs
-     */
-    void flush() throws IOException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/InputStreamReader.java
--- a/emul/compact/src/main/java/java/io/InputStreamReader.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-
-/**
- * An InputStreamReader is a bridge from byte streams to character streams: It
- * reads bytes and decodes them into characters using a specified {@link
- * java.nio.charset.Charset <code>charset</code>}.  The charset that it uses
- * may be specified by name or may be given explicitly, or the platform's
- * default charset may be accepted.
- *
- * <p> Each invocation of one of an InputStreamReader's read() methods may
- * cause one or more bytes to be read from the underlying byte-input stream.
- * To enable the efficient conversion of bytes to characters, more bytes may
- * be read ahead from the underlying stream than are necessary to satisfy the
- * current read operation.
- *
- * <p> For top efficiency, consider wrapping an InputStreamReader within a
- * BufferedReader.  For example:
- *
- * <pre>
- * BufferedReader in
- *   = new BufferedReader(new InputStreamReader(System.in));
- * </pre>
- *
- * @see BufferedReader
- * @see InputStream
- * @see java.nio.charset.Charset
- *
- * @author      Mark Reinhold
- * @since       JDK1.1
- */
-
-public class InputStreamReader extends Reader {
-
-    /**
-     * Creates an InputStreamReader that uses the default charset.
-     *
-     * @param  in   An InputStream
-     */
-    public InputStreamReader(InputStream in) {
-        super(in);
-    }
-
-    /**
-     * Creates an InputStreamReader that uses the named charset.
-     *
-     * @param  in
-     *         An InputStream
-     *
-     * @param  charsetName
-     *         The name of a supported
-     *         {@link java.nio.charset.Charset </code>charset<code>}
-     *
-     * @exception  UnsupportedEncodingException
-     *             If the named charset is not supported
-     */
-    public InputStreamReader(InputStream in, String charsetName)
-        throws UnsupportedEncodingException
-    {
-        super(in);
-        if (!charsetName.toUpperCase().equals("UTF-8")) {
-            throw new UnsupportedEncodingException(charsetName);
-        }
-    }
-
-    /**
-     * Creates an InputStreamReader that uses the given charset. </p>
-     *
-     * @param  in       An InputStream
-     * @param  cs       A charset
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-/* XXX:
-    public InputStreamReader(InputStream in, Charset cs) {
-        super(in);
-        if (cs == null)
-            throw new NullPointerException("charset");
-        sd = StreamDecoder.forInputStreamReader(in, this, cs);
-    }
-*/
-    /**
-     * Creates an InputStreamReader that uses the given charset decoder.  </p>
-     *
-     * @param  in       An InputStream
-     * @param  dec      A charset decoder
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-/* XXX:
-    public InputStreamReader(InputStream in, CharsetDecoder dec) {
-        super(in);
-        if (dec == null)
-            throw new NullPointerException("charset decoder");
-        sd = StreamDecoder.forInputStreamReader(in, this, dec);
-    }
-*/
-    
-    /**
-     * Returns the name of the character encoding being used by this stream.
-     *
-     * <p> If the encoding has an historical name then that name is returned;
-     * otherwise the encoding's canonical name is returned.
-     *
-     * <p> If this instance was created with the {@link
-     * #InputStreamReader(InputStream, String)} constructor then the returned
-     * name, being unique for the encoding, may differ from the name passed to
-     * the constructor. This method will return <code>null</code> if the
-     * stream has been closed.
-     * </p>
-     * @return The historical name of this encoding, or
-     *         <code>null</code> if the stream has been closed
-     *
-     * @see java.nio.charset.Charset
-     *
-     * @revised 1.4
-     * @spec JSR-51
-     */
-    public String getEncoding() {
-        return "UTF-8";
-    }
-
-    /**
-     * Reads a single character.
-     *
-     * @return The character read, or -1 if the end of the stream has been
-     *         reached
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    public int read() throws IOException {
-        final InputStream is = (InputStream)lock;
-        int c = is.read();
-        if (c == -1) {
-            return -1;
-        }
-        c = (int) c & 0xff;
-        switch (c >> 4) {
-            case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-                /* 0xxxxxxx*/
-                return c;
-            case 12: case 13: {
-                /* 110x xxxx   10xx xxxx*/
-                int char2 = (int) is.read();
-                if ((char2 & 0xC0) != 0x80)
-                    throw new UTFDataFormatException("malformed input");
-                return (((c & 0x1F) << 6) | (char2 & 0x3F));
-            }
-            case 14: {
-                /* 1110 xxxx  10xx xxxx  10xx xxxx */
-                int char2 = is.read();
-                int char3 = is.read();
-                if (((char2 & 0xC0) != 0x80) || ((char3 & 0xC0) != 0x80))
-                    throw new UTFDataFormatException("malformed input");
-                return (((c    & 0x0F) << 12) |
-                       ((char2 & 0x3F) << 6)  |
-                       ((char3 & 0x3F) << 0));
-            }
-            default:
-                /* 10xx xxxx,  1111 xxxx */
-                throw new UTFDataFormatException("malformed input");
-        }
-    }
-    
-    /**
-     * Reads characters into a portion of an array.
-     *
-     * @param      cbuf     Destination buffer
-     * @param      offset   Offset at which to start storing characters
-     * @param      length   Maximum number of characters to read
-     *
-     * @return     The number of characters read, or -1 if the end of the
-     *             stream has been reached
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    public int read(char cbuf[], int offset, int length) throws IOException {
-        for (int i = 0; i < length; i++) {
-            int ch = read();
-            if (ch == -1) {
-                if (i == 0) return -1;
-                return i;
-            }
-            cbuf[offset++] = (char) ch;
-        }
-        return length;
-    }
-
-    /**
-     * Tells whether this stream is ready to be read.  An InputStreamReader is
-     * ready if its input buffer is not empty, or if bytes are available to be
-     * read from the underlying byte stream.
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    public boolean ready() throws IOException {
-        return ((InputStream)lock).available() > 0;
-    }
-
-    public void close() throws IOException {
-        ((InputStream)lock).close();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/InvalidClassException.java
--- a/emul/compact/src/main/java/java/io/InvalidClassException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Thrown when the Serialization runtime detects one of the following
- * problems with a Class.
- * <UL>
- * <LI> The serial version of the class does not match that of the class
- *      descriptor read from the stream
- * <LI> The class contains unknown datatypes
- * <LI> The class does not have an accessible no-arg constructor
- * </UL>
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public class InvalidClassException extends ObjectStreamException {
-
-    private static final long serialVersionUID = -4333316296251054416L;
-
-    /**
-     * Name of the invalid class.
-     *
-     * @serial Name of the invalid class.
-     */
-    public String classname;
-
-    /**
-     * Report an InvalidClassException for the reason specified.
-     *
-     * @param reason  String describing the reason for the exception.
-     */
-    public InvalidClassException(String reason) {
-        super(reason);
-    }
-
-    /**
-     * Constructs an InvalidClassException object.
-     *
-     * @param cname   a String naming the invalid class.
-     * @param reason  a String describing the reason for the exception.
-     */
-    public InvalidClassException(String cname, String reason) {
-        super(reason);
-        classname = cname;
-    }
-
-    /**
-     * Produce the message and include the classname, if present.
-     */
-    public String getMessage() {
-        if (classname == null)
-            return super.getMessage();
-        else
-            return classname + "; " + super.getMessage();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/InvalidObjectException.java
--- a/emul/compact/src/main/java/java/io/InvalidObjectException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Indicates that one or more deserialized objects failed validation
- * tests.  The argument should provide the reason for the failure.
- *
- * @see ObjectInputValidation
- * @since JDK1.1
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public class InvalidObjectException extends ObjectStreamException {
-
-    private static final long serialVersionUID = 3233174318281839583L;
-
-    /**
-     * Constructs an <code>InvalidObjectException</code>.
-     * @param reason Detailed message explaining the reason for the failure.
-     *
-     * @see ObjectInputValidation
-     */
-    public  InvalidObjectException(String reason) {
-        super(reason);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/NotActiveException.java
--- a/emul/compact/src/main/java/java/io/NotActiveException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Thrown when serialization or deserialization is not active.
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public class NotActiveException extends ObjectStreamException {
-
-    private static final long serialVersionUID = -3893467273049808895L;
-
-    /**
-     * Constructor to create a new NotActiveException with the reason given.
-     *
-     * @param reason  a String describing the reason for the exception.
-     */
-    public NotActiveException(String reason) {
-        super(reason);
-    }
-
-    /**
-     * Constructor to create a new NotActiveException without a reason.
-     */
-    public NotActiveException() {
-        super();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/NotSerializableException.java
--- a/emul/compact/src/main/java/java/io/NotSerializableException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Thrown when an instance is required to have a Serializable interface.
- * The serialization runtime or the class of the instance can throw
- * this exception. The argument should be the name of the class.
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public class NotSerializableException extends ObjectStreamException {
-
-    private static final long serialVersionUID = 2906642554793891381L;
-
-    /**
-     * Constructs a NotSerializableException object with message string.
-     *
-     * @param classname Class of the instance being serialized/deserialized.
-     */
-    public NotSerializableException(String classname) {
-        super(classname);
-    }
-
-    /**
-     *  Constructs a NotSerializableException object.
-     */
-    public NotSerializableException() {
-        super();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectInput.java
--- a/emul/compact/src/main/java/java/io/ObjectInput.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * ObjectInput extends the DataInput interface to include the reading of
- * objects. DataInput includes methods for the input of primitive types,
- * ObjectInput extends that interface to include objects, arrays, and Strings.
- *
- * @author  unascribed
- * @see java.io.InputStream
- * @see java.io.ObjectOutputStream
- * @see java.io.ObjectInputStream
- * @since   JDK1.1
- */
-public interface ObjectInput extends DataInput, AutoCloseable {
-    /**
-     * Read and return an object. The class that implements this interface
-     * defines where the object is "read" from.
-     *
-     * @return the object read from the stream
-     * @exception java.lang.ClassNotFoundException If the class of a serialized
-     *      object cannot be found.
-     * @exception IOException If any of the usual Input/Output
-     * related exceptions occur.
-     */
-    public Object readObject()
-        throws ClassNotFoundException, IOException;
-
-    /**
-     * Reads a byte of data. This method will block if no input is
-     * available.
-     * @return  the byte read, or -1 if the end of the
-     *          stream is reached.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public int read() throws IOException;
-
-    /**
-     * Reads into an array of bytes.  This method will
-     * block until some input is available.
-     * @param b the buffer into which the data is read
-     * @return  the actual number of bytes read, -1 is
-     *          returned when the end of the stream is reached.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public int read(byte b[]) throws IOException;
-
-    /**
-     * Reads into an array of bytes.  This method will
-     * block until some input is available.
-     * @param b the buffer into which the data is read
-     * @param off the start offset of the data
-     * @param len the maximum number of bytes read
-     * @return  the actual number of bytes read, -1 is
-     *          returned when the end of the stream is reached.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public int read(byte b[], int off, int len) throws IOException;
-
-    /**
-     * Skips n bytes of input.
-     * @param n the number of bytes to be skipped
-     * @return  the actual number of bytes skipped.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public long skip(long n) throws IOException;
-
-    /**
-     * Returns the number of bytes that can be read
-     * without blocking.
-     * @return the number of available bytes.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public int available() throws IOException;
-
-    /**
-     * Closes the input stream. Must be called
-     * to release any resources associated with
-     * the stream.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public void close() throws IOException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectInputStream.java
--- a/emul/compact/src/main/java/java/io/ObjectInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3357 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-import java.util.HashMap;
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * An ObjectInputStream deserializes primitive data and objects previously
- * written using an ObjectOutputStream.
- *
- * <p>ObjectOutputStream and ObjectInputStream can provide an application with
- * persistent storage for graphs of objects when used with a FileOutputStream
- * and FileInputStream respectively.  ObjectInputStream is used to recover
- * those objects previously serialized. Other uses include passing objects
- * between hosts using a socket stream or for marshaling and unmarshaling
- * arguments and parameters in a remote communication system.
- *
- * <p>ObjectInputStream ensures that the types of all objects in the graph
- * created from the stream match the classes present in the Java Virtual
- * Machine.  Classes are loaded as required using the standard mechanisms.
- *
- * <p>Only objects that support the java.io.Serializable or
- * java.io.Externalizable interface can be read from streams.
- *
- * <p>The method <code>readObject</code> is used to read an object from the
- * stream.  Java's safe casting should be used to get the desired type.  In
- * Java, strings and arrays are objects and are treated as objects during
- * serialization. When read they need to be cast to the expected type.
- *
- * <p>Primitive data types can be read from the stream using the appropriate
- * method on DataInput.
- *
- * <p>The default deserialization mechanism for objects restores the contents
- * of each field to the value and type it had when it was written.  Fields
- * declared as transient or static are ignored by the deserialization process.
- * References to other objects cause those objects to be read from the stream
- * as necessary.  Graphs of objects are restored correctly using a reference
- * sharing mechanism.  New objects are always allocated when deserializing,
- * which prevents existing objects from being overwritten.
- *
- * <p>Reading an object is analogous to running the constructors of a new
- * object.  Memory is allocated for the object and initialized to zero (NULL).
- * No-arg constructors are invoked for the non-serializable classes and then
- * the fields of the serializable classes are restored from the stream starting
- * with the serializable class closest to java.lang.object and finishing with
- * the object's most specific class.
- *
- * <p>For example to read from a stream as written by the example in
- * ObjectOutputStream:
- * <br>
- * <pre>
- *      FileInputStream fis = new FileInputStream("t.tmp");
- *      ObjectInputStream ois = new ObjectInputStream(fis);
- *
- *      int i = ois.readInt();
- *      String today = (String) ois.readObject();
- *      Date date = (Date) ois.readObject();
- *
- *      ois.close();
- * </pre>
- *
- * <p>Classes control how they are serialized by implementing either the
- * java.io.Serializable or java.io.Externalizable interfaces.
- *
- * <p>Implementing the Serializable interface allows object serialization to
- * save and restore the entire state of the object and it allows classes to
- * evolve between the time the stream is written and the time it is read.  It
- * automatically traverses references between objects, saving and restoring
- * entire graphs.
- *
- * <p>Serializable classes that require special handling during the
- * serialization and deserialization process should implement the following
- * methods:<p>
- *
- * <pre>
- * private void writeObject(java.io.ObjectOutputStream stream)
- *     throws IOException;
- * private void readObject(java.io.ObjectInputStream stream)
- *     throws IOException, ClassNotFoundException;
- * private void readObjectNoData()
- *     throws ObjectStreamException;
- * </pre>
- *
- * <p>The readObject method is responsible for reading and restoring the state
- * of the object for its particular class using data written to the stream by
- * the corresponding writeObject method.  The method does not need to concern
- * itself with the state belonging to its superclasses or subclasses.  State is
- * restored by reading data from the ObjectInputStream for the individual
- * fields and making assignments to the appropriate fields of the object.
- * Reading primitive data types is supported by DataInput.
- *
- * <p>Any attempt to read object data which exceeds the boundaries of the
- * custom data written by the corresponding writeObject method will cause an
- * OptionalDataException to be thrown with an eof field value of true.
- * Non-object reads which exceed the end of the allotted data will reflect the
- * end of data in the same way that they would indicate the end of the stream:
- * bytewise reads will return -1 as the byte read or number of bytes read, and
- * primitive reads will throw EOFExceptions.  If there is no corresponding
- * writeObject method, then the end of default serialized data marks the end of
- * the allotted data.
- *
- * <p>Primitive and object read calls issued from within a readExternal method
- * behave in the same manner--if the stream is already positioned at the end of
- * data written by the corresponding writeExternal method, object reads will
- * throw OptionalDataExceptions with eof set to true, bytewise reads will
- * return -1, and primitive reads will throw EOFExceptions.  Note that this
- * behavior does not hold for streams written with the old
- * <code>ObjectStreamConstants.PROTOCOL_VERSION_1</code> protocol, in which the
- * end of data written by writeExternal methods is not demarcated, and hence
- * cannot be detected.
- *
- * <p>The readObjectNoData method is responsible for initializing the state of
- * the object for its particular class in the event that the serialization
- * stream does not list the given class as a superclass of the object being
- * deserialized.  This may occur in cases where the receiving party uses a
- * different version of the deserialized instance's class than the sending
- * party, and the receiver's version extends classes that are not extended by
- * the sender's version.  This may also occur if the serialization stream has
- * been tampered; hence, readObjectNoData is useful for initializing
- * deserialized objects properly despite a "hostile" or incomplete source
- * stream.
- *
- * <p>Serialization does not read or assign values to the fields of any object
- * that does not implement the java.io.Serializable interface.  Subclasses of
- * Objects that are not serializable can be serializable. In this case the
- * non-serializable class must have a no-arg constructor to allow its fields to
- * be initialized.  In this case it is the responsibility of the subclass to
- * save and restore the state of the non-serializable class. It is frequently
- * the case that the fields of that class are accessible (public, package, or
- * protected) or that there are get and set methods that can be used to restore
- * the state.
- *
- * <p>Any exception that occurs while deserializing an object will be caught by
- * the ObjectInputStream and abort the reading process.
- *
- * <p>Implementing the Externalizable interface allows the object to assume
- * complete control over the contents and format of the object's serialized
- * form.  The methods of the Externalizable interface, writeExternal and
- * readExternal, are called to save and restore the objects state.  When
- * implemented by a class they can write and read their own state using all of
- * the methods of ObjectOutput and ObjectInput.  It is the responsibility of
- * the objects to handle any versioning that occurs.
- *
- * <p>Enum constants are deserialized differently than ordinary serializable or
- * externalizable objects.  The serialized form of an enum constant consists
- * solely of its name; field values of the constant are not transmitted.  To
- * deserialize an enum constant, ObjectInputStream reads the constant name from
- * the stream; the deserialized constant is then obtained by calling the static
- * method <code>Enum.valueOf(Class, String)</code> with the enum constant's
- * base type and the received constant name as arguments.  Like other
- * serializable or externalizable objects, enum constants can function as the
- * targets of back references appearing subsequently in the serialization
- * stream.  The process by which enum constants are deserialized cannot be
- * customized: any class-specific readObject, readObjectNoData, and readResolve
- * methods defined by enum types are ignored during deserialization.
- * Similarly, any serialPersistentFields or serialVersionUID field declarations
- * are also ignored--all enum types have a fixed serialVersionUID of 0L.
- *
- * @author      Mike Warres
- * @author      Roger Riggs
- * @see java.io.DataInput
- * @see java.io.ObjectOutputStream
- * @see java.io.Serializable
- * @see <a href="../../../platform/serialization/spec/input.html"> Object Serialization Specification, Section 3, Object Input Classes</a>
- * @since   JDK1.1
- */
-public class ObjectInputStream
-    extends InputStream implements ObjectInput, ObjectStreamConstants
-{
-    /** handle value representing null */
-    private static final int NULL_HANDLE = -1;
-
-    /** marker for unshared objects in internal handle table */
-    private static final Object unsharedMarker = new Object();
-
-    /** table mapping primitive type names to corresponding class objects */
-    private static final HashMap<String, Class<?>> primClasses
-        = new HashMap<>(8, 1.0F);
-    static {
-        primClasses.put("boolean", boolean.class);
-        primClasses.put("byte", byte.class);
-        primClasses.put("char", char.class);
-        primClasses.put("short", short.class);
-        primClasses.put("int", int.class);
-        primClasses.put("long", long.class);
-        primClasses.put("float", float.class);
-        primClasses.put("double", double.class);
-        primClasses.put("void", void.class);
-    }
-
-    /** filter stream for handling block data conversion */
-    private final BlockDataInputStream bin;
-    /** validation callback list */
-    private final ValidationList vlist;
-    /** recursion depth */
-    private int depth;
-    /** whether stream is closed */
-    private boolean closed;
-
-    /** wire handle -> obj/exception map */
-    private final HandleTable handles;
-    /** scratch field for passing handle values up/down call stack */
-    private int passHandle = NULL_HANDLE;
-    /** flag set when at end of field value block with no TC_ENDBLOCKDATA */
-    private boolean defaultDataEnd = false;
-
-    /** buffer for reading primitive field values */
-    private byte[] primVals;
-
-    /** if true, invoke readObjectOverride() instead of readObject() */
-    private final boolean enableOverride;
-    /** if true, invoke resolveObject() */
-    private boolean enableResolve;
-
-    /**
-     * Context during upcalls to class-defined readObject methods; holds
-     * object currently being deserialized and descriptor for current class.
-     * Null when not during readObject upcall.
-     */
-    private Object curContext;
-
-    /**
-     * Creates an ObjectInputStream that reads from the specified InputStream.
-     * A serialization stream header is read from the stream and verified.
-     * This constructor will block until the corresponding ObjectOutputStream
-     * has written and flushed the header.
-     *
-     * <p>If a security manager is installed, this constructor will check for
-     * the "enableSubclassImplementation" SerializablePermission when invoked
-     * directly or indirectly by the constructor of a subclass which overrides
-     * the ObjectInputStream.readFields or ObjectInputStream.readUnshared
-     * methods.
-     *
-     * @param   in input stream to read from
-     * @throws  StreamCorruptedException if the stream header is incorrect
-     * @throws  IOException if an I/O error occurs while reading stream header
-     * @throws  SecurityException if untrusted subclass illegally overrides
-     *          security-sensitive methods
-     * @throws  NullPointerException if <code>in</code> is <code>null</code>
-     * @see     ObjectInputStream#ObjectInputStream()
-     * @see     ObjectInputStream#readFields()
-     * @see     ObjectOutputStream#ObjectOutputStream(OutputStream)
-     */
-    public ObjectInputStream(InputStream in) throws IOException {
-        verifySubclass();
-        bin = new BlockDataInputStream(in);
-        handles = new HandleTable(10);
-        vlist = new ValidationList();
-        enableOverride = false;
-        readStreamHeader();
-        bin.setBlockDataMode(true);
-    }
-
-    /**
-     * Provide a way for subclasses that are completely reimplementing
-     * ObjectInputStream to not have to allocate private data just used by this
-     * implementation of ObjectInputStream.
-     *
-     * <p>If there is a security manager installed, this method first calls the
-     * security manager's <code>checkPermission</code> method with the
-     * <code>SerializablePermission("enableSubclassImplementation")</code>
-     * permission to ensure it's ok to enable subclassing.
-     *
-     * @throws  SecurityException if a security manager exists and its
-     *          <code>checkPermission</code> method denies enabling
-     *          subclassing.
-     * @see SecurityManager#checkPermission
-     * @see java.io.SerializablePermission
-     */
-    protected ObjectInputStream() throws IOException, SecurityException {
-        throw new SecurityException();
-    }
-
-    /**
-     * Read an object from the ObjectInputStream.  The class of the object, the
-     * signature of the class, and the values of the non-transient and
-     * non-static fields of the class and all of its supertypes are read.
-     * Default deserializing for a class can be overriden using the writeObject
-     * and readObject methods.  Objects referenced by this object are read
-     * transitively so that a complete equivalent graph of objects is
-     * reconstructed by readObject.
-     *
-     * <p>The root object is completely restored when all of its fields and the
-     * objects it references are completely restored.  At this point the object
-     * validation callbacks are executed in order based on their registered
-     * priorities. The callbacks are registered by objects (in the readObject
-     * special methods) as they are individually restored.
-     *
-     * <p>Exceptions are thrown for problems with the InputStream and for
-     * classes that should not be deserialized.  All exceptions are fatal to
-     * the InputStream and leave it in an indeterminate state; it is up to the
-     * caller to ignore or recover the stream state.
-     *
-     * @throws  ClassNotFoundException Class of a serialized object cannot be
-     *          found.
-     * @throws  InvalidClassException Something is wrong with a class used by
-     *          serialization.
-     * @throws  StreamCorruptedException Control information in the
-     *          stream is inconsistent.
-     * @throws  OptionalDataException Primitive data was found in the
-     *          stream instead of objects.
-     * @throws  IOException Any of the usual Input/Output related exceptions.
-     */
-    public final Object readObject()
-        throws IOException, ClassNotFoundException
-    {
-        throw new IOException();
-    }
-
-    /**
-     * This method is called by trusted subclasses of ObjectOutputStream that
-     * constructed ObjectOutputStream using the protected no-arg constructor.
-     * The subclass is expected to provide an override method with the modifier
-     * "final".
-     *
-     * @return  the Object read from the stream.
-     * @throws  ClassNotFoundException Class definition of a serialized object
-     *          cannot be found.
-     * @throws  OptionalDataException Primitive data was found in the stream
-     *          instead of objects.
-     * @throws  IOException if I/O errors occurred while reading from the
-     *          underlying stream
-     * @see #ObjectInputStream()
-     * @see #readObject()
-     * @since 1.2
-     */
-    protected Object readObjectOverride()
-        throws IOException, ClassNotFoundException
-    {
-        return null;
-    }
-
-    /**
-     * Reads an "unshared" object from the ObjectInputStream.  This method is
-     * identical to readObject, except that it prevents subsequent calls to
-     * readObject and readUnshared from returning additional references to the
-     * deserialized instance obtained via this call.  Specifically:
-     * <ul>
-     *   <li>If readUnshared is called to deserialize a back-reference (the
-     *       stream representation of an object which has been written
-     *       previously to the stream), an ObjectStreamException will be
-     *       thrown.
-     *
-     *   <li>If readUnshared returns successfully, then any subsequent attempts
-     *       to deserialize back-references to the stream handle deserialized
-     *       by readUnshared will cause an ObjectStreamException to be thrown.
-     * </ul>
-     * Deserializing an object via readUnshared invalidates the stream handle
-     * associated with the returned object.  Note that this in itself does not
-     * always guarantee that the reference returned by readUnshared is unique;
-     * the deserialized object may define a readResolve method which returns an
-     * object visible to other parties, or readUnshared may return a Class
-     * object or enum constant obtainable elsewhere in the stream or through
-     * external means. If the deserialized object defines a readResolve method
-     * and the invocation of that method returns an array, then readUnshared
-     * returns a shallow clone of that array; this guarantees that the returned
-     * array object is unique and cannot be obtained a second time from an
-     * invocation of readObject or readUnshared on the ObjectInputStream,
-     * even if the underlying data stream has been manipulated.
-     *
-     * <p>ObjectInputStream subclasses which override this method can only be
-     * constructed in security contexts possessing the
-     * "enableSubclassImplementation" SerializablePermission; any attempt to
-     * instantiate such a subclass without this permission will cause a
-     * SecurityException to be thrown.
-     *
-     * @return  reference to deserialized object
-     * @throws  ClassNotFoundException if class of an object to deserialize
-     *          cannot be found
-     * @throws  StreamCorruptedException if control information in the stream
-     *          is inconsistent
-     * @throws  ObjectStreamException if object to deserialize has already
-     *          appeared in stream
-     * @throws  OptionalDataException if primitive data is next in stream
-     * @throws  IOException if an I/O error occurs during deserialization
-     * @since   1.4
-     */
-    public Object readUnshared() throws IOException, ClassNotFoundException {
-        // if nested read, passHandle contains handle of enclosing object
-        int outerHandle = passHandle;
-        try {
-            Object obj = readObject0(true);
-            handles.markDependency(outerHandle, passHandle);
-            ClassNotFoundException ex = handles.lookupException(passHandle);
-            if (ex != null) {
-                throw ex;
-            }
-            if (depth == 0) {
-                vlist.doCallbacks();
-            }
-            return obj;
-        } finally {
-            passHandle = outerHandle;
-            if (closed && depth == 0) {
-                clear();
-            }
-        }
-    }
-
-    /**
-     * Read the non-static and non-transient fields of the current class from
-     * this stream.  This may only be called from the readObject method of the
-     * class being deserialized. It will throw the NotActiveException if it is
-     * called otherwise.
-     *
-     * @throws  ClassNotFoundException if the class of a serialized object
-     *          could not be found.
-     * @throws  IOException if an I/O error occurs.
-     * @throws  NotActiveException if the stream is not currently reading
-     *          objects.
-     */
-    public void defaultReadObject()
-        throws IOException, ClassNotFoundException
-    {
-        if (curContext == null) {
-            throw new NotActiveException("not in call to readObject");
-        }
-        Object curObj = null; // curContext.getObj();
-        ObjectStreamClass curDesc = null; // curContext.getDesc();
-        bin.setBlockDataMode(false);
-        defaultReadFields(curObj, curDesc);
-        bin.setBlockDataMode(true);
-        if (!curDesc.hasWriteObjectData()) {
-            /*
-             * Fix for 4360508: since stream does not contain terminating
-             * TC_ENDBLOCKDATA tag, set flag so that reading code elsewhere
-             * knows to simulate end-of-custom-data behavior.
-             */
-            defaultDataEnd = true;
-        }
-        ClassNotFoundException ex = handles.lookupException(passHandle);
-        if (ex != null) {
-            throw ex;
-        }
-    }
-
-    /**
-     * Reads the persistent fields from the stream and makes them available by
-     * name.
-     *
-     * @return  the <code>GetField</code> object representing the persistent
-     *          fields of the object being deserialized
-     * @throws  ClassNotFoundException if the class of a serialized object
-     *          could not be found.
-     * @throws  IOException if an I/O error occurs.
-     * @throws  NotActiveException if the stream is not currently reading
-     *          objects.
-     * @since 1.2
-     */
-    public ObjectInputStream.GetField readFields()
-        throws IOException, ClassNotFoundException
-    {
-        if (curContext == null) {
-            throw new NotActiveException("not in call to readObject");
-        }
-        Object curObj = null; // curContext.getObj();
-        ObjectStreamClass curDesc = null; // curContext.getDesc();
-        bin.setBlockDataMode(false);
-        GetFieldImpl getField = new GetFieldImpl(curDesc);
-        getField.readFields();
-        bin.setBlockDataMode(true);
-        if (!curDesc.hasWriteObjectData()) {
-            /*
-             * Fix for 4360508: since stream does not contain terminating
-             * TC_ENDBLOCKDATA tag, set flag so that reading code elsewhere
-             * knows to simulate end-of-custom-data behavior.
-             */
-            defaultDataEnd = true;
-        }
-
-        return getField;
-    }
-
-    /**
-     * Register an object to be validated before the graph is returned.  While
-     * similar to resolveObject these validations are called after the entire
-     * graph has been reconstituted.  Typically, a readObject method will
-     * register the object with the stream so that when all of the objects are
-     * restored a final set of validations can be performed.
-     *
-     * @param   obj the object to receive the validation callback.
-     * @param   prio controls the order of callbacks;zero is a good default.
-     *          Use higher numbers to be called back earlier, lower numbers for
-     *          later callbacks. Within a priority, callbacks are processed in
-     *          no particular order.
-     * @throws  NotActiveException The stream is not currently reading objects
-     *          so it is invalid to register a callback.
-     * @throws  InvalidObjectException The validation object is null.
-     */
-    public void registerValidation(ObjectInputValidation obj, int prio)
-        throws NotActiveException, InvalidObjectException
-    {
-        if (depth == 0) {
-            throw new NotActiveException("stream inactive");
-        }
-        vlist.register(obj, prio);
-    }
-
-    /**
-     * Load the local class equivalent of the specified stream class
-     * description.  Subclasses may implement this method to allow classes to
-     * be fetched from an alternate source.
-     *
-     * <p>The corresponding method in <code>ObjectOutputStream</code> is
-     * <code>annotateClass</code>.  This method will be invoked only once for
-     * each unique class in the stream.  This method can be implemented by
-     * subclasses to use an alternate loading mechanism but must return a
-     * <code>Class</code> object. Once returned, if the class is not an array
-     * class, its serialVersionUID is compared to the serialVersionUID of the
-     * serialized class, and if there is a mismatch, the deserialization fails
-     * and an {@link InvalidClassException} is thrown.
-     *
-     * <p>The default implementation of this method in
-     * <code>ObjectInputStream</code> returns the result of calling
-     * <pre>
-     *     Class.forName(desc.getName(), false, loader)
-     * </pre>
-     * where <code>loader</code> is determined as follows: if there is a
-     * method on the current thread's stack whose declaring class was
-     * defined by a user-defined class loader (and was not a generated to
-     * implement reflective invocations), then <code>loader</code> is class
-     * loader corresponding to the closest such method to the currently
-     * executing frame; otherwise, <code>loader</code> is
-     * <code>null</code>. If this call results in a
-     * <code>ClassNotFoundException</code> and the name of the passed
-     * <code>ObjectStreamClass</code> instance is the Java language keyword
-     * for a primitive type or void, then the <code>Class</code> object
-     * representing that primitive type or void will be returned
-     * (e.g., an <code>ObjectStreamClass</code> with the name
-     * <code>"int"</code> will be resolved to <code>Integer.TYPE</code>).
-     * Otherwise, the <code>ClassNotFoundException</code> will be thrown to
-     * the caller of this method.
-     *
-     * @param   desc an instance of class <code>ObjectStreamClass</code>
-     * @return  a <code>Class</code> object corresponding to <code>desc</code>
-     * @throws  IOException any of the usual Input/Output exceptions.
-     * @throws  ClassNotFoundException if class of a serialized object cannot
-     *          be found.
-     */
-    protected Class<?> resolveClass(ObjectStreamClass desc)
-        throws IOException, ClassNotFoundException
-    {
-        String name = desc.getName();
-        try {
-            return Class.forName(name, false, latestUserDefinedLoader());
-        } catch (ClassNotFoundException ex) {
-            Class<?> cl = primClasses.get(name);
-            if (cl != null) {
-                return cl;
-            } else {
-                throw ex;
-            }
-        }
-    }
-
-    /**
-     * Returns a proxy class that implements the interfaces named in a proxy
-     * class descriptor; subclasses may implement this method to read custom
-     * data from the stream along with the descriptors for dynamic proxy
-     * classes, allowing them to use an alternate loading mechanism for the
-     * interfaces and the proxy class.
-     *
-     * <p>This method is called exactly once for each unique proxy class
-     * descriptor in the stream.
-     *
-     * <p>The corresponding method in <code>ObjectOutputStream</code> is
-     * <code>annotateProxyClass</code>.  For a given subclass of
-     * <code>ObjectInputStream</code> that overrides this method, the
-     * <code>annotateProxyClass</code> method in the corresponding subclass of
-     * <code>ObjectOutputStream</code> must write any data or objects read by
-     * this method.
-     *
-     * <p>The default implementation of this method in
-     * <code>ObjectInputStream</code> returns the result of calling
-     * <code>Proxy.getProxyClass</code> with the list of <code>Class</code>
-     * objects for the interfaces that are named in the <code>interfaces</code>
-     * parameter.  The <code>Class</code> object for each interface name
-     * <code>i</code> is the value returned by calling
-     * <pre>
-     *     Class.forName(i, false, loader)
-     * </pre>
-     * where <code>loader</code> is that of the first non-<code>null</code>
-     * class loader up the execution stack, or <code>null</code> if no
-     * non-<code>null</code> class loaders are on the stack (the same class
-     * loader choice used by the <code>resolveClass</code> method).  Unless any
-     * of the resolved interfaces are non-public, this same value of
-     * <code>loader</code> is also the class loader passed to
-     * <code>Proxy.getProxyClass</code>; if non-public interfaces are present,
-     * their class loader is passed instead (if more than one non-public
-     * interface class loader is encountered, an
-     * <code>IllegalAccessError</code> is thrown).
-     * If <code>Proxy.getProxyClass</code> throws an
-     * <code>IllegalArgumentException</code>, <code>resolveProxyClass</code>
-     * will throw a <code>ClassNotFoundException</code> containing the
-     * <code>IllegalArgumentException</code>.
-     *
-     * @param interfaces the list of interface names that were
-     *                deserialized in the proxy class descriptor
-     * @return  a proxy class for the specified interfaces
-     * @throws        IOException any exception thrown by the underlying
-     *                <code>InputStream</code>
-     * @throws        ClassNotFoundException if the proxy class or any of the
-     *                named interfaces could not be found
-     * @see ObjectOutputStream#annotateProxyClass(Class)
-     * @since 1.3
-     */
-    protected Class<?> resolveProxyClass(String[] interfaces)
-        throws IOException, ClassNotFoundException
-    {
-        ClassLoader latestLoader = latestUserDefinedLoader();
-        ClassLoader nonPublicLoader = null;
-        boolean hasNonPublicInterface = false;
-
-        // define proxy in class loader of non-public interface(s), if any
-        Class[] classObjs = new Class[interfaces.length];
-        for (int i = 0; i < interfaces.length; i++) {
-            Class cl = Class.forName(interfaces[i], false, latestLoader);
-            if ((cl.getModifiers() & Modifier.PUBLIC) == 0) {
-                if (hasNonPublicInterface) {
-                    if (nonPublicLoader != cl.getClassLoader()) {
-                        throw new IllegalAccessError(
-                            "conflicting non-public interface class loaders");
-                    }
-                } else {
-                    nonPublicLoader = cl.getClassLoader();
-                    hasNonPublicInterface = true;
-                }
-            }
-            classObjs[i] = cl;
-        }
-        try {
-            return Proxy.getProxyClass(
-                hasNonPublicInterface ? nonPublicLoader : latestLoader,
-                classObjs);
-        } catch (IllegalArgumentException e) {
-            throw new ClassNotFoundException(null, e);
-        }
-    }
-
-    /**
-     * This method will allow trusted subclasses of ObjectInputStream to
-     * substitute one object for another during deserialization. Replacing
-     * objects is disabled until enableResolveObject is called. The
-     * enableResolveObject method checks that the stream requesting to resolve
-     * object can be trusted. Every reference to serializable objects is passed
-     * to resolveObject.  To insure that the private state of objects is not
-     * unintentionally exposed only trusted streams may use resolveObject.
-     *
-     * <p>This method is called after an object has been read but before it is
-     * returned from readObject.  The default resolveObject method just returns
-     * the same object.
-     *
-     * <p>When a subclass is replacing objects it must insure that the
-     * substituted object is compatible with every field where the reference
-     * will be stored.  Objects whose type is not a subclass of the type of the
-     * field or array element abort the serialization by raising an exception
-     * and the object is not be stored.
-     *
-     * <p>This method is called only once when each object is first
-     * encountered.  All subsequent references to the object will be redirected
-     * to the new object.
-     *
-     * @param   obj object to be substituted
-     * @return  the substituted object
-     * @throws  IOException Any of the usual Input/Output exceptions.
-     */
-    protected Object resolveObject(Object obj) throws IOException {
-        return obj;
-    }
-
-    /**
-     * Enable the stream to allow objects read from the stream to be replaced.
-     * When enabled, the resolveObject method is called for every object being
-     * deserialized.
-     *
-     * <p>If <i>enable</i> is true, and there is a security manager installed,
-     * this method first calls the security manager's
-     * <code>checkPermission</code> method with the
-     * <code>SerializablePermission("enableSubstitution")</code> permission to
-     * ensure it's ok to enable the stream to allow objects read from the
-     * stream to be replaced.
-     *
-     * @param   enable true for enabling use of <code>resolveObject</code> for
-     *          every object being deserialized
-     * @return  the previous setting before this method was invoked
-     * @throws  SecurityException if a security manager exists and its
-     *          <code>checkPermission</code> method denies enabling the stream
-     *          to allow objects read from the stream to be replaced.
-     * @see SecurityManager#checkPermission
-     * @see java.io.SerializablePermission
-     */
-    protected boolean enableResolveObject(boolean enable)
-        throws SecurityException
-    {
-        throw new SecurityException();
-    }
-
-    /**
-     * The readStreamHeader method is provided to allow subclasses to read and
-     * verify their own stream headers. It reads and verifies the magic number
-     * and version number.
-     *
-     * @throws  IOException if there are I/O errors while reading from the
-     *          underlying <code>InputStream</code>
-     * @throws  StreamCorruptedException if control information in the stream
-     *          is inconsistent
-     */
-    protected void readStreamHeader()
-        throws IOException, StreamCorruptedException
-    {
-        short s0 = bin.readShort();
-        short s1 = bin.readShort();
-        if (s0 != STREAM_MAGIC || s1 != STREAM_VERSION) {
-            throw new StreamCorruptedException(
-                String.format("invalid stream header: %04X%04X", s0, s1));
-        }
-    }
-
-    /**
-     * Read a class descriptor from the serialization stream.  This method is
-     * called when the ObjectInputStream expects a class descriptor as the next
-     * item in the serialization stream.  Subclasses of ObjectInputStream may
-     * override this method to read in class descriptors that have been written
-     * in non-standard formats (by subclasses of ObjectOutputStream which have
-     * overridden the <code>writeClassDescriptor</code> method).  By default,
-     * this method reads class descriptors according to the format defined in
-     * the Object Serialization specification.
-     *
-     * @return  the class descriptor read
-     * @throws  IOException If an I/O error has occurred.
-     * @throws  ClassNotFoundException If the Class of a serialized object used
-     *          in the class descriptor representation cannot be found
-     * @see java.io.ObjectOutputStream#writeClassDescriptor(java.io.ObjectStreamClass)
-     * @since 1.3
-     */
-    protected ObjectStreamClass readClassDescriptor()
-        throws IOException, ClassNotFoundException
-    {
-        ObjectStreamClass desc = new ObjectStreamClass();
-        desc.readNonProxy(this);
-        return desc;
-    }
-
-    /**
-     * Reads a byte of data. This method will block if no input is available.
-     *
-     * @return  the byte read, or -1 if the end of the stream is reached.
-     * @throws  IOException If an I/O error has occurred.
-     */
-    public int read() throws IOException {
-        return bin.read();
-    }
-
-    /**
-     * Reads into an array of bytes.  This method will block until some input
-     * is available. Consider using java.io.DataInputStream.readFully to read
-     * exactly 'length' bytes.
-     *
-     * @param   buf the buffer into which the data is read
-     * @param   off the start offset of the data
-     * @param   len the maximum number of bytes read
-     * @return  the actual number of bytes read, -1 is returned when the end of
-     *          the stream is reached.
-     * @throws  IOException If an I/O error has occurred.
-     * @see java.io.DataInputStream#readFully(byte[],int,int)
-     */
-    public int read(byte[] buf, int off, int len) throws IOException {
-        if (buf == null) {
-            throw new NullPointerException();
-        }
-        int endoff = off + len;
-        if (off < 0 || len < 0 || endoff > buf.length || endoff < 0) {
-            throw new IndexOutOfBoundsException();
-        }
-        return bin.read(buf, off, len, false);
-    }
-
-    /**
-     * Returns the number of bytes that can be read without blocking.
-     *
-     * @return  the number of available bytes.
-     * @throws  IOException if there are I/O errors while reading from the
-     *          underlying <code>InputStream</code>
-     */
-    public int available() throws IOException {
-        return bin.available();
-    }
-
-    /**
-     * Closes the input stream. Must be called to release any resources
-     * associated with the stream.
-     *
-     * @throws  IOException If an I/O error has occurred.
-     */
-    public void close() throws IOException {
-        /*
-         * Even if stream already closed, propagate redundant close to
-         * underlying stream to stay consistent with previous implementations.
-         */
-        closed = true;
-        if (depth == 0) {
-            clear();
-        }
-        bin.close();
-    }
-
-    /**
-     * Reads in a boolean.
-     *
-     * @return  the boolean read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public boolean readBoolean() throws IOException {
-        return bin.readBoolean();
-    }
-
-    /**
-     * Reads an 8 bit byte.
-     *
-     * @return  the 8 bit byte read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public byte readByte() throws IOException  {
-        return bin.readByte();
-    }
-
-    /**
-     * Reads an unsigned 8 bit byte.
-     *
-     * @return  the 8 bit byte read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public int readUnsignedByte()  throws IOException {
-        return bin.readUnsignedByte();
-    }
-
-    /**
-     * Reads a 16 bit char.
-     *
-     * @return  the 16 bit char read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public char readChar()  throws IOException {
-        return bin.readChar();
-    }
-
-    /**
-     * Reads a 16 bit short.
-     *
-     * @return  the 16 bit short read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public short readShort()  throws IOException {
-        return bin.readShort();
-    }
-
-    /**
-     * Reads an unsigned 16 bit short.
-     *
-     * @return  the 16 bit short read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public int readUnsignedShort() throws IOException {
-        return bin.readUnsignedShort();
-    }
-
-    /**
-     * Reads a 32 bit int.
-     *
-     * @return  the 32 bit integer read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public int readInt()  throws IOException {
-        return bin.readInt();
-    }
-
-    /**
-     * Reads a 64 bit long.
-     *
-     * @return  the read 64 bit long.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public long readLong()  throws IOException {
-        return bin.readLong();
-    }
-
-    /**
-     * Reads a 32 bit float.
-     *
-     * @return  the 32 bit float read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public float readFloat() throws IOException {
-        return bin.readFloat();
-    }
-
-    /**
-     * Reads a 64 bit double.
-     *
-     * @return  the 64 bit double read.
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public double readDouble() throws IOException {
-        return bin.readDouble();
-    }
-
-    /**
-     * Reads bytes, blocking until all bytes are read.
-     *
-     * @param   buf the buffer into which the data is read
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public void readFully(byte[] buf) throws IOException {
-        bin.readFully(buf, 0, buf.length, false);
-    }
-
-    /**
-     * Reads bytes, blocking until all bytes are read.
-     *
-     * @param   buf the buffer into which the data is read
-     * @param   off the start offset of the data
-     * @param   len the maximum number of bytes to read
-     * @throws  EOFException If end of file is reached.
-     * @throws  IOException If other I/O error has occurred.
-     */
-    public void readFully(byte[] buf, int off, int len) throws IOException {
-        int endoff = off + len;
-        if (off < 0 || len < 0 || endoff > buf.length || endoff < 0) {
-            throw new IndexOutOfBoundsException();
-        }
-        bin.readFully(buf, off, len, false);
-    }
-
-    /**
-     * Skips bytes.
-     *
-     * @param   len the number of bytes to be skipped
-     * @return  the actual number of bytes skipped.
-     * @throws  IOException If an I/O error has occurred.
-     */
-    public int skipBytes(int len) throws IOException {
-        return bin.skipBytes(len);
-    }
-
-    /**
-     * Reads in a line that has been terminated by a \n, \r, \r\n or EOF.
-     *
-     * @return  a String copy of the line.
-     * @throws  IOException if there are I/O errors while reading from the
-     *          underlying <code>InputStream</code>
-     * @deprecated This method does not properly convert bytes to characters.
-     *          see DataInputStream for the details and alternatives.
-     */
-    @Deprecated
-    public String readLine() throws IOException {
-        return bin.readLine();
-    }
-
-    /**
-     * Reads a String in
-     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
-     * format.
-     *
-     * @return  the String.
-     * @throws  IOException if there are I/O errors while reading from the
-     *          underlying <code>InputStream</code>
-     * @throws  UTFDataFormatException if read bytes do not represent a valid
-     *          modified UTF-8 encoding of a string
-     */
-    public String readUTF() throws IOException {
-        return bin.readUTF();
-    }
-
-    /**
-     * Provide access to the persistent fields read from the input stream.
-     */
-    public static abstract class GetField {
-
-        /**
-         * Get the ObjectStreamClass that describes the fields in the stream.
-         *
-         * @return  the descriptor class that describes the serializable fields
-         */
-        public abstract ObjectStreamClass getObjectStreamClass();
-
-        /**
-         * Return true if the named field is defaulted and has no value in this
-         * stream.
-         *
-         * @param  name the name of the field
-         * @return true, if and only if the named field is defaulted
-         * @throws IOException if there are I/O errors while reading from
-         *         the underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if <code>name</code> does not
-         *         correspond to a serializable field
-         */
-        public abstract boolean defaulted(String name) throws IOException;
-
-        /**
-         * Get the value of the named boolean field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>boolean</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract boolean get(String name, boolean val)
-            throws IOException;
-
-        /**
-         * Get the value of the named byte field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>byte</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract byte get(String name, byte val) throws IOException;
-
-        /**
-         * Get the value of the named char field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>char</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract char get(String name, char val) throws IOException;
-
-        /**
-         * Get the value of the named short field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>short</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract short get(String name, short val) throws IOException;
-
-        /**
-         * Get the value of the named int field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>int</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract int get(String name, int val) throws IOException;
-
-        /**
-         * Get the value of the named long field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>long</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract long get(String name, long val) throws IOException;
-
-        /**
-         * Get the value of the named float field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>float</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract float get(String name, float val) throws IOException;
-
-        /**
-         * Get the value of the named double field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>double</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract double get(String name, double val) throws IOException;
-
-        /**
-         * Get the value of the named Object field from the persistent field.
-         *
-         * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
-         *         have a value
-         * @return the value of the named <code>Object</code> field
-         * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
-         *         not serializable or if the field type is incorrect
-         */
-        public abstract Object get(String name, Object val) throws IOException;
-    }
-
-    /**
-     * Verifies that this (possibly subclass) instance can be constructed
-     * without violating security constraints: the subclass must not override
-     * security-sensitive non-final methods, or else the
-     * "enableSubclassImplementation" SerializablePermission is checked.
-     */
-    private void verifySubclass() {
-        Class cl = getClass();
-        if (cl == ObjectInputStream.class) {
-            return;
-        }
-        throw new SecurityException();
-    }
-
-    /**
-     * Clears internal data structures.
-     */
-    private void clear() {
-        handles.clear();
-        vlist.clear();
-    }
-
-    /**
-     * Underlying readObject implementation.
-     */
-    private Object readObject0(boolean unshared) throws IOException {
-        boolean oldMode = bin.getBlockDataMode();
-        if (oldMode) {
-            int remain = bin.currentBlockRemaining();
-            if (remain > 0) {
-                throw new OptionalDataException(remain);
-            } else if (defaultDataEnd) {
-                /*
-                 * Fix for 4360508: stream is currently at the end of a field
-                 * value block written via default serialization; since there
-                 * is no terminating TC_ENDBLOCKDATA tag, simulate
-                 * end-of-custom-data behavior explicitly.
-                 */
-                throw new OptionalDataException(true);
-            }
-            bin.setBlockDataMode(false);
-        }
-
-        byte tc;
-        while ((tc = bin.peekByte()) == TC_RESET) {
-            bin.readByte();
-            handleReset();
-        }
-
-        depth++;
-        try {
-            switch (tc) {
-                case TC_NULL:
-                    return readNull();
-
-                case TC_REFERENCE:
-                    return readHandle(unshared);
-
-                case TC_CLASS:
-                    return readClass(unshared);
-
-                case TC_CLASSDESC:
-                case TC_PROXYCLASSDESC:
-                    return readClassDesc(unshared);
-
-                case TC_STRING:
-                case TC_LONGSTRING:
-                    return checkResolve(readString(unshared));
-
-                case TC_ARRAY:
-                    return checkResolve(readArray(unshared));
-
-                case TC_ENUM:
-                    return checkResolve(readEnum(unshared));
-
-                case TC_OBJECT:
-                    return checkResolve(readOrdinaryObject(unshared));
-
-                case TC_EXCEPTION:
-                    IOException ex = readFatalException();
-                    throw new WriteAbortedException("writing aborted", ex);
-
-                case TC_BLOCKDATA:
-                case TC_BLOCKDATALONG:
-                    if (oldMode) {
-                        bin.setBlockDataMode(true);
-                        bin.peek();             // force header read
-                        throw new OptionalDataException(
-                            bin.currentBlockRemaining());
-                    } else {
-                        throw new StreamCorruptedException(
-                            "unexpected block data");
-                    }
-
-                case TC_ENDBLOCKDATA:
-                    if (oldMode) {
-                        throw new OptionalDataException(true);
-                    } else {
-                        throw new StreamCorruptedException(
-                            "unexpected end of block data");
-                    }
-
-                default:
-                    throw new StreamCorruptedException(
-                        String.format("invalid type code: %02X", tc));
-            }
-        } finally {
-            depth--;
-            bin.setBlockDataMode(oldMode);
-        }
-    }
-
-    /**
-     * If resolveObject has been enabled and given object does not have an
-     * exception associated with it, calls resolveObject to determine
-     * replacement for object, and updates handle table accordingly.  Returns
-     * replacement object, or echoes provided object if no replacement
-     * occurred.  Expects that passHandle is set to given object's handle prior
-     * to calling this method.
-     */
-    private Object checkResolve(Object obj) throws IOException {
-        if (!enableResolve || handles.lookupException(passHandle) != null) {
-            return obj;
-        }
-        Object rep = resolveObject(obj);
-        if (rep != obj) {
-            handles.setObject(passHandle, rep);
-        }
-        return rep;
-    }
-
-    /**
-     * Reads string without allowing it to be replaced in stream.  Called from
-     * within ObjectStreamClass.read().
-     */
-    String readTypeString() throws IOException {
-        int oldHandle = passHandle;
-        try {
-            byte tc = bin.peekByte();
-            switch (tc) {
-                case TC_NULL:
-                    return (String) readNull();
-
-                case TC_REFERENCE:
-                    return (String) readHandle(false);
-
-                case TC_STRING:
-                case TC_LONGSTRING:
-                    return readString(false);
-
-                default:
-                    throw new StreamCorruptedException(
-                        String.format("invalid type code: %02X", tc));
-            }
-        } finally {
-            passHandle = oldHandle;
-        }
-    }
-
-    /**
-     * Reads in null code, sets passHandle to NULL_HANDLE and returns null.
-     */
-    private Object readNull() throws IOException {
-        if (bin.readByte() != TC_NULL) {
-            throw new InternalError();
-        }
-        passHandle = NULL_HANDLE;
-        return null;
-    }
-
-    /**
-     * Reads in object handle, sets passHandle to the read handle, and returns
-     * object associated with the handle.
-     */
-    private Object readHandle(boolean unshared) throws IOException {
-        if (bin.readByte() != TC_REFERENCE) {
-            throw new InternalError();
-        }
-        passHandle = bin.readInt() - baseWireHandle;
-        if (passHandle < 0 || passHandle >= handles.size()) {
-            throw new StreamCorruptedException(
-                String.format("invalid handle value: %08X", passHandle +
-                baseWireHandle));
-        }
-        if (unshared) {
-            // REMIND: what type of exception to throw here?
-            throw new InvalidObjectException(
-                "cannot read back reference as unshared");
-        }
-
-        Object obj = handles.lookupObject(passHandle);
-        if (obj == unsharedMarker) {
-            // REMIND: what type of exception to throw here?
-            throw new InvalidObjectException(
-                "cannot read back reference to unshared object");
-        }
-        return obj;
-    }
-
-    /**
-     * Reads in and returns class object.  Sets passHandle to class object's
-     * assigned handle.  Returns null if class is unresolvable (in which case a
-     * ClassNotFoundException will be associated with the class' handle in the
-     * handle table).
-     */
-    private Class readClass(boolean unshared) throws IOException {
-        if (bin.readByte() != TC_CLASS) {
-            throw new InternalError();
-        }
-        ObjectStreamClass desc = readClassDesc(false);
-        Class cl = desc.forClass();
-        passHandle = handles.assign(unshared ? unsharedMarker : cl);
-
-        ClassNotFoundException resolveEx = desc.getResolveException();
-        if (resolveEx != null) {
-            handles.markException(passHandle, resolveEx);
-        }
-
-        handles.finish(passHandle);
-        return cl;
-    }
-
-    /**
-     * Reads in and returns (possibly null) class descriptor.  Sets passHandle
-     * to class descriptor's assigned handle.  If class descriptor cannot be
-     * resolved to a class in the local VM, a ClassNotFoundException is
-     * associated with the class descriptor's handle.
-     */
-    private ObjectStreamClass readClassDesc(boolean unshared)
-        throws IOException
-    {
-        byte tc = bin.peekByte();
-        switch (tc) {
-            case TC_NULL:
-                return (ObjectStreamClass) readNull();
-
-            case TC_REFERENCE:
-                return (ObjectStreamClass) readHandle(unshared);
-
-            case TC_PROXYCLASSDESC:
-                return readProxyDesc(unshared);
-
-            case TC_CLASSDESC:
-                return readNonProxyDesc(unshared);
-
-            default:
-                throw new StreamCorruptedException(
-                    String.format("invalid type code: %02X", tc));
-        }
-    }
-
-    /**
-     * Reads in and returns class descriptor for a dynamic proxy class.  Sets
-     * passHandle to proxy class descriptor's assigned handle.  If proxy class
-     * descriptor cannot be resolved to a class in the local VM, a
-     * ClassNotFoundException is associated with the descriptor's handle.
-     */
-    private ObjectStreamClass readProxyDesc(boolean unshared)
-        throws IOException
-    {
-        if (bin.readByte() != TC_PROXYCLASSDESC) {
-            throw new InternalError();
-        }
-
-        ObjectStreamClass desc = new ObjectStreamClass();
-        int descHandle = handles.assign(unshared ? unsharedMarker : desc);
-        passHandle = NULL_HANDLE;
-
-        int numIfaces = bin.readInt();
-        String[] ifaces = new String[numIfaces];
-        for (int i = 0; i < numIfaces; i++) {
-            ifaces[i] = bin.readUTF();
-        }
-
-        Class cl = null;
-        ClassNotFoundException resolveEx = null;
-        bin.setBlockDataMode(true);
-        try {
-            if ((cl = resolveProxyClass(ifaces)) == null) {
-                resolveEx = new ClassNotFoundException("null class");
-            }
-        } catch (ClassNotFoundException ex) {
-            resolveEx = ex;
-        }
-        skipCustomData();
-
-        desc.initProxy(cl, resolveEx, readClassDesc(false));
-
-        handles.finish(descHandle);
-        passHandle = descHandle;
-        return desc;
-    }
-
-    /**
-     * Reads in and returns class descriptor for a class that is not a dynamic
-     * proxy class.  Sets passHandle to class descriptor's assigned handle.  If
-     * class descriptor cannot be resolved to a class in the local VM, a
-     * ClassNotFoundException is associated with the descriptor's handle.
-     */
-    private ObjectStreamClass readNonProxyDesc(boolean unshared)
-        throws IOException
-    {
-        if (bin.readByte() != TC_CLASSDESC) {
-            throw new InternalError();
-        }
-
-        ObjectStreamClass desc = new ObjectStreamClass();
-        int descHandle = handles.assign(unshared ? unsharedMarker : desc);
-        passHandle = NULL_HANDLE;
-
-        ObjectStreamClass readDesc = null;
-        try {
-            readDesc = readClassDescriptor();
-        } catch (ClassNotFoundException ex) {
-            throw (IOException) new InvalidClassException(
-                "failed to read class descriptor").initCause(ex);
-        }
-
-        Class cl = null;
-        ClassNotFoundException resolveEx = null;
-        bin.setBlockDataMode(true);
-        try {
-            if ((cl = resolveClass(readDesc)) == null) {
-                resolveEx = new ClassNotFoundException("null class");
-            }
-        } catch (ClassNotFoundException ex) {
-            resolveEx = ex;
-        }
-        skipCustomData();
-
-        desc.initNonProxy(readDesc, cl, resolveEx, readClassDesc(false));
-
-        handles.finish(descHandle);
-        passHandle = descHandle;
-        return desc;
-    }
-
-    /**
-     * Reads in and returns new string.  Sets passHandle to new string's
-     * assigned handle.
-     */
-    private String readString(boolean unshared) throws IOException {
-        String str;
-        byte tc = bin.readByte();
-        switch (tc) {
-            case TC_STRING:
-                str = bin.readUTF();
-                break;
-
-            case TC_LONGSTRING:
-                str = bin.readLongUTF();
-                break;
-
-            default:
-                throw new StreamCorruptedException(
-                    String.format("invalid type code: %02X", tc));
-        }
-        passHandle = handles.assign(unshared ? unsharedMarker : str);
-        handles.finish(passHandle);
-        return str;
-    }
-
-    /**
-     * Reads in and returns array object, or null if array class is
-     * unresolvable.  Sets passHandle to array's assigned handle.
-     */
-    private Object readArray(boolean unshared) throws IOException {
-        if (bin.readByte() != TC_ARRAY) {
-            throw new InternalError();
-        }
-
-        ObjectStreamClass desc = readClassDesc(false);
-        int len = bin.readInt();
-
-        Object array = null;
-        Class cl, ccl = null;
-        if ((cl = desc.forClass()) != null) {
-            ccl = cl.getComponentType();
-            array = Array.newInstance(ccl, len);
-        }
-
-        int arrayHandle = handles.assign(unshared ? unsharedMarker : array);
-        ClassNotFoundException resolveEx = desc.getResolveException();
-        if (resolveEx != null) {
-            handles.markException(arrayHandle, resolveEx);
-        }
-
-        if (ccl == null) {
-            for (int i = 0; i < len; i++) {
-                readObject0(false);
-            }
-        } else if (ccl.isPrimitive()) {
-            if (ccl == Integer.TYPE) {
-                bin.readInts((int[]) array, 0, len);
-            } else if (ccl == Byte.TYPE) {
-                bin.readFully((byte[]) array, 0, len, true);
-            } else if (ccl == Long.TYPE) {
-                bin.readLongs((long[]) array, 0, len);
-            } else if (ccl == Float.TYPE) {
-                bin.readFloats((float[]) array, 0, len);
-            } else if (ccl == Double.TYPE) {
-                bin.readDoubles((double[]) array, 0, len);
-            } else if (ccl == Short.TYPE) {
-                bin.readShorts((short[]) array, 0, len);
-            } else if (ccl == Character.TYPE) {
-                bin.readChars((char[]) array, 0, len);
-            } else if (ccl == Boolean.TYPE) {
-                bin.readBooleans((boolean[]) array, 0, len);
-            } else {
-                throw new InternalError();
-            }
-        } else {
-            Object[] oa = (Object[]) array;
-            for (int i = 0; i < len; i++) {
-                oa[i] = readObject0(false);
-                handles.markDependency(arrayHandle, passHandle);
-            }
-        }
-
-        handles.finish(arrayHandle);
-        passHandle = arrayHandle;
-        return array;
-    }
-
-    /**
-     * Reads in and returns enum constant, or null if enum type is
-     * unresolvable.  Sets passHandle to enum constant's assigned handle.
-     */
-    private Enum readEnum(boolean unshared) throws IOException {
-        if (bin.readByte() != TC_ENUM) {
-            throw new InternalError();
-        }
-
-        ObjectStreamClass desc = readClassDesc(false);
-        if (!desc.isEnum()) {
-            throw new InvalidClassException("non-enum class: " + desc);
-        }
-
-        int enumHandle = handles.assign(unshared ? unsharedMarker : null);
-        ClassNotFoundException resolveEx = desc.getResolveException();
-        if (resolveEx != null) {
-            handles.markException(enumHandle, resolveEx);
-        }
-
-        String name = readString(false);
-        Enum en = null;
-        Class cl = desc.forClass();
-        if (cl != null) {
-            try {
-                en = Enum.valueOf(cl, name);
-            } catch (IllegalArgumentException ex) {
-                throw (IOException) new InvalidObjectException(
-                    "enum constant " + name + " does not exist in " +
-                    cl).initCause(ex);
-            }
-            if (!unshared) {
-                handles.setObject(enumHandle, en);
-            }
-        }
-
-        handles.finish(enumHandle);
-        passHandle = enumHandle;
-        return en;
-    }
-
-    /**
-     * Reads and returns "ordinary" (i.e., not a String, Class,
-     * ObjectStreamClass, array, or enum constant) object, or null if object's
-     * class is unresolvable (in which case a ClassNotFoundException will be
-     * associated with object's handle).  Sets passHandle to object's assigned
-     * handle.
-     */
-    private Object readOrdinaryObject(boolean unshared)
-        throws IOException
-    {
-        if (bin.readByte() != TC_OBJECT) {
-            throw new InternalError();
-        }
-
-        ObjectStreamClass desc = readClassDesc(false);
-        desc.checkDeserialize();
-
-        Object obj;
-        try {
-            obj = desc.isInstantiable() ? desc.newInstance() : null;
-        } catch (Exception ex) {
-            throw (IOException) new InvalidClassException(
-                desc.forClass().getName(),
-                "unable to create instance").initCause(ex);
-        }
-
-        passHandle = handles.assign(unshared ? unsharedMarker : obj);
-        ClassNotFoundException resolveEx = desc.getResolveException();
-        if (resolveEx != null) {
-            handles.markException(passHandle, resolveEx);
-        }
-
-        if (desc.isExternalizable()) {
-            readExternalData((Externalizable) obj, desc);
-        } else {
-            readSerialData(obj, desc);
-        }
-
-        handles.finish(passHandle);
-
-        if (obj != null &&
-            handles.lookupException(passHandle) == null &&
-            desc.hasReadResolveMethod())
-        {
-            Object rep = desc.invokeReadResolve(obj);
-            if (unshared && rep.getClass().isArray()) {
-                rep = cloneArray(rep);
-            }
-            if (rep != obj) {
-                handles.setObject(passHandle, obj = rep);
-            }
-        }
-
-        return obj;
-    }
-
-    /**
-     * If obj is non-null, reads externalizable data by invoking readExternal()
-     * method of obj; otherwise, attempts to skip over externalizable data.
-     * Expects that passHandle is set to obj's handle before this method is
-     * called.
-     */
-    private void readExternalData(Externalizable obj, ObjectStreamClass desc)
-        throws IOException
-    {
-        Object oldContext = curContext;
-        curContext = null;
-        try {
-            boolean blocked = desc.hasBlockExternalData();
-            if (blocked) {
-                bin.setBlockDataMode(true);
-            }
-            if (obj != null) {
-                try {
-                    obj.readExternal(this);
-                } catch (ClassNotFoundException ex) {
-                    /*
-                     * In most cases, the handle table has already propagated
-                     * a CNFException to passHandle at this point; this mark
-                     * call is included to address cases where the readExternal
-                     * method has cons'ed and thrown a new CNFException of its
-                     * own.
-                     */
-                     handles.markException(passHandle, ex);
-                }
-            }
-            if (blocked) {
-                skipCustomData();
-            }
-        } finally {
-            curContext = oldContext;
-        }
-        /*
-         * At this point, if the externalizable data was not written in
-         * block-data form and either the externalizable class doesn't exist
-         * locally (i.e., obj == null) or readExternal() just threw a
-         * CNFException, then the stream is probably in an inconsistent state,
-         * since some (or all) of the externalizable data may not have been
-         * consumed.  Since there's no "correct" action to take in this case,
-         * we mimic the behavior of past serialization implementations and
-         * blindly hope that the stream is in sync; if it isn't and additional
-         * externalizable data remains in the stream, a subsequent read will
-         * most likely throw a StreamCorruptedException.
-         */
-    }
-
-    /**
-     * Reads (or attempts to skip, if obj is null or is tagged with a
-     * ClassNotFoundException) instance data for each serializable class of
-     * object in stream, from superclass to subclass.  Expects that passHandle
-     * is set to obj's handle before this method is called.
-     */
-    private void readSerialData(Object obj, ObjectStreamClass desc)
-        throws IOException
-    {
-        ObjectStreamClass.ClassDataSlot[] slots = desc.getClassDataLayout();
-        for (int i = 0; i < slots.length; i++) {
-            ObjectStreamClass slotDesc = slots[i].desc;
-
-            if (slots[i].hasData) {
-                if (obj != null &&
-                    slotDesc.hasReadObjectMethod() &&
-                    handles.lookupException(passHandle) == null)
-                {
-                    Object oldContext = curContext;
-
-                    try {
-                        curContext = null; //new SerialCallbackContext(obj, slotDesc);
-
-                        bin.setBlockDataMode(true);
-                        slotDesc.invokeReadObject(obj, this);
-                    } catch (ClassNotFoundException ex) {
-                        /*
-                         * In most cases, the handle table has already
-                         * propagated a CNFException to passHandle at this
-                         * point; this mark call is included to address cases
-                         * where the custom readObject method has cons'ed and
-                         * thrown a new CNFException of its own.
-                         */
-                        handles.markException(passHandle, ex);
-                    } finally {
-                        //curContext.setUsed();
-                        curContext = oldContext;
-                    }
-
-                    /*
-                     * defaultDataEnd may have been set indirectly by custom
-                     * readObject() method when calling defaultReadObject() or
-                     * readFields(); clear it to restore normal read behavior.
-                     */
-                    defaultDataEnd = false;
-                } else {
-                    defaultReadFields(obj, slotDesc);
-                }
-                if (slotDesc.hasWriteObjectData()) {
-                    skipCustomData();
-                } else {
-                    bin.setBlockDataMode(false);
-                }
-            } else {
-                if (obj != null &&
-                    slotDesc.hasReadObjectNoDataMethod() &&
-                    handles.lookupException(passHandle) == null)
-                {
-                    slotDesc.invokeReadObjectNoData(obj);
-                }
-            }
-        }
-    }
-
-    /**
-     * Skips over all block data and objects until TC_ENDBLOCKDATA is
-     * encountered.
-     */
-    private void skipCustomData() throws IOException {
-        int oldHandle = passHandle;
-        for (;;) {
-            if (bin.getBlockDataMode()) {
-                bin.skipBlockData();
-                bin.setBlockDataMode(false);
-            }
-            switch (bin.peekByte()) {
-                case TC_BLOCKDATA:
-                case TC_BLOCKDATALONG:
-                    bin.setBlockDataMode(true);
-                    break;
-
-                case TC_ENDBLOCKDATA:
-                    bin.readByte();
-                    passHandle = oldHandle;
-                    return;
-
-                default:
-                    readObject0(false);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Reads in values of serializable fields declared by given class
-     * descriptor.  If obj is non-null, sets field values in obj.  Expects that
-     * passHandle is set to obj's handle before this method is called.
-     */
-    private void defaultReadFields(Object obj, ObjectStreamClass desc)
-        throws IOException
-    {
-        // REMIND: is isInstance check necessary?
-        Class cl = desc.forClass();
-        if (cl != null && obj != null && !cl.isInstance(obj)) {
-            throw new ClassCastException();
-        }
-
-        int primDataSize = desc.getPrimDataSize();
-        if (primVals == null || primVals.length < primDataSize) {
-            primVals = new byte[primDataSize];
-        }
-        bin.readFully(primVals, 0, primDataSize, false);
-        if (obj != null) {
-            desc.setPrimFieldValues(obj, primVals);
-        }
-
-        int objHandle = passHandle;
-        ObjectStreamField[] fields = desc.getFields(false);
-        Object[] objVals = new Object[desc.getNumObjFields()];
-        int numPrimFields = fields.length - objVals.length;
-        for (int i = 0; i < objVals.length; i++) {
-            ObjectStreamField f = fields[numPrimFields + i];
-            objVals[i] = readObject0(f.isUnshared());
-            if (f.getField() != null) {
-                handles.markDependency(objHandle, passHandle);
-            }
-        }
-        if (obj != null) {
-            desc.setObjFieldValues(obj, objVals);
-        }
-        passHandle = objHandle;
-    }
-
-    /**
-     * Reads in and returns IOException that caused serialization to abort.
-     * All stream state is discarded prior to reading in fatal exception.  Sets
-     * passHandle to fatal exception's handle.
-     */
-    private IOException readFatalException() throws IOException {
-        if (bin.readByte() != TC_EXCEPTION) {
-            throw new InternalError();
-        }
-        clear();
-        return (IOException) readObject0(false);
-    }
-
-    /**
-     * If recursion depth is 0, clears internal data structures; otherwise,
-     * throws a StreamCorruptedException.  This method is called when a
-     * TC_RESET typecode is encountered.
-     */
-    private void handleReset() throws StreamCorruptedException {
-        if (depth > 0) {
-            throw new StreamCorruptedException(
-                "unexpected reset; recursion depth: " + depth);
-        }
-        clear();
-    }
-
-    /**
-     * Converts specified span of bytes into float values.
-     */
-    // REMIND: remove once hotspot inlines Float.intBitsToFloat
-    private static native void bytesToFloats(byte[] src, int srcpos,
-                                             float[] dst, int dstpos,
-                                             int nfloats);
-
-    /**
-     * Converts specified span of bytes into double values.
-     */
-    // REMIND: remove once hotspot inlines Double.longBitsToDouble
-    private static native void bytesToDoubles(byte[] src, int srcpos,
-                                              double[] dst, int dstpos,
-                                              int ndoubles);
-
-    /**
-     * Returns the first non-null class loader (not counting class loaders of
-     * generated reflection implementation classes) up the execution stack, or
-     * null if only code from the null class loader is on the stack.  This
-     * method is also called via reflection by the following RMI-IIOP class:
-     *
-     *     com.sun.corba.se.internal.util.JDKClassLoader
-     *
-     * This method should not be removed or its signature changed without
-     * corresponding modifications to the above class.
-     */
-    // REMIND: change name to something more accurate?
-    private static native ClassLoader latestUserDefinedLoader();
-
-    /**
-     * Default GetField implementation.
-     */
-    private class GetFieldImpl extends GetField {
-
-        /** class descriptor describing serializable fields */
-        private final ObjectStreamClass desc;
-        /** primitive field values */
-        private final byte[] primVals;
-        /** object field values */
-        private final Object[] objVals;
-        /** object field value handles */
-        private final int[] objHandles;
-
-        /**
-         * Creates GetFieldImpl object for reading fields defined in given
-         * class descriptor.
-         */
-        GetFieldImpl(ObjectStreamClass desc) {
-            this.desc = desc;
-            primVals = new byte[desc.getPrimDataSize()];
-            objVals = new Object[desc.getNumObjFields()];
-            objHandles = new int[objVals.length];
-        }
-
-        public ObjectStreamClass getObjectStreamClass() {
-            return desc;
-        }
-
-        public boolean defaulted(String name) throws IOException {
-            return (getFieldOffset(name, null) < 0);
-        }
-
-        public boolean get(String name, boolean val) throws IOException {
-            int off = getFieldOffset(name, Boolean.TYPE);
-            return (off >= 0) ? Bits.getBoolean(primVals, off) : val;
-        }
-
-        public byte get(String name, byte val) throws IOException {
-            int off = getFieldOffset(name, Byte.TYPE);
-            return (off >= 0) ? primVals[off] : val;
-        }
-
-        public char get(String name, char val) throws IOException {
-            int off = getFieldOffset(name, Character.TYPE);
-            return (off >= 0) ? Bits.getChar(primVals, off) : val;
-        }
-
-        public short get(String name, short val) throws IOException {
-            int off = getFieldOffset(name, Short.TYPE);
-            return (off >= 0) ? Bits.getShort(primVals, off) : val;
-        }
-
-        public int get(String name, int val) throws IOException {
-            int off = getFieldOffset(name, Integer.TYPE);
-            return (off >= 0) ? Bits.getInt(primVals, off) : val;
-        }
-
-        public float get(String name, float val) throws IOException {
-            int off = getFieldOffset(name, Float.TYPE);
-            return (off >= 0) ? Bits.getFloat(primVals, off) : val;
-        }
-
-        public long get(String name, long val) throws IOException {
-            int off = getFieldOffset(name, Long.TYPE);
-            return (off >= 0) ? Bits.getLong(primVals, off) : val;
-        }
-
-        public double get(String name, double val) throws IOException {
-            int off = getFieldOffset(name, Double.TYPE);
-            return (off >= 0) ? Bits.getDouble(primVals, off) : val;
-        }
-
-        public Object get(String name, Object val) throws IOException {
-            int off = getFieldOffset(name, Object.class);
-            if (off >= 0) {
-                int objHandle = objHandles[off];
-                handles.markDependency(passHandle, objHandle);
-                return (handles.lookupException(objHandle) == null) ?
-                    objVals[off] : null;
-            } else {
-                return val;
-            }
-        }
-
-        /**
-         * Reads primitive and object field values from stream.
-         */
-        void readFields() throws IOException {
-            bin.readFully(primVals, 0, primVals.length, false);
-
-            int oldHandle = passHandle;
-            ObjectStreamField[] fields = desc.getFields(false);
-            int numPrimFields = fields.length - objVals.length;
-            for (int i = 0; i < objVals.length; i++) {
-                objVals[i] =
-                    readObject0(fields[numPrimFields + i].isUnshared());
-                objHandles[i] = passHandle;
-            }
-            passHandle = oldHandle;
-        }
-
-        /**
-         * Returns offset of field with given name and type.  A specified type
-         * of null matches all types, Object.class matches all non-primitive
-         * types, and any other non-null type matches assignable types only.
-         * If no matching field is found in the (incoming) class
-         * descriptor but a matching field is present in the associated local
-         * class descriptor, returns -1.  Throws IllegalArgumentException if
-         * neither incoming nor local class descriptor contains a match.
-         */
-        private int getFieldOffset(String name, Class type) {
-            ObjectStreamField field = desc.getField(name, type);
-            if (field != null) {
-                return field.getOffset();
-            } else if (desc.getLocalDesc().getField(name, type) != null) {
-                return -1;
-            } else {
-                throw new IllegalArgumentException("no such field " + name +
-                                                   " with type " + type);
-            }
-        }
-    }
-
-    /**
-     * Prioritized list of callbacks to be performed once object graph has been
-     * completely deserialized.
-     */
-    private static class ValidationList {
-
-
-        /**
-         * Creates new (empty) ValidationList.
-         */
-        ValidationList() {
-        }
-
-        /**
-         * Registers callback.  Throws InvalidObjectException if callback
-         * object is null.
-         */
-        void register(ObjectInputValidation obj, int priority)
-            throws InvalidObjectException
-        {
-            if (obj == null) {
-                throw new InvalidObjectException("null callback");
-            }
-            throw new InvalidObjectException("Does not work.");
-        }
-
-        /**
-         * Invokes all registered callbacks and clears the callback list.
-         * Callbacks with higher priorities are called first; those with equal
-         * priorities may be called in any order.  If any of the callbacks
-         * throws an InvalidObjectException, the callback process is terminated
-         * and the exception propagated upwards.
-         */
-        void doCallbacks() throws InvalidObjectException {
-        }
-
-        /**
-         * Resets the callback list to its initial (empty) state.
-         */
-        public void clear() {
-        }
-    }
-
-    /**
-     * Input stream supporting single-byte peek operations.
-     */
-    private static class PeekInputStream extends InputStream {
-
-        /** underlying stream */
-        private final InputStream in;
-        /** peeked byte */
-        private int peekb = -1;
-
-        /**
-         * Creates new PeekInputStream on top of given underlying stream.
-         */
-        PeekInputStream(InputStream in) {
-            this.in = in;
-        }
-
-        /**
-         * Peeks at next byte value in stream.  Similar to read(), except
-         * that it does not consume the read value.
-         */
-        int peek() throws IOException {
-            return (peekb >= 0) ? peekb : (peekb = in.read());
-        }
-
-        public int read() throws IOException {
-            if (peekb >= 0) {
-                int v = peekb;
-                peekb = -1;
-                return v;
-            } else {
-                return in.read();
-            }
-        }
-
-        public int read(byte[] b, int off, int len) throws IOException {
-            if (len == 0) {
-                return 0;
-            } else if (peekb < 0) {
-                return in.read(b, off, len);
-            } else {
-                b[off++] = (byte) peekb;
-                len--;
-                peekb = -1;
-                int n = in.read(b, off, len);
-                return (n >= 0) ? (n + 1) : 1;
-            }
-        }
-
-        void readFully(byte[] b, int off, int len) throws IOException {
-            int n = 0;
-            while (n < len) {
-                int count = read(b, off + n, len - n);
-                if (count < 0) {
-                    throw new EOFException();
-                }
-                n += count;
-            }
-        }
-
-        public long skip(long n) throws IOException {
-            if (n <= 0) {
-                return 0;
-            }
-            int skipped = 0;
-            if (peekb >= 0) {
-                peekb = -1;
-                skipped++;
-                n--;
-            }
-            return skipped + skip(n);
-        }
-
-        public int available() throws IOException {
-            return in.available() + ((peekb >= 0) ? 1 : 0);
-        }
-
-        public void close() throws IOException {
-            in.close();
-        }
-    }
-
-    /**
-     * Input stream with two modes: in default mode, inputs data written in the
-     * same format as DataOutputStream; in "block data" mode, inputs data
-     * bracketed by block data markers (see object serialization specification
-     * for details).  Buffering depends on block data mode: when in default
-     * mode, no data is buffered in advance; when in block data mode, all data
-     * for the current data block is read in at once (and buffered).
-     */
-    private class BlockDataInputStream
-        extends InputStream implements DataInput
-    {
-        /** maximum data block length */
-        private static final int MAX_BLOCK_SIZE = 1024;
-        /** maximum data block header length */
-        private static final int MAX_HEADER_SIZE = 5;
-        /** (tunable) length of char buffer (for reading strings) */
-        private static final int CHAR_BUF_SIZE = 256;
-        /** readBlockHeader() return value indicating header read may block */
-        private static final int HEADER_BLOCKED = -2;
-
-        /** buffer for reading general/block data */
-        private final byte[] buf = new byte[MAX_BLOCK_SIZE];
-        /** buffer for reading block data headers */
-        private final byte[] hbuf = new byte[MAX_HEADER_SIZE];
-        /** char buffer for fast string reads */
-        private final char[] cbuf = new char[CHAR_BUF_SIZE];
-
-        /** block data mode */
-        private boolean blkmode = false;
-
-        // block data state fields; values meaningful only when blkmode true
-        /** current offset into buf */
-        private int pos = 0;
-        /** end offset of valid data in buf, or -1 if no more block data */
-        private int end = -1;
-        /** number of bytes in current block yet to be read from stream */
-        private int unread = 0;
-
-        /** underlying stream (wrapped in peekable filter stream) */
-        private final PeekInputStream in;
-        /** loopback stream (for data reads that span data blocks) */
-        private final DataInputStream din;
-
-        /**
-         * Creates new BlockDataInputStream on top of given underlying stream.
-         * Block data mode is turned off by default.
-         */
-        BlockDataInputStream(InputStream in) {
-            this.in = new PeekInputStream(in);
-            din = new DataInputStream(this);
-        }
-
-        /**
-         * Sets block data mode to the given mode (true == on, false == off)
-         * and returns the previous mode value.  If the new mode is the same as
-         * the old mode, no action is taken.  Throws IllegalStateException if
-         * block data mode is being switched from on to off while unconsumed
-         * block data is still present in the stream.
-         */
-        boolean setBlockDataMode(boolean newmode) throws IOException {
-            if (blkmode == newmode) {
-                return blkmode;
-            }
-            if (newmode) {
-                pos = 0;
-                end = 0;
-                unread = 0;
-            } else if (pos < end) {
-                throw new IllegalStateException("unread block data");
-            }
-            blkmode = newmode;
-            return !blkmode;
-        }
-
-        /**
-         * Returns true if the stream is currently in block data mode, false
-         * otherwise.
-         */
-        boolean getBlockDataMode() {
-            return blkmode;
-        }
-
-        /**
-         * If in block data mode, skips to the end of the current group of data
-         * blocks (but does not unset block data mode).  If not in block data
-         * mode, throws an IllegalStateException.
-         */
-        void skipBlockData() throws IOException {
-            if (!blkmode) {
-                throw new IllegalStateException("not in block data mode");
-            }
-            while (end >= 0) {
-                refill();
-            }
-        }
-
-        /**
-         * Attempts to read in the next block data header (if any).  If
-         * canBlock is false and a full header cannot be read without possibly
-         * blocking, returns HEADER_BLOCKED, else if the next element in the
-         * stream is a block data header, returns the block data length
-         * specified by the header, else returns -1.
-         */
-        private int readBlockHeader(boolean canBlock) throws IOException {
-            if (defaultDataEnd) {
-                /*
-                 * Fix for 4360508: stream is currently at the end of a field
-                 * value block written via default serialization; since there
-                 * is no terminating TC_ENDBLOCKDATA tag, simulate
-                 * end-of-custom-data behavior explicitly.
-                 */
-                return -1;
-            }
-            try {
-                for (;;) {
-                    int avail = canBlock ? Integer.MAX_VALUE : in.available();
-                    if (avail == 0) {
-                        return HEADER_BLOCKED;
-                    }
-
-                    int tc = in.peek();
-                    switch (tc) {
-                        case TC_BLOCKDATA:
-                            if (avail < 2) {
-                                return HEADER_BLOCKED;
-                            }
-                            in.readFully(hbuf, 0, 2);
-                            return hbuf[1] & 0xFF;
-
-                        case TC_BLOCKDATALONG:
-                            if (avail < 5) {
-                                return HEADER_BLOCKED;
-                            }
-                            in.readFully(hbuf, 0, 5);
-                            int len = Bits.getInt(hbuf, 1);
-                            if (len < 0) {
-                                throw new StreamCorruptedException(
-                                    "illegal block data header length: " +
-                                    len);
-                            }
-                            return len;
-
-                        /*
-                         * TC_RESETs may occur in between data blocks.
-                         * Unfortunately, this case must be parsed at a lower
-                         * level than other typecodes, since primitive data
-                         * reads may span data blocks separated by a TC_RESET.
-                         */
-                        case TC_RESET:
-                            in.read();
-                            handleReset();
-                            break;
-
-                        default:
-                            if (tc >= 0 && (tc < TC_BASE || tc > TC_MAX)) {
-                                throw new StreamCorruptedException(
-                                    String.format("invalid type code: %02X",
-                                    tc));
-                            }
-                            return -1;
-                    }
-                }
-            } catch (EOFException ex) {
-                throw new StreamCorruptedException(
-                    "unexpected EOF while reading block data header");
-            }
-        }
-
-        /**
-         * Refills internal buffer buf with block data.  Any data in buf at the
-         * time of the call is considered consumed.  Sets the pos, end, and
-         * unread fields to reflect the new amount of available block data; if
-         * the next element in the stream is not a data block, sets pos and
-         * unread to 0 and end to -1.
-         */
-        private void refill() throws IOException {
-            try {
-                do {
-                    pos = 0;
-                    if (unread > 0) {
-                        int n =
-                            in.read(buf, 0, Math.min(unread, MAX_BLOCK_SIZE));
-                        if (n >= 0) {
-                            end = n;
-                            unread -= n;
-                        } else {
-                            throw new StreamCorruptedException(
-                                "unexpected EOF in middle of data block");
-                        }
-                    } else {
-                        int n = readBlockHeader(true);
-                        if (n >= 0) {
-                            end = 0;
-                            unread = n;
-                        } else {
-                            end = -1;
-                            unread = 0;
-                        }
-                    }
-                } while (pos == end);
-            } catch (IOException ex) {
-                pos = 0;
-                end = -1;
-                unread = 0;
-                throw ex;
-            }
-        }
-
-        /**
-         * If in block data mode, returns the number of unconsumed bytes
-         * remaining in the current data block.  If not in block data mode,
-         * throws an IllegalStateException.
-         */
-        int currentBlockRemaining() {
-            if (blkmode) {
-                return (end >= 0) ? (end - pos) + unread : 0;
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        /**
-         * Peeks at (but does not consume) and returns the next byte value in
-         * the stream, or -1 if the end of the stream/block data (if in block
-         * data mode) has been reached.
-         */
-        int peek() throws IOException {
-            if (blkmode) {
-                if (pos == end) {
-                    refill();
-                }
-                return (end >= 0) ? (buf[pos] & 0xFF) : -1;
-            } else {
-                return in.peek();
-            }
-        }
-
-        /**
-         * Peeks at (but does not consume) and returns the next byte value in
-         * the stream, or throws EOFException if end of stream/block data has
-         * been reached.
-         */
-        byte peekByte() throws IOException {
-            int val = peek();
-            if (val < 0) {
-                throw new EOFException();
-            }
-            return (byte) val;
-        }
-
-
-        /* ----------------- generic input stream methods ------------------ */
-        /*
-         * The following methods are equivalent to their counterparts in
-         * InputStream, except that they interpret data block boundaries and
-         * read the requested data from within data blocks when in block data
-         * mode.
-         */
-
-        public int read() throws IOException {
-            if (blkmode) {
-                if (pos == end) {
-                    refill();
-                }
-                return (end >= 0) ? (buf[pos++] & 0xFF) : -1;
-            } else {
-                return in.read();
-            }
-        }
-
-        public int read(byte[] b, int off, int len) throws IOException {
-            return read(b, off, len, false);
-        }
-
-        public long skip(long len) throws IOException {
-            long remain = len;
-            while (remain > 0) {
-                if (blkmode) {
-                    if (pos == end) {
-                        refill();
-                    }
-                    if (end < 0) {
-                        break;
-                    }
-                    int nread = (int) Math.min(remain, end - pos);
-                    remain -= nread;
-                    pos += nread;
-                } else {
-                    int nread = (int) Math.min(remain, MAX_BLOCK_SIZE);
-                    if ((nread = in.read(buf, 0, nread)) < 0) {
-                        break;
-                    }
-                    remain -= nread;
-                }
-            }
-            return len - remain;
-        }
-
-        public int available() throws IOException {
-            if (blkmode) {
-                if ((pos == end) && (unread == 0)) {
-                    int n;
-                    while ((n = readBlockHeader(false)) == 0) ;
-                    switch (n) {
-                        case HEADER_BLOCKED:
-                            break;
-
-                        case -1:
-                            pos = 0;
-                            end = -1;
-                            break;
-
-                        default:
-                            pos = 0;
-                            end = 0;
-                            unread = n;
-                            break;
-                    }
-                }
-                // avoid unnecessary call to in.available() if possible
-                int unreadAvail = (unread > 0) ?
-                    Math.min(in.available(), unread) : 0;
-                return (end >= 0) ? (end - pos) + unreadAvail : 0;
-            } else {
-                return in.available();
-            }
-        }
-
-        public void close() throws IOException {
-            if (blkmode) {
-                pos = 0;
-                end = -1;
-                unread = 0;
-            }
-            in.close();
-        }
-
-        /**
-         * Attempts to read len bytes into byte array b at offset off.  Returns
-         * the number of bytes read, or -1 if the end of stream/block data has
-         * been reached.  If copy is true, reads values into an intermediate
-         * buffer before copying them to b (to avoid exposing a reference to
-         * b).
-         */
-        int read(byte[] b, int off, int len, boolean copy) throws IOException {
-            if (len == 0) {
-                return 0;
-            } else if (blkmode) {
-                if (pos == end) {
-                    refill();
-                }
-                if (end < 0) {
-                    return -1;
-                }
-                int nread = Math.min(len, end - pos);
-                System.arraycopy(buf, pos, b, off, nread);
-                pos += nread;
-                return nread;
-            } else if (copy) {
-                int nread = in.read(buf, 0, Math.min(len, MAX_BLOCK_SIZE));
-                if (nread > 0) {
-                    System.arraycopy(buf, 0, b, off, nread);
-                }
-                return nread;
-            } else {
-                return in.read(b, off, len);
-            }
-        }
-
-        /* ----------------- primitive data input methods ------------------ */
-        /*
-         * The following methods are equivalent to their counterparts in
-         * DataInputStream, except that they interpret data block boundaries
-         * and read the requested data from within data blocks when in block
-         * data mode.
-         */
-
-        public void readFully(byte[] b) throws IOException {
-            readFully(b, 0, b.length, false);
-        }
-
-        public void readFully(byte[] b, int off, int len) throws IOException {
-            readFully(b, off, len, false);
-        }
-
-        public void readFully(byte[] b, int off, int len, boolean copy)
-            throws IOException
-        {
-            while (len > 0) {
-                int n = read(b, off, len, copy);
-                if (n < 0) {
-                    throw new EOFException();
-                }
-                off += n;
-                len -= n;
-            }
-        }
-
-        public int skipBytes(int n) throws IOException {
-            return din.skipBytes(n);
-        }
-
-        public boolean readBoolean() throws IOException {
-            int v = read();
-            if (v < 0) {
-                throw new EOFException();
-            }
-            return (v != 0);
-        }
-
-        public byte readByte() throws IOException {
-            int v = read();
-            if (v < 0) {
-                throw new EOFException();
-            }
-            return (byte) v;
-        }
-
-        public int readUnsignedByte() throws IOException {
-            int v = read();
-            if (v < 0) {
-                throw new EOFException();
-            }
-            return v;
-        }
-
-        public char readChar() throws IOException {
-            if (!blkmode) {
-                pos = 0;
-                in.readFully(buf, 0, 2);
-            } else if (end - pos < 2) {
-                return din.readChar();
-            }
-            char v = Bits.getChar(buf, pos);
-            pos += 2;
-            return v;
-        }
-
-        public short readShort() throws IOException {
-            if (!blkmode) {
-                pos = 0;
-                in.readFully(buf, 0, 2);
-            } else if (end - pos < 2) {
-                return din.readShort();
-            }
-            short v = Bits.getShort(buf, pos);
-            pos += 2;
-            return v;
-        }
-
-        public int readUnsignedShort() throws IOException {
-            if (!blkmode) {
-                pos = 0;
-                in.readFully(buf, 0, 2);
-            } else if (end - pos < 2) {
-                return din.readUnsignedShort();
-            }
-            int v = Bits.getShort(buf, pos) & 0xFFFF;
-            pos += 2;
-            return v;
-        }
-
-        public int readInt() throws IOException {
-            if (!blkmode) {
-                pos = 0;
-                in.readFully(buf, 0, 4);
-            } else if (end - pos < 4) {
-                return din.readInt();
-            }
-            int v = Bits.getInt(buf, pos);
-            pos += 4;
-            return v;
-        }
-
-        public float readFloat() throws IOException {
-            if (!blkmode) {
-                pos = 0;
-                in.readFully(buf, 0, 4);
-            } else if (end - pos < 4) {
-                return din.readFloat();
-            }
-            float v = Bits.getFloat(buf, pos);
-            pos += 4;
-            return v;
-        }
-
-        public long readLong() throws IOException {
-            if (!blkmode) {
-                pos = 0;
-                in.readFully(buf, 0, 8);
-            } else if (end - pos < 8) {
-                return din.readLong();
-            }
-            long v = Bits.getLong(buf, pos);
-            pos += 8;
-            return v;
-        }
-
-        public double readDouble() throws IOException {
-            if (!blkmode) {
-                pos = 0;
-                in.readFully(buf, 0, 8);
-            } else if (end - pos < 8) {
-                return din.readDouble();
-            }
-            double v = Bits.getDouble(buf, pos);
-            pos += 8;
-            return v;
-        }
-
-        public String readUTF() throws IOException {
-            return readUTFBody(readUnsignedShort());
-        }
-
-        public String readLine() throws IOException {
-            return din.readLine();      // deprecated, not worth optimizing
-        }
-
-        /* -------------- primitive data array input methods --------------- */
-        /*
-         * The following methods read in spans of primitive data values.
-         * Though equivalent to calling the corresponding primitive read
-         * methods repeatedly, these methods are optimized for reading groups
-         * of primitive data values more efficiently.
-         */
-
-        void readBooleans(boolean[] v, int off, int len) throws IOException {
-            int stop, endoff = off + len;
-            while (off < endoff) {
-                if (!blkmode) {
-                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE);
-                    in.readFully(buf, 0, span);
-                    stop = off + span;
-                    pos = 0;
-                } else if (end - pos < 1) {
-                    v[off++] = din.readBoolean();
-                    continue;
-                } else {
-                    stop = Math.min(endoff, off + end - pos);
-                }
-
-                while (off < stop) {
-                    v[off++] = Bits.getBoolean(buf, pos++);
-                }
-            }
-        }
-
-        void readChars(char[] v, int off, int len) throws IOException {
-            int stop, endoff = off + len;
-            while (off < endoff) {
-                if (!blkmode) {
-                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 1);
-                    in.readFully(buf, 0, span << 1);
-                    stop = off + span;
-                    pos = 0;
-                } else if (end - pos < 2) {
-                    v[off++] = din.readChar();
-                    continue;
-                } else {
-                    stop = Math.min(endoff, off + ((end - pos) >> 1));
-                }
-
-                while (off < stop) {
-                    v[off++] = Bits.getChar(buf, pos);
-                    pos += 2;
-                }
-            }
-        }
-
-        void readShorts(short[] v, int off, int len) throws IOException {
-            int stop, endoff = off + len;
-            while (off < endoff) {
-                if (!blkmode) {
-                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 1);
-                    in.readFully(buf, 0, span << 1);
-                    stop = off + span;
-                    pos = 0;
-                } else if (end - pos < 2) {
-                    v[off++] = din.readShort();
-                    continue;
-                } else {
-                    stop = Math.min(endoff, off + ((end - pos) >> 1));
-                }
-
-                while (off < stop) {
-                    v[off++] = Bits.getShort(buf, pos);
-                    pos += 2;
-                }
-            }
-        }
-
-        void readInts(int[] v, int off, int len) throws IOException {
-            int stop, endoff = off + len;
-            while (off < endoff) {
-                if (!blkmode) {
-                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 2);
-                    in.readFully(buf, 0, span << 2);
-                    stop = off + span;
-                    pos = 0;
-                } else if (end - pos < 4) {
-                    v[off++] = din.readInt();
-                    continue;
-                } else {
-                    stop = Math.min(endoff, off + ((end - pos) >> 2));
-                }
-
-                while (off < stop) {
-                    v[off++] = Bits.getInt(buf, pos);
-                    pos += 4;
-                }
-            }
-        }
-
-        void readFloats(float[] v, int off, int len) throws IOException {
-            int span, endoff = off + len;
-            while (off < endoff) {
-                if (!blkmode) {
-                    span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 2);
-                    in.readFully(buf, 0, span << 2);
-                    pos = 0;
-                } else if (end - pos < 4) {
-                    v[off++] = din.readFloat();
-                    continue;
-                } else {
-                    span = Math.min(endoff - off, ((end - pos) >> 2));
-                }
-
-                bytesToFloats(buf, pos, v, off, span);
-                off += span;
-                pos += span << 2;
-            }
-        }
-
-        void readLongs(long[] v, int off, int len) throws IOException {
-            int stop, endoff = off + len;
-            while (off < endoff) {
-                if (!blkmode) {
-                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 3);
-                    in.readFully(buf, 0, span << 3);
-                    stop = off + span;
-                    pos = 0;
-                } else if (end - pos < 8) {
-                    v[off++] = din.readLong();
-                    continue;
-                } else {
-                    stop = Math.min(endoff, off + ((end - pos) >> 3));
-                }
-
-                while (off < stop) {
-                    v[off++] = Bits.getLong(buf, pos);
-                    pos += 8;
-                }
-            }
-        }
-
-        void readDoubles(double[] v, int off, int len) throws IOException {
-            int span, endoff = off + len;
-            while (off < endoff) {
-                if (!blkmode) {
-                    span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 3);
-                    in.readFully(buf, 0, span << 3);
-                    pos = 0;
-                } else if (end - pos < 8) {
-                    v[off++] = din.readDouble();
-                    continue;
-                } else {
-                    span = Math.min(endoff - off, ((end - pos) >> 3));
-                }
-
-                bytesToDoubles(buf, pos, v, off, span);
-                off += span;
-                pos += span << 3;
-            }
-        }
-
-        /**
-         * Reads in string written in "long" UTF format.  "Long" UTF format is
-         * identical to standard UTF, except that it uses an 8 byte header
-         * (instead of the standard 2 bytes) to convey the UTF encoding length.
-         */
-        String readLongUTF() throws IOException {
-            return readUTFBody(readLong());
-        }
-
-        /**
-         * Reads in the "body" (i.e., the UTF representation minus the 2-byte
-         * or 8-byte length header) of a UTF encoding, which occupies the next
-         * utflen bytes.
-         */
-        private String readUTFBody(long utflen) throws IOException {
-            StringBuilder sbuf = new StringBuilder();
-            if (!blkmode) {
-                end = pos = 0;
-            }
-
-            while (utflen > 0) {
-                int avail = end - pos;
-                if (avail >= 3 || (long) avail == utflen) {
-                    utflen -= readUTFSpan(sbuf, utflen);
-                } else {
-                    if (blkmode) {
-                        // near block boundary, read one byte at a time
-                        utflen -= readUTFChar(sbuf, utflen);
-                    } else {
-                        // shift and refill buffer manually
-                        if (avail > 0) {
-                            System.arraycopy(buf, pos, buf, 0, avail);
-                        }
-                        pos = 0;
-                        end = (int) Math.min(MAX_BLOCK_SIZE, utflen);
-                        in.readFully(buf, avail, end - avail);
-                    }
-                }
-            }
-
-            return sbuf.toString();
-        }
-
-        /**
-         * Reads span of UTF-encoded characters out of internal buffer
-         * (starting at offset pos and ending at or before offset end),
-         * consuming no more than utflen bytes.  Appends read characters to
-         * sbuf.  Returns the number of bytes consumed.
-         */
-        private long readUTFSpan(StringBuilder sbuf, long utflen)
-            throws IOException
-        {
-            int cpos = 0;
-            int start = pos;
-            int avail = Math.min(end - pos, CHAR_BUF_SIZE);
-            // stop short of last char unless all of utf bytes in buffer
-            int stop = pos + ((utflen > avail) ? avail - 2 : (int) utflen);
-            boolean outOfBounds = false;
-
-            try {
-                while (pos < stop) {
-                    int b1, b2, b3;
-                    b1 = buf[pos++] & 0xFF;
-                    switch (b1 >> 4) {
-                        case 0:
-                        case 1:
-                        case 2:
-                        case 3:
-                        case 4:
-                        case 5:
-                        case 6:
-                        case 7:   // 1 byte format: 0xxxxxxx
-                            cbuf[cpos++] = (char) b1;
-                            break;
-
-                        case 12:
-                        case 13:  // 2 byte format: 110xxxxx 10xxxxxx
-                            b2 = buf[pos++];
-                            if ((b2 & 0xC0) != 0x80) {
-                                throw new UTFDataFormatException();
-                            }
-                            cbuf[cpos++] = (char) (((b1 & 0x1F) << 6) |
-                                                   ((b2 & 0x3F) << 0));
-                            break;
-
-                        case 14:  // 3 byte format: 1110xxxx 10xxxxxx 10xxxxxx
-                            b3 = buf[pos + 1];
-                            b2 = buf[pos + 0];
-                            pos += 2;
-                            if ((b2 & 0xC0) != 0x80 || (b3 & 0xC0) != 0x80) {
-                                throw new UTFDataFormatException();
-                            }
-                            cbuf[cpos++] = (char) (((b1 & 0x0F) << 12) |
-                                                   ((b2 & 0x3F) << 6) |
-                                                   ((b3 & 0x3F) << 0));
-                            break;
-
-                        default:  // 10xx xxxx, 1111 xxxx
-                            throw new UTFDataFormatException();
-                    }
-                }
-            } catch (ArrayIndexOutOfBoundsException ex) {
-                outOfBounds = true;
-            } finally {
-                if (outOfBounds || (pos - start) > utflen) {
-                    /*
-                     * Fix for 4450867: if a malformed utf char causes the
-                     * conversion loop to scan past the expected end of the utf
-                     * string, only consume the expected number of utf bytes.
-                     */
-                    pos = start + (int) utflen;
-                    throw new UTFDataFormatException();
-                }
-            }
-
-            sbuf.append(cbuf, 0, cpos);
-            return pos - start;
-        }
-
-        /**
-         * Reads in single UTF-encoded character one byte at a time, appends
-         * the character to sbuf, and returns the number of bytes consumed.
-         * This method is used when reading in UTF strings written in block
-         * data mode to handle UTF-encoded characters which (potentially)
-         * straddle block-data boundaries.
-         */
-        private int readUTFChar(StringBuilder sbuf, long utflen)
-            throws IOException
-        {
-            int b1, b2, b3;
-            b1 = readByte() & 0xFF;
-            switch (b1 >> 4) {
-                case 0:
-                case 1:
-                case 2:
-                case 3:
-                case 4:
-                case 5:
-                case 6:
-                case 7:     // 1 byte format: 0xxxxxxx
-                    sbuf.append((char) b1);
-                    return 1;
-
-                case 12:
-                case 13:    // 2 byte format: 110xxxxx 10xxxxxx
-                    if (utflen < 2) {
-                        throw new UTFDataFormatException();
-                    }
-                    b2 = readByte();
-                    if ((b2 & 0xC0) != 0x80) {
-                        throw new UTFDataFormatException();
-                    }
-                    sbuf.append((char) (((b1 & 0x1F) << 6) |
-                                        ((b2 & 0x3F) << 0)));
-                    return 2;
-
-                case 14:    // 3 byte format: 1110xxxx 10xxxxxx 10xxxxxx
-                    if (utflen < 3) {
-                        if (utflen == 2) {
-                            readByte();         // consume remaining byte
-                        }
-                        throw new UTFDataFormatException();
-                    }
-                    b2 = readByte();
-                    b3 = readByte();
-                    if ((b2 & 0xC0) != 0x80 || (b3 & 0xC0) != 0x80) {
-                        throw new UTFDataFormatException();
-                    }
-                    sbuf.append((char) (((b1 & 0x0F) << 12) |
-                                        ((b2 & 0x3F) << 6) |
-                                        ((b3 & 0x3F) << 0)));
-                    return 3;
-
-                default:   // 10xx xxxx, 1111 xxxx
-                    throw new UTFDataFormatException();
-            }
-        }
-    }
-
-    /**
-     * Unsynchronized table which tracks wire handle to object mappings, as
-     * well as ClassNotFoundExceptions associated with deserialized objects.
-     * This class implements an exception-propagation algorithm for
-     * determining which objects should have ClassNotFoundExceptions associated
-     * with them, taking into account cycles and discontinuities (e.g., skipped
-     * fields) in the object graph.
-     *
-     * <p>General use of the table is as follows: during deserialization, a
-     * given object is first assigned a handle by calling the assign method.
-     * This method leaves the assigned handle in an "open" state, wherein
-     * dependencies on the exception status of other handles can be registered
-     * by calling the markDependency method, or an exception can be directly
-     * associated with the handle by calling markException.  When a handle is
-     * tagged with an exception, the HandleTable assumes responsibility for
-     * propagating the exception to any other objects which depend
-     * (transitively) on the exception-tagged object.
-     *
-     * <p>Once all exception information/dependencies for the handle have been
-     * registered, the handle should be "closed" by calling the finish method
-     * on it.  The act of finishing a handle allows the exception propagation
-     * algorithm to aggressively prune dependency links, lessening the
-     * performance/memory impact of exception tracking.
-     *
-     * <p>Note that the exception propagation algorithm used depends on handles
-     * being assigned/finished in LIFO order; however, for simplicity as well
-     * as memory conservation, it does not enforce this constraint.
-     */
-    // REMIND: add full description of exception propagation algorithm?
-    private static class HandleTable {
-
-        /* status codes indicating whether object has associated exception */
-        private static final byte STATUS_OK = 1;
-        private static final byte STATUS_UNKNOWN = 2;
-        private static final byte STATUS_EXCEPTION = 3;
-
-        /** array mapping handle -> object status */
-        byte[] status;
-        /** array mapping handle -> object/exception (depending on status) */
-        Object[] entries;
-        /** array mapping handle -> list of dependent handles (if any) */
-        HandleList[] deps;
-        /** lowest unresolved dependency */
-        int lowDep = -1;
-        /** number of handles in table */
-        int size = 0;
-
-        /**
-         * Creates handle table with the given initial capacity.
-         */
-        HandleTable(int initialCapacity) {
-            status = new byte[initialCapacity];
-            entries = new Object[initialCapacity];
-            deps = new HandleList[initialCapacity];
-        }
-
-        /**
-         * Assigns next available handle to given object, and returns assigned
-         * handle.  Once object has been completely deserialized (and all
-         * dependencies on other objects identified), the handle should be
-         * "closed" by passing it to finish().
-         */
-        int assign(Object obj) {
-            if (size >= entries.length) {
-                grow();
-            }
-            status[size] = STATUS_UNKNOWN;
-            entries[size] = obj;
-            return size++;
-        }
-
-        /**
-         * Registers a dependency (in exception status) of one handle on
-         * another.  The dependent handle must be "open" (i.e., assigned, but
-         * not finished yet).  No action is taken if either dependent or target
-         * handle is NULL_HANDLE.
-         */
-        void markDependency(int dependent, int target) {
-            if (dependent == NULL_HANDLE || target == NULL_HANDLE) {
-                return;
-            }
-            switch (status[dependent]) {
-
-                case STATUS_UNKNOWN:
-                    switch (status[target]) {
-                        case STATUS_OK:
-                            // ignore dependencies on objs with no exception
-                            break;
-
-                        case STATUS_EXCEPTION:
-                            // eagerly propagate exception
-                            markException(dependent,
-                                (ClassNotFoundException) entries[target]);
-                            break;
-
-                        case STATUS_UNKNOWN:
-                            // add to dependency list of target
-                            if (deps[target] == null) {
-                                deps[target] = new HandleList();
-                            }
-                            deps[target].add(dependent);
-
-                            // remember lowest unresolved target seen
-                            if (lowDep < 0 || lowDep > target) {
-                                lowDep = target;
-                            }
-                            break;
-
-                        default:
-                            throw new InternalError();
-                    }
-                    break;
-
-                case STATUS_EXCEPTION:
-                    break;
-
-                default:
-                    throw new InternalError();
-            }
-        }
-
-        /**
-         * Associates a ClassNotFoundException (if one not already associated)
-         * with the currently active handle and propagates it to other
-         * referencing objects as appropriate.  The specified handle must be
-         * "open" (i.e., assigned, but not finished yet).
-         */
-        void markException(int handle, ClassNotFoundException ex) {
-            switch (status[handle]) {
-                case STATUS_UNKNOWN:
-                    status[handle] = STATUS_EXCEPTION;
-                    entries[handle] = ex;
-
-                    // propagate exception to dependents
-                    HandleList dlist = deps[handle];
-                    if (dlist != null) {
-                        int ndeps = dlist.size();
-                        for (int i = 0; i < ndeps; i++) {
-                            markException(dlist.get(i), ex);
-                        }
-                        deps[handle] = null;
-                    }
-                    break;
-
-                case STATUS_EXCEPTION:
-                    break;
-
-                default:
-                    throw new InternalError();
-            }
-        }
-
-        /**
-         * Marks given handle as finished, meaning that no new dependencies
-         * will be marked for handle.  Calls to the assign and finish methods
-         * must occur in LIFO order.
-         */
-        void finish(int handle) {
-            int end;
-            if (lowDep < 0) {
-                // no pending unknowns, only resolve current handle
-                end = handle + 1;
-            } else if (lowDep >= handle) {
-                // pending unknowns now clearable, resolve all upward handles
-                end = size;
-                lowDep = -1;
-            } else {
-                // unresolved backrefs present, can't resolve anything yet
-                return;
-            }
-
-            // change STATUS_UNKNOWN -> STATUS_OK in selected span of handles
-            for (int i = handle; i < end; i++) {
-                switch (status[i]) {
-                    case STATUS_UNKNOWN:
-                        status[i] = STATUS_OK;
-                        deps[i] = null;
-                        break;
-
-                    case STATUS_OK:
-                    case STATUS_EXCEPTION:
-                        break;
-
-                    default:
-                        throw new InternalError();
-                }
-            }
-        }
-
-        /**
-         * Assigns a new object to the given handle.  The object previously
-         * associated with the handle is forgotten.  This method has no effect
-         * if the given handle already has an exception associated with it.
-         * This method may be called at any time after the handle is assigned.
-         */
-        void setObject(int handle, Object obj) {
-            switch (status[handle]) {
-                case STATUS_UNKNOWN:
-                case STATUS_OK:
-                    entries[handle] = obj;
-                    break;
-
-                case STATUS_EXCEPTION:
-                    break;
-
-                default:
-                    throw new InternalError();
-            }
-        }
-
-        /**
-         * Looks up and returns object associated with the given handle.
-         * Returns null if the given handle is NULL_HANDLE, or if it has an
-         * associated ClassNotFoundException.
-         */
-        Object lookupObject(int handle) {
-            return (handle != NULL_HANDLE &&
-                    status[handle] != STATUS_EXCEPTION) ?
-                entries[handle] : null;
-        }
-
-        /**
-         * Looks up and returns ClassNotFoundException associated with the
-         * given handle.  Returns null if the given handle is NULL_HANDLE, or
-         * if there is no ClassNotFoundException associated with the handle.
-         */
-        ClassNotFoundException lookupException(int handle) {
-            return (handle != NULL_HANDLE &&
-                    status[handle] == STATUS_EXCEPTION) ?
-                (ClassNotFoundException) entries[handle] : null;
-        }
-
-        /**
-         * Resets table to its initial state.
-         */
-        void clear() {
-            Arrays.fill(status, 0, size, (byte) 0);
-            Arrays.fill(entries, 0, size, null);
-            Arrays.fill(deps, 0, size, null);
-            lowDep = -1;
-            size = 0;
-        }
-
-        /**
-         * Returns number of handles registered in table.
-         */
-        int size() {
-            return size;
-        }
-
-        /**
-         * Expands capacity of internal arrays.
-         */
-        private void grow() {
-            int newCapacity = (entries.length << 1) + 1;
-
-            byte[] newStatus = new byte[newCapacity];
-            Object[] newEntries = new Object[newCapacity];
-            HandleList[] newDeps = new HandleList[newCapacity];
-
-            System.arraycopy(status, 0, newStatus, 0, size);
-            System.arraycopy(entries, 0, newEntries, 0, size);
-            System.arraycopy(deps, 0, newDeps, 0, size);
-
-            status = newStatus;
-            entries = newEntries;
-            deps = newDeps;
-        }
-
-        /**
-         * Simple growable list of (integer) handles.
-         */
-        private static class HandleList {
-            private int[] list = new int[4];
-            private int size = 0;
-
-            public HandleList() {
-            }
-
-            public void add(int handle) {
-                if (size >= list.length) {
-                    int[] newList = new int[list.length << 1];
-                    System.arraycopy(list, 0, newList, 0, list.length);
-                    list = newList;
-                }
-                list[size++] = handle;
-            }
-
-            public int get(int index) {
-                if (index >= size) {
-                    throw new ArrayIndexOutOfBoundsException();
-                }
-                return list[index];
-            }
-
-            public int size() {
-                return size;
-            }
-        }
-    }
-
-    /**
-     * Method for cloning arrays in case of using unsharing reading
-     */
-    private static Object cloneArray(Object array) {
-        if (array instanceof Object[]) {
-            return ((Object[]) array).clone();
-        } else if (array instanceof boolean[]) {
-            return ((boolean[]) array).clone();
-        } else if (array instanceof byte[]) {
-            return ((byte[]) array).clone();
-        } else if (array instanceof char[]) {
-            return ((char[]) array).clone();
-        } else if (array instanceof double[]) {
-            return ((double[]) array).clone();
-        } else if (array instanceof float[]) {
-            return ((float[]) array).clone();
-        } else if (array instanceof int[]) {
-            return ((int[]) array).clone();
-        } else if (array instanceof long[]) {
-            return ((long[]) array).clone();
-        } else if (array instanceof short[]) {
-            return ((short[]) array).clone();
-        } else {
-            throw new AssertionError();
-        }
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectInputValidation.java
--- a/emul/compact/src/main/java/java/io/ObjectInputValidation.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Callback interface to allow validation of objects within a graph.
- * Allows an object to be called when a complete graph of objects has
- * been deserialized.
- *
- * @author  unascribed
- * @see     ObjectInputStream
- * @see     ObjectInputStream#registerValidation(java.io.ObjectInputValidation, int)
- * @since   JDK1.1
- */
-public interface ObjectInputValidation {
-    /**
-     * Validates the object.
-     *
-     * @exception InvalidObjectException If the object cannot validate itself.
-     */
-    public void validateObject() throws InvalidObjectException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectOutput.java
--- a/emul/compact/src/main/java/java/io/ObjectOutput.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * ObjectOutput extends the DataOutput interface to include writing of objects.
- * DataOutput includes methods for output of primitive types, ObjectOutput
- * extends that interface to include objects, arrays, and Strings.
- *
- * @author  unascribed
- * @see java.io.InputStream
- * @see java.io.ObjectOutputStream
- * @see java.io.ObjectInputStream
- * @since   JDK1.1
- */
-public interface ObjectOutput extends DataOutput, AutoCloseable {
-    /**
-     * Write an object to the underlying storage or stream.  The
-     * class that implements this interface defines how the object is
-     * written.
-     *
-     * @param obj the object to be written
-     * @exception IOException Any of the usual Input/Output related exceptions.
-     */
-    public void writeObject(Object obj)
-      throws IOException;
-
-    /**
-     * Writes a byte. This method will block until the byte is actually
-     * written.
-     * @param b the byte
-     * @exception IOException If an I/O error has occurred.
-     */
-    public void write(int b) throws IOException;
-
-    /**
-     * Writes an array of bytes. This method will block until the bytes
-     * are actually written.
-     * @param b the data to be written
-     * @exception IOException If an I/O error has occurred.
-     */
-    public void write(byte b[]) throws IOException;
-
-    /**
-     * Writes a sub array of bytes.
-     * @param b the data to be written
-     * @param off       the start offset in the data
-     * @param len       the number of bytes that are written
-     * @exception IOException If an I/O error has occurred.
-     */
-    public void write(byte b[], int off, int len) throws IOException;
-
-    /**
-     * Flushes the stream. This will write any buffered
-     * output bytes.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public void flush() throws IOException;
-
-    /**
-     * Closes the stream. This method must be called
-     * to release any resources associated with the
-     * stream.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public void close() throws IOException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectOutputStream.java
--- a/emul/compact/src/main/java/java/io/ObjectOutputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2369 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * An ObjectOutputStream writes primitive data types and graphs of Java objects
- * to an OutputStream.  The objects can be read (reconstituted) using an
- * ObjectInputStream.  Persistent storage of objects can be accomplished by
- * using a file for the stream.  If the stream is a network socket stream, the
- * objects can be reconstituted on another host or in another process.
- *
- * <p>Only objects that support the java.io.Serializable interface can be
- * written to streams.  The class of each serializable object is encoded
- * including the class name and signature of the class, the values of the
- * object's fields and arrays, and the closure of any other objects referenced
- * from the initial objects.
- *
- * <p>The method writeObject is used to write an object to the stream.  Any
- * object, including Strings and arrays, is written with writeObject. Multiple
- * objects or primitives can be written to the stream.  The objects must be
- * read back from the corresponding ObjectInputstream with the same types and
- * in the same order as they were written.
- *
- * <p>Primitive data types can also be written to the stream using the
- * appropriate methods from DataOutput. Strings can also be written using the
- * writeUTF method.
- *
- * <p>The default serialization mechanism for an object writes the class of the
- * object, the class signature, and the values of all non-transient and
- * non-static fields.  References to other objects (except in transient or
- * static fields) cause those objects to be written also. Multiple references
- * to a single object are encoded using a reference sharing mechanism so that
- * graphs of objects can be restored to the same shape as when the original was
- * written.
- *
- * <p>For example to write an object that can be read by the example in
- * ObjectInputStream:
- * <br>
- * <pre>
- *      FileOutputStream fos = new FileOutputStream("t.tmp");
- *      ObjectOutputStream oos = new ObjectOutputStream(fos);
- *
- *      oos.writeInt(12345);
- *      oos.writeObject("Today");
- *      oos.writeObject(new Date());
- *
- *      oos.close();
- * </pre>
- *
- * <p>Classes that require special handling during the serialization and
- * deserialization process must implement special methods with these exact
- * signatures:
- * <br>
- * <pre>
- * private void readObject(java.io.ObjectInputStream stream)
- *     throws IOException, ClassNotFoundException;
- * private void writeObject(java.io.ObjectOutputStream stream)
- *     throws IOException
- * private void readObjectNoData()
- *     throws ObjectStreamException;
- * </pre>
- *
- * <p>The writeObject method is responsible for writing the state of the object
- * for its particular class so that the corresponding readObject method can
- * restore it.  The method does not need to concern itself with the state
- * belonging to the object's superclasses or subclasses.  State is saved by
- * writing the individual fields to the ObjectOutputStream using the
- * writeObject method or by using the methods for primitive data types
- * supported by DataOutput.
- *
- * <p>Serialization does not write out the fields of any object that does not
- * implement the java.io.Serializable interface.  Subclasses of Objects that
- * are not serializable can be serializable. In this case the non-serializable
- * class must have a no-arg constructor to allow its fields to be initialized.
- * In this case it is the responsibility of the subclass to save and restore
- * the state of the non-serializable class. It is frequently the case that the
- * fields of that class are accessible (public, package, or protected) or that
- * there are get and set methods that can be used to restore the state.
- *
- * <p>Serialization of an object can be prevented by implementing writeObject
- * and readObject methods that throw the NotSerializableException.  The
- * exception will be caught by the ObjectOutputStream and abort the
- * serialization process.
- *
- * <p>Implementing the Externalizable interface allows the object to assume
- * complete control over the contents and format of the object's serialized
- * form.  The methods of the Externalizable interface, writeExternal and
- * readExternal, are called to save and restore the objects state.  When
- * implemented by a class they can write and read their own state using all of
- * the methods of ObjectOutput and ObjectInput.  It is the responsibility of
- * the objects to handle any versioning that occurs.
- *
- * <p>Enum constants are serialized differently than ordinary serializable or
- * externalizable objects.  The serialized form of an enum constant consists
- * solely of its name; field values of the constant are not transmitted.  To
- * serialize an enum constant, ObjectOutputStream writes the string returned by
- * the constant's name method.  Like other serializable or externalizable
- * objects, enum constants can function as the targets of back references
- * appearing subsequently in the serialization stream.  The process by which
- * enum constants are serialized cannot be customized; any class-specific
- * writeObject and writeReplace methods defined by enum types are ignored
- * during serialization.  Similarly, any serialPersistentFields or
- * serialVersionUID field declarations are also ignored--all enum types have a
- * fixed serialVersionUID of 0L.
- *
- * <p>Primitive data, excluding serializable fields and externalizable data, is
- * written to the ObjectOutputStream in block-data records. A block data record
- * is composed of a header and data. The block data header consists of a marker
- * and the number of bytes to follow the header.  Consecutive primitive data
- * writes are merged into one block-data record.  The blocking factor used for
- * a block-data record will be 1024 bytes.  Each block-data record will be
- * filled up to 1024 bytes, or be written whenever there is a termination of
- * block-data mode.  Calls to the ObjectOutputStream methods writeObject,
- * defaultWriteObject and writeFields initially terminate any existing
- * block-data record.
- *
- * @author      Mike Warres
- * @author      Roger Riggs
- * @see java.io.DataOutput
- * @see java.io.ObjectInputStream
- * @see java.io.Serializable
- * @see java.io.Externalizable
- * @see <a href="../../../platform/serialization/spec/output.html">Object Serialization Specification, Section 2, Object Output Classes</a>
- * @since       JDK1.1
- */
-public class ObjectOutputStream
-    extends OutputStream implements ObjectOutput, ObjectStreamConstants
-{
-    /** filter stream for handling block data conversion */
-    private final BlockDataOutputStream bout;
-    /** obj -> wire handle map */
-    private final HandleTable handles;
-    /** obj -> replacement obj map */
-    private final ReplaceTable subs;
-    /** stream protocol version */
-    private int protocol = PROTOCOL_VERSION_2;
-    /** recursion depth */
-    private int depth;
-
-    /** buffer for writing primitive field values */
-    private byte[] primVals;
-
-    /** if true, invoke writeObjectOverride() instead of writeObject() */
-    private final boolean enableOverride;
-    /** if true, invoke replaceObject() */
-    private boolean enableReplace;
-
-    // values below valid only during upcalls to writeObject()/writeExternal()
-    /**
-     * Context during upcalls to class-defined writeObject methods; holds
-     * object currently being serialized and descriptor for current class.
-     * Null when not during writeObject upcall.
-     */
-    private Object curContext;
-    /** current PutField object */
-    private PutFieldImpl curPut;
-
-    /** custom storage for debug trace info */
-    private final DebugTraceInfoStack debugInfoStack;
-
-    /**
-     * value of "sun.io.serialization.extendedDebugInfo" property,
-     * as true or false for extended information about exception's place
-     */
-    private static final boolean extendedDebugInfo = false;
-
-    /**
-     * Creates an ObjectOutputStream that writes to the specified OutputStream.
-     * This constructor writes the serialization stream header to the
-     * underlying stream; callers may wish to flush the stream immediately to
-     * ensure that constructors for receiving ObjectInputStreams will not block
-     * when reading the header.
-     *
-     * <p>If a security manager is installed, this constructor will check for
-     * the "enableSubclassImplementation" SerializablePermission when invoked
-     * directly or indirectly by the constructor of a subclass which overrides
-     * the ObjectOutputStream.putFields or ObjectOutputStream.writeUnshared
-     * methods.
-     *
-     * @param   out output stream to write to
-     * @throws  IOException if an I/O error occurs while writing stream header
-     * @throws  SecurityException if untrusted subclass illegally overrides
-     *          security-sensitive methods
-     * @throws  NullPointerException if <code>out</code> is <code>null</code>
-     * @since   1.4
-     * @see     ObjectOutputStream#ObjectOutputStream()
-     * @see     ObjectOutputStream#putFields()
-     * @see     ObjectInputStream#ObjectInputStream(InputStream)
-     */
-    public ObjectOutputStream(OutputStream out) throws IOException {
-        verifySubclass();
-        bout = new BlockDataOutputStream(out);
-        handles = new HandleTable(10, (float) 3.00);
-        subs = new ReplaceTable(10, (float) 3.00);
-        enableOverride = false;
-        writeStreamHeader();
-        bout.setBlockDataMode(true);
-        if (extendedDebugInfo) {
-            debugInfoStack = new DebugTraceInfoStack();
-        } else {
-            debugInfoStack = null;
-        }
-    }
-
-    /**
-     * Provide a way for subclasses that are completely reimplementing
-     * ObjectOutputStream to not have to allocate private data just used by
-     * this implementation of ObjectOutputStream.
-     *
-     * <p>If there is a security manager installed, this method first calls the
-     * security manager's <code>checkPermission</code> method with a
-     * <code>SerializablePermission("enableSubclassImplementation")</code>
-     * permission to ensure it's ok to enable subclassing.
-     *
-     * @throws  SecurityException if a security manager exists and its
-     *          <code>checkPermission</code> method denies enabling
-     *          subclassing.
-     * @see SecurityManager#checkPermission
-     * @see java.io.SerializablePermission
-     */
-    protected ObjectOutputStream() throws IOException, SecurityException {
-        throw new SecurityException();
-    }
-
-    /**
-     * Specify stream protocol version to use when writing the stream.
-     *
-     * <p>This routine provides a hook to enable the current version of
-     * Serialization to write in a format that is backwards compatible to a
-     * previous version of the stream format.
-     *
-     * <p>Every effort will be made to avoid introducing additional
-     * backwards incompatibilities; however, sometimes there is no
-     * other alternative.
-     *
-     * @param   version use ProtocolVersion from java.io.ObjectStreamConstants.
-     * @throws  IllegalStateException if called after any objects
-     *          have been serialized.
-     * @throws  IllegalArgumentException if invalid version is passed in.
-     * @throws  IOException if I/O errors occur
-     * @see java.io.ObjectStreamConstants#PROTOCOL_VERSION_1
-     * @see java.io.ObjectStreamConstants#PROTOCOL_VERSION_2
-     * @since   1.2
-     */
-    public void useProtocolVersion(int version) throws IOException {
-        if (handles.size() != 0) {
-            // REMIND: implement better check for pristine stream?
-            throw new IllegalStateException("stream non-empty");
-        }
-        switch (version) {
-            case PROTOCOL_VERSION_1:
-            case PROTOCOL_VERSION_2:
-                protocol = version;
-                break;
-
-            default:
-                throw new IllegalArgumentException(
-                    "unknown version: " + version);
-        }
-    }
-
-    /**
-     * Write the specified object to the ObjectOutputStream.  The class of the
-     * object, the signature of the class, and the values of the non-transient
-     * and non-static fields of the class and all of its supertypes are
-     * written.  Default serialization for a class can be overridden using the
-     * writeObject and the readObject methods.  Objects referenced by this
-     * object are written transitively so that a complete equivalent graph of
-     * objects can be reconstructed by an ObjectInputStream.
-     *
-     * <p>Exceptions are thrown for problems with the OutputStream and for
-     * classes that should not be serialized.  All exceptions are fatal to the
-     * OutputStream, which is left in an indeterminate state, and it is up to
-     * the caller to ignore or recover the stream state.
-     *
-     * @throws  InvalidClassException Something is wrong with a class used by
-     *          serialization.
-     * @throws  NotSerializableException Some object to be serialized does not
-     *          implement the java.io.Serializable interface.
-     * @throws  IOException Any exception thrown by the underlying
-     *          OutputStream.
-     */
-    public final void writeObject(Object obj) throws IOException {
-        if (enableOverride) {
-            writeObjectOverride(obj);
-            return;
-        }
-        try {
-            writeObject0(obj, false);
-        } catch (IOException ex) {
-            if (depth == 0) {
-                writeFatalException(ex);
-            }
-            throw ex;
-        }
-    }
-
-    /**
-     * Method used by subclasses to override the default writeObject method.
-     * This method is called by trusted subclasses of ObjectInputStream that
-     * constructed ObjectInputStream using the protected no-arg constructor.
-     * The subclass is expected to provide an override method with the modifier
-     * "final".
-     *
-     * @param   obj object to be written to the underlying stream
-     * @throws  IOException if there are I/O errors while writing to the
-     *          underlying stream
-     * @see #ObjectOutputStream()
-     * @see #writeObject(Object)
-     * @since 1.2
-     */
-    protected void writeObjectOverride(Object obj) throws IOException {
-    }
-
-    /**
-     * Writes an "unshared" object to the ObjectOutputStream.  This method is
-     * identical to writeObject, except that it always writes the given object
-     * as a new, unique object in the stream (as opposed to a back-reference
-     * pointing to a previously serialized instance).  Specifically:
-     * <ul>
-     *   <li>An object written via writeUnshared is always serialized in the
-     *       same manner as a newly appearing object (an object that has not
-     *       been written to the stream yet), regardless of whether or not the
-     *       object has been written previously.
-     *
-     *   <li>If writeObject is used to write an object that has been previously
-     *       written with writeUnshared, the previous writeUnshared operation
-     *       is treated as if it were a write of a separate object.  In other
-     *       words, ObjectOutputStream will never generate back-references to
-     *       object data written by calls to writeUnshared.
-     * </ul>
-     * While writing an object via writeUnshared does not in itself guarantee a
-     * unique reference to the object when it is deserialized, it allows a
-     * single object to be defined multiple times in a stream, so that multiple
-     * calls to readUnshared by the receiver will not conflict.  Note that the
-     * rules described above only apply to the base-level object written with
-     * writeUnshared, and not to any transitively referenced sub-objects in the
-     * object graph to be serialized.
-     *
-     * <p>ObjectOutputStream subclasses which override this method can only be
-     * constructed in security contexts possessing the
-     * "enableSubclassImplementation" SerializablePermission; any attempt to
-     * instantiate such a subclass without this permission will cause a
-     * SecurityException to be thrown.
-     *
-     * @param   obj object to write to stream
-     * @throws  NotSerializableException if an object in the graph to be
-     *          serialized does not implement the Serializable interface
-     * @throws  InvalidClassException if a problem exists with the class of an
-     *          object to be serialized
-     * @throws  IOException if an I/O error occurs during serialization
-     * @since 1.4
-     */
-    public void writeUnshared(Object obj) throws IOException {
-        try {
-            writeObject0(obj, true);
-        } catch (IOException ex) {
-            if (depth == 0) {
-                writeFatalException(ex);
-            }
-            throw ex;
-        }
-    }
-
-    /**
-     * Write the non-static and non-transient fields of the current class to
-     * this stream.  This may only be called from the writeObject method of the
-     * class being serialized. It will throw the NotActiveException if it is
-     * called otherwise.
-     *
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          <code>OutputStream</code>
-     */
-    public void defaultWriteObject() throws IOException {
-        if ( curContext == null ) {
-            throw new NotActiveException("not in call to writeObject");
-        }
-        Object curObj = null; // curContext.getObj();
-        ObjectStreamClass curDesc = null; // curContext.getDesc();
-        bout.setBlockDataMode(false);
-        defaultWriteFields(curObj, curDesc);
-        bout.setBlockDataMode(true);
-    }
-
-    /**
-     * Retrieve the object used to buffer persistent fields to be written to
-     * the stream.  The fields will be written to the stream when writeFields
-     * method is called.
-     *
-     * @return  an instance of the class Putfield that holds the serializable
-     *          fields
-     * @throws  IOException if I/O errors occur
-     * @since 1.2
-     */
-    public ObjectOutputStream.PutField putFields() throws IOException {
-        if (curPut == null) {
-            if (curContext == null) {
-                throw new NotActiveException("not in call to writeObject");
-            }
-            Object curObj = null; // curContext.getObj();
-            ObjectStreamClass curDesc = null; // curContext.getDesc();
-            curPut = new PutFieldImpl(curDesc);
-        }
-        return curPut;
-    }
-
-    /**
-     * Write the buffered fields to the stream.
-     *
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     * @throws  NotActiveException Called when a classes writeObject method was
-     *          not called to write the state of the object.
-     * @since 1.2
-     */
-    public void writeFields() throws IOException {
-        if (curPut == null) {
-            throw new NotActiveException("no current PutField object");
-        }
-        bout.setBlockDataMode(false);
-        curPut.writeFields();
-        bout.setBlockDataMode(true);
-    }
-
-    /**
-     * Reset will disregard the state of any objects already written to the
-     * stream.  The state is reset to be the same as a new ObjectOutputStream.
-     * The current point in the stream is marked as reset so the corresponding
-     * ObjectInputStream will be reset at the same point.  Objects previously
-     * written to the stream will not be refered to as already being in the
-     * stream.  They will be written to the stream again.
-     *
-     * @throws  IOException if reset() is invoked while serializing an object.
-     */
-    public void reset() throws IOException {
-        if (depth != 0) {
-            throw new IOException("stream active");
-        }
-        bout.setBlockDataMode(false);
-        bout.writeByte(TC_RESET);
-        clear();
-        bout.setBlockDataMode(true);
-    }
-
-    /**
-     * Subclasses may implement this method to allow class data to be stored in
-     * the stream. By default this method does nothing.  The corresponding
-     * method in ObjectInputStream is resolveClass.  This method is called
-     * exactly once for each unique class in the stream.  The class name and
-     * signature will have already been written to the stream.  This method may
-     * make free use of the ObjectOutputStream to save any representation of
-     * the class it deems suitable (for example, the bytes of the class file).
-     * The resolveClass method in the corresponding subclass of
-     * ObjectInputStream must read and use any data or objects written by
-     * annotateClass.
-     *
-     * @param   cl the class to annotate custom data for
-     * @throws  IOException Any exception thrown by the underlying
-     *          OutputStream.
-     */
-    protected void annotateClass(Class<?> cl) throws IOException {
-    }
-
-    /**
-     * Subclasses may implement this method to store custom data in the stream
-     * along with descriptors for dynamic proxy classes.
-     *
-     * <p>This method is called exactly once for each unique proxy class
-     * descriptor in the stream.  The default implementation of this method in
-     * <code>ObjectOutputStream</code> does nothing.
-     *
-     * <p>The corresponding method in <code>ObjectInputStream</code> is
-     * <code>resolveProxyClass</code>.  For a given subclass of
-     * <code>ObjectOutputStream</code> that overrides this method, the
-     * <code>resolveProxyClass</code> method in the corresponding subclass of
-     * <code>ObjectInputStream</code> must read any data or objects written by
-     * <code>annotateProxyClass</code>.
-     *
-     * @param   cl the proxy class to annotate custom data for
-     * @throws  IOException any exception thrown by the underlying
-     *          <code>OutputStream</code>
-     * @see ObjectInputStream#resolveProxyClass(String[])
-     * @since   1.3
-     */
-    protected void annotateProxyClass(Class<?> cl) throws IOException {
-    }
-
-    /**
-     * This method will allow trusted subclasses of ObjectOutputStream to
-     * substitute one object for another during serialization. Replacing
-     * objects is disabled until enableReplaceObject is called. The
-     * enableReplaceObject method checks that the stream requesting to do
-     * replacement can be trusted.  The first occurrence of each object written
-     * into the serialization stream is passed to replaceObject.  Subsequent
-     * references to the object are replaced by the object returned by the
-     * original call to replaceObject.  To ensure that the private state of
-     * objects is not unintentionally exposed, only trusted streams may use
-     * replaceObject.
-     *
-     * <p>The ObjectOutputStream.writeObject method takes a parameter of type
-     * Object (as opposed to type Serializable) to allow for cases where
-     * non-serializable objects are replaced by serializable ones.
-     *
-     * <p>When a subclass is replacing objects it must insure that either a
-     * complementary substitution must be made during deserialization or that
-     * the substituted object is compatible with every field where the
-     * reference will be stored.  Objects whose type is not a subclass of the
-     * type of the field or array element abort the serialization by raising an
-     * exception and the object is not be stored.
-     *
-     * <p>This method is called only once when each object is first
-     * encountered.  All subsequent references to the object will be redirected
-     * to the new object. This method should return the object to be
-     * substituted or the original object.
-     *
-     * <p>Null can be returned as the object to be substituted, but may cause
-     * NullReferenceException in classes that contain references to the
-     * original object since they may be expecting an object instead of
-     * null.
-     *
-     * @param   obj the object to be replaced
-     * @return  the alternate object that replaced the specified one
-     * @throws  IOException Any exception thrown by the underlying
-     *          OutputStream.
-     */
-    protected Object replaceObject(Object obj) throws IOException {
-        return obj;
-    }
-
-    /**
-     * Enable the stream to do replacement of objects in the stream.  When
-     * enabled, the replaceObject method is called for every object being
-     * serialized.
-     *
-     * <p>If <code>enable</code> is true, and there is a security manager
-     * installed, this method first calls the security manager's
-     * <code>checkPermission</code> method with a
-     * <code>SerializablePermission("enableSubstitution")</code> permission to
-     * ensure it's ok to enable the stream to do replacement of objects in the
-     * stream.
-     *
-     * @param   enable boolean parameter to enable replacement of objects
-     * @return  the previous setting before this method was invoked
-     * @throws  SecurityException if a security manager exists and its
-     *          <code>checkPermission</code> method denies enabling the stream
-     *          to do replacement of objects in the stream.
-     * @see SecurityManager#checkPermission
-     * @see java.io.SerializablePermission
-     */
-    protected boolean enableReplaceObject(boolean enable)
-        throws SecurityException
-    {
-        throw new SecurityException();
-    }
-
-    /**
-     * The writeStreamHeader method is provided so subclasses can append or
-     * prepend their own header to the stream.  It writes the magic number and
-     * version to the stream.
-     *
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    protected void writeStreamHeader() throws IOException {
-        bout.writeShort(STREAM_MAGIC);
-        bout.writeShort(STREAM_VERSION);
-    }
-
-    /**
-     * Write the specified class descriptor to the ObjectOutputStream.  Class
-     * descriptors are used to identify the classes of objects written to the
-     * stream.  Subclasses of ObjectOutputStream may override this method to
-     * customize the way in which class descriptors are written to the
-     * serialization stream.  The corresponding method in ObjectInputStream,
-     * <code>readClassDescriptor</code>, should then be overridden to
-     * reconstitute the class descriptor from its custom stream representation.
-     * By default, this method writes class descriptors according to the format
-     * defined in the Object Serialization specification.
-     *
-     * <p>Note that this method will only be called if the ObjectOutputStream
-     * is not using the old serialization stream format (set by calling
-     * ObjectOutputStream's <code>useProtocolVersion</code> method).  If this
-     * serialization stream is using the old format
-     * (<code>PROTOCOL_VERSION_1</code>), the class descriptor will be written
-     * internally in a manner that cannot be overridden or customized.
-     *
-     * @param   desc class descriptor to write to the stream
-     * @throws  IOException If an I/O error has occurred.
-     * @see java.io.ObjectInputStream#readClassDescriptor()
-     * @see #useProtocolVersion(int)
-     * @see java.io.ObjectStreamConstants#PROTOCOL_VERSION_1
-     * @since 1.3
-     */
-    protected void writeClassDescriptor(ObjectStreamClass desc)
-        throws IOException
-    {
-        desc.writeNonProxy(this);
-    }
-
-    /**
-     * Writes a byte. This method will block until the byte is actually
-     * written.
-     *
-     * @param   val the byte to be written to the stream
-     * @throws  IOException If an I/O error has occurred.
-     */
-    public void write(int val) throws IOException {
-        bout.write(val);
-    }
-
-    /**
-     * Writes an array of bytes. This method will block until the bytes are
-     * actually written.
-     *
-     * @param   buf the data to be written
-     * @throws  IOException If an I/O error has occurred.
-     */
-    public void write(byte[] buf) throws IOException {
-        bout.write(buf, 0, buf.length, false);
-    }
-
-    /**
-     * Writes a sub array of bytes.
-     *
-     * @param   buf the data to be written
-     * @param   off the start offset in the data
-     * @param   len the number of bytes that are written
-     * @throws  IOException If an I/O error has occurred.
-     */
-    public void write(byte[] buf, int off, int len) throws IOException {
-        if (buf == null) {
-            throw new NullPointerException();
-        }
-        int endoff = off + len;
-        if (off < 0 || len < 0 || endoff > buf.length || endoff < 0) {
-            throw new IndexOutOfBoundsException();
-        }
-        bout.write(buf, off, len, false);
-    }
-
-    /**
-     * Flushes the stream. This will write any buffered output bytes and flush
-     * through to the underlying stream.
-     *
-     * @throws  IOException If an I/O error has occurred.
-     */
-    public void flush() throws IOException {
-        bout.flush();
-    }
-
-    /**
-     * Drain any buffered data in ObjectOutputStream.  Similar to flush but
-     * does not propagate the flush to the underlying stream.
-     *
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    protected void drain() throws IOException {
-        bout.drain();
-    }
-
-    /**
-     * Closes the stream. This method must be called to release any resources
-     * associated with the stream.
-     *
-     * @throws  IOException If an I/O error has occurred.
-     */
-    public void close() throws IOException {
-        flush();
-        clear();
-        bout.close();
-    }
-
-    /**
-     * Writes a boolean.
-     *
-     * @param   val the boolean to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeBoolean(boolean val) throws IOException {
-        bout.writeBoolean(val);
-    }
-
-    /**
-     * Writes an 8 bit byte.
-     *
-     * @param   val the byte value to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeByte(int val) throws IOException  {
-        bout.writeByte(val);
-    }
-
-    /**
-     * Writes a 16 bit short.
-     *
-     * @param   val the short value to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeShort(int val)  throws IOException {
-        bout.writeShort(val);
-    }
-
-    /**
-     * Writes a 16 bit char.
-     *
-     * @param   val the char value to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeChar(int val)  throws IOException {
-        bout.writeChar(val);
-    }
-
-    /**
-     * Writes a 32 bit int.
-     *
-     * @param   val the integer value to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeInt(int val)  throws IOException {
-        bout.writeInt(val);
-    }
-
-    /**
-     * Writes a 64 bit long.
-     *
-     * @param   val the long value to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeLong(long val)  throws IOException {
-        bout.writeLong(val);
-    }
-
-    /**
-     * Writes a 32 bit float.
-     *
-     * @param   val the float value to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeFloat(float val) throws IOException {
-        bout.writeFloat(val);
-    }
-
-    /**
-     * Writes a 64 bit double.
-     *
-     * @param   val the double value to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeDouble(double val) throws IOException {
-        bout.writeDouble(val);
-    }
-
-    /**
-     * Writes a String as a sequence of bytes.
-     *
-     * @param   str the String of bytes to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeBytes(String str) throws IOException {
-        bout.writeBytes(str);
-    }
-
-    /**
-     * Writes a String as a sequence of chars.
-     *
-     * @param   str the String of chars to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeChars(String str) throws IOException {
-        bout.writeChars(str);
-    }
-
-    /**
-     * Primitive data write of this String in
-     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
-     * format.  Note that there is a
-     * significant difference between writing a String into the stream as
-     * primitive data or as an Object. A String instance written by writeObject
-     * is written into the stream as a String initially. Future writeObject()
-     * calls write references to the string into the stream.
-     *
-     * @param   str the String to be written
-     * @throws  IOException if I/O errors occur while writing to the underlying
-     *          stream
-     */
-    public void writeUTF(String str) throws IOException {
-        bout.writeUTF(str);
-    }
-
-    /**
-     * Provide programmatic access to the persistent fields to be written
-     * to ObjectOutput.
-     *
-     * @since 1.2
-     */
-    public static abstract class PutField {
-
-        /**
-         * Put the value of the named boolean field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not
-         * <code>boolean</code>
-         */
-        public abstract void put(String name, boolean val);
-
-        /**
-         * Put the value of the named byte field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not
-         * <code>byte</code>
-         */
-        public abstract void put(String name, byte val);
-
-        /**
-         * Put the value of the named char field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not
-         * <code>char</code>
-         */
-        public abstract void put(String name, char val);
-
-        /**
-         * Put the value of the named short field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not
-         * <code>short</code>
-         */
-        public abstract void put(String name, short val);
-
-        /**
-         * Put the value of the named int field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not
-         * <code>int</code>
-         */
-        public abstract void put(String name, int val);
-
-        /**
-         * Put the value of the named long field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not
-         * <code>long</code>
-         */
-        public abstract void put(String name, long val);
-
-        /**
-         * Put the value of the named float field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not
-         * <code>float</code>
-         */
-        public abstract void put(String name, float val);
-
-        /**
-         * Put the value of the named double field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not
-         * <code>double</code>
-         */
-        public abstract void put(String name, double val);
-
-        /**
-         * Put the value of the named Object field into the persistent field.
-         *
-         * @param  name the name of the serializable field
-         * @param  val the value to assign to the field
-         *         (which may be <code>null</code>)
-         * @throws IllegalArgumentException if <code>name</code> does not
-         * match the name of a serializable field for the class whose fields
-         * are being written, or if the type of the named field is not a
-         * reference type
-         */
-        public abstract void put(String name, Object val);
-
-        /**
-         * Write the data and fields to the specified ObjectOutput stream,
-         * which must be the same stream that produced this
-         * <code>PutField</code> object.
-         *
-         * @param  out the stream to write the data and fields to
-         * @throws IOException if I/O errors occur while writing to the
-         *         underlying stream
-         * @throws IllegalArgumentException if the specified stream is not
-         *         the same stream that produced this <code>PutField</code>
-         *         object
-         * @deprecated This method does not write the values contained by this
-         *         <code>PutField</code> object in a proper format, and may
-         *         result in corruption of the serialization stream.  The
-         *         correct way to write <code>PutField</code> data is by
-         *         calling the {@link java.io.ObjectOutputStream#writeFields()}
-         *         method.
-         */
-        @Deprecated
-        public abstract void write(ObjectOutput out) throws IOException;
-    }
-
-
-    /**
-     * Returns protocol version in use.
-     */
-    int getProtocolVersion() {
-        return protocol;
-    }
-
-    /**
-     * Writes string without allowing it to be replaced in stream.  Used by
-     * ObjectStreamClass to write class descriptor type strings.
-     */
-    void writeTypeString(String str) throws IOException {
-        int handle;
-        if (str == null) {
-            writeNull();
-        } else if ((handle = handles.lookup(str)) != -1) {
-            writeHandle(handle);
-        } else {
-            writeString(str, false);
-        }
-    }
-
-    /**
-     * Verifies that this (possibly subclass) instance can be constructed
-     * without violating security constraints: the subclass must not override
-     * security-sensitive non-final methods, or else the
-     * "enableSubclassImplementation" SerializablePermission is checked.
-     */
-    private void verifySubclass() {
-        Class cl = getClass();
-        if (cl == ObjectOutputStream.class) {
-            return;
-        }
-        throw new SecurityException();
-    }
-
-    /**
-     * Clears internal data structures.
-     */
-    private void clear() {
-        subs.clear();
-        handles.clear();
-    }
-
-    /**
-     * Underlying writeObject/writeUnshared implementation.
-     */
-    private void writeObject0(Object obj, boolean unshared)
-        throws IOException
-    {
-        boolean oldMode = bout.setBlockDataMode(false);
-        depth++;
-        try {
-            // handle previously written and non-replaceable objects
-            int h;
-            if ((obj = subs.lookup(obj)) == null) {
-                writeNull();
-                return;
-            } else if (!unshared && (h = handles.lookup(obj)) != -1) {
-                writeHandle(h);
-                return;
-            } else if (obj instanceof Class) {
-                writeClass((Class) obj, unshared);
-                return;
-            } else if (obj instanceof ObjectStreamClass) {
-                writeClassDesc((ObjectStreamClass) obj, unshared);
-                return;
-            }
-
-            // check for replacement object
-            Object orig = obj;
-            Class cl = obj.getClass();
-            ObjectStreamClass desc;
-            for (;;) {
-                // REMIND: skip this check for strings/arrays?
-                Class repCl;
-                desc = ObjectStreamClass.lookup(cl, true);
-                if (!desc.hasWriteReplaceMethod() ||
-                    (obj = desc.invokeWriteReplace(obj)) == null ||
-                    (repCl = obj.getClass()) == cl)
-                {
-                    break;
-                }
-                cl = repCl;
-            }
-            if (enableReplace) {
-                Object rep = replaceObject(obj);
-                if (rep != obj && rep != null) {
-                    cl = rep.getClass();
-                    desc = ObjectStreamClass.lookup(cl, true);
-                }
-                obj = rep;
-            }
-
-            // if object replaced, run through original checks a second time
-            if (obj != orig) {
-                subs.assign(orig, obj);
-                if (obj == null) {
-                    writeNull();
-                    return;
-                } else if (!unshared && (h = handles.lookup(obj)) != -1) {
-                    writeHandle(h);
-                    return;
-                } else if (obj instanceof Class) {
-                    writeClass((Class) obj, unshared);
-                    return;
-                } else if (obj instanceof ObjectStreamClass) {
-                    writeClassDesc((ObjectStreamClass) obj, unshared);
-                    return;
-                }
-            }
-
-            // remaining cases
-            if (obj instanceof String) {
-                writeString((String) obj, unshared);
-            } else if (cl.isArray()) {
-                writeArray(obj, desc, unshared);
-            } else if (obj instanceof Enum) {
-                writeEnum((Enum) obj, desc, unshared);
-            } else if (obj instanceof Serializable) {
-                writeOrdinaryObject(obj, desc, unshared);
-            } else {
-                if (extendedDebugInfo) {
-                    throw new NotSerializableException(
-                        cl.getName() + "\n" + debugInfoStack.toString());
-                } else {
-                    throw new NotSerializableException(cl.getName());
-                }
-            }
-        } finally {
-            depth--;
-            bout.setBlockDataMode(oldMode);
-        }
-    }
-
-    /**
-     * Writes null code to stream.
-     */
-    private void writeNull() throws IOException {
-        bout.writeByte(TC_NULL);
-    }
-
-    /**
-     * Writes given object handle to stream.
-     */
-    private void writeHandle(int handle) throws IOException {
-        bout.writeByte(TC_REFERENCE);
-        bout.writeInt(baseWireHandle + handle);
-    }
-
-    /**
-     * Writes representation of given class to stream.
-     */
-    private void writeClass(Class cl, boolean unshared) throws IOException {
-        bout.writeByte(TC_CLASS);
-        writeClassDesc(ObjectStreamClass.lookup(cl, true), false);
-        handles.assign(unshared ? null : cl);
-    }
-
-    /**
-     * Writes representation of given class descriptor to stream.
-     */
-    private void writeClassDesc(ObjectStreamClass desc, boolean unshared)
-        throws IOException
-    {
-        int handle;
-        if (desc == null) {
-            writeNull();
-        } else if (!unshared && (handle = handles.lookup(desc)) != -1) {
-            writeHandle(handle);
-        } else if (desc.isProxy()) {
-            writeProxyDesc(desc, unshared);
-        } else {
-            writeNonProxyDesc(desc, unshared);
-        }
-    }
-
-    /**
-     * Writes class descriptor representing a dynamic proxy class to stream.
-     */
-    private void writeProxyDesc(ObjectStreamClass desc, boolean unshared)
-        throws IOException
-    {
-        bout.writeByte(TC_PROXYCLASSDESC);
-        handles.assign(unshared ? null : desc);
-
-        Class cl = desc.forClass();
-        Class[] ifaces = cl.getInterfaces();
-        bout.writeInt(ifaces.length);
-        for (int i = 0; i < ifaces.length; i++) {
-            bout.writeUTF(ifaces[i].getName());
-        }
-
-        bout.setBlockDataMode(true);
-        annotateProxyClass(cl);
-        bout.setBlockDataMode(false);
-        bout.writeByte(TC_ENDBLOCKDATA);
-
-        writeClassDesc(desc.getSuperDesc(), false);
-    }
-
-    /**
-     * Writes class descriptor representing a standard (i.e., not a dynamic
-     * proxy) class to stream.
-     */
-    private void writeNonProxyDesc(ObjectStreamClass desc, boolean unshared)
-        throws IOException
-    {
-        bout.writeByte(TC_CLASSDESC);
-        handles.assign(unshared ? null : desc);
-
-        if (protocol == PROTOCOL_VERSION_1) {
-            // do not invoke class descriptor write hook with old protocol
-            desc.writeNonProxy(this);
-        } else {
-            writeClassDescriptor(desc);
-        }
-
-        Class cl = desc.forClass();
-        bout.setBlockDataMode(true);
-        annotateClass(cl);
-        bout.setBlockDataMode(false);
-        bout.writeByte(TC_ENDBLOCKDATA);
-
-        writeClassDesc(desc.getSuperDesc(), false);
-    }
-
-    /**
-     * Writes given string to stream, using standard or long UTF format
-     * depending on string length.
-     */
-    private void writeString(String str, boolean unshared) throws IOException {
-        handles.assign(unshared ? null : str);
-        long utflen = bout.getUTFLength(str);
-        if (utflen <= 0xFFFF) {
-            bout.writeByte(TC_STRING);
-            bout.writeUTF(str, utflen);
-        } else {
-            bout.writeByte(TC_LONGSTRING);
-            bout.writeLongUTF(str, utflen);
-        }
-    }
-
-    /**
-     * Writes given array object to stream.
-     */
-    private void writeArray(Object array,
-                            ObjectStreamClass desc,
-                            boolean unshared)
-        throws IOException
-    {
-        bout.writeByte(TC_ARRAY);
-        writeClassDesc(desc, false);
-        handles.assign(unshared ? null : array);
-
-        Class ccl = desc.forClass().getComponentType();
-        if (ccl.isPrimitive()) {
-            if (ccl == Integer.TYPE) {
-                int[] ia = (int[]) array;
-                bout.writeInt(ia.length);
-                bout.writeInts(ia, 0, ia.length);
-            } else if (ccl == Byte.TYPE) {
-                byte[] ba = (byte[]) array;
-                bout.writeInt(ba.length);
-                bout.write(ba, 0, ba.length, true);
-            } else if (ccl == Long.TYPE) {
-                long[] ja = (long[]) array;
-                bout.writeInt(ja.length);
-                bout.writeLongs(ja, 0, ja.length);
-            } else if (ccl == Float.TYPE) {
-                float[] fa = (float[]) array;
-                bout.writeInt(fa.length);
-                bout.writeFloats(fa, 0, fa.length);
-            } else if (ccl == Double.TYPE) {
-                double[] da = (double[]) array;
-                bout.writeInt(da.length);
-                bout.writeDoubles(da, 0, da.length);
-            } else if (ccl == Short.TYPE) {
-                short[] sa = (short[]) array;
-                bout.writeInt(sa.length);
-                bout.writeShorts(sa, 0, sa.length);
-            } else if (ccl == Character.TYPE) {
-                char[] ca = (char[]) array;
-                bout.writeInt(ca.length);
-                bout.writeChars(ca, 0, ca.length);
-            } else if (ccl == Boolean.TYPE) {
-                boolean[] za = (boolean[]) array;
-                bout.writeInt(za.length);
-                bout.writeBooleans(za, 0, za.length);
-            } else {
-                throw new InternalError();
-            }
-        } else {
-            Object[] objs = (Object[]) array;
-            int len = objs.length;
-            bout.writeInt(len);
-            if (extendedDebugInfo) {
-                debugInfoStack.push(
-                    "array (class \"" + array.getClass().getName() +
-                    "\", size: " + len  + ")");
-            }
-            try {
-                for (int i = 0; i < len; i++) {
-                    if (extendedDebugInfo) {
-                        debugInfoStack.push(
-                            "element of array (index: " + i + ")");
-                    }
-                    try {
-                        writeObject0(objs[i], false);
-                    } finally {
-                        if (extendedDebugInfo) {
-                            debugInfoStack.pop();
-                        }
-                    }
-                }
-            } finally {
-                if (extendedDebugInfo) {
-                    debugInfoStack.pop();
-                }
-            }
-        }
-    }
-
-    /**
-     * Writes given enum constant to stream.
-     */
-    private void writeEnum(Enum en,
-                           ObjectStreamClass desc,
-                           boolean unshared)
-        throws IOException
-    {
-        bout.writeByte(TC_ENUM);
-        ObjectStreamClass sdesc = desc.getSuperDesc();
-        writeClassDesc((sdesc.forClass() == Enum.class) ? desc : sdesc, false);
-        handles.assign(unshared ? null : en);
-        writeString(en.name(), false);
-    }
-
-    /**
-     * Writes representation of a "ordinary" (i.e., not a String, Class,
-     * ObjectStreamClass, array, or enum constant) serializable object to the
-     * stream.
-     */
-    private void writeOrdinaryObject(Object obj,
-                                     ObjectStreamClass desc,
-                                     boolean unshared)
-        throws IOException
-    {
-        if (extendedDebugInfo) {
-            debugInfoStack.push(
-                (depth == 1 ? "root " : "") + "object (class \"" +
-                obj.getClass().getName() + "\", " + obj.toString() + ")");
-        }
-        try {
-            desc.checkSerialize();
-
-            bout.writeByte(TC_OBJECT);
-            writeClassDesc(desc, false);
-            handles.assign(unshared ? null : obj);
-            if (desc.isExternalizable() && !desc.isProxy()) {
-                writeExternalData((Externalizable) obj);
-            } else {
-                writeSerialData(obj, desc);
-            }
-        } finally {
-            if (extendedDebugInfo) {
-                debugInfoStack.pop();
-            }
-        }
-    }
-
-    /**
-     * Writes externalizable data of given object by invoking its
-     * writeExternal() method.
-     */
-    private void writeExternalData(Externalizable obj) throws IOException {
-        PutFieldImpl oldPut = curPut;
-        curPut = null;
-
-        if (extendedDebugInfo) {
-            debugInfoStack.push("writeExternal data");
-        }
-        Object oldContext = curContext;
-        try {
-            curContext = null;
-            if (protocol == PROTOCOL_VERSION_1) {
-                obj.writeExternal(this);
-            } else {
-                bout.setBlockDataMode(true);
-                obj.writeExternal(this);
-                bout.setBlockDataMode(false);
-                bout.writeByte(TC_ENDBLOCKDATA);
-            }
-        } finally {
-            curContext = oldContext;
-            if (extendedDebugInfo) {
-                debugInfoStack.pop();
-            }
-        }
-
-        curPut = oldPut;
-    }
-
-    /**
-     * Writes instance data for each serializable class of given object, from
-     * superclass to subclass.
-     */
-    private void writeSerialData(Object obj, ObjectStreamClass desc)
-        throws IOException
-    {
-        ObjectStreamClass.ClassDataSlot[] slots = desc.getClassDataLayout();
-        for (int i = 0; i < slots.length; i++) {
-            ObjectStreamClass slotDesc = slots[i].desc;
-            if (slotDesc.hasWriteObjectMethod()) {
-                PutFieldImpl oldPut = curPut;
-                curPut = null;
-                Object oldContext = curContext;
-
-                if (extendedDebugInfo) {
-                    debugInfoStack.push(
-                        "custom writeObject data (class \"" +
-                        slotDesc.getName() + "\")");
-                }
-                try {
-                    curContext = new Object(); //new SerialCallbackContext(obj, slotDesc);
-                    bout.setBlockDataMode(true);
-                    slotDesc.invokeWriteObject(obj, this);
-                    bout.setBlockDataMode(false);
-                    bout.writeByte(TC_ENDBLOCKDATA);
-                } finally {
-                    //curContext.setUsed();
-                    curContext = oldContext;
-                    if (extendedDebugInfo) {
-                        debugInfoStack.pop();
-                    }
-                }
-
-                curPut = oldPut;
-            } else {
-                defaultWriteFields(obj, slotDesc);
-            }
-        }
-    }
-
-    /**
-     * Fetches and writes values of serializable fields of given object to
-     * stream.  The given class descriptor specifies which field values to
-     * write, and in which order they should be written.
-     */
-    private void defaultWriteFields(Object obj, ObjectStreamClass desc)
-        throws IOException
-    {
-        // REMIND: perform conservative isInstance check here?
-        desc.checkDefaultSerialize();
-
-        int primDataSize = desc.getPrimDataSize();
-        if (primVals == null || primVals.length < primDataSize) {
-            primVals = new byte[primDataSize];
-        }
-        desc.getPrimFieldValues(obj, primVals);
-        bout.write(primVals, 0, primDataSize, false);
-
-        ObjectStreamField[] fields = desc.getFields(false);
-        Object[] objVals = new Object[desc.getNumObjFields()];
-        int numPrimFields = fields.length - objVals.length;
-        desc.getObjFieldValues(obj, objVals);
-        for (int i = 0; i < objVals.length; i++) {
-            if (extendedDebugInfo) {
-                debugInfoStack.push(
-                    "field (class \"" + desc.getName() + "\", name: \"" +
-                    fields[numPrimFields + i].getName() + "\", type: \"" +
-                    fields[numPrimFields + i].getType() + "\")");
-            }
-            try {
-                writeObject0(objVals[i],
-                             fields[numPrimFields + i].isUnshared());
-            } finally {
-                if (extendedDebugInfo) {
-                    debugInfoStack.pop();
-                }
-            }
-        }
-    }
-
-    /**
-     * Attempts to write to stream fatal IOException that has caused
-     * serialization to abort.
-     */
-    private void writeFatalException(IOException ex) throws IOException {
-        /*
-         * Note: the serialization specification states that if a second
-         * IOException occurs while attempting to serialize the original fatal
-         * exception to the stream, then a StreamCorruptedException should be
-         * thrown (section 2.1).  However, due to a bug in previous
-         * implementations of serialization, StreamCorruptedExceptions were
-         * rarely (if ever) actually thrown--the "root" exceptions from
-         * underlying streams were thrown instead.  This historical behavior is
-         * followed here for consistency.
-         */
-        clear();
-        boolean oldMode = bout.setBlockDataMode(false);
-        try {
-            bout.writeByte(TC_EXCEPTION);
-            writeObject0(ex, false);
-            clear();
-        } finally {
-            bout.setBlockDataMode(oldMode);
-        }
-    }
-
-    /**
-     * Converts specified span of float values into byte values.
-     */
-    // REMIND: remove once hotspot inlines Float.floatToIntBits
-    private static native void floatsToBytes(float[] src, int srcpos,
-                                             byte[] dst, int dstpos,
-                                             int nfloats);
-
-    /**
-     * Converts specified span of double values into byte values.
-     */
-    // REMIND: remove once hotspot inlines Double.doubleToLongBits
-    private static native void doublesToBytes(double[] src, int srcpos,
-                                              byte[] dst, int dstpos,
-                                              int ndoubles);
-
-    /**
-     * Default PutField implementation.
-     */
-    private class PutFieldImpl extends PutField {
-
-        /** class descriptor describing serializable fields */
-        private final ObjectStreamClass desc;
-        /** primitive field values */
-        private final byte[] primVals;
-        /** object field values */
-        private final Object[] objVals;
-
-        /**
-         * Creates PutFieldImpl object for writing fields defined in given
-         * class descriptor.
-         */
-        PutFieldImpl(ObjectStreamClass desc) {
-            this.desc = desc;
-            primVals = new byte[desc.getPrimDataSize()];
-            objVals = new Object[desc.getNumObjFields()];
-        }
-
-        public void put(String name, boolean val) {
-            Bits.putBoolean(primVals, getFieldOffset(name, Boolean.TYPE), val);
-        }
-
-        public void put(String name, byte val) {
-            primVals[getFieldOffset(name, Byte.TYPE)] = val;
-        }
-
-        public void put(String name, char val) {
-            Bits.putChar(primVals, getFieldOffset(name, Character.TYPE), val);
-        }
-
-        public void put(String name, short val) {
-            Bits.putShort(primVals, getFieldOffset(name, Short.TYPE), val);
-        }
-
-        public void put(String name, int val) {
-            Bits.putInt(primVals, getFieldOffset(name, Integer.TYPE), val);
-        }
-
-        public void put(String name, float val) {
-            Bits.putFloat(primVals, getFieldOffset(name, Float.TYPE), val);
-        }
-
-        public void put(String name, long val) {
-            Bits.putLong(primVals, getFieldOffset(name, Long.TYPE), val);
-        }
-
-        public void put(String name, double val) {
-            Bits.putDouble(primVals, getFieldOffset(name, Double.TYPE), val);
-        }
-
-        public void put(String name, Object val) {
-            objVals[getFieldOffset(name, Object.class)] = val;
-        }
-
-        // deprecated in ObjectOutputStream.PutField
-        public void write(ObjectOutput out) throws IOException {
-            /*
-             * Applications should *not* use this method to write PutField
-             * data, as it will lead to stream corruption if the PutField
-             * object writes any primitive data (since block data mode is not
-             * unset/set properly, as is done in OOS.writeFields()).  This
-             * broken implementation is being retained solely for behavioral
-             * compatibility, in order to support applications which use
-             * OOS.PutField.write() for writing only non-primitive data.
-             *
-             * Serialization of unshared objects is not implemented here since
-             * it is not necessary for backwards compatibility; also, unshared
-             * semantics may not be supported by the given ObjectOutput
-             * instance.  Applications which write unshared objects using the
-             * PutField API must use OOS.writeFields().
-             */
-            if (ObjectOutputStream.this != out) {
-                throw new IllegalArgumentException("wrong stream");
-            }
-            out.write(primVals, 0, primVals.length);
-
-            ObjectStreamField[] fields = desc.getFields(false);
-            int numPrimFields = fields.length - objVals.length;
-            // REMIND: warn if numPrimFields > 0?
-            for (int i = 0; i < objVals.length; i++) {
-                if (fields[numPrimFields + i].isUnshared()) {
-                    throw new IOException("cannot write unshared object");
-                }
-                out.writeObject(objVals[i]);
-            }
-        }
-
-        /**
-         * Writes buffered primitive data and object fields to stream.
-         */
-        void writeFields() throws IOException {
-            bout.write(primVals, 0, primVals.length, false);
-
-            ObjectStreamField[] fields = desc.getFields(false);
-            int numPrimFields = fields.length - objVals.length;
-            for (int i = 0; i < objVals.length; i++) {
-                if (extendedDebugInfo) {
-                    debugInfoStack.push(
-                        "field (class \"" + desc.getName() + "\", name: \"" +
-                        fields[numPrimFields + i].getName() + "\", type: \"" +
-                        fields[numPrimFields + i].getType() + "\")");
-                }
-                try {
-                    writeObject0(objVals[i],
-                                 fields[numPrimFields + i].isUnshared());
-                } finally {
-                    if (extendedDebugInfo) {
-                        debugInfoStack.pop();
-                    }
-                }
-            }
-        }
-
-        /**
-         * Returns offset of field with given name and type.  A specified type
-         * of null matches all types, Object.class matches all non-primitive
-         * types, and any other non-null type matches assignable types only.
-         * Throws IllegalArgumentException if no matching field found.
-         */
-        private int getFieldOffset(String name, Class type) {
-            ObjectStreamField field = desc.getField(name, type);
-            if (field == null) {
-                throw new IllegalArgumentException("no such field " + name +
-                                                   " with type " + type);
-            }
-            return field.getOffset();
-        }
-    }
-
-    /**
-     * Buffered output stream with two modes: in default mode, outputs data in
-     * same format as DataOutputStream; in "block data" mode, outputs data
-     * bracketed by block data markers (see object serialization specification
-     * for details).
-     */
-    private static class BlockDataOutputStream
-        extends OutputStream implements DataOutput
-    {
-        /** maximum data block length */
-        private static final int MAX_BLOCK_SIZE = 1024;
-        /** maximum data block header length */
-        private static final int MAX_HEADER_SIZE = 5;
-        /** (tunable) length of char buffer (for writing strings) */
-        private static final int CHAR_BUF_SIZE = 256;
-
-        /** buffer for writing general/block data */
-        private final byte[] buf = new byte[MAX_BLOCK_SIZE];
-        /** buffer for writing block data headers */
-        private final byte[] hbuf = new byte[MAX_HEADER_SIZE];
-        /** char buffer for fast string writes */
-        private final char[] cbuf = new char[CHAR_BUF_SIZE];
-
-        /** block data mode */
-        private boolean blkmode = false;
-        /** current offset into buf */
-        private int pos = 0;
-
-        /** underlying output stream */
-        private final OutputStream out;
-        /** loopback stream (for data writes that span data blocks) */
-        private final DataOutputStream dout;
-
-        /**
-         * Creates new BlockDataOutputStream on top of given underlying stream.
-         * Block data mode is turned off by default.
-         */
-        BlockDataOutputStream(OutputStream out) {
-            this.out = out;
-            dout = new DataOutputStream(this);
-        }
-
-        /**
-         * Sets block data mode to the given mode (true == on, false == off)
-         * and returns the previous mode value.  If the new mode is the same as
-         * the old mode, no action is taken.  If the new mode differs from the
-         * old mode, any buffered data is flushed before switching to the new
-         * mode.
-         */
-        boolean setBlockDataMode(boolean mode) throws IOException {
-            if (blkmode == mode) {
-                return blkmode;
-            }
-            drain();
-            blkmode = mode;
-            return !blkmode;
-        }
-
-        /**
-         * Returns true if the stream is currently in block data mode, false
-         * otherwise.
-         */
-        boolean getBlockDataMode() {
-            return blkmode;
-        }
-
-        /* ----------------- generic output stream methods ----------------- */
-        /*
-         * The following methods are equivalent to their counterparts in
-         * OutputStream, except that they partition written data into data
-         * blocks when in block data mode.
-         */
-
-        public void write(int b) throws IOException {
-            if (pos >= MAX_BLOCK_SIZE) {
-                drain();
-            }
-            buf[pos++] = (byte) b;
-        }
-
-        public void write(byte[] b) throws IOException {
-            write(b, 0, b.length, false);
-        }
-
-        public void write(byte[] b, int off, int len) throws IOException {
-            write(b, off, len, false);
-        }
-
-        public void flush() throws IOException {
-            drain();
-            out.flush();
-        }
-
-        public void close() throws IOException {
-            flush();
-            out.close();
-        }
-
-        /**
-         * Writes specified span of byte values from given array.  If copy is
-         * true, copies the values to an intermediate buffer before writing
-         * them to underlying stream (to avoid exposing a reference to the
-         * original byte array).
-         */
-        void write(byte[] b, int off, int len, boolean copy)
-            throws IOException
-        {
-            if (!(copy || blkmode)) {           // write directly
-                drain();
-                out.write(b, off, len);
-                return;
-            }
-
-            while (len > 0) {
-                if (pos >= MAX_BLOCK_SIZE) {
-                    drain();
-                }
-                if (len >= MAX_BLOCK_SIZE && !copy && pos == 0) {
-                    // avoid unnecessary copy
-                    writeBlockHeader(MAX_BLOCK_SIZE);
-                    out.write(b, off, MAX_BLOCK_SIZE);
-                    off += MAX_BLOCK_SIZE;
-                    len -= MAX_BLOCK_SIZE;
-                } else {
-                    int wlen = Math.min(len, MAX_BLOCK_SIZE - pos);
-                    System.arraycopy(b, off, buf, pos, wlen);
-                    pos += wlen;
-                    off += wlen;
-                    len -= wlen;
-                }
-            }
-        }
-
-        /**
-         * Writes all buffered data from this stream to the underlying stream,
-         * but does not flush underlying stream.
-         */
-        void drain() throws IOException {
-            if (pos == 0) {
-                return;
-            }
-            if (blkmode) {
-                writeBlockHeader(pos);
-            }
-            out.write(buf, 0, pos);
-            pos = 0;
-        }
-
-        /**
-         * Writes block data header.  Data blocks shorter than 256 bytes are
-         * prefixed with a 2-byte header; all others start with a 5-byte
-         * header.
-         */
-        private void writeBlockHeader(int len) throws IOException {
-            if (len <= 0xFF) {
-                hbuf[0] = TC_BLOCKDATA;
-                hbuf[1] = (byte) len;
-                out.write(hbuf, 0, 2);
-            } else {
-                hbuf[0] = TC_BLOCKDATALONG;
-                Bits.putInt(hbuf, 1, len);
-                out.write(hbuf, 0, 5);
-            }
-        }
-
-
-        /* ----------------- primitive data output methods ----------------- */
-        /*
-         * The following methods are equivalent to their counterparts in
-         * DataOutputStream, except that they partition written data into data
-         * blocks when in block data mode.
-         */
-
-        public void writeBoolean(boolean v) throws IOException {
-            if (pos >= MAX_BLOCK_SIZE) {
-                drain();
-            }
-            Bits.putBoolean(buf, pos++, v);
-        }
-
-        public void writeByte(int v) throws IOException {
-            if (pos >= MAX_BLOCK_SIZE) {
-                drain();
-            }
-            buf[pos++] = (byte) v;
-        }
-
-        public void writeChar(int v) throws IOException {
-            if (pos + 2 <= MAX_BLOCK_SIZE) {
-                Bits.putChar(buf, pos, (char) v);
-                pos += 2;
-            } else {
-                dout.writeChar(v);
-            }
-        }
-
-        public void writeShort(int v) throws IOException {
-            if (pos + 2 <= MAX_BLOCK_SIZE) {
-                Bits.putShort(buf, pos, (short) v);
-                pos += 2;
-            } else {
-                dout.writeShort(v);
-            }
-        }
-
-        public void writeInt(int v) throws IOException {
-            if (pos + 4 <= MAX_BLOCK_SIZE) {
-                Bits.putInt(buf, pos, v);
-                pos += 4;
-            } else {
-                dout.writeInt(v);
-            }
-        }
-
-        public void writeFloat(float v) throws IOException {
-            if (pos + 4 <= MAX_BLOCK_SIZE) {
-                Bits.putFloat(buf, pos, v);
-                pos += 4;
-            } else {
-                dout.writeFloat(v);
-            }
-        }
-
-        public void writeLong(long v) throws IOException {
-            if (pos + 8 <= MAX_BLOCK_SIZE) {
-                Bits.putLong(buf, pos, v);
-                pos += 8;
-            } else {
-                dout.writeLong(v);
-            }
-        }
-
-        public void writeDouble(double v) throws IOException {
-            if (pos + 8 <= MAX_BLOCK_SIZE) {
-                Bits.putDouble(buf, pos, v);
-                pos += 8;
-            } else {
-                dout.writeDouble(v);
-            }
-        }
-
-        public void writeBytes(String s) throws IOException {
-            int endoff = s.length();
-            int cpos = 0;
-            int csize = 0;
-            for (int off = 0; off < endoff; ) {
-                if (cpos >= csize) {
-                    cpos = 0;
-                    csize = Math.min(endoff - off, CHAR_BUF_SIZE);
-                    s.getChars(off, off + csize, cbuf, 0);
-                }
-                if (pos >= MAX_BLOCK_SIZE) {
-                    drain();
-                }
-                int n = Math.min(csize - cpos, MAX_BLOCK_SIZE - pos);
-                int stop = pos + n;
-                while (pos < stop) {
-                    buf[pos++] = (byte) cbuf[cpos++];
-                }
-                off += n;
-            }
-        }
-
-        public void writeChars(String s) throws IOException {
-            int endoff = s.length();
-            for (int off = 0; off < endoff; ) {
-                int csize = Math.min(endoff - off, CHAR_BUF_SIZE);
-                s.getChars(off, off + csize, cbuf, 0);
-                writeChars(cbuf, 0, csize);
-                off += csize;
-            }
-        }
-
-        public void writeUTF(String s) throws IOException {
-            writeUTF(s, getUTFLength(s));
-        }
-
-
-        /* -------------- primitive data array output methods -------------- */
-        /*
-         * The following methods write out spans of primitive data values.
-         * Though equivalent to calling the corresponding primitive write
-         * methods repeatedly, these methods are optimized for writing groups
-         * of primitive data values more efficiently.
-         */
-
-        void writeBooleans(boolean[] v, int off, int len) throws IOException {
-            int endoff = off + len;
-            while (off < endoff) {
-                if (pos >= MAX_BLOCK_SIZE) {
-                    drain();
-                }
-                int stop = Math.min(endoff, off + (MAX_BLOCK_SIZE - pos));
-                while (off < stop) {
-                    Bits.putBoolean(buf, pos++, v[off++]);
-                }
-            }
-        }
-
-        void writeChars(char[] v, int off, int len) throws IOException {
-            int limit = MAX_BLOCK_SIZE - 2;
-            int endoff = off + len;
-            while (off < endoff) {
-                if (pos <= limit) {
-                    int avail = (MAX_BLOCK_SIZE - pos) >> 1;
-                    int stop = Math.min(endoff, off + avail);
-                    while (off < stop) {
-                        Bits.putChar(buf, pos, v[off++]);
-                        pos += 2;
-                    }
-                } else {
-                    dout.writeChar(v[off++]);
-                }
-            }
-        }
-
-        void writeShorts(short[] v, int off, int len) throws IOException {
-            int limit = MAX_BLOCK_SIZE - 2;
-            int endoff = off + len;
-            while (off < endoff) {
-                if (pos <= limit) {
-                    int avail = (MAX_BLOCK_SIZE - pos) >> 1;
-                    int stop = Math.min(endoff, off + avail);
-                    while (off < stop) {
-                        Bits.putShort(buf, pos, v[off++]);
-                        pos += 2;
-                    }
-                } else {
-                    dout.writeShort(v[off++]);
-                }
-            }
-        }
-
-        void writeInts(int[] v, int off, int len) throws IOException {
-            int limit = MAX_BLOCK_SIZE - 4;
-            int endoff = off + len;
-            while (off < endoff) {
-                if (pos <= limit) {
-                    int avail = (MAX_BLOCK_SIZE - pos) >> 2;
-                    int stop = Math.min(endoff, off + avail);
-                    while (off < stop) {
-                        Bits.putInt(buf, pos, v[off++]);
-                        pos += 4;
-                    }
-                } else {
-                    dout.writeInt(v[off++]);
-                }
-            }
-        }
-
-        void writeFloats(float[] v, int off, int len) throws IOException {
-            int limit = MAX_BLOCK_SIZE - 4;
-            int endoff = off + len;
-            while (off < endoff) {
-                if (pos <= limit) {
-                    int avail = (MAX_BLOCK_SIZE - pos) >> 2;
-                    int chunklen = Math.min(endoff - off, avail);
-                    floatsToBytes(v, off, buf, pos, chunklen);
-                    off += chunklen;
-                    pos += chunklen << 2;
-                } else {
-                    dout.writeFloat(v[off++]);
-                }
-            }
-        }
-
-        void writeLongs(long[] v, int off, int len) throws IOException {
-            int limit = MAX_BLOCK_SIZE - 8;
-            int endoff = off + len;
-            while (off < endoff) {
-                if (pos <= limit) {
-                    int avail = (MAX_BLOCK_SIZE - pos) >> 3;
-                    int stop = Math.min(endoff, off + avail);
-                    while (off < stop) {
-                        Bits.putLong(buf, pos, v[off++]);
-                        pos += 8;
-                    }
-                } else {
-                    dout.writeLong(v[off++]);
-                }
-            }
-        }
-
-        void writeDoubles(double[] v, int off, int len) throws IOException {
-            int limit = MAX_BLOCK_SIZE - 8;
-            int endoff = off + len;
-            while (off < endoff) {
-                if (pos <= limit) {
-                    int avail = (MAX_BLOCK_SIZE - pos) >> 3;
-                    int chunklen = Math.min(endoff - off, avail);
-                    doublesToBytes(v, off, buf, pos, chunklen);
-                    off += chunklen;
-                    pos += chunklen << 3;
-                } else {
-                    dout.writeDouble(v[off++]);
-                }
-            }
-        }
-
-        /**
-         * Returns the length in bytes of the UTF encoding of the given string.
-         */
-        long getUTFLength(String s) {
-            int len = s.length();
-            long utflen = 0;
-            for (int off = 0; off < len; ) {
-                int csize = Math.min(len - off, CHAR_BUF_SIZE);
-                s.getChars(off, off + csize, cbuf, 0);
-                for (int cpos = 0; cpos < csize; cpos++) {
-                    char c = cbuf[cpos];
-                    if (c >= 0x0001 && c <= 0x007F) {
-                        utflen++;
-                    } else if (c > 0x07FF) {
-                        utflen += 3;
-                    } else {
-                        utflen += 2;
-                    }
-                }
-                off += csize;
-            }
-            return utflen;
-        }
-
-        /**
-         * Writes the given string in UTF format.  This method is used in
-         * situations where the UTF encoding length of the string is already
-         * known; specifying it explicitly avoids a prescan of the string to
-         * determine its UTF length.
-         */
-        void writeUTF(String s, long utflen) throws IOException {
-            if (utflen > 0xFFFFL) {
-                throw new UTFDataFormatException();
-            }
-            writeShort((int) utflen);
-            if (utflen == (long) s.length()) {
-                writeBytes(s);
-            } else {
-                writeUTFBody(s);
-            }
-        }
-
-        /**
-         * Writes given string in "long" UTF format.  "Long" UTF format is
-         * identical to standard UTF, except that it uses an 8 byte header
-         * (instead of the standard 2 bytes) to convey the UTF encoding length.
-         */
-        void writeLongUTF(String s) throws IOException {
-            writeLongUTF(s, getUTFLength(s));
-        }
-
-        /**
-         * Writes given string in "long" UTF format, where the UTF encoding
-         * length of the string is already known.
-         */
-        void writeLongUTF(String s, long utflen) throws IOException {
-            writeLong(utflen);
-            if (utflen == (long) s.length()) {
-                writeBytes(s);
-            } else {
-                writeUTFBody(s);
-            }
-        }
-
-        /**
-         * Writes the "body" (i.e., the UTF representation minus the 2-byte or
-         * 8-byte length header) of the UTF encoding for the given string.
-         */
-        private void writeUTFBody(String s) throws IOException {
-            int limit = MAX_BLOCK_SIZE - 3;
-            int len = s.length();
-            for (int off = 0; off < len; ) {
-                int csize = Math.min(len - off, CHAR_BUF_SIZE);
-                s.getChars(off, off + csize, cbuf, 0);
-                for (int cpos = 0; cpos < csize; cpos++) {
-                    char c = cbuf[cpos];
-                    if (pos <= limit) {
-                        if (c <= 0x007F && c != 0) {
-                            buf[pos++] = (byte) c;
-                        } else if (c > 0x07FF) {
-                            buf[pos + 2] = (byte) (0x80 | ((c >> 0) & 0x3F));
-                            buf[pos + 1] = (byte) (0x80 | ((c >> 6) & 0x3F));
-                            buf[pos + 0] = (byte) (0xE0 | ((c >> 12) & 0x0F));
-                            pos += 3;
-                        } else {
-                            buf[pos + 1] = (byte) (0x80 | ((c >> 0) & 0x3F));
-                            buf[pos + 0] = (byte) (0xC0 | ((c >> 6) & 0x1F));
-                            pos += 2;
-                        }
-                    } else {    // write one byte at a time to normalize block
-                        if (c <= 0x007F && c != 0) {
-                            write(c);
-                        } else if (c > 0x07FF) {
-                            write(0xE0 | ((c >> 12) & 0x0F));
-                            write(0x80 | ((c >> 6) & 0x3F));
-                            write(0x80 | ((c >> 0) & 0x3F));
-                        } else {
-                            write(0xC0 | ((c >> 6) & 0x1F));
-                            write(0x80 | ((c >> 0) & 0x3F));
-                        }
-                    }
-                }
-                off += csize;
-            }
-        }
-    }
-
-    /**
-     * Lightweight identity hash table which maps objects to integer handles,
-     * assigned in ascending order.
-     */
-    private static class HandleTable {
-
-        /* number of mappings in table/next available handle */
-        private int size;
-        /* size threshold determining when to expand hash spine */
-        private int threshold;
-        /* factor for computing size threshold */
-        private final float loadFactor;
-        /* maps hash value -> candidate handle value */
-        private int[] spine;
-        /* maps handle value -> next candidate handle value */
-        private int[] next;
-        /* maps handle value -> associated object */
-        private Object[] objs;
-
-        /**
-         * Creates new HandleTable with given capacity and load factor.
-         */
-        HandleTable(int initialCapacity, float loadFactor) {
-            this.loadFactor = loadFactor;
-            spine = new int[initialCapacity];
-            next = new int[initialCapacity];
-            objs = new Object[initialCapacity];
-            threshold = (int) (initialCapacity * loadFactor);
-            clear();
-        }
-
-        /**
-         * Assigns next available handle to given object, and returns handle
-         * value.  Handles are assigned in ascending order starting at 0.
-         */
-        int assign(Object obj) {
-            if (size >= next.length) {
-                growEntries();
-            }
-            if (size >= threshold) {
-                growSpine();
-            }
-            insert(obj, size);
-            return size++;
-        }
-
-        /**
-         * Looks up and returns handle associated with given object, or -1 if
-         * no mapping found.
-         */
-        int lookup(Object obj) {
-            if (size == 0) {
-                return -1;
-            }
-            int index = hash(obj) % spine.length;
-            for (int i = spine[index]; i >= 0; i = next[i]) {
-                if (objs[i] == obj) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-
-        /**
-         * Resets table to its initial (empty) state.
-         */
-        void clear() {
-            Arrays.fill(spine, -1);
-            Arrays.fill(objs, 0, size, null);
-            size = 0;
-        }
-
-        /**
-         * Returns the number of mappings currently in table.
-         */
-        int size() {
-            return size;
-        }
-
-        /**
-         * Inserts mapping object -> handle mapping into table.  Assumes table
-         * is large enough to accommodate new mapping.
-         */
-        private void insert(Object obj, int handle) {
-            int index = hash(obj) % spine.length;
-            objs[handle] = obj;
-            next[handle] = spine[index];
-            spine[index] = handle;
-        }
-
-        /**
-         * Expands the hash "spine" -- equivalent to increasing the number of
-         * buckets in a conventional hash table.
-         */
-        private void growSpine() {
-            spine = new int[(spine.length << 1) + 1];
-            threshold = (int) (spine.length * loadFactor);
-            Arrays.fill(spine, -1);
-            for (int i = 0; i < size; i++) {
-                insert(objs[i], i);
-            }
-        }
-
-        /**
-         * Increases hash table capacity by lengthening entry arrays.
-         */
-        private void growEntries() {
-            int newLength = (next.length << 1) + 1;
-            int[] newNext = new int[newLength];
-            System.arraycopy(next, 0, newNext, 0, size);
-            next = newNext;
-
-            Object[] newObjs = new Object[newLength];
-            System.arraycopy(objs, 0, newObjs, 0, size);
-            objs = newObjs;
-        }
-
-        /**
-         * Returns hash value for given object.
-         */
-        private int hash(Object obj) {
-            return System.identityHashCode(obj) & 0x7FFFFFFF;
-        }
-    }
-
-    /**
-     * Lightweight identity hash table which maps objects to replacement
-     * objects.
-     */
-    private static class ReplaceTable {
-
-        /* maps object -> index */
-        private final HandleTable htab;
-        /* maps index -> replacement object */
-        private Object[] reps;
-
-        /**
-         * Creates new ReplaceTable with given capacity and load factor.
-         */
-        ReplaceTable(int initialCapacity, float loadFactor) {
-            htab = new HandleTable(initialCapacity, loadFactor);
-            reps = new Object[initialCapacity];
-        }
-
-        /**
-         * Enters mapping from object to replacement object.
-         */
-        void assign(Object obj, Object rep) {
-            int index = htab.assign(obj);
-            while (index >= reps.length) {
-                grow();
-            }
-            reps[index] = rep;
-        }
-
-        /**
-         * Looks up and returns replacement for given object.  If no
-         * replacement is found, returns the lookup object itself.
-         */
-        Object lookup(Object obj) {
-            int index = htab.lookup(obj);
-            return (index >= 0) ? reps[index] : obj;
-        }
-
-        /**
-         * Resets table to its initial (empty) state.
-         */
-        void clear() {
-            Arrays.fill(reps, 0, htab.size(), null);
-            htab.clear();
-        }
-
-        /**
-         * Returns the number of mappings currently in table.
-         */
-        int size() {
-            return htab.size();
-        }
-
-        /**
-         * Increases table capacity.
-         */
-        private void grow() {
-            Object[] newReps = new Object[(reps.length << 1) + 1];
-            System.arraycopy(reps, 0, newReps, 0, reps.length);
-            reps = newReps;
-        }
-    }
-
-    /**
-     * Stack to keep debug information about the state of the
-     * serialization process, for embedding in exception messages.
-     */
-    private static class DebugTraceInfoStack {
-        private final List<String> stack;
-
-        DebugTraceInfoStack() {
-            stack = new ArrayList<>();
-        }
-
-        /**
-         * Removes all of the elements from enclosed list.
-         */
-        void clear() {
-            stack.clear();
-        }
-
-        /**
-         * Removes the object at the top of enclosed list.
-         */
-        void pop() {
-            stack.remove(stack.size()-1);
-        }
-
-        /**
-         * Pushes a String onto the top of enclosed list.
-         */
-        void push(String entry) {
-            stack.add("\t- " + entry);
-        }
-
-        /**
-         * Returns a string representation of this object
-         */
-        public String toString() {
-            StringBuilder buffer = new StringBuilder();
-            if (!stack.isEmpty()) {
-                for(int i = stack.size(); i > 0; i-- ) {
-                    buffer.append(stack.get(i-1) + ((i != 1) ? "\n" : ""));
-                }
-            }
-            return buffer.toString();
-        }
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectStreamClass.java
--- a/emul/compact/src/main/java/java/io/ObjectStreamClass.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1396 +0,0 @@
-/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Serialization's descriptor for classes.  It contains the name and
- * serialVersionUID of the class.  The ObjectStreamClass for a specific class
- * loaded in this Java VM can be found/created using the lookup method.
- *
- * <p>The algorithm to compute the SerialVersionUID is described in
- * <a href="../../../platform/serialization/spec/class.html#4100">Object
- * Serialization Specification, Section 4.6, Stream Unique Identifiers</a>.
- *
- * @author      Mike Warres
- * @author      Roger Riggs
- * @see ObjectStreamField
- * @see <a href="../../../platform/serialization/spec/class.html">Object Serialization Specification, Section 4, Class Descriptors</a>
- * @since   JDK1.1
- */
-public class ObjectStreamClass implements Serializable {
-
-    /** serialPersistentFields value indicating no serializable fields */
-    public static final ObjectStreamField[] NO_FIELDS =
-        new ObjectStreamField[0];
-
-    private static final long serialVersionUID = -6120832682080437368L;
-    private static final ObjectStreamField[] serialPersistentFields =
-        NO_FIELDS;
-
-
-    /** class associated with this descriptor (if any) */
-    private Class<?> cl;
-    /** name of class represented by this descriptor */
-    private String name;
-    /** serialVersionUID of represented class (null if not computed yet) */
-    private volatile Long suid;
-
-    /** true if represents dynamic proxy class */
-    private boolean isProxy;
-    /** true if represents enum type */
-    private boolean isEnum;
-    /** true if represented class implements Serializable */
-    private boolean serializable;
-    /** true if represented class implements Externalizable */
-    private boolean externalizable;
-    /** true if desc has data written by class-defined writeObject method */
-    private boolean hasWriteObjectData;
-    /**
-     * true if desc has externalizable data written in block data format; this
-     * must be true by default to accommodate ObjectInputStream subclasses which
-     * override readClassDescriptor() to return class descriptors obtained from
-     * ObjectStreamClass.lookup() (see 4461737)
-     */
-    private boolean hasBlockExternalData = true;
-
-    /** exception (if any) thrown while attempting to resolve class */
-    private ClassNotFoundException resolveEx;
-    /** exception (if any) to throw if non-enum deserialization attempted */
-    private InvalidClassException deserializeEx;
-    /** exception (if any) to throw if non-enum serialization attempted */
-    private InvalidClassException serializeEx;
-    /** exception (if any) to throw if default serialization attempted */
-    private InvalidClassException defaultSerializeEx;
-
-    /** serializable fields */
-    private ObjectStreamField[] fields;
-    /** aggregate marshalled size of primitive fields */
-    private int primDataSize;
-    /** number of non-primitive fields */
-    private int numObjFields;
-    /** reflector for setting/getting serializable field values */
-//    private FieldReflector fieldRefl;
-    /** data layout of serialized objects described by this class desc */
-    private volatile ClassDataSlot[] dataLayout;
-
-    /** serialization-appropriate constructor, or null if none */
-    private Constructor cons;
-    /** class-defined writeObject method, or null if none */
-    private Method writeObjectMethod;
-    /** class-defined readObject method, or null if none */
-    private Method readObjectMethod;
-    /** class-defined readObjectNoData method, or null if none */
-    private Method readObjectNoDataMethod;
-    /** class-defined writeReplace method, or null if none */
-    private Method writeReplaceMethod;
-    /** class-defined readResolve method, or null if none */
-    private Method readResolveMethod;
-
-    /** local class descriptor for represented class (may point to self) */
-    private ObjectStreamClass localDesc;
-    /** superclass descriptor appearing in stream */
-    private ObjectStreamClass superDesc;
-
-    /**
-     * Initializes native code.
-     */
-    private static native void initNative();
-    static {
-        initNative();
-    }
-
-    /**
-     * Find the descriptor for a class that can be serialized.  Creates an
-     * ObjectStreamClass instance if one does not exist yet for class. Null is
-     * returned if the specified class does not implement java.io.Serializable
-     * or java.io.Externalizable.
-     *
-     * @param   cl class for which to get the descriptor
-     * @return  the class descriptor for the specified class
-     */
-    public static ObjectStreamClass lookup(Class<?> cl) {
-        return lookup(cl, false);
-    }
-
-    /**
-     * Returns the descriptor for any class, regardless of whether it
-     * implements {@link Serializable}.
-     *
-     * @param        cl class for which to get the descriptor
-     * @return       the class descriptor for the specified class
-     * @since 1.6
-     */
-    public static ObjectStreamClass lookupAny(Class<?> cl) {
-        return lookup(cl, true);
-    }
-
-    /**
-     * Returns the name of the class described by this descriptor.
-     * This method returns the name of the class in the format that
-     * is used by the {@link Class#getName} method.
-     *
-     * @return a string representing the name of the class
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Return the serialVersionUID for this class.  The serialVersionUID
-     * defines a set of classes all with the same name that have evolved from a
-     * common root class and agree to be serialized and deserialized using a
-     * common format.  NonSerializable classes have a serialVersionUID of 0L.
-     *
-     * @return  the SUID of the class described by this descriptor
-     */
-    public long getSerialVersionUID() {
-        // REMIND: synchronize instead of relying on volatile?
-        if (suid == null) {
-            return computeDefaultSUID(cl);
-        }
-        return suid.longValue();
-    }
-
-    /**
-     * Return the class in the local VM that this version is mapped to.  Null
-     * is returned if there is no corresponding local class.
-     *
-     * @return  the <code>Class</code> instance that this descriptor represents
-     */
-    public Class<?> forClass() {
-        return cl;
-    }
-
-    /**
-     * Return an array of the fields of this serializable class.
-     *
-     * @return  an array containing an element for each persistent field of
-     *          this class. Returns an array of length zero if there are no
-     *          fields.
-     * @since 1.2
-     */
-    public ObjectStreamField[] getFields() {
-        return getFields(true);
-    }
-
-    /**
-     * Get the field of this class by name.
-     *
-     * @param   name the name of the data field to look for
-     * @return  The ObjectStreamField object of the named field or null if
-     *          there is no such named field.
-     */
-    public ObjectStreamField getField(String name) {
-        return getField(name, null);
-    }
-
-    /**
-     * Return a string describing this ObjectStreamClass.
-     */
-    public String toString() {
-        return name + ": static final long serialVersionUID = " +
-            getSerialVersionUID() + "L;";
-    }
-
-    /**
-     * Looks up and returns class descriptor for given class, or null if class
-     * is non-serializable and "all" is set to false.
-     *
-     * @param   cl class to look up
-     * @param   all if true, return descriptors for all classes; if false, only
-     *          return descriptors for serializable classes
-     */
-    static ObjectStreamClass lookup(Class<?> cl, boolean all) {
-        if (!(all || Serializable.class.isAssignableFrom(cl))) {
-            return null;
-        }
-        Object entry = null;
-        EntryFuture future = null;
-        if (entry == null) {
-            EntryFuture newEntry = new EntryFuture();
-            Reference<?> newRef = new SoftReference<>(newEntry);
-            if (entry == null) {
-                future = newEntry;
-            }
-        }
-
-        if (entry instanceof ObjectStreamClass) {  // check common case first
-            return (ObjectStreamClass) entry;
-        }
-        if (entry instanceof EntryFuture) {
-            future = (EntryFuture) entry;
-            if (true) {
-                /*
-                 * Handle nested call situation described by 4803747: waiting
-                 * for future value to be set by a lookup() call further up the
-                 * stack will result in deadlock, so calculate and set the
-                 * future value here instead.
-                 */
-                entry = null;
-            } else {
-                entry = future.get();
-            }
-        }
-        if (entry == null) {
-            try {
-                entry = new ObjectStreamClass(cl);
-            } catch (Throwable th) {
-                entry = th;
-            }
-            // nested lookup call already set future
-            entry = future.get();
-        }
-
-        if (entry instanceof ObjectStreamClass) {
-            return (ObjectStreamClass) entry;
-        } else if (entry instanceof RuntimeException) {
-            throw (RuntimeException) entry;
-        } else if (entry instanceof Error) {
-            throw (Error) entry;
-        } else {
-            throw new InternalError("unexpected entry: " + entry);
-        }
-    }
-
-    /**
-     * Placeholder used in class descriptor and field reflector lookup tables
-     * for an entry in the process of being initialized.  (Internal) callers
-     * which receive an EntryFuture belonging to another thread as the result
-     * of a lookup should call the get() method of the EntryFuture; this will
-     * return the actual entry once it is ready for use and has been set().  To
-     * conserve objects, EntryFutures synchronize on themselves.
-     */
-    private static class EntryFuture {
-
-        private static final Object unset = new Object();
-        private Object entry = unset;
-
-        /**
-         * Attempts to set the value contained by this EntryFuture.  If the
-         * EntryFuture's value has not been set already, then the value is
-         * saved, any callers blocked in the get() method are notified, and
-         * true is returned.  If the value has already been set, then no saving
-         * or notification occurs, and false is returned.
-         */
-        synchronized boolean set(Object entry) {
-            if (this.entry != unset) {
-                return false;
-            }
-            this.entry = entry;
-            notifyAll();
-            return true;
-        }
-
-        /**
-         * Returns the value contained by this EntryFuture, blocking if
-         * necessary until a value is set.
-         */
-        synchronized Object get() {
-            boolean interrupted = false;
-            while (entry == unset) {
-                try {
-                    wait();
-                } catch (InterruptedException ex) {
-                    interrupted = true;
-                }
-            }
-            return entry;
-        }
-    }
-
-    /**
-     * Creates local class descriptor representing given class.
-     */
-    private ObjectStreamClass(final Class<?> cl) {
-        this.cl = cl;
-        name = cl.getName();
-        isProxy = Proxy.isProxyClass(cl);
-        isEnum = Enum.class.isAssignableFrom(cl);
-        serializable = Serializable.class.isAssignableFrom(cl);
-        externalizable = Externalizable.class.isAssignableFrom(cl);
-
-        Class<?> superCl = cl.getSuperclass();
-        superDesc = (superCl != null) ? lookup(superCl, false) : null;
-        localDesc = this;
-
-        suid = Long.valueOf(0);
-        fields = NO_FIELDS;
-
-
-        if (deserializeEx == null) {
-            if (isEnum) {
-                deserializeEx = new InvalidClassException(name, "enum type");
-            } else if (cons == null) {
-                deserializeEx = new InvalidClassException(
-                    name, "no valid constructor");
-            }
-        }
-        for (int i = 0; i < fields.length; i++) {
-            if (fields[i].getField() == null) {
-                defaultSerializeEx = new InvalidClassException(
-                    name, "unmatched serializable field(s) declared");
-            }
-        }
-    }
-
-    /**
-     * Creates blank class descriptor which should be initialized via a
-     * subsequent call to initProxy(), initNonProxy() or readNonProxy().
-     */
-    ObjectStreamClass() {
-    }
-
-    /**
-     * Initializes class descriptor representing a proxy class.
-     */
-    void initProxy(Class<?> cl,
-                   ClassNotFoundException resolveEx,
-                   ObjectStreamClass superDesc)
-        throws InvalidClassException
-    {
-        this.cl = cl;
-        this.resolveEx = resolveEx;
-        this.superDesc = superDesc;
-        isProxy = true;
-        serializable = true;
-        suid = Long.valueOf(0);
-        fields = NO_FIELDS;
-
-        if (cl != null) {
-            localDesc = lookup(cl, true);
-            if (!localDesc.isProxy) {
-                throw new InvalidClassException(
-                    "cannot bind proxy descriptor to a non-proxy class");
-            }
-            name = localDesc.name;
-            externalizable = localDesc.externalizable;
-            cons = localDesc.cons;
-            writeReplaceMethod = localDesc.writeReplaceMethod;
-            readResolveMethod = localDesc.readResolveMethod;
-            deserializeEx = localDesc.deserializeEx;
-        }
-    }
-
-    /**
-     * Initializes class descriptor representing a non-proxy class.
-     */
-    void initNonProxy(ObjectStreamClass model,
-                      Class<?> cl,
-                      ClassNotFoundException resolveEx,
-                      ObjectStreamClass superDesc)
-        throws InvalidClassException
-    {
-        this.cl = cl;
-        this.resolveEx = resolveEx;
-        this.superDesc = superDesc;
-        name = model.name;
-        suid = Long.valueOf(model.getSerialVersionUID());
-        isProxy = false;
-        isEnum = model.isEnum;
-        serializable = model.serializable;
-        externalizable = model.externalizable;
-        hasBlockExternalData = model.hasBlockExternalData;
-        hasWriteObjectData = model.hasWriteObjectData;
-        fields = model.fields;
-        primDataSize = model.primDataSize;
-        numObjFields = model.numObjFields;
-
-        if (cl != null) {
-            localDesc = lookup(cl, true);
-            if (localDesc.isProxy) {
-                throw new InvalidClassException(
-                    "cannot bind non-proxy descriptor to a proxy class");
-            }
-            if (isEnum != localDesc.isEnum) {
-                throw new InvalidClassException(isEnum ?
-                    "cannot bind enum descriptor to a non-enum class" :
-                    "cannot bind non-enum descriptor to an enum class");
-            }
-
-            if (serializable == localDesc.serializable &&
-                !cl.isArray() &&
-                suid.longValue() != localDesc.getSerialVersionUID())
-            {
-                throw new InvalidClassException(localDesc.name,
-                    "local class incompatible: " +
-                    "stream classdesc serialVersionUID = " + suid +
-                    ", local class serialVersionUID = " +
-                    localDesc.getSerialVersionUID());
-            }
-
-            if (!classNamesEqual(name, localDesc.name)) {
-                throw new InvalidClassException(localDesc.name,
-                    "local class name incompatible with stream class " +
-                    "name \"" + name + "\"");
-            }
-
-            if (!isEnum) {
-                if ((serializable == localDesc.serializable) &&
-                    (externalizable != localDesc.externalizable))
-                {
-                    throw new InvalidClassException(localDesc.name,
-                        "Serializable incompatible with Externalizable");
-                }
-
-                if ((serializable != localDesc.serializable) ||
-                    (externalizable != localDesc.externalizable) ||
-                    !(serializable || externalizable))
-                {
-                    deserializeEx = new InvalidClassException(localDesc.name,
-                        "class invalid for deserialization");
-                }
-            }
-
-            cons = localDesc.cons;
-            writeObjectMethod = localDesc.writeObjectMethod;
-            readObjectMethod = localDesc.readObjectMethod;
-            readObjectNoDataMethod = localDesc.readObjectNoDataMethod;
-            writeReplaceMethod = localDesc.writeReplaceMethod;
-            readResolveMethod = localDesc.readResolveMethod;
-            if (deserializeEx == null) {
-                deserializeEx = localDesc.deserializeEx;
-            }
-        }
-        // reassign to matched fields so as to reflect local unshared settings
-        fields = null;
-    }
-
-    /**
-     * Reads non-proxy class descriptor information from given input stream.
-     * The resulting class descriptor is not fully functional; it can only be
-     * used as input to the ObjectInputStream.resolveClass() and
-     * ObjectStreamClass.initNonProxy() methods.
-     */
-    void readNonProxy(ObjectInputStream in)
-        throws IOException, ClassNotFoundException
-    {
-        name = in.readUTF();
-        suid = Long.valueOf(in.readLong());
-        isProxy = false;
-
-        byte flags = in.readByte();
-        hasWriteObjectData =
-            ((flags & ObjectStreamConstants.SC_WRITE_METHOD) != 0);
-        hasBlockExternalData =
-            ((flags & ObjectStreamConstants.SC_BLOCK_DATA) != 0);
-        externalizable =
-            ((flags & ObjectStreamConstants.SC_EXTERNALIZABLE) != 0);
-        boolean sflag =
-            ((flags & ObjectStreamConstants.SC_SERIALIZABLE) != 0);
-        if (externalizable && sflag) {
-            throw new InvalidClassException(
-                name, "serializable and externalizable flags conflict");
-        }
-        serializable = externalizable || sflag;
-        isEnum = ((flags & ObjectStreamConstants.SC_ENUM) != 0);
-        if (isEnum && suid.longValue() != 0L) {
-            throw new InvalidClassException(name,
-                "enum descriptor has non-zero serialVersionUID: " + suid);
-        }
-
-        int numFields = in.readShort();
-        if (isEnum && numFields != 0) {
-            throw new InvalidClassException(name,
-                "enum descriptor has non-zero field count: " + numFields);
-        }
-        fields = (numFields > 0) ?
-            new ObjectStreamField[numFields] : NO_FIELDS;
-        for (int i = 0; i < numFields; i++) {
-            char tcode = (char) in.readByte();
-            String fname = in.readUTF();
-            String signature = ((tcode == 'L') || (tcode == '[')) ?
-                in.readTypeString() : new String(new char[] { tcode });
-            try {
-                fields[i] = new ObjectStreamField(fname, signature, false);
-            } catch (RuntimeException e) {
-                throw (IOException) new InvalidClassException(name,
-                    "invalid descriptor for field " + fname).initCause(e);
-            }
-        }
-        computeFieldOffsets();
-    }
-
-    /**
-     * Writes non-proxy class descriptor information to given output stream.
-     */
-    void writeNonProxy(ObjectOutputStream out) throws IOException {
-        out.writeUTF(name);
-        out.writeLong(getSerialVersionUID());
-
-        byte flags = 0;
-        if (externalizable) {
-            flags |= ObjectStreamConstants.SC_EXTERNALIZABLE;
-            int protocol = out.getProtocolVersion();
-            if (protocol != ObjectStreamConstants.PROTOCOL_VERSION_1) {
-                flags |= ObjectStreamConstants.SC_BLOCK_DATA;
-            }
-        } else if (serializable) {
-            flags |= ObjectStreamConstants.SC_SERIALIZABLE;
-        }
-        if (hasWriteObjectData) {
-            flags |= ObjectStreamConstants.SC_WRITE_METHOD;
-        }
-        if (isEnum) {
-            flags |= ObjectStreamConstants.SC_ENUM;
-        }
-        out.writeByte(flags);
-
-        out.writeShort(fields.length);
-        for (int i = 0; i < fields.length; i++) {
-            ObjectStreamField f = fields[i];
-            out.writeByte(f.getTypeCode());
-            out.writeUTF(f.getName());
-            if (!f.isPrimitive()) {
-                out.writeTypeString(f.getTypeString());
-            }
-        }
-    }
-
-    /**
-     * Returns ClassNotFoundException (if any) thrown while attempting to
-     * resolve local class corresponding to this class descriptor.
-     */
-    ClassNotFoundException getResolveException() {
-        return resolveEx;
-    }
-
-    /**
-     * Throws an InvalidClassException if object instances referencing this
-     * class descriptor should not be allowed to deserialize.  This method does
-     * not apply to deserialization of enum constants.
-     */
-    void checkDeserialize() throws InvalidClassException {
-        if (deserializeEx != null) {
-            InvalidClassException ice =
-                new InvalidClassException(deserializeEx.classname,
-                                          deserializeEx.getMessage());
-            ice.initCause(deserializeEx);
-            throw ice;
-        }
-    }
-
-    /**
-     * Throws an InvalidClassException if objects whose class is represented by
-     * this descriptor should not be allowed to serialize.  This method does
-     * not apply to serialization of enum constants.
-     */
-    void checkSerialize() throws InvalidClassException {
-        if (serializeEx != null) {
-            InvalidClassException ice =
-                new InvalidClassException(serializeEx.classname,
-                                          serializeEx.getMessage());
-            ice.initCause(serializeEx);
-            throw ice;
-        }
-    }
-
-    /**
-     * Throws an InvalidClassException if objects whose class is represented by
-     * this descriptor should not be permitted to use default serialization
-     * (e.g., if the class declares serializable fields that do not correspond
-     * to actual fields, and hence must use the GetField API).  This method
-     * does not apply to deserialization of enum constants.
-     */
-    void checkDefaultSerialize() throws InvalidClassException {
-        if (defaultSerializeEx != null) {
-            InvalidClassException ice =
-                new InvalidClassException(defaultSerializeEx.classname,
-                                          defaultSerializeEx.getMessage());
-            ice.initCause(defaultSerializeEx);
-            throw ice;
-        }
-    }
-
-    /**
-     * Returns superclass descriptor.  Note that on the receiving side, the
-     * superclass descriptor may be bound to a class that is not a superclass
-     * of the subclass descriptor's bound class.
-     */
-    ObjectStreamClass getSuperDesc() {
-        return superDesc;
-    }
-
-    /**
-     * Returns the "local" class descriptor for the class associated with this
-     * class descriptor (i.e., the result of
-     * ObjectStreamClass.lookup(this.forClass())) or null if there is no class
-     * associated with this descriptor.
-     */
-    ObjectStreamClass getLocalDesc() {
-        return localDesc;
-    }
-
-    /**
-     * Returns arrays of ObjectStreamFields representing the serializable
-     * fields of the represented class.  If copy is true, a clone of this class
-     * descriptor's field array is returned, otherwise the array itself is
-     * returned.
-     */
-    ObjectStreamField[] getFields(boolean copy) {
-        return copy ? fields.clone() : fields;
-    }
-
-    /**
-     * Looks up a serializable field of the represented class by name and type.
-     * A specified type of null matches all types, Object.class matches all
-     * non-primitive types, and any other non-null type matches assignable
-     * types only.  Returns matching field, or null if no match found.
-     */
-    ObjectStreamField getField(String name, Class<?> type) {
-        for (int i = 0; i < fields.length; i++) {
-            ObjectStreamField f = fields[i];
-            if (f.getName().equals(name)) {
-                if (type == null ||
-                    (type == Object.class && !f.isPrimitive()))
-                {
-                    return f;
-                }
-                Class<?> ftype = f.getType();
-                if (ftype != null && type.isAssignableFrom(ftype)) {
-                    return f;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns true if class descriptor represents a dynamic proxy class, false
-     * otherwise.
-     */
-    boolean isProxy() {
-        return isProxy;
-    }
-
-    /**
-     * Returns true if class descriptor represents an enum type, false
-     * otherwise.
-     */
-    boolean isEnum() {
-        return isEnum;
-    }
-
-    /**
-     * Returns true if represented class implements Externalizable, false
-     * otherwise.
-     */
-    boolean isExternalizable() {
-        return externalizable;
-    }
-
-    /**
-     * Returns true if represented class implements Serializable, false
-     * otherwise.
-     */
-    boolean isSerializable() {
-        return serializable;
-    }
-
-    /**
-     * Returns true if class descriptor represents externalizable class that
-     * has written its data in 1.2 (block data) format, false otherwise.
-     */
-    boolean hasBlockExternalData() {
-        return hasBlockExternalData;
-    }
-
-    /**
-     * Returns true if class descriptor represents serializable (but not
-     * externalizable) class which has written its data via a custom
-     * writeObject() method, false otherwise.
-     */
-    boolean hasWriteObjectData() {
-        return hasWriteObjectData;
-    }
-
-    /**
-     * Returns true if represented class is serializable/externalizable and can
-     * be instantiated by the serialization runtime--i.e., if it is
-     * externalizable and defines a public no-arg constructor, or if it is
-     * non-externalizable and its first non-serializable superclass defines an
-     * accessible no-arg constructor.  Otherwise, returns false.
-     */
-    boolean isInstantiable() {
-        return (cons != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable (but not
-     * externalizable) and defines a conformant writeObject method.  Otherwise,
-     * returns false.
-     */
-    boolean hasWriteObjectMethod() {
-        return (writeObjectMethod != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable (but not
-     * externalizable) and defines a conformant readObject method.  Otherwise,
-     * returns false.
-     */
-    boolean hasReadObjectMethod() {
-        return (readObjectMethod != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable (but not
-     * externalizable) and defines a conformant readObjectNoData method.
-     * Otherwise, returns false.
-     */
-    boolean hasReadObjectNoDataMethod() {
-        return (readObjectNoDataMethod != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable or externalizable and
-     * defines a conformant writeReplace method.  Otherwise, returns false.
-     */
-    boolean hasWriteReplaceMethod() {
-        return (writeReplaceMethod != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable or externalizable and
-     * defines a conformant readResolve method.  Otherwise, returns false.
-     */
-    boolean hasReadResolveMethod() {
-        return (readResolveMethod != null);
-    }
-
-    /**
-     * Creates a new instance of the represented class.  If the class is
-     * externalizable, invokes its public no-arg constructor; otherwise, if the
-     * class is serializable, invokes the no-arg constructor of the first
-     * non-serializable superclass.  Throws UnsupportedOperationException if
-     * this class descriptor is not associated with a class, if the associated
-     * class is non-serializable or if the appropriate no-arg constructor is
-     * inaccessible/unavailable.
-     */
-    Object newInstance()
-        throws InstantiationException, InvocationTargetException,
-               UnsupportedOperationException
-    {
-        if (cons != null) {
-            try {
-                return cons.newInstance();
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the writeObject method of the represented serializable class.
-     * Throws UnsupportedOperationException if this class descriptor is not
-     * associated with a class, or if the class is externalizable,
-     * non-serializable or does not define writeObject.
-     */
-    void invokeWriteObject(Object obj, ObjectOutputStream out)
-        throws IOException, UnsupportedOperationException
-    {
-        if (writeObjectMethod != null) {
-            try {
-                writeObjectMethod.invoke(obj, new Object[]{ out });
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof IOException) {
-                    throw (IOException) th;
-                } else {
-                    throwMiscException(th);
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the readObject method of the represented serializable class.
-     * Throws UnsupportedOperationException if this class descriptor is not
-     * associated with a class, or if the class is externalizable,
-     * non-serializable or does not define readObject.
-     */
-    void invokeReadObject(Object obj, ObjectInputStream in)
-        throws ClassNotFoundException, IOException,
-               UnsupportedOperationException
-    {
-        if (readObjectMethod != null) {
-            try {
-                readObjectMethod.invoke(obj, new Object[]{ in });
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof ClassNotFoundException) {
-                    throw (ClassNotFoundException) th;
-                } else if (th instanceof IOException) {
-                    throw (IOException) th;
-                } else {
-                    throwMiscException(th);
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the readObjectNoData method of the represented serializable
-     * class.  Throws UnsupportedOperationException if this class descriptor is
-     * not associated with a class, or if the class is externalizable,
-     * non-serializable or does not define readObjectNoData.
-     */
-    void invokeReadObjectNoData(Object obj)
-        throws IOException, UnsupportedOperationException
-    {
-        if (readObjectNoDataMethod != null) {
-            try {
-                readObjectNoDataMethod.invoke(obj, (Object[]) null);
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof ObjectStreamException) {
-                    throw (ObjectStreamException) th;
-                } else {
-                    throwMiscException(th);
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the writeReplace method of the represented serializable class and
-     * returns the result.  Throws UnsupportedOperationException if this class
-     * descriptor is not associated with a class, or if the class is
-     * non-serializable or does not define writeReplace.
-     */
-    Object invokeWriteReplace(Object obj)
-        throws IOException, UnsupportedOperationException
-    {
-        if (writeReplaceMethod != null) {
-            try {
-                return writeReplaceMethod.invoke(obj, (Object[]) null);
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof ObjectStreamException) {
-                    throw (ObjectStreamException) th;
-                } else {
-                    throwMiscException(th);
-                    throw new InternalError();  // never reached
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the readResolve method of the represented serializable class and
-     * returns the result.  Throws UnsupportedOperationException if this class
-     * descriptor is not associated with a class, or if the class is
-     * non-serializable or does not define readResolve.
-     */
-    Object invokeReadResolve(Object obj)
-        throws IOException, UnsupportedOperationException
-    {
-        if (readResolveMethod != null) {
-            try {
-                return readResolveMethod.invoke(obj, (Object[]) null);
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof ObjectStreamException) {
-                    throw (ObjectStreamException) th;
-                } else {
-                    throwMiscException(th);
-                    throw new InternalError();  // never reached
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Class representing the portion of an object's serialized form allotted
-     * to data described by a given class descriptor.  If "hasData" is false,
-     * the object's serialized form does not contain data associated with the
-     * class descriptor.
-     */
-    static class ClassDataSlot {
-
-        /** class descriptor "occupying" this slot */
-        final ObjectStreamClass desc;
-        /** true if serialized form includes data for this slot's descriptor */
-        final boolean hasData;
-
-        ClassDataSlot(ObjectStreamClass desc, boolean hasData) {
-            this.desc = desc;
-            this.hasData = hasData;
-        }
-    }
-
-    /**
-     * Returns array of ClassDataSlot instances representing the data layout
-     * (including superclass data) for serialized objects described by this
-     * class descriptor.  ClassDataSlots are ordered by inheritance with those
-     * containing "higher" superclasses appearing first.  The final
-     * ClassDataSlot contains a reference to this descriptor.
-     */
-    ClassDataSlot[] getClassDataLayout() throws InvalidClassException {
-        // REMIND: synchronize instead of relying on volatile?
-        if (dataLayout == null) {
-            dataLayout = getClassDataLayout0();
-        }
-        return dataLayout;
-    }
-
-    private ClassDataSlot[] getClassDataLayout0()
-        throws InvalidClassException
-    {
-        ArrayList<ClassDataSlot> slots = new ArrayList<>();
-        Class<?> start = cl, end = cl;
-
-        // locate closest non-serializable superclass
-        while (end != null && Serializable.class.isAssignableFrom(end)) {
-            end = end.getSuperclass();
-        }
-
-        for (ObjectStreamClass d = this; d != null; d = d.superDesc) {
-
-            // search up inheritance hierarchy for class with matching name
-            String searchName = (d.cl != null) ? d.cl.getName() : d.name;
-            Class<?> match = null;
-            for (Class<?> c = start; c != end; c = c.getSuperclass()) {
-                if (searchName.equals(c.getName())) {
-                    match = c;
-                    break;
-                }
-            }
-
-            // add "no data" slot for each unmatched class below match
-            if (match != null) {
-                for (Class<?> c = start; c != match; c = c.getSuperclass()) {
-                    slots.add(new ClassDataSlot(
-                        ObjectStreamClass.lookup(c, true), false));
-                }
-                start = match.getSuperclass();
-            }
-
-            // record descriptor/class pairing
-            slots.add(new ClassDataSlot(d.getVariantFor(match), true));
-        }
-
-        // add "no data" slot for any leftover unmatched classes
-        for (Class<?> c = start; c != end; c = c.getSuperclass()) {
-            slots.add(new ClassDataSlot(
-                ObjectStreamClass.lookup(c, true), false));
-        }
-
-        // order slots from superclass -> subclass
-        Collections.reverse(slots);
-        return slots.toArray(new ClassDataSlot[slots.size()]);
-    }
-
-    /**
-     * Returns aggregate size (in bytes) of marshalled primitive field values
-     * for represented class.
-     */
-    int getPrimDataSize() {
-        return primDataSize;
-    }
-
-    /**
-     * Returns number of non-primitive serializable fields of represented
-     * class.
-     */
-    int getNumObjFields() {
-        return numObjFields;
-    }
-
-    /**
-     * Fetches the serializable primitive field values of object obj and
-     * marshals them into byte array buf starting at offset 0.  It is the
-     * responsibility of the caller to ensure that obj is of the proper type if
-     * non-null.
-     */
-    void getPrimFieldValues(Object obj, byte[] buf) {
-    }
-
-    /**
-     * Sets the serializable primitive fields of object obj using values
-     * unmarshalled from byte array buf starting at offset 0.  It is the
-     * responsibility of the caller to ensure that obj is of the proper type if
-     * non-null.
-     */
-    void setPrimFieldValues(Object obj, byte[] buf) {
-    }
-
-    /**
-     * Fetches the serializable object field values of object obj and stores
-     * them in array vals starting at offset 0.  It is the responsibility of
-     * the caller to ensure that obj is of the proper type if non-null.
-     */
-    void getObjFieldValues(Object obj, Object[] vals) {
-    }
-
-    /**
-     * Sets the serializable object fields of object obj using values from
-     * array vals starting at offset 0.  It is the responsibility of the caller
-     * to ensure that obj is of the proper type if non-null.
-     */
-    void setObjFieldValues(Object obj, Object[] vals) {
-    }
-
-    /**
-     * Calculates and sets serializable field offsets, as well as primitive
-     * data size and object field count totals.  Throws InvalidClassException
-     * if fields are illegally ordered.
-     */
-    private void computeFieldOffsets() throws InvalidClassException {
-        primDataSize = 0;
-        numObjFields = 0;
-        int firstObjIndex = -1;
-
-        for (int i = 0; i < fields.length; i++) {
-            ObjectStreamField f = fields[i];
-            switch (f.getTypeCode()) {
-                case 'Z':
-                case 'B':
-                    f.setOffset(primDataSize++);
-                    break;
-
-                case 'C':
-                case 'S':
-                    f.setOffset(primDataSize);
-                    primDataSize += 2;
-                    break;
-
-                case 'I':
-                case 'F':
-                    f.setOffset(primDataSize);
-                    primDataSize += 4;
-                    break;
-
-                case 'J':
-                case 'D':
-                    f.setOffset(primDataSize);
-                    primDataSize += 8;
-                    break;
-
-                case '[':
-                case 'L':
-                    f.setOffset(numObjFields++);
-                    if (firstObjIndex == -1) {
-                        firstObjIndex = i;
-                    }
-                    break;
-
-                default:
-                    throw new InternalError();
-            }
-        }
-        if (firstObjIndex != -1 &&
-            firstObjIndex + numObjFields != fields.length)
-        {
-            throw new InvalidClassException(name, "illegal field order");
-        }
-    }
-
-    /**
-     * If given class is the same as the class associated with this class
-     * descriptor, returns reference to this class descriptor.  Otherwise,
-     * returns variant of this class descriptor bound to given class.
-     */
-    private ObjectStreamClass getVariantFor(Class<?> cl)
-        throws InvalidClassException
-    {
-        if (this.cl == cl) {
-            return this;
-        }
-        ObjectStreamClass desc = new ObjectStreamClass();
-        if (isProxy) {
-            desc.initProxy(cl, null, superDesc);
-        } else {
-            desc.initNonProxy(this, cl, null, superDesc);
-        }
-        return desc;
-    }
-
-    /**
-     * Returns public no-arg constructor of given class, or null if none found.
-     * Access checks are disabled on the returned constructor (if any), since
-     * the defining class may still be non-public.
-     */
-    private static Constructor getExternalizableConstructor(Class<?> cl) {
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns subclass-accessible no-arg constructor of first non-serializable
-     * superclass, or null if none found.  Access checks are disabled on the
-     * returned constructor (if any).
-     */
-    private static Constructor getSerializableConstructor(Class<?> cl) {
-        Class<?> initCl = cl;
-        while (Serializable.class.isAssignableFrom(initCl)) {
-            if ((initCl = initCl.getSuperclass()) == null) {
-                return null;
-            }
-        }
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns non-static, non-abstract method with given signature provided it
-     * is defined by or accessible (via inheritance) by the given class, or
-     * null if no match found.  Access checks are disabled on the returned
-     * method (if any).
-     */
-    private static Method getInheritableMethod(Class<?> cl, String name,
-                                               Class<?>[] argTypes,
-                                               Class<?> returnType)
-    {
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns non-static private method with given signature defined by given
-     * class, or null if none found.  Access checks are disabled on the
-     * returned method (if any).
-     */
-    private static Method getPrivateMethod(Class<?> cl, String name,
-                                           Class<?>[] argTypes,
-                                           Class<?> returnType)
-    {
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns true if classes are defined in the same runtime package, false
-     * otherwise.
-     */
-    private static boolean packageEquals(Class<?> cl1, Class<?> cl2) {
-        return (cl1.getClassLoader() == cl2.getClassLoader() &&
-                getPackageName(cl1).equals(getPackageName(cl2)));
-    }
-
-    /**
-     * Returns package name of given class.
-     */
-    private static String getPackageName(Class<?> cl) {
-        String s = cl.getName();
-        int i = s.lastIndexOf('[');
-        if (i >= 0) {
-            s = s.substring(i + 2);
-        }
-        i = s.lastIndexOf('.');
-        return (i >= 0) ? s.substring(0, i) : "";
-    }
-
-    /**
-     * Compares class names for equality, ignoring package names.  Returns true
-     * if class names equal, false otherwise.
-     */
-    private static boolean classNamesEqual(String name1, String name2) {
-        name1 = name1.substring(name1.lastIndexOf('.') + 1);
-        name2 = name2.substring(name2.lastIndexOf('.') + 1);
-        return name1.equals(name2);
-    }
-
-    /**
-     * Returns JVM type signature for given class.
-     */
-    private static String getClassSignature(Class<?> cl) {
-        StringBuilder sbuf = new StringBuilder();
-        while (cl.isArray()) {
-            sbuf.append('[');
-            cl = cl.getComponentType();
-        }
-        if (cl.isPrimitive()) {
-            if (cl == Integer.TYPE) {
-                sbuf.append('I');
-            } else if (cl == Byte.TYPE) {
-                sbuf.append('B');
-            } else if (cl == Long.TYPE) {
-                sbuf.append('J');
-            } else if (cl == Float.TYPE) {
-                sbuf.append('F');
-            } else if (cl == Double.TYPE) {
-                sbuf.append('D');
-            } else if (cl == Short.TYPE) {
-                sbuf.append('S');
-            } else if (cl == Character.TYPE) {
-                sbuf.append('C');
-            } else if (cl == Boolean.TYPE) {
-                sbuf.append('Z');
-            } else if (cl == Void.TYPE) {
-                sbuf.append('V');
-            } else {
-                throw new InternalError();
-            }
-        } else {
-            sbuf.append('L' + cl.getName().replace('.', '/') + ';');
-        }
-        return sbuf.toString();
-    }
-
-    /**
-     * Returns JVM type signature for given list of parameters and return type.
-     */
-    private static String getMethodSignature(Class<?>[] paramTypes,
-                                             Class<?> retType)
-    {
-        StringBuilder sbuf = new StringBuilder();
-        sbuf.append('(');
-        for (int i = 0; i < paramTypes.length; i++) {
-            sbuf.append(getClassSignature(paramTypes[i]));
-        }
-        sbuf.append(')');
-        sbuf.append(getClassSignature(retType));
-        return sbuf.toString();
-    }
-
-    /**
-     * Convenience method for throwing an exception that is either a
-     * RuntimeException, Error, or of some unexpected type (in which case it is
-     * wrapped inside an IOException).
-     */
-    private static void throwMiscException(Throwable th) throws IOException {
-        if (th instanceof RuntimeException) {
-            throw (RuntimeException) th;
-        } else if (th instanceof Error) {
-            throw (Error) th;
-        } else {
-            IOException ex = new IOException("unexpected exception type");
-            ex.initCause(th);
-            throw ex;
-        }
-    }
-
-    /**
-     * Returns ObjectStreamField array describing the serializable fields of
-     * the given class.  Serializable fields backed by an actual field of the
-     * class are represented by ObjectStreamFields with corresponding non-null
-     * Field objects.  Throws InvalidClassException if the (explicitly
-     * declared) serializable fields are invalid.
-     */
-    private static ObjectStreamField[] getSerialFields(Class<?> cl)
-        throws InvalidClassException
-    {
-        ObjectStreamField[] fields;
-        if (Serializable.class.isAssignableFrom(cl) &&
-            !Externalizable.class.isAssignableFrom(cl) &&
-            !Proxy.isProxyClass(cl) &&
-            !cl.isInterface())
-        {
-            if ((fields = getDeclaredSerialFields(cl)) == null) {
-                fields = getDefaultSerialFields(cl);
-            }
-            Arrays.sort(fields);
-        } else {
-            fields = NO_FIELDS;
-        }
-        return fields;
-    }
-
-    /**
-     * Returns serializable fields of given class as defined explicitly by a
-     * "serialPersistentFields" field, or null if no appropriate
-     * "serialPersistentFields" field is defined.  Serializable fields backed
-     * by an actual field of the class are represented by ObjectStreamFields
-     * with corresponding non-null Field objects.  For compatibility with past
-     * releases, a "serialPersistentFields" field with a null value is
-     * considered equivalent to not declaring "serialPersistentFields".  Throws
-     * InvalidClassException if the declared serializable fields are
-     * invalid--e.g., if multiple fields share the same name.
-     */
-    private static ObjectStreamField[] getDeclaredSerialFields(Class<?> cl)
-        throws InvalidClassException
-    {
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns array of ObjectStreamFields corresponding to all non-static
-     * non-transient fields declared by given class.  Each ObjectStreamField
-     * contains a Field object for the field it represents.  If no default
-     * serializable fields exist, NO_FIELDS is returned.
-     */
-    private static ObjectStreamField[] getDefaultSerialFields(Class<?> cl) {
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns explicit serial version UID value declared by given class, or
-     * null if none.
-     */
-    private static Long getDeclaredSUID(Class<?> cl) {
-        return null;
-    }
-
-    /**
-     * Computes the default serial version UID value for the given class.
-     */
-    private static long computeDefaultSUID(Class<?> cl) {
-        throw new SecurityException();
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectStreamConstants.java
--- a/emul/compact/src/main/java/java/io/ObjectStreamConstants.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Constants written into the Object Serialization Stream.
- *
- * @author  unascribed
- * @since JDK 1.1
- */
-public interface ObjectStreamConstants {
-
-    /**
-     * Magic number that is written to the stream header.
-     */
-    final static short STREAM_MAGIC = (short)0xaced;
-
-    /**
-     * Version number that is written to the stream header.
-     */
-    final static short STREAM_VERSION = 5;
-
-    /* Each item in the stream is preceded by a tag
-     */
-
-    /**
-     * First tag value.
-     */
-    final static byte TC_BASE = 0x70;
-
-    /**
-     * Null object reference.
-     */
-    final static byte TC_NULL =         (byte)0x70;
-
-    /**
-     * Reference to an object already written into the stream.
-     */
-    final static byte TC_REFERENCE =    (byte)0x71;
-
-    /**
-     * new Class Descriptor.
-     */
-    final static byte TC_CLASSDESC =    (byte)0x72;
-
-    /**
-     * new Object.
-     */
-    final static byte TC_OBJECT =       (byte)0x73;
-
-    /**
-     * new String.
-     */
-    final static byte TC_STRING =       (byte)0x74;
-
-    /**
-     * new Array.
-     */
-    final static byte TC_ARRAY =        (byte)0x75;
-
-    /**
-     * Reference to Class.
-     */
-    final static byte TC_CLASS =        (byte)0x76;
-
-    /**
-     * Block of optional data. Byte following tag indicates number
-     * of bytes in this block data.
-     */
-    final static byte TC_BLOCKDATA =    (byte)0x77;
-
-    /**
-     * End of optional block data blocks for an object.
-     */
-    final static byte TC_ENDBLOCKDATA = (byte)0x78;
-
-    /**
-     * Reset stream context. All handles written into stream are reset.
-     */
-    final static byte TC_RESET =        (byte)0x79;
-
-    /**
-     * long Block data. The long following the tag indicates the
-     * number of bytes in this block data.
-     */
-    final static byte TC_BLOCKDATALONG= (byte)0x7A;
-
-    /**
-     * Exception during write.
-     */
-    final static byte TC_EXCEPTION =    (byte)0x7B;
-
-    /**
-     * Long string.
-     */
-    final static byte TC_LONGSTRING =   (byte)0x7C;
-
-    /**
-     * new Proxy Class Descriptor.
-     */
-    final static byte TC_PROXYCLASSDESC =       (byte)0x7D;
-
-    /**
-     * new Enum constant.
-     * @since 1.5
-     */
-    final static byte TC_ENUM =         (byte)0x7E;
-
-    /**
-     * Last tag value.
-     */
-    final static byte TC_MAX =          (byte)0x7E;
-
-    /**
-     * First wire handle to be assigned.
-     */
-    final static int baseWireHandle = 0x7e0000;
-
-
-    /******************************************************/
-    /* Bit masks for ObjectStreamClass flag.*/
-
-    /**
-     * Bit mask for ObjectStreamClass flag. Indicates a Serializable class
-     * defines its own writeObject method.
-     */
-    final static byte SC_WRITE_METHOD = 0x01;
-
-    /**
-     * Bit mask for ObjectStreamClass flag. Indicates Externalizable data
-     * written in Block Data mode.
-     * Added for PROTOCOL_VERSION_2.
-     *
-     * @see #PROTOCOL_VERSION_2
-     * @since 1.2
-     */
-    final static byte SC_BLOCK_DATA = 0x08;
-
-    /**
-     * Bit mask for ObjectStreamClass flag. Indicates class is Serializable.
-     */
-    final static byte SC_SERIALIZABLE = 0x02;
-
-    /**
-     * Bit mask for ObjectStreamClass flag. Indicates class is Externalizable.
-     */
-    final static byte SC_EXTERNALIZABLE = 0x04;
-
-    /**
-     * Bit mask for ObjectStreamClass flag. Indicates class is an enum type.
-     * @since 1.5
-     */
-    final static byte SC_ENUM = 0x10;
-
-
-    /* *******************************************************************/
-    /* Security permissions */
-
-   /**
-    * A Stream Protocol Version. <p>
-    *
-    * All externalizable data is written in JDK 1.1 external data
-    * format after calling this method. This version is needed to write
-    * streams containing Externalizable data that can be read by
-    * pre-JDK 1.1.6 JVMs.
-    *
-    * @see java.io.ObjectOutputStream#useProtocolVersion(int)
-    * @since 1.2
-    */
-    public final static int PROTOCOL_VERSION_1 = 1;
-
-
-   /**
-    * A Stream Protocol Version. <p>
-    *
-    * This protocol is written by JVM 1.2.
-    *
-    * Externalizable data is written in block data mode and is
-    * terminated with TC_ENDBLOCKDATA. Externalizable classdescriptor
-    * flags has SC_BLOCK_DATA enabled. JVM 1.1.6 and greater can
-    * read this format change.
-    *
-    * Enables writing a nonSerializable class descriptor into the
-    * stream. The serialVersionUID of a nonSerializable class is
-    * set to 0L.
-    *
-    * @see java.io.ObjectOutputStream#useProtocolVersion(int)
-    * @see #SC_BLOCK_DATA
-    * @since 1.2
-    */
-    public final static int PROTOCOL_VERSION_2 = 2;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectStreamException.java
--- a/emul/compact/src/main/java/java/io/ObjectStreamException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Superclass of all exceptions specific to Object Stream classes.
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public abstract class ObjectStreamException extends IOException {
-
-    private static final long serialVersionUID = 7260898174833392607L;
-
-    /**
-     * Create an ObjectStreamException with the specified argument.
-     *
-     * @param classname the detailed message for the exception
-     */
-    protected ObjectStreamException(String classname) {
-        super(classname);
-    }
-
-    /**
-     * Create an ObjectStreamException.
-     */
-    protected ObjectStreamException() {
-        super();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/ObjectStreamField.java
--- a/emul/compact/src/main/java/java/io/ObjectStreamField.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.lang.reflect.Field;
-
-/**
- * A description of a Serializable field from a Serializable class.  An array
- * of ObjectStreamFields is used to declare the Serializable fields of a class.
- *
- * @author      Mike Warres
- * @author      Roger Riggs
- * @see ObjectStreamClass
- * @since 1.2
- */
-public class ObjectStreamField
-    implements Comparable<Object>
-{
-
-    /** field name */
-    private final String name;
-    /** canonical JVM signature of field type */
-    private final String signature;
-    /** field type (Object.class if unknown non-primitive type) */
-    private final Class<?> type;
-    /** whether or not to (de)serialize field values as unshared */
-    private final boolean unshared;
-    /** corresponding reflective field object, if any */
-    private final Field field;
-    /** offset of field value in enclosing field group */
-    private int offset = 0;
-
-    /**
-     * Create a Serializable field with the specified type.  This field should
-     * be documented with a <code>serialField</code> tag.
-     *
-     * @param   name the name of the serializable field
-     * @param   type the <code>Class</code> object of the serializable field
-     */
-    public ObjectStreamField(String name, Class<?> type) {
-        this(name, type, false);
-    }
-
-    /**
-     * Creates an ObjectStreamField representing a serializable field with the
-     * given name and type.  If unshared is false, values of the represented
-     * field are serialized and deserialized in the default manner--if the
-     * field is non-primitive, object values are serialized and deserialized as
-     * if they had been written and read by calls to writeObject and
-     * readObject.  If unshared is true, values of the represented field are
-     * serialized and deserialized as if they had been written and read by
-     * calls to writeUnshared and readUnshared.
-     *
-     * @param   name field name
-     * @param   type field type
-     * @param   unshared if false, write/read field values in the same manner
-     *          as writeObject/readObject; if true, write/read in the same
-     *          manner as writeUnshared/readUnshared
-     * @since   1.4
-     */
-    public ObjectStreamField(String name, Class<?> type, boolean unshared) {
-        if (name == null) {
-            throw new NullPointerException();
-        }
-        this.name = name;
-        this.type = type;
-        this.unshared = unshared;
-        signature = getClassSignature(type).intern();
-        field = null;
-    }
-
-    /**
-     * Creates an ObjectStreamField representing a field with the given name,
-     * signature and unshared setting.
-     */
-    ObjectStreamField(String name, String signature, boolean unshared) {
-        if (name == null) {
-            throw new NullPointerException();
-        }
-        this.name = name;
-        this.signature = signature.intern();
-        this.unshared = unshared;
-        field = null;
-
-        switch (signature.charAt(0)) {
-            case 'Z': type = Boolean.TYPE; break;
-            case 'B': type = Byte.TYPE; break;
-            case 'C': type = Character.TYPE; break;
-            case 'S': type = Short.TYPE; break;
-            case 'I': type = Integer.TYPE; break;
-            case 'J': type = Long.TYPE; break;
-            case 'F': type = Float.TYPE; break;
-            case 'D': type = Double.TYPE; break;
-            case 'L':
-            case '[': type = Object.class; break;
-            default: throw new IllegalArgumentException("illegal signature");
-        }
-    }
-
-    /**
-     * Creates an ObjectStreamField representing the given field with the
-     * specified unshared setting.  For compatibility with the behavior of
-     * earlier serialization implementations, a "showType" parameter is
-     * necessary to govern whether or not a getType() call on this
-     * ObjectStreamField (if non-primitive) will return Object.class (as
-     * opposed to a more specific reference type).
-     */
-    ObjectStreamField(Field field, boolean unshared, boolean showType) {
-        this.field = field;
-        this.unshared = unshared;
-        name = field.getName();
-        Class<?> ftype = field.getType();
-        type = (showType || ftype.isPrimitive()) ? ftype : Object.class;
-        signature = getClassSignature(ftype).intern();
-    }
-
-    /**
-     * Get the name of this field.
-     *
-     * @return  a <code>String</code> representing the name of the serializable
-     *          field
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Get the type of the field.  If the type is non-primitive and this
-     * <code>ObjectStreamField</code> was obtained from a deserialized {@link
-     * ObjectStreamClass} instance, then <code>Object.class</code> is returned.
-     * Otherwise, the <code>Class</code> object for the type of the field is
-     * returned.
-     *
-     * @return  a <code>Class</code> object representing the type of the
-     *          serializable field
-     */
-    public Class<?> getType() {
-        return type;
-    }
-
-    /**
-     * Returns character encoding of field type.  The encoding is as follows:
-     * <blockquote><pre>
-     * B            byte
-     * C            char
-     * D            double
-     * F            float
-     * I            int
-     * J            long
-     * L            class or interface
-     * S            short
-     * Z            boolean
-     * [            array
-     * </pre></blockquote>
-     *
-     * @return  the typecode of the serializable field
-     */
-    // REMIND: deprecate?
-    public char getTypeCode() {
-        return signature.charAt(0);
-    }
-
-    /**
-     * Return the JVM type signature.
-     *
-     * @return  null if this field has a primitive type.
-     */
-    // REMIND: deprecate?
-    public String getTypeString() {
-        return isPrimitive() ? null : signature;
-    }
-
-    /**
-     * Offset of field within instance data.
-     *
-     * @return  the offset of this field
-     * @see #setOffset
-     */
-    // REMIND: deprecate?
-    public int getOffset() {
-        return offset;
-    }
-
-    /**
-     * Offset within instance data.
-     *
-     * @param   offset the offset of the field
-     * @see #getOffset
-     */
-    // REMIND: deprecate?
-    protected void setOffset(int offset) {
-        this.offset = offset;
-    }
-
-    /**
-     * Return true if this field has a primitive type.
-     *
-     * @return  true if and only if this field corresponds to a primitive type
-     */
-    // REMIND: deprecate?
-    public boolean isPrimitive() {
-        char tcode = signature.charAt(0);
-        return ((tcode != 'L') && (tcode != '['));
-    }
-
-    /**
-     * Returns boolean value indicating whether or not the serializable field
-     * represented by this ObjectStreamField instance is unshared.
-     *
-     * @since 1.4
-     */
-    public boolean isUnshared() {
-        return unshared;
-    }
-
-    /**
-     * Compare this field with another <code>ObjectStreamField</code>.  Return
-     * -1 if this is smaller, 0 if equal, 1 if greater.  Types that are
-     * primitives are "smaller" than object types.  If equal, the field names
-     * are compared.
-     */
-    // REMIND: deprecate?
-    public int compareTo(Object obj) {
-        ObjectStreamField other = (ObjectStreamField) obj;
-        boolean isPrim = isPrimitive();
-        if (isPrim != other.isPrimitive()) {
-            return isPrim ? -1 : 1;
-        }
-        return name.compareTo(other.name);
-    }
-
-    /**
-     * Return a string that describes this field.
-     */
-    public String toString() {
-        return signature + ' ' + name;
-    }
-
-    /**
-     * Returns field represented by this ObjectStreamField, or null if
-     * ObjectStreamField is not associated with an actual field.
-     */
-    Field getField() {
-        return field;
-    }
-
-    /**
-     * Returns JVM type signature of field (similar to getTypeString, except
-     * that signature strings are returned for primitive fields as well).
-     */
-    String getSignature() {
-        return signature;
-    }
-
-    /**
-     * Returns JVM type signature for given class.
-     */
-    private static String getClassSignature(Class<?> cl) {
-        StringBuilder sbuf = new StringBuilder();
-        while (cl.isArray()) {
-            sbuf.append('[');
-            cl = cl.getComponentType();
-        }
-        if (cl.isPrimitive()) {
-            if (cl == Integer.TYPE) {
-                sbuf.append('I');
-            } else if (cl == Byte.TYPE) {
-                sbuf.append('B');
-            } else if (cl == Long.TYPE) {
-                sbuf.append('J');
-            } else if (cl == Float.TYPE) {
-                sbuf.append('F');
-            } else if (cl == Double.TYPE) {
-                sbuf.append('D');
-            } else if (cl == Short.TYPE) {
-                sbuf.append('S');
-            } else if (cl == Character.TYPE) {
-                sbuf.append('C');
-            } else if (cl == Boolean.TYPE) {
-                sbuf.append('Z');
-            } else if (cl == Void.TYPE) {
-                sbuf.append('V');
-            } else {
-                throw new InternalError();
-            }
-        } else {
-            sbuf.append('L' + cl.getName().replace('.', '/') + ';');
-        }
-        return sbuf.toString();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/OptionalDataException.java
--- a/emul/compact/src/main/java/java/io/OptionalDataException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.io;
-
-/**
- * Exception indicating the failure of an object read operation due to
- * unread primitive data, or the end of data belonging to a serialized
- * object in the stream.  This exception may be thrown in two cases:
- *
- * <ul>
- *   <li>An attempt was made to read an object when the next element in the
- *       stream is primitive data.  In this case, the OptionalDataException's
- *       length field is set to the number of bytes of primitive data
- *       immediately readable from the stream, and the eof field is set to
- *       false.
- *
- *   <li>An attempt was made to read past the end of data consumable by a
- *       class-defined readObject or readExternal method.  In this case, the
- *       OptionalDataException's eof field is set to true, and the length field
- *       is set to 0.
- * </ul>
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public class OptionalDataException extends ObjectStreamException {
-
-    private static final long serialVersionUID = -8011121865681257820L;
-
-    /*
-     * Create an <code>OptionalDataException</code> with a length.
-     */
-    OptionalDataException(int len) {
-        eof = false;
-        length = len;
-    }
-
-    /*
-     * Create an <code>OptionalDataException</code> signifying no
-     * more primitive data is available.
-     */
-    OptionalDataException(boolean end) {
-        length = 0;
-        eof = end;
-    }
-
-    /**
-     * The number of bytes of primitive data available to be read
-     * in the current buffer.
-     *
-     * @serial
-     */
-    public int length;
-
-    /**
-     * True if there is no more data in the buffered part of the stream.
-     *
-     * @serial
-     */
-    public boolean eof;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/OutputStream.java
--- a/emul/compact/src/main/java/java/io/OutputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * This abstract class is the superclass of all classes representing
- * an output stream of bytes. An output stream accepts output bytes
- * and sends them to some sink.
- * <p>
- * Applications that need to define a subclass of
- * <code>OutputStream</code> must always provide at least a method
- * that writes one byte of output.
- *
- * @author  Arthur van Hoff
- * @see     java.io.BufferedOutputStream
- * @see     java.io.ByteArrayOutputStream
- * @see     java.io.DataOutputStream
- * @see     java.io.FilterOutputStream
- * @see     java.io.InputStream
- * @see     java.io.OutputStream#write(int)
- * @since   JDK1.0
- */
-public abstract class OutputStream implements Closeable, Flushable {
-    /**
-     * Writes the specified byte to this output stream. The general
-     * contract for <code>write</code> is that one byte is written
-     * to the output stream. The byte to be written is the eight
-     * low-order bits of the argument <code>b</code>. The 24
-     * high-order bits of <code>b</code> are ignored.
-     * <p>
-     * Subclasses of <code>OutputStream</code> must provide an
-     * implementation for this method.
-     *
-     * @param      b   the <code>byte</code>.
-     * @exception  IOException  if an I/O error occurs. In particular,
-     *             an <code>IOException</code> may be thrown if the
-     *             output stream has been closed.
-     */
-    public abstract void write(int b) throws IOException;
-
-    /**
-     * Writes <code>b.length</code> bytes from the specified byte array
-     * to this output stream. The general contract for <code>write(b)</code>
-     * is that it should have exactly the same effect as the call
-     * <code>write(b, 0, b.length)</code>.
-     *
-     * @param      b   the data.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.OutputStream#write(byte[], int, int)
-     */
-    public void write(byte b[]) throws IOException {
-        write(b, 0, b.length);
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this output stream.
-     * The general contract for <code>write(b, off, len)</code> is that
-     * some of the bytes in the array <code>b</code> are written to the
-     * output stream in order; element <code>b[off]</code> is the first
-     * byte written and <code>b[off+len-1]</code> is the last byte written
-     * by this operation.
-     * <p>
-     * The <code>write</code> method of <code>OutputStream</code> calls
-     * the write method of one argument on each of the bytes to be
-     * written out. Subclasses are encouraged to override this method and
-     * provide a more efficient implementation.
-     * <p>
-     * If <code>b</code> is <code>null</code>, a
-     * <code>NullPointerException</code> is thrown.
-     * <p>
-     * If <code>off</code> is negative, or <code>len</code> is negative, or
-     * <code>off+len</code> is greater than the length of the array
-     * <code>b</code>, then an <tt>IndexOutOfBoundsException</tt> is thrown.
-     *
-     * @param      b     the data.
-     * @param      off   the start offset in the data.
-     * @param      len   the number of bytes to write.
-     * @exception  IOException  if an I/O error occurs. In particular,
-     *             an <code>IOException</code> is thrown if the output
-     *             stream is closed.
-     */
-    public void write(byte b[], int off, int len) throws IOException {
-        if (b == null) {
-            throw new NullPointerException();
-        } else if ((off < 0) || (off > b.length) || (len < 0) ||
-                   ((off + len) > b.length) || ((off + len) < 0)) {
-            throw new IndexOutOfBoundsException();
-        } else if (len == 0) {
-            return;
-        }
-        for (int i = 0 ; i < len ; i++) {
-            write(b[off + i]);
-        }
-    }
-
-    /**
-     * Flushes this output stream and forces any buffered output bytes
-     * to be written out. The general contract of <code>flush</code> is
-     * that calling it is an indication that, if any bytes previously
-     * written have been buffered by the implementation of the output
-     * stream, such bytes should immediately be written to their
-     * intended destination.
-     * <p>
-     * If the intended destination of this stream is an abstraction provided by
-     * the underlying operating system, for example a file, then flushing the
-     * stream guarantees only that bytes previously written to the stream are
-     * passed to the operating system for writing; it does not guarantee that
-     * they are actually written to a physical device such as a disk drive.
-     * <p>
-     * The <code>flush</code> method of <code>OutputStream</code> does nothing.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void flush() throws IOException {
-    }
-
-    /**
-     * Closes this output stream and releases any system resources
-     * associated with this stream. The general contract of <code>close</code>
-     * is that it closes the output stream. A closed stream cannot perform
-     * output operations and cannot be reopened.
-     * <p>
-     * The <code>close</code> method of <code>OutputStream</code> does nothing.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void close() throws IOException {
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/Reader.java
--- a/emul/compact/src/main/java/java/io/Reader.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-
-/**
- * Abstract class for reading character streams.  The only methods that a
- * subclass must implement are read(char[], int, int) and close().  Most
- * subclasses, however, will override some of the methods defined here in order
- * to provide higher efficiency, additional functionality, or both.
- *
- *
- * @see BufferedReader
- * @see   LineNumberReader
- * @see CharArrayReader
- * @see InputStreamReader
- * @see   FileReader
- * @see FilterReader
- * @see   PushbackReader
- * @see PipedReader
- * @see StringReader
- * @see Writer
- *
- * @author      Mark Reinhold
- * @since       JDK1.1
- */
-
-public abstract class Reader implements Readable, Closeable {
-
-    /**
-     * The object used to synchronize operations on this stream.  For
-     * efficiency, a character-stream object may use an object other than
-     * itself to protect critical sections.  A subclass should therefore use
-     * the object in this field rather than <tt>this</tt> or a synchronized
-     * method.
-     */
-    protected Object lock;
-
-    /**
-     * Creates a new character-stream reader whose critical sections will
-     * synchronize on the reader itself.
-     */
-    protected Reader() {
-        this.lock = this;
-    }
-
-    /**
-     * Creates a new character-stream reader whose critical sections will
-     * synchronize on the given object.
-     *
-     * @param lock  The Object to synchronize on.
-     */
-    protected Reader(Object lock) {
-        if (lock == null) {
-            throw new NullPointerException();
-        }
-        this.lock = lock;
-    }
-
-    /**
-     * Attempts to read characters into the specified character buffer.
-     * The buffer is used as a repository of characters as-is: the only
-     * changes made are the results of a put operation. No flipping or
-     * rewinding of the buffer is performed.
-     *
-     * @param target the buffer to read characters into
-     * @return The number of characters added to the buffer, or
-     *         -1 if this source of characters is at its end
-     * @throws IOException if an I/O error occurs
-     * @throws NullPointerException if target is null
-     * @throws ReadOnlyBufferException if target is a read only buffer
-     * @since 1.5
-     */
-//    public int read(java.nio.CharBuffer target) throws IOException {
-//        int len = target.remaining();
-//        char[] cbuf = new char[len];
-//        int n = read(cbuf, 0, len);
-//        if (n > 0)
-//            target.put(cbuf, 0, n);
-//        return n;
-//    }
-
-    /**
-     * Reads a single character.  This method will block until a character is
-     * available, an I/O error occurs, or the end of the stream is reached.
-     *
-     * <p> Subclasses that intend to support efficient single-character input
-     * should override this method.
-     *
-     * @return     The character read, as an integer in the range 0 to 65535
-     *             (<tt>0x00-0xffff</tt>), or -1 if the end of the stream has
-     *             been reached
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    public int read() throws IOException {
-        char cb[] = new char[1];
-        if (read(cb, 0, 1) == -1)
-            return -1;
-        else
-            return cb[0];
-    }
-
-    /**
-     * Reads characters into an array.  This method will block until some input
-     * is available, an I/O error occurs, or the end of the stream is reached.
-     *
-     * @param       cbuf  Destination buffer
-     *
-     * @return      The number of characters read, or -1
-     *              if the end of the stream
-     *              has been reached
-     *
-     * @exception   IOException  If an I/O error occurs
-     */
-    public int read(char cbuf[]) throws IOException {
-        return read(cbuf, 0, cbuf.length);
-    }
-
-    /**
-     * Reads characters into a portion of an array.  This method will block
-     * until some input is available, an I/O error occurs, or the end of the
-     * stream is reached.
-     *
-     * @param      cbuf  Destination buffer
-     * @param      off   Offset at which to start storing characters
-     * @param      len   Maximum number of characters to read
-     *
-     * @return     The number of characters read, or -1 if the end of the
-     *             stream has been reached
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    abstract public int read(char cbuf[], int off, int len) throws IOException;
-
-    /** Maximum skip-buffer size */
-    private static final int maxSkipBufferSize = 8192;
-
-    /** Skip buffer, null until allocated */
-    private char skipBuffer[] = null;
-
-    /**
-     * Skips characters.  This method will block until some characters are
-     * available, an I/O error occurs, or the end of the stream is reached.
-     *
-     * @param  n  The number of characters to skip
-     *
-     * @return    The number of characters actually skipped
-     *
-     * @exception  IllegalArgumentException  If <code>n</code> is negative.
-     * @exception  IOException  If an I/O error occurs
-     */
-    public long skip(long n) throws IOException {
-        if (n < 0L)
-            throw new IllegalArgumentException("skip value is negative");
-        int nn = (int) Math.min(n, maxSkipBufferSize);
-        synchronized (lock) {
-            if ((skipBuffer == null) || (skipBuffer.length < nn))
-                skipBuffer = new char[nn];
-            long r = n;
-            while (r > 0) {
-                int nc = read(skipBuffer, 0, (int)Math.min(r, nn));
-                if (nc == -1)
-                    break;
-                r -= nc;
-            }
-            return n - r;
-        }
-    }
-
-    /**
-     * Tells whether this stream is ready to be read.
-     *
-     * @return True if the next read() is guaranteed not to block for input,
-     * false otherwise.  Note that returning false does not guarantee that the
-     * next read will block.
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-    public boolean ready() throws IOException {
-        return false;
-    }
-
-    /**
-     * Tells whether this stream supports the mark() operation. The default
-     * implementation always returns false. Subclasses should override this
-     * method.
-     *
-     * @return true if and only if this stream supports the mark operation.
-     */
-    public boolean markSupported() {
-        return false;
-    }
-
-    /**
-     * Marks the present position in the stream.  Subsequent calls to reset()
-     * will attempt to reposition the stream to this point.  Not all
-     * character-input streams support the mark() operation.
-     *
-     * @param  readAheadLimit  Limit on the number of characters that may be
-     *                         read while still preserving the mark.  After
-     *                         reading this many characters, attempting to
-     *                         reset the stream may fail.
-     *
-     * @exception  IOException  If the stream does not support mark(),
-     *                          or if some other I/O error occurs
-     */
-    public void mark(int readAheadLimit) throws IOException {
-        throw new IOException("mark() not supported");
-    }
-
-    /**
-     * Resets the stream.  If the stream has been marked, then attempt to
-     * reposition it at the mark.  If the stream has not been marked, then
-     * attempt to reset it in some way appropriate to the particular stream,
-     * for example by repositioning it to its starting point.  Not all
-     * character-input streams support the reset() operation, and some support
-     * reset() without supporting mark().
-     *
-     * @exception  IOException  If the stream has not been marked,
-     *                          or if the mark has been invalidated,
-     *                          or if the stream does not support reset(),
-     *                          or if some other I/O error occurs
-     */
-    public void reset() throws IOException {
-        throw new IOException("reset() not supported");
-    }
-
-    /**
-     * Closes the stream and releases any system resources associated with
-     * it.  Once the stream has been closed, further read(), ready(),
-     * mark(), reset(), or skip() invocations will throw an IOException.
-     * Closing a previously closed stream has no effect.
-     *
-     * @exception  IOException  If an I/O error occurs
-     */
-     abstract public void close() throws IOException;
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/StreamCorruptedException.java
--- a/emul/compact/src/main/java/java/io/StreamCorruptedException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Thrown when control information that was read from an object stream
- * violates internal consistency checks.
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public class StreamCorruptedException extends ObjectStreamException {
-
-    private static final long serialVersionUID = 8983558202217591746L;
-
-    /**
-     * Create a StreamCorruptedException and list a reason why thrown.
-     *
-     * @param reason  String describing the reason for the exception.
-     */
-    public StreamCorruptedException(String reason) {
-        super(reason);
-    }
-
-    /**
-     * Create a StreamCorruptedException and list no reason why thrown.
-     */
-    public StreamCorruptedException() {
-        super();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/io/WriteAbortedException.java
--- a/emul/compact/src/main/java/java/io/WriteAbortedException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Signals that one of the ObjectStreamExceptions was thrown during a
- * write operation.  Thrown during a read operation when one of the
- * ObjectStreamExceptions was thrown during a write operation.  The
- * exception that terminated the write can be found in the detail
- * field. The stream is reset to it's initial state and all references
- * to objects already deserialized are discarded.
- *
- * <p>As of release 1.4, this exception has been retrofitted to conform to
- * the general purpose exception-chaining mechanism.  The "exception causing
- * the abort" that is provided at construction time and
- * accessed via the public {@link #detail} field is now known as the
- * <i>cause</i>, and may be accessed via the {@link Throwable#getCause()}
- * method, as well as the aforementioned "legacy field."
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public class WriteAbortedException extends ObjectStreamException {
-    private static final long serialVersionUID = -3326426625597282442L;
-
-    /**
-     * Exception that was caught while writing the ObjectStream.
-     *
-     * <p>This field predates the general-purpose exception chaining facility.
-     * The {@link Throwable#getCause()} method is now the preferred means of
-     * obtaining this information.
-     *
-     * @serial
-     */
-    public Exception detail;
-
-    /**
-     * Constructs a WriteAbortedException with a string describing
-     * the exception and the exception causing the abort.
-     * @param s   String describing the exception.
-     * @param ex  Exception causing the abort.
-     */
-    public WriteAbortedException(String s, Exception ex) {
-        super(s);
-        initCause(null);  // Disallow subsequent initCause
-        detail = ex;
-    }
-
-    /**
-     * Produce the message and include the message from the nested
-     * exception, if there is one.
-     */
-    public String getMessage() {
-        if (detail == null)
-            return super.getMessage();
-        else
-            return super.getMessage() + "; " + detail.toString();
-    }
-
-    /**
-     * Returns the exception that terminated the operation (the <i>cause</i>).
-     *
-     * @return  the exception that terminated the operation (the <i>cause</i>),
-     *          which may be null.
-     * @since   1.4
-     */
-    public Throwable getCause() {
-        return detail;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/AbstractMethodError.java
--- a/emul/compact/src/main/java/java/lang/AbstractMethodError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when an application tries to call an abstract method.
- * Normally, this error is caught by the compiler; this error can
- * only occur at run time if the definition of some class has
- * incompatibly changed since the currently executing method was last
- * compiled.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class AbstractMethodError extends IncompatibleClassChangeError {
-    private static final long serialVersionUID = -1654391082989018462L;
-
-    /**
-     * Constructs an <code>AbstractMethodError</code> with no detail  message.
-     */
-    public AbstractMethodError() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>AbstractMethodError</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public AbstractMethodError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/Cloneable.java
--- a/emul/compact/src/main/java/java/lang/Cloneable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * A class implements the <code>Cloneable</code> interface to
- * indicate to the {@link java.lang.Object#clone()} method that it
- * is legal for that method to make a
- * field-for-field copy of instances of that class.
- * <p>
- * Invoking Object's clone method on an instance that does not implement the
- * <code>Cloneable</code> interface results in the exception
- * <code>CloneNotSupportedException</code> being thrown.
- * <p>
- * By convention, classes that implement this interface should override
- * <tt>Object.clone</tt> (which is protected) with a public method.
- * See {@link java.lang.Object#clone()} for details on overriding this
- * method.
- * <p>
- * Note that this interface does <i>not</i> contain the <tt>clone</tt> method.
- * Therefore, it is not possible to clone an object merely by virtue of the
- * fact that it implements this interface.  Even if the clone method is invoked
- * reflectively, there is no guarantee that it will succeed.
- *
- * @author  unascribed
- * @see     java.lang.CloneNotSupportedException
- * @see     java.lang.Object#clone()
- * @since   JDK1.0
- */
-public interface Cloneable {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/IncompatibleClassChangeError.java
--- a/emul/compact/src/main/java/java/lang/IncompatibleClassChangeError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when an incompatible class change has occurred to some class
- * definition. The definition of some class, on which the currently
- * executing method depends, has since changed.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class IncompatibleClassChangeError extends LinkageError {
-    private static final long serialVersionUID = -4914975503642802119L;
-
-    /**
-     * Constructs an <code>IncompatibleClassChangeError</code> with no
-     * detail message.
-     */
-    public IncompatibleClassChangeError () {
-        super();
-    }
-
-    /**
-     * Constructs an <code>IncompatibleClassChangeError</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public IncompatibleClassChangeError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/InternalError.java
--- a/emul/compact/src/main/java/java/lang/InternalError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate some unexpected internal error has occurred in
- * the Java Virtual Machine.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class InternalError extends VirtualMachineError {
-    private static final long serialVersionUID = -9062593416125562365L;
-
-    /**
-     * Constructs an <code>InternalError</code> with no detail message.
-     */
-    public InternalError() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>InternalError</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public InternalError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/Iterable.java
--- a/emul/compact/src/main/java/java/lang/Iterable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.util.Iterator;
-
-/**
- * Implementing this interface allows an object to be the target of
- * the "foreach" statement.
- *
- * @param <T> the type of elements returned by the iterator
- *
- * @since 1.5
- */
-public interface Iterable<T> {
-
-    /**
-     * Returns an iterator over a set of elements of type T.
-     *
-     * @return an Iterator.
-     */
-    Iterator<T> iterator();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/NoSuchFieldError.java
--- a/emul/compact/src/main/java/java/lang/NoSuchFieldError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown if an application tries to access or modify a specified
- * field of an object, and that object no longer has that field.
- * <p>
- * Normally, this error is caught by the compiler; this error can
- * only occur at run time if the definition of a class has
- * incompatibly changed.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class NoSuchFieldError extends IncompatibleClassChangeError {
-    private static final long serialVersionUID = -3456430195886129035L;
-
-    /**
-     * Constructs a <code>NoSuchFieldError</code> with no detail message.
-     */
-    public NoSuchFieldError() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>NoSuchFieldError</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public NoSuchFieldError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/Readable.java
--- a/emul/compact/src/main/java/java/lang/Readable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.io.IOException;
-
-/**
- * A <tt>Readable</tt> is a source of characters. Characters from
- * a <tt>Readable</tt> are made available to callers of the read
- * method via a {@link java.nio.CharBuffer CharBuffer}.
- *
- * @since 1.5
- */
-
-public interface Readable {
-
-    /**
-     * Attempts to read characters into the specified character buffer.
-     * The buffer is used as a repository of characters as-is: the only
-     * changes made are the results of a put operation. No flipping or
-     * rewinding of the buffer is performed.
-     *
-     * @param cb the buffer to read characters into
-     * @return The number of {@code char} values added to the buffer,
-     *                 or -1 if this source of characters is at its end
-     * @throws IOException if an I/O error occurs
-     * @throws NullPointerException if cb is null
-     * @throws java.nio.ReadOnlyBufferException if cb is a read only buffer
-     */
-// XXX:    public int read(java.nio.CharBuffer cb) throws IOException;
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/SafeVarargs.java
--- a/emul/compact/src/main/java/java/lang/SafeVarargs.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.lang.annotation.*;
-
-/**
- * A programmer assertion that the body of the annotated method or
- * constructor does not perform potentially unsafe operations on its
- * varargs parameter.  Applying this annotation to a method or
- * constructor suppresses unchecked warnings about a
- * <i>non-reifiable</i> variable arity (vararg) type and suppresses
- * unchecked warnings about parameterized array creation at call
- * sites.
- *
- * <p> In addition to the usage restrictions imposed by its {@link
- * Target @Target} meta-annotation, compilers are required to implement
- * additional usage restrictions on this annotation type; it is a
- * compile-time error if a method or constructor declaration is
- * annotated with a {@code @SafeVarargs} annotation, and either:
- * <ul>
- * <li>  the declaration is a fixed arity method or constructor
- *
- * <li> the declaration is a variable arity method that is neither
- * {@code static} nor {@code final}.
- *
- * </ul>
- *
- * <p> Compilers are encouraged to issue warnings when this annotation
- * type is applied to a method or constructor declaration where:
- *
- * <ul>
- *
- * <li> The variable arity parameter has a reifiable element type,
- * which includes primitive types, {@code Object}, and {@code String}.
- * (The unchecked warnings this annotation type suppresses already do
- * not occur for a reifiable element type.)
- *
- * <li> The body of the method or constructor declaration performs
- * potentially unsafe operations, such as an assignment to an element
- * of the variable arity parameter's array that generates an unchecked
- * warning.  Some unsafe operations do not trigger an unchecked
- * warning.  For example, the aliasing in
- *
- * <blockquote><pre>
- * &#64;SafeVarargs // Not actually safe!
- * static void m(List&lt;String&gt;... stringLists) {
- *   Object[] array = stringLists;
- *   List&lt;Integer&gt; tmpList = Arrays.asList(42);
- *   array[0] = tmpList; // Semantically invalid, but compiles without warnings
- *   String s = stringLists[0].get(0); // Oh no, ClassCastException at runtime!
- * }
- * </pre></blockquote>
- *
- * leads to a {@code ClassCastException} at runtime.
- *
- * <p>Future versions of the platform may mandate compiler errors for
- * such unsafe operations.
- *
- * </ul>
- *
- * @jls 4.7 Reifiable Types
- * @jls 8.4.1 Formal Parameters
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.CONSTRUCTOR, ElementType.METHOD})
-public @interface SafeVarargs {}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/SuppressWarnings.java
--- a/emul/compact/src/main/java/java/lang/SuppressWarnings.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.lang.annotation.*;
-import static java.lang.annotation.ElementType.*;
-
-/**
- * Indicates that the named compiler warnings should be suppressed in the
- * annotated element (and in all program elements contained in the annotated
- * element).  Note that the set of warnings suppressed in a given element is
- * a superset of the warnings suppressed in all containing elements.  For
- * example, if you annotate a class to suppress one warning and annotate a
- * method to suppress another, both warnings will be suppressed in the method.
- *
- * <p>As a matter of style, programmers should always use this annotation
- * on the most deeply nested element where it is effective.  If you want to
- * suppress a warning in a particular method, you should annotate that
- * method rather than its class.
- *
- * @since 1.5
- * @author Josh Bloch
- */
-@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE})
-@Retention(RetentionPolicy.SOURCE)
-public @interface SuppressWarnings {
-    /**
-     * The set of warnings that are to be suppressed by the compiler in the
-     * annotated element.  Duplicate names are permitted.  The second and
-     * successive occurrences of a name are ignored.  The presence of
-     * unrecognized warning names is <i>not</i> an error: Compilers must
-     * ignore any warning names they do not recognize.  They are, however,
-     * free to emit a warning if an annotation contains an unrecognized
-     * warning name.
-     *
-     * <p>Compiler vendors should document the warning names they support in
-     * conjunction with this annotation type. They are encouraged to cooperate
-     * to ensure that the same names work across multiple compilers.
-     */
-    String[] value();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/System.java
--- a/emul/compact/src/main/java/java/lang/System.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package java.lang;
-
-/** Poor man's re-implementation of most important System methods.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class System {
-    private System() {
-    }
-    
-    public static void arraycopy(Object value, int srcBegin, Object dst, int dstBegin, int count) {
-        org.apidesign.bck2brwsr.emul.lang.System.arraycopy(value, srcBegin, dst, dstBegin, count);
-    }
-    
-    public static long currentTimeMillis() {
-        return org.apidesign.bck2brwsr.emul.lang.System.currentTimeMillis();
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/ref/PhantomReference.java
--- a/emul/compact/src/main/java/java/lang/ref/PhantomReference.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.ref;
-
-
-/**
- * Phantom reference objects, which are enqueued after the collector
- * determines that their referents may otherwise be reclaimed.  Phantom
- * references are most often used for scheduling pre-mortem cleanup actions in
- * a more flexible way than is possible with the Java finalization mechanism.
- *
- * <p> If the garbage collector determines at a certain point in time that the
- * referent of a phantom reference is <a
- * href="package-summary.html#reachability">phantom reachable</a>, then at that
- * time or at some later time it will enqueue the reference.
- *
- * <p> In order to ensure that a reclaimable object remains so, the referent of
- * a phantom reference may not be retrieved: The <code>get</code> method of a
- * phantom reference always returns <code>null</code>.
- *
- * <p> Unlike soft and weak references, phantom references are not
- * automatically cleared by the garbage collector as they are enqueued.  An
- * object that is reachable via phantom references will remain so until all
- * such references are cleared or themselves become unreachable.
- *
- * @author   Mark Reinhold
- * @since    1.2
- */
-
-public class PhantomReference<T> extends Reference<T> {
-
-    /**
-     * Returns this reference object's referent.  Because the referent of a
-     * phantom reference is always inaccessible, this method always returns
-     * <code>null</code>.
-     *
-     * @return  <code>null</code>
-     */
-    public T get() {
-        return null;
-    }
-
-    /**
-     * Creates a new phantom reference that refers to the given object and
-     * is registered with the given queue.
-     *
-     * <p> It is possible to create a phantom reference with a <tt>null</tt>
-     * queue, but such a reference is completely useless: Its <tt>get</tt>
-     * method will always return null and, since it does not have a queue, it
-     * will never be enqueued.
-     *
-     * @param referent the object the new phantom reference will refer to
-     * @param q the queue with which the reference is to be registered,
-     *          or <tt>null</tt> if registration is not required
-     */
-    public PhantomReference(T referent, ReferenceQueue<? super T> q) {
-        super(referent, q);
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/ref/Reference.java
--- a/emul/compact/src/main/java/java/lang/ref/Reference.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.ref;
-
-
-/**
- * Abstract base class for reference objects.  This class defines the
- * operations common to all reference objects.  Because reference objects are
- * implemented in close cooperation with the garbage collector, this class may
- * not be subclassed directly.
- *
- * @author   Mark Reinhold
- * @since    1.2
- */
-
-public abstract class Reference<T> {
-
-    /* A Reference instance is in one of four possible internal states:
-     *
-     *     Active: Subject to special treatment by the garbage collector.  Some
-     *     time after the collector detects that the reachability of the
-     *     referent has changed to the appropriate state, it changes the
-     *     instance's state to either Pending or Inactive, depending upon
-     *     whether or not the instance was registered with a queue when it was
-     *     created.  In the former case it also adds the instance to the
-     *     pending-Reference list.  Newly-created instances are Active.
-     *
-     *     Pending: An element of the pending-Reference list, waiting to be
-     *     enqueued by the Reference-handler thread.  Unregistered instances
-     *     are never in this state.
-     *
-     *     Enqueued: An element of the queue with which the instance was
-     *     registered when it was created.  When an instance is removed from
-     *     its ReferenceQueue, it is made Inactive.  Unregistered instances are
-     *     never in this state.
-     *
-     *     Inactive: Nothing more to do.  Once an instance becomes Inactive its
-     *     state will never change again.
-     *
-     * The state is encoded in the queue and next fields as follows:
-     *
-     *     Active: queue = ReferenceQueue with which instance is registered, or
-     *     ReferenceQueue.NULL if it was not registered with a queue; next =
-     *     null.
-     *
-     *     Pending: queue = ReferenceQueue with which instance is registered;
-     *     next = Following instance in queue, or this if at end of list.
-     *
-     *     Enqueued: queue = ReferenceQueue.ENQUEUED; next = Following instance
-     *     in queue, or this if at end of list.
-     *
-     *     Inactive: queue = ReferenceQueue.NULL; next = this.
-     *
-     * With this scheme the collector need only examine the next field in order
-     * to determine whether a Reference instance requires special treatment: If
-     * the next field is null then the instance is active; if it is non-null,
-     * then the collector should treat the instance normally.
-     *
-     * To ensure that concurrent collector can discover active Reference
-     * objects without interfering with application threads that may apply
-     * the enqueue() method to those objects, collectors should link
-     * discovered objects through the discovered field.
-     */
-
-    private T referent;         /* Treated specially by GC */
-
-    ReferenceQueue<? super T> queue;
-
-    Reference next;
-    transient private Reference<T> discovered;  /* used by VM */
-
-
-    /* Object used to synchronize with the garbage collector.  The collector
-     * must acquire this lock at the beginning of each collection cycle.  It is
-     * therefore critical that any code holding this lock complete as quickly
-     * as possible, allocate no new objects, and avoid calling user code.
-     */
-    static private class Lock { };
-    private static Lock lock = new Lock();
-
-
-    /* List of References waiting to be enqueued.  The collector adds
-     * References to this list, while the Reference-handler thread removes
-     * them.  This list is protected by the above lock object.
-     */
-    private static Reference pending = null;
-
-
-
-    /* -- Referent accessor and setters -- */
-
-    /**
-     * Returns this reference object's referent.  If this reference object has
-     * been cleared, either by the program or by the garbage collector, then
-     * this method returns <code>null</code>.
-     *
-     * @return   The object to which this reference refers, or
-     *           <code>null</code> if this reference object has been cleared
-     */
-    public T get() {
-        return this.referent;
-    }
-
-    /**
-     * Clears this reference object.  Invoking this method will not cause this
-     * object to be enqueued.
-     *
-     * <p> This method is invoked only by Java code; when the garbage collector
-     * clears references it does so directly, without invoking this method.
-     */
-    public void clear() {
-        this.referent = null;
-    }
-
-
-    /* -- Queue operations -- */
-
-    /**
-     * Tells whether or not this reference object has been enqueued, either by
-     * the program or by the garbage collector.  If this reference object was
-     * not registered with a queue when it was created, then this method will
-     * always return <code>false</code>.
-     *
-     * @return   <code>true</code> if and only if this reference object has
-     *           been enqueued
-     */
-    public boolean isEnqueued() {
-        /* In terms of the internal states, this predicate actually tests
-           whether the instance is either Pending or Enqueued */
-        synchronized (this) {
-            return (this.queue != ReferenceQueue.NULL) && (this.next != null);
-        }
-    }
-
-    /**
-     * Adds this reference object to the queue with which it is registered,
-     * if any.
-     *
-     * <p> This method is invoked only by Java code; when the garbage collector
-     * enqueues references it does so directly, without invoking this method.
-     *
-     * @return   <code>true</code> if this reference object was successfully
-     *           enqueued; <code>false</code> if it was already enqueued or if
-     *           it was not registered with a queue when it was created
-     */
-    public boolean enqueue() {
-        return this.queue.enqueue(this);
-    }
-
-
-    /* -- Constructors -- */
-
-    Reference(T referent) {
-        this(referent, null);
-    }
-
-    Reference(T referent, ReferenceQueue<? super T> queue) {
-        this.referent = referent;
-        this.queue = (queue == null) ? ReferenceQueue.NULL : queue;
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/ref/ReferenceQueue.java
--- a/emul/compact/src/main/java/java/lang/ref/ReferenceQueue.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.ref;
-
-/**
- * Reference queues, to which registered reference objects are appended by the
- * garbage collector after the appropriate reachability changes are detected.
- *
- * @author   Mark Reinhold
- * @since    1.2
- */
-
-public class ReferenceQueue<T> {
-
-    /**
-     * Constructs a new reference-object queue.
-     */
-    public ReferenceQueue() { }
-
-    private static class Null extends ReferenceQueue {
-        boolean enqueue(Reference r) {
-            return false;
-        }
-    }
-
-    static ReferenceQueue NULL = new Null();
-    static ReferenceQueue ENQUEUED = new Null();
-
-    static private class Lock { };
-    private Lock lock = new Lock();
-    private volatile Reference<? extends T> head = null;
-    private long queueLength = 0;
-
-    boolean enqueue(Reference<? extends T> r) { /* Called only by Reference class */
-        synchronized (r) {
-            if (r.queue == ENQUEUED) return false;
-            synchronized (lock) {
-                r.queue = ENQUEUED;
-                r.next = (head == null) ? r : head;
-                head = r;
-                queueLength++;
-                lock.notifyAll();
-                return true;
-            }
-        }
-    }
-
-    private Reference<? extends T> reallyPoll() {       /* Must hold lock */
-        if (head != null) {
-            Reference<? extends T> r = head;
-            head = (r.next == r) ? null : r.next;
-            r.queue = NULL;
-            r.next = r;
-            queueLength--;
-            return r;
-        }
-        return null;
-    }
-
-    /**
-     * Polls this queue to see if a reference object is available.  If one is
-     * available without further delay then it is removed from the queue and
-     * returned.  Otherwise this method immediately returns <tt>null</tt>.
-     *
-     * @return  A reference object, if one was immediately available,
-     *          otherwise <code>null</code>
-     */
-    public Reference<? extends T> poll() {
-        if (head == null)
-            return null;
-        synchronized (lock) {
-            return reallyPoll();
-        }
-    }
-
-    /**
-     * Removes the next reference object in this queue, blocking until either
-     * one becomes available or the given timeout period expires.
-     *
-     * <p> This method does not offer real-time guarantees: It schedules the
-     * timeout as if by invoking the {@link Object#wait(long)} method.
-     *
-     * @param  timeout  If positive, block for up to <code>timeout</code>
-     *                  milliseconds while waiting for a reference to be
-     *                  added to this queue.  If zero, block indefinitely.
-     *
-     * @return  A reference object, if one was available within the specified
-     *          timeout period, otherwise <code>null</code>
-     *
-     * @throws  IllegalArgumentException
-     *          If the value of the timeout argument is negative
-     *
-     * @throws  InterruptedException
-     *          If the timeout wait is interrupted
-     */
-    public Reference<? extends T> remove(long timeout)
-        throws IllegalArgumentException, InterruptedException
-    {
-        if (timeout < 0) {
-            throw new IllegalArgumentException("Negative timeout value");
-        }
-        synchronized (lock) {
-            Reference<? extends T> r = reallyPoll();
-            if (r != null) return r;
-            for (;;) {
-                lock.wait(timeout);
-                r = reallyPoll();
-                if (r != null) return r;
-                if (timeout != 0) return null;
-            }
-        }
-    }
-
-    /**
-     * Removes the next reference object in this queue, blocking until one
-     * becomes available.
-     *
-     * @return A reference object, blocking until one becomes available
-     * @throws  InterruptedException  If the wait is interrupted
-     */
-    public Reference<? extends T> remove() throws InterruptedException {
-        return remove(0);
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/ref/SoftReference.java
--- a/emul/compact/src/main/java/java/lang/ref/SoftReference.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.ref;
-
-
-/**
- * Soft reference objects, which are cleared at the discretion of the garbage
- * collector in response to memory demand.  Soft references are most often used
- * to implement memory-sensitive caches.
- *
- * <p> Suppose that the garbage collector determines at a certain point in time
- * that an object is <a href="package-summary.html#reachability">softly
- * reachable</a>.  At that time it may choose to clear atomically all soft
- * references to that object and all soft references to any other
- * softly-reachable objects from which that object is reachable through a chain
- * of strong references.  At the same time or at some later time it will
- * enqueue those newly-cleared soft references that are registered with
- * reference queues.
- *
- * <p> All soft references to softly-reachable objects are guaranteed to have
- * been cleared before the virtual machine throws an
- * <code>OutOfMemoryError</code>.  Otherwise no constraints are placed upon the
- * time at which a soft reference will be cleared or the order in which a set
- * of such references to different objects will be cleared.  Virtual machine
- * implementations are, however, encouraged to bias against clearing
- * recently-created or recently-used soft references.
- *
- * <p> Direct instances of this class may be used to implement simple caches;
- * this class or derived subclasses may also be used in larger data structures
- * to implement more sophisticated caches.  As long as the referent of a soft
- * reference is strongly reachable, that is, is actually in use, the soft
- * reference will not be cleared.  Thus a sophisticated cache can, for example,
- * prevent its most recently used entries from being discarded by keeping
- * strong referents to those entries, leaving the remaining entries to be
- * discarded at the discretion of the garbage collector.
- *
- * @author   Mark Reinhold
- * @since    1.2
- */
-
-public class SoftReference<T> extends Reference<T> {
-
-    /**
-     * Timestamp clock, updated by the garbage collector
-     */
-    static private long clock;
-
-    /**
-     * Timestamp updated by each invocation of the get method.  The VM may use
-     * this field when selecting soft references to be cleared, but it is not
-     * required to do so.
-     */
-    private long timestamp;
-
-    /**
-     * Creates a new soft reference that refers to the given object.  The new
-     * reference is not registered with any queue.
-     *
-     * @param referent object the new soft reference will refer to
-     */
-    public SoftReference(T referent) {
-        super(referent);
-        this.timestamp = clock;
-    }
-
-    /**
-     * Creates a new soft reference that refers to the given object and is
-     * registered with the given queue.
-     *
-     * @param referent object the new soft reference will refer to
-     * @param q the queue with which the reference is to be registered,
-     *          or <tt>null</tt> if registration is not required
-     *
-     */
-    public SoftReference(T referent, ReferenceQueue<? super T> q) {
-        super(referent, q);
-        this.timestamp = clock;
-    }
-
-    /**
-     * Returns this reference object's referent.  If this reference object has
-     * been cleared, either by the program or by the garbage collector, then
-     * this method returns <code>null</code>.
-     *
-     * @return   The object to which this reference refers, or
-     *           <code>null</code> if this reference object has been cleared
-     */
-    public T get() {
-        T o = super.get();
-        if (o != null && this.timestamp != clock)
-            this.timestamp = clock;
-        return o;
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/ref/WeakReference.java
--- a/emul/compact/src/main/java/java/lang/ref/WeakReference.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.ref;
-
-
-/**
- * Weak reference objects, which do not prevent their referents from being
- * made finalizable, finalized, and then reclaimed.  Weak references are most
- * often used to implement canonicalizing mappings.
- *
- * <p> Suppose that the garbage collector determines at a certain point in time
- * that an object is <a href="package-summary.html#reachability">weakly
- * reachable</a>.  At that time it will atomically clear all weak references to
- * that object and all weak references to any other weakly-reachable objects
- * from which that object is reachable through a chain of strong and soft
- * references.  At the same time it will declare all of the formerly
- * weakly-reachable objects to be finalizable.  At the same time or at some
- * later time it will enqueue those newly-cleared weak references that are
- * registered with reference queues.
- *
- * @author   Mark Reinhold
- * @since    1.2
- */
-
-public class WeakReference<T> extends Reference<T> {
-
-    /**
-     * Creates a new weak reference that refers to the given object.  The new
-     * reference is not registered with any queue.
-     *
-     * @param referent object the new weak reference will refer to
-     */
-    public WeakReference(T referent) {
-        super(referent);
-    }
-
-    /**
-     * Creates a new weak reference that refers to the given object and is
-     * registered with the given queue.
-     *
-     * @param referent object the new weak reference will refer to
-     * @param q the queue with which the reference is to be registered,
-     *          or <tt>null</tt> if registration is not required
-     */
-    public WeakReference(T referent, ReferenceQueue<? super T> q) {
-        super(referent, q);
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/lang/ref/package.html
--- a/emul/compact/src/main/java/java/lang/ref/package.html	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-<!--
- Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.  Oracle designates this
- particular file as subject to the "Classpath" exception as provided
- by Oracle in the LICENSE file that accompanied this code.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<body bgcolor="white">
-
-
-Provides reference-object classes, which support a limited degree of
-interaction with the garbage collector.  A program may use a reference object
-to maintain a reference to some other object in such a way that the latter
-object may still be reclaimed by the collector.  A program may also arrange to
-be notified some time after the collector has determined that the reachability
-of a given object has changed.
-
-
-<h2>Package Specification</h2>
-
-A <em>reference object</em> encapsulates a reference to some other object so
-that the reference itself may be examined and manipulated like any other
-object.  Three types of reference objects are provided, each weaker than the
-last: <em>soft</em>, <em>weak</em>, and <em>phantom</em>.  Each type
-corresponds to a different level of reachability, as defined below.  Soft
-references are for implementing memory-sensitive caches, weak references are
-for implementing canonicalizing mappings that do not prevent their keys (or
-values) from being reclaimed, and phantom references are for scheduling
-pre-mortem cleanup actions in a more flexible way than is possible with the
-Java finalization mechanism.
-
-<p> Each reference-object type is implemented by a subclass of the abstract
-base <code>{@link java.lang.ref.Reference}</code> class.  An instance of one of
-these subclasses encapsulates a single reference to a particular object, called
-the <em>referent</em>.  Every reference object provides methods for getting and
-clearing the reference.  Aside from the clearing operation reference objects
-are otherwise immutable, so no <code>set</code> operation is provided.  A
-program may further subclass these subclasses, adding whatever fields and
-methods are required for its purposes, or it may use these subclasses without
-change.
-
-
-<h3>Notification</h3>
-
-A program may request to be notified of changes in an object's reachability by
-<em>registering</em> an appropriate reference object with a <em>reference
-queue</em> at the time the reference object is created.  Some time after the
-garbage collector determines that the reachability of the referent has changed
-to the value corresponding to the type of the reference, it will add the
-reference to the associated queue.  At this point, the reference is considered
-to be <em>enqueued</em>.  The program may remove references from a queue either
-by polling or by blocking until a reference becomes available.  Reference
-queues are implemented by the <code>{@link java.lang.ref.ReferenceQueue}</code>
-class.
-
-<p> The relationship between a registered reference object and its queue is
-one-sided.  That is, a queue does not keep track of the references that are
-registered with it.  If a registered reference becomes unreachable itself, then
-it will never be enqueued.  It is the responsibility of the program using
-reference objects to ensure that the objects remain reachable for as long as
-the program is interested in their referents.
-
-<p> While some programs will choose to dedicate a thread to removing reference
-objects from one or more queues and processing them, this is by no means
-necessary.  A tactic that often works well is to examine a reference queue in
-the course of performing some other fairly-frequent action.  For example, a
-hashtable that uses weak references to implement weak keys could poll its
-reference queue each time the table is accessed.  This is how the <code>{@link
-java.util.WeakHashMap}</code> class works.  Because the <code>{@link
-java.lang.ref.ReferenceQueue#poll ReferenceQueue.poll}</code> method simply
-checks an internal data structure, this check will add little overhead to the
-hashtable access methods.
-
-
-<h3>Automatically-cleared references</h3>
-
-Soft and weak references are automatically cleared by the collector before
-being added to the queues with which they are registered, if any.  Therefore
-soft and weak references need not be registered with a queue in order to be
-useful, while phantom references do.  An object that is reachable via phantom
-references will remain so until all such references are cleared or themselves
-become unreachable.
-
-
-<a name="reachability"></a>
-<h3>Reachability</h3>
-
-Going from strongest to weakest, the different levels of reachability reflect
-the life cycle of an object.  They are operationally defined as follows:
-
-<ul>
-
-<li> An object is <em>strongly reachable</em> if it can be reached by some
-thread without traversing any reference objects.  A newly-created object is
-strongly reachable by the thread that created it.
-
-<li> An object is <em>softly reachable</em> if it is not strongly reachable but
-can be reached by traversing a soft reference.
-
-<li> An object is <em>weakly reachable</em> if it is neither strongly nor
-softly reachable but can be reached by traversing a weak reference.  When the
-weak references to a weakly-reachable object are cleared, the object becomes
-eligible for finalization.
-
-<li> An object is <em>phantom reachable</em> if it is neither strongly, softly,
-nor weakly reachable, it has been finalized, and some phantom reference refers
-to it.
-
-<li> Finally, an object is <em>unreachable</em>, and therefore eligible for
-reclamation, when it is not reachable in any of the above ways.
-
-</ul>
-
-
-@author	  Mark Reinhold
-@since	  1.2
-
-<!--
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
--->
-</body>
-</html>
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/AbstractCollection.java
--- a/emul/compact/src/main/java/java/util/AbstractCollection.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,457 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * This class provides a skeletal implementation of the <tt>Collection</tt>
- * interface, to minimize the effort required to implement this interface. <p>
- *
- * To implement an unmodifiable collection, the programmer needs only to
- * extend this class and provide implementations for the <tt>iterator</tt> and
- * <tt>size</tt> methods.  (The iterator returned by the <tt>iterator</tt>
- * method must implement <tt>hasNext</tt> and <tt>next</tt>.)<p>
- *
- * To implement a modifiable collection, the programmer must additionally
- * override this class's <tt>add</tt> method (which otherwise throws an
- * <tt>UnsupportedOperationException</tt>), and the iterator returned by the
- * <tt>iterator</tt> method must additionally implement its <tt>remove</tt>
- * method.<p>
- *
- * The programmer should generally provide a void (no argument) and
- * <tt>Collection</tt> constructor, as per the recommendation in the
- * <tt>Collection</tt> interface specification.<p>
- *
- * The documentation for each non-abstract method in this class describes its
- * implementation in detail.  Each of these methods may be overridden if
- * the collection being implemented admits a more efficient implementation.<p>
- *
- * This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see Collection
- * @since 1.2
- */
-
-public abstract class AbstractCollection<E> implements Collection<E> {
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    protected AbstractCollection() {
-    }
-
-    // Query Operations
-
-    /**
-     * Returns an iterator over the elements contained in this collection.
-     *
-     * @return an iterator over the elements contained in this collection
-     */
-    public abstract Iterator<E> iterator();
-
-    public abstract int size();
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns <tt>size() == 0</tt>.
-     */
-    public boolean isEmpty() {
-        return size() == 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over the elements in the collection,
-     * checking each element in turn for equality with the specified element.
-     *
-     * @throws ClassCastException   {@inheritDoc}
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public boolean contains(Object o) {
-        Iterator<E> it = iterator();
-        if (o==null) {
-            while (it.hasNext())
-                if (it.next()==null)
-                    return true;
-        } else {
-            while (it.hasNext())
-                if (o.equals(it.next()))
-                    return true;
-        }
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns an array containing all the elements
-     * returned by this collection's iterator, in the same order, stored in
-     * consecutive elements of the array, starting with index {@code 0}.
-     * The length of the returned array is equal to the number of elements
-     * returned by the iterator, even if the size of this collection changes
-     * during iteration, as might happen if the collection permits
-     * concurrent modification during iteration.  The {@code size} method is
-     * called only as an optimization hint; the correct result is returned
-     * even if the iterator returns a different number of elements.
-     *
-     * <p>This method is equivalent to:
-     *
-     *  <pre> {@code
-     * List<E> list = new ArrayList<E>(size());
-     * for (E e : this)
-     *     list.add(e);
-     * return list.toArray();
-     * }</pre>
-     */
-    public Object[] toArray() {
-        // Estimate size of array; be prepared to see more or fewer elements
-        Object[] r = new Object[size()];
-        Iterator<E> it = iterator();
-        for (int i = 0; i < r.length; i++) {
-            if (! it.hasNext()) // fewer elements than expected
-                return Arrays.copyOf(r, i);
-            r[i] = it.next();
-        }
-        return it.hasNext() ? finishToArray(r, it) : r;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns an array containing all the elements
-     * returned by this collection's iterator in the same order, stored in
-     * consecutive elements of the array, starting with index {@code 0}.
-     * If the number of elements returned by the iterator is too large to
-     * fit into the specified array, then the elements are returned in a
-     * newly allocated array with length equal to the number of elements
-     * returned by the iterator, even if the size of this collection
-     * changes during iteration, as might happen if the collection permits
-     * concurrent modification during iteration.  The {@code size} method is
-     * called only as an optimization hint; the correct result is returned
-     * even if the iterator returns a different number of elements.
-     *
-     * <p>This method is equivalent to:
-     *
-     *  <pre> {@code
-     * List<E> list = new ArrayList<E>(size());
-     * for (E e : this)
-     *     list.add(e);
-     * return list.toArray(a);
-     * }</pre>
-     *
-     * @throws ArrayStoreException  {@inheritDoc}
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public <T> T[] toArray(T[] a) {
-        // Estimate size of array; be prepared to see more or fewer elements
-        int size = size();
-        T[] r = a.length >= size ? a :
-                  (T[])java.lang.reflect.Array
-                  .newInstance(a.getClass().getComponentType(), size);
-        Iterator<E> it = iterator();
-
-        for (int i = 0; i < r.length; i++) {
-            if (! it.hasNext()) { // fewer elements than expected
-                if (a != r)
-                    return Arrays.copyOf(r, i);
-                r[i] = null; // null-terminate
-                return r;
-            }
-            r[i] = (T)it.next();
-        }
-        return it.hasNext() ? finishToArray(r, it) : r;
-    }
-
-    /**
-     * The maximum size of array to allocate.
-     * Some VMs reserve some header words in an array.
-     * Attempts to allocate larger arrays may result in
-     * OutOfMemoryError: Requested array size exceeds VM limit
-     */
-    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
-    /**
-     * Reallocates the array being used within toArray when the iterator
-     * returned more elements than expected, and finishes filling it from
-     * the iterator.
-     *
-     * @param r the array, replete with previously stored elements
-     * @param it the in-progress iterator over this collection
-     * @return array containing the elements in the given array, plus any
-     *         further elements returned by the iterator, trimmed to size
-     */
-    private static <T> T[] finishToArray(T[] r, Iterator<?> it) {
-        int i = r.length;
-        while (it.hasNext()) {
-            int cap = r.length;
-            if (i == cap) {
-                int newCap = cap + (cap >> 1) + 1;
-                // overflow-conscious code
-                if (newCap - MAX_ARRAY_SIZE > 0)
-                    newCap = hugeCapacity(cap + 1);
-                r = Arrays.copyOf(r, newCap);
-            }
-            r[i++] = (T)it.next();
-        }
-        // trim if overallocated
-        return (i == r.length) ? r : Arrays.copyOf(r, i);
-    }
-
-    private static int hugeCapacity(int minCapacity) {
-        if (minCapacity < 0) // overflow
-            throw new OutOfMemoryError
-                ("Required array size too large");
-        return (minCapacity > MAX_ARRAY_SIZE) ?
-            Integer.MAX_VALUE :
-            MAX_ARRAY_SIZE;
-    }
-
-    // Modification Operations
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation always throws an
-     * <tt>UnsupportedOperationException</tt>.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     * @throws IllegalStateException         {@inheritDoc}
-     */
-    public boolean add(E e) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over the collection looking for the
-     * specified element.  If it finds the element, it removes the element
-     * from the collection using the iterator's remove method.
-     *
-     * <p>Note that this implementation throws an
-     * <tt>UnsupportedOperationException</tt> if the iterator returned by this
-     * collection's iterator method does not implement the <tt>remove</tt>
-     * method and this collection contains the specified object.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     */
-    public boolean remove(Object o) {
-        Iterator<E> it = iterator();
-        if (o==null) {
-            while (it.hasNext()) {
-                if (it.next()==null) {
-                    it.remove();
-                    return true;
-                }
-            }
-        } else {
-            while (it.hasNext()) {
-                if (o.equals(it.next())) {
-                    it.remove();
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-
-    // Bulk Operations
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over the specified collection,
-     * checking each element returned by the iterator in turn to see
-     * if it's contained in this collection.  If all elements are so
-     * contained <tt>true</tt> is returned, otherwise <tt>false</tt>.
-     *
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @see #contains(Object)
-     */
-    public boolean containsAll(Collection<?> c) {
-        for (Object e : c)
-            if (!contains(e))
-                return false;
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over the specified collection, and adds
-     * each object returned by the iterator to this collection, in turn.
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> unless <tt>add</tt> is
-     * overridden (assuming the specified collection is non-empty).
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     * @throws IllegalStateException         {@inheritDoc}
-     *
-     * @see #add(Object)
-     */
-    public boolean addAll(Collection<? extends E> c) {
-        boolean modified = false;
-        for (E e : c)
-            if (add(e))
-                modified = true;
-        return modified;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over this collection, checking each
-     * element returned by the iterator in turn to see if it's contained
-     * in the specified collection.  If it's so contained, it's removed from
-     * this collection with the iterator's <tt>remove</tt> method.
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> if the iterator returned by the
-     * <tt>iterator</tt> method does not implement the <tt>remove</tt> method
-     * and this collection contains one or more elements in common with the
-     * specified collection.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     *
-     * @see #remove(Object)
-     * @see #contains(Object)
-     */
-    public boolean removeAll(Collection<?> c) {
-        boolean modified = false;
-        Iterator<?> it = iterator();
-        while (it.hasNext()) {
-            if (c.contains(it.next())) {
-                it.remove();
-                modified = true;
-            }
-        }
-        return modified;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over this collection, checking each
-     * element returned by the iterator in turn to see if it's contained
-     * in the specified collection.  If it's not so contained, it's removed
-     * from this collection with the iterator's <tt>remove</tt> method.
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> if the iterator returned by the
-     * <tt>iterator</tt> method does not implement the <tt>remove</tt> method
-     * and this collection contains one or more elements not present in the
-     * specified collection.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     *
-     * @see #remove(Object)
-     * @see #contains(Object)
-     */
-    public boolean retainAll(Collection<?> c) {
-        boolean modified = false;
-        Iterator<E> it = iterator();
-        while (it.hasNext()) {
-            if (!c.contains(it.next())) {
-                it.remove();
-                modified = true;
-            }
-        }
-        return modified;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over this collection, removing each
-     * element using the <tt>Iterator.remove</tt> operation.  Most
-     * implementations will probably choose to override this method for
-     * efficiency.
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> if the iterator returned by this
-     * collection's <tt>iterator</tt> method does not implement the
-     * <tt>remove</tt> method and this collection is non-empty.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     */
-    public void clear() {
-        Iterator<E> it = iterator();
-        while (it.hasNext()) {
-            it.next();
-            it.remove();
-        }
-    }
-
-
-    //  String conversion
-
-    /**
-     * Returns a string representation of this collection.  The string
-     * representation consists of a list of the collection's elements in the
-     * order they are returned by its iterator, enclosed in square brackets
-     * (<tt>"[]"</tt>).  Adjacent elements are separated by the characters
-     * <tt>", "</tt> (comma and space).  Elements are converted to strings as
-     * by {@link String#valueOf(Object)}.
-     *
-     * @return a string representation of this collection
-     */
-    public String toString() {
-        Iterator<E> it = iterator();
-        if (! it.hasNext())
-            return "[]";
-
-        StringBuilder sb = new StringBuilder();
-        sb.append('[');
-        for (;;) {
-            E e = it.next();
-            sb.append(e == this ? "(this Collection)" : e);
-            if (! it.hasNext())
-                return sb.append(']').toString();
-            sb.append(',').append(' ');
-        }
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/AbstractList.java
--- a/emul/compact/src/main/java/java/util/AbstractList.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,781 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * This class provides a skeletal implementation of the {@link List}
- * interface to minimize the effort required to implement this interface
- * backed by a "random access" data store (such as an array).  For sequential
- * access data (such as a linked list), {@link AbstractSequentialList} should
- * be used in preference to this class.
- *
- * <p>To implement an unmodifiable list, the programmer needs only to extend
- * this class and provide implementations for the {@link #get(int)} and
- * {@link List#size() size()} methods.
- *
- * <p>To implement a modifiable list, the programmer must additionally
- * override the {@link #set(int, Object) set(int, E)} method (which otherwise
- * throws an {@code UnsupportedOperationException}).  If the list is
- * variable-size the programmer must additionally override the
- * {@link #add(int, Object) add(int, E)} and {@link #remove(int)} methods.
- *
- * <p>The programmer should generally provide a void (no argument) and collection
- * constructor, as per the recommendation in the {@link Collection} interface
- * specification.
- *
- * <p>Unlike the other abstract collection implementations, the programmer does
- * <i>not</i> have to provide an iterator implementation; the iterator and
- * list iterator are implemented by this class, on top of the "random access"
- * methods:
- * {@link #get(int)},
- * {@link #set(int, Object) set(int, E)},
- * {@link #add(int, Object) add(int, E)} and
- * {@link #remove(int)}.
- *
- * <p>The documentation for each non-abstract method in this class describes its
- * implementation in detail.  Each of these methods may be overridden if the
- * collection being implemented admits a more efficient implementation.
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @since 1.2
- */
-
-public abstract class AbstractList<E> extends AbstractCollection<E> implements List<E> {
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    protected AbstractList() {
-    }
-
-    /**
-     * Appends the specified element to the end of this list (optional
-     * operation).
-     *
-     * <p>Lists that support this operation may place limitations on what
-     * elements may be added to this list.  In particular, some
-     * lists will refuse to add null elements, and others will impose
-     * restrictions on the type of elements that may be added.  List
-     * classes should clearly specify in their documentation any restrictions
-     * on what elements may be added.
-     *
-     * <p>This implementation calls {@code add(size(), e)}.
-     *
-     * <p>Note that this implementation throws an
-     * {@code UnsupportedOperationException} unless
-     * {@link #add(int, Object) add(int, E)} is overridden.
-     *
-     * @param e element to be appended to this list
-     * @return {@code true} (as specified by {@link Collection#add})
-     * @throws UnsupportedOperationException if the {@code add} operation
-     *         is not supported by this list
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this list
-     * @throws NullPointerException if the specified element is null and this
-     *         list does not permit null elements
-     * @throws IllegalArgumentException if some property of this element
-     *         prevents it from being added to this list
-     */
-    public boolean add(E e) {
-        add(size(), e);
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    abstract public E get(int index);
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation always throws an
-     * {@code UnsupportedOperationException}.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     * @throws IndexOutOfBoundsException     {@inheritDoc}
-     */
-    public E set(int index, E element) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation always throws an
-     * {@code UnsupportedOperationException}.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     * @throws IndexOutOfBoundsException     {@inheritDoc}
-     */
-    public void add(int index, E element) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation always throws an
-     * {@code UnsupportedOperationException}.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws IndexOutOfBoundsException     {@inheritDoc}
-     */
-    public E remove(int index) {
-        throw new UnsupportedOperationException();
-    }
-
-
-    // Search Operations
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation first gets a list iterator (with
-     * {@code listIterator()}).  Then, it iterates over the list until the
-     * specified element is found or the end of the list is reached.
-     *
-     * @throws ClassCastException   {@inheritDoc}
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public int indexOf(Object o) {
-        ListIterator<E> it = listIterator();
-        if (o==null) {
-            while (it.hasNext())
-                if (it.next()==null)
-                    return it.previousIndex();
-        } else {
-            while (it.hasNext())
-                if (o.equals(it.next()))
-                    return it.previousIndex();
-        }
-        return -1;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation first gets a list iterator that points to the end
-     * of the list (with {@code listIterator(size())}).  Then, it iterates
-     * backwards over the list until the specified element is found, or the
-     * beginning of the list is reached.
-     *
-     * @throws ClassCastException   {@inheritDoc}
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public int lastIndexOf(Object o) {
-        ListIterator<E> it = listIterator(size());
-        if (o==null) {
-            while (it.hasPrevious())
-                if (it.previous()==null)
-                    return it.nextIndex();
-        } else {
-            while (it.hasPrevious())
-                if (o.equals(it.previous()))
-                    return it.nextIndex();
-        }
-        return -1;
-    }
-
-
-    // Bulk Operations
-
-    /**
-     * Removes all of the elements from this list (optional operation).
-     * The list will be empty after this call returns.
-     *
-     * <p>This implementation calls {@code removeRange(0, size())}.
-     *
-     * <p>Note that this implementation throws an
-     * {@code UnsupportedOperationException} unless {@code remove(int
-     * index)} or {@code removeRange(int fromIndex, int toIndex)} is
-     * overridden.
-     *
-     * @throws UnsupportedOperationException if the {@code clear} operation
-     *         is not supported by this list
-     */
-    public void clear() {
-        removeRange(0, size());
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation gets an iterator over the specified collection
-     * and iterates over it, inserting the elements obtained from the
-     * iterator into this list at the appropriate position, one at a time,
-     * using {@code add(int, E)}.
-     * Many implementations will override this method for efficiency.
-     *
-     * <p>Note that this implementation throws an
-     * {@code UnsupportedOperationException} unless
-     * {@link #add(int, Object) add(int, E)} is overridden.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     * @throws IndexOutOfBoundsException     {@inheritDoc}
-     */
-    public boolean addAll(int index, Collection<? extends E> c) {
-        rangeCheckForAdd(index);
-        boolean modified = false;
-        for (E e : c) {
-            add(index++, e);
-            modified = true;
-        }
-        return modified;
-    }
-
-
-    // Iterators
-
-    /**
-     * Returns an iterator over the elements in this list in proper sequence.
-     *
-     * <p>This implementation returns a straightforward implementation of the
-     * iterator interface, relying on the backing list's {@code size()},
-     * {@code get(int)}, and {@code remove(int)} methods.
-     *
-     * <p>Note that the iterator returned by this method will throw an
-     * {@link UnsupportedOperationException} in response to its
-     * {@code remove} method unless the list's {@code remove(int)} method is
-     * overridden.
-     *
-     * <p>This implementation can be made to throw runtime exceptions in the
-     * face of concurrent modification, as described in the specification
-     * for the (protected) {@link #modCount} field.
-     *
-     * @return an iterator over the elements in this list in proper sequence
-     */
-    public Iterator<E> iterator() {
-        return new Itr();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns {@code listIterator(0)}.
-     *
-     * @see #listIterator(int)
-     */
-    public ListIterator<E> listIterator() {
-        return listIterator(0);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns a straightforward implementation of the
-     * {@code ListIterator} interface that extends the implementation of the
-     * {@code Iterator} interface returned by the {@code iterator()} method.
-     * The {@code ListIterator} implementation relies on the backing list's
-     * {@code get(int)}, {@code set(int, E)}, {@code add(int, E)}
-     * and {@code remove(int)} methods.
-     *
-     * <p>Note that the list iterator returned by this implementation will
-     * throw an {@link UnsupportedOperationException} in response to its
-     * {@code remove}, {@code set} and {@code add} methods unless the
-     * list's {@code remove(int)}, {@code set(int, E)}, and
-     * {@code add(int, E)} methods are overridden.
-     *
-     * <p>This implementation can be made to throw runtime exceptions in the
-     * face of concurrent modification, as described in the specification for
-     * the (protected) {@link #modCount} field.
-     *
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public ListIterator<E> listIterator(final int index) {
-        rangeCheckForAdd(index);
-
-        return new ListItr(index);
-    }
-
-    private class Itr implements Iterator<E> {
-        /**
-         * Index of element to be returned by subsequent call to next.
-         */
-        int cursor = 0;
-
-        /**
-         * Index of element returned by most recent call to next or
-         * previous.  Reset to -1 if this element is deleted by a call
-         * to remove.
-         */
-        int lastRet = -1;
-
-        /**
-         * The modCount value that the iterator believes that the backing
-         * List should have.  If this expectation is violated, the iterator
-         * has detected concurrent modification.
-         */
-        int expectedModCount = modCount;
-
-        public boolean hasNext() {
-            return cursor != size();
-        }
-
-        public E next() {
-            checkForComodification();
-            try {
-                int i = cursor;
-                E next = get(i);
-                lastRet = i;
-                cursor = i + 1;
-                return next;
-            } catch (IndexOutOfBoundsException e) {
-                checkForComodification();
-                throw new NoSuchElementException();
-            }
-        }
-
-        public void remove() {
-            if (lastRet < 0)
-                throw new IllegalStateException();
-            checkForComodification();
-
-            try {
-                AbstractList.this.remove(lastRet);
-                if (lastRet < cursor)
-                    cursor--;
-                lastRet = -1;
-                expectedModCount = modCount;
-            } catch (IndexOutOfBoundsException e) {
-                throw new ConcurrentModificationException();
-            }
-        }
-
-        final void checkForComodification() {
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-        }
-    }
-
-    private class ListItr extends Itr implements ListIterator<E> {
-        ListItr(int index) {
-            cursor = index;
-        }
-
-        public boolean hasPrevious() {
-            return cursor != 0;
-        }
-
-        public E previous() {
-            checkForComodification();
-            try {
-                int i = cursor - 1;
-                E previous = get(i);
-                lastRet = cursor = i;
-                return previous;
-            } catch (IndexOutOfBoundsException e) {
-                checkForComodification();
-                throw new NoSuchElementException();
-            }
-        }
-
-        public int nextIndex() {
-            return cursor;
-        }
-
-        public int previousIndex() {
-            return cursor-1;
-        }
-
-        public void set(E e) {
-            if (lastRet < 0)
-                throw new IllegalStateException();
-            checkForComodification();
-
-            try {
-                AbstractList.this.set(lastRet, e);
-                expectedModCount = modCount;
-            } catch (IndexOutOfBoundsException ex) {
-                throw new ConcurrentModificationException();
-            }
-        }
-
-        public void add(E e) {
-            checkForComodification();
-
-            try {
-                int i = cursor;
-                AbstractList.this.add(i, e);
-                lastRet = -1;
-                cursor = i + 1;
-                expectedModCount = modCount;
-            } catch (IndexOutOfBoundsException ex) {
-                throw new ConcurrentModificationException();
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns a list that subclasses
-     * {@code AbstractList}.  The subclass stores, in private fields, the
-     * offset of the subList within the backing list, the size of the subList
-     * (which can change over its lifetime), and the expected
-     * {@code modCount} value of the backing list.  There are two variants
-     * of the subclass, one of which implements {@code RandomAccess}.
-     * If this list implements {@code RandomAccess} the returned list will
-     * be an instance of the subclass that implements {@code RandomAccess}.
-     *
-     * <p>The subclass's {@code set(int, E)}, {@code get(int)},
-     * {@code add(int, E)}, {@code remove(int)}, {@code addAll(int,
-     * Collection)} and {@code removeRange(int, int)} methods all
-     * delegate to the corresponding methods on the backing abstract list,
-     * after bounds-checking the index and adjusting for the offset.  The
-     * {@code addAll(Collection c)} method merely returns {@code addAll(size,
-     * c)}.
-     *
-     * <p>The {@code listIterator(int)} method returns a "wrapper object"
-     * over a list iterator on the backing list, which is created with the
-     * corresponding method on the backing list.  The {@code iterator} method
-     * merely returns {@code listIterator()}, and the {@code size} method
-     * merely returns the subclass's {@code size} field.
-     *
-     * <p>All methods first check to see if the actual {@code modCount} of
-     * the backing list is equal to its expected value, and throw a
-     * {@code ConcurrentModificationException} if it is not.
-     *
-     * @throws IndexOutOfBoundsException if an endpoint index value is out of range
-     *         {@code (fromIndex < 0 || toIndex > size)}
-     * @throws IllegalArgumentException if the endpoint indices are out of order
-     *         {@code (fromIndex > toIndex)}
-     */
-    public List<E> subList(int fromIndex, int toIndex) {
-        return (this instanceof RandomAccess ?
-                new RandomAccessSubList<>(this, fromIndex, toIndex) :
-                new SubList<>(this, fromIndex, toIndex));
-    }
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified object with this list for equality.  Returns
-     * {@code true} if and only if the specified object is also a list, both
-     * lists have the same size, and all corresponding pairs of elements in
-     * the two lists are <i>equal</i>.  (Two elements {@code e1} and
-     * {@code e2} are <i>equal</i> if {@code (e1==null ? e2==null :
-     * e1.equals(e2))}.)  In other words, two lists are defined to be
-     * equal if they contain the same elements in the same order.<p>
-     *
-     * This implementation first checks if the specified object is this
-     * list. If so, it returns {@code true}; if not, it checks if the
-     * specified object is a list. If not, it returns {@code false}; if so,
-     * it iterates over both lists, comparing corresponding pairs of elements.
-     * If any comparison returns {@code false}, this method returns
-     * {@code false}.  If either iterator runs out of elements before the
-     * other it returns {@code false} (as the lists are of unequal length);
-     * otherwise it returns {@code true} when the iterations complete.
-     *
-     * @param o the object to be compared for equality with this list
-     * @return {@code true} if the specified object is equal to this list
-     */
-    public boolean equals(Object o) {
-        if (o == this)
-            return true;
-        if (!(o instanceof List))
-            return false;
-
-        ListIterator<E> e1 = listIterator();
-        ListIterator e2 = ((List) o).listIterator();
-        while (e1.hasNext() && e2.hasNext()) {
-            E o1 = e1.next();
-            Object o2 = e2.next();
-            if (!(o1==null ? o2==null : o1.equals(o2)))
-                return false;
-        }
-        return !(e1.hasNext() || e2.hasNext());
-    }
-
-    /**
-     * Returns the hash code value for this list.
-     *
-     * <p>This implementation uses exactly the code that is used to define the
-     * list hash function in the documentation for the {@link List#hashCode}
-     * method.
-     *
-     * @return the hash code value for this list
-     */
-    public int hashCode() {
-        int hashCode = 1;
-        for (E e : this)
-            hashCode = 31*hashCode + (e==null ? 0 : e.hashCode());
-        return hashCode;
-    }
-
-    /**
-     * Removes from this list all of the elements whose index is between
-     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
-     * Shifts any succeeding elements to the left (reduces their index).
-     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
-     * (If {@code toIndex==fromIndex}, this operation has no effect.)
-     *
-     * <p>This method is called by the {@code clear} operation on this list
-     * and its subLists.  Overriding this method to take advantage of
-     * the internals of the list implementation can <i>substantially</i>
-     * improve the performance of the {@code clear} operation on this list
-     * and its subLists.
-     *
-     * <p>This implementation gets a list iterator positioned before
-     * {@code fromIndex}, and repeatedly calls {@code ListIterator.next}
-     * followed by {@code ListIterator.remove} until the entire range has
-     * been removed.  <b>Note: if {@code ListIterator.remove} requires linear
-     * time, this implementation requires quadratic time.</b>
-     *
-     * @param fromIndex index of first element to be removed
-     * @param toIndex index after last element to be removed
-     */
-    protected void removeRange(int fromIndex, int toIndex) {
-        ListIterator<E> it = listIterator(fromIndex);
-        for (int i=0, n=toIndex-fromIndex; i<n; i++) {
-            it.next();
-            it.remove();
-        }
-    }
-
-    /**
-     * The number of times this list has been <i>structurally modified</i>.
-     * Structural modifications are those that change the size of the
-     * list, or otherwise perturb it in such a fashion that iterations in
-     * progress may yield incorrect results.
-     *
-     * <p>This field is used by the iterator and list iterator implementation
-     * returned by the {@code iterator} and {@code listIterator} methods.
-     * If the value of this field changes unexpectedly, the iterator (or list
-     * iterator) will throw a {@code ConcurrentModificationException} in
-     * response to the {@code next}, {@code remove}, {@code previous},
-     * {@code set} or {@code add} operations.  This provides
-     * <i>fail-fast</i> behavior, rather than non-deterministic behavior in
-     * the face of concurrent modification during iteration.
-     *
-     * <p><b>Use of this field by subclasses is optional.</b> If a subclass
-     * wishes to provide fail-fast iterators (and list iterators), then it
-     * merely has to increment this field in its {@code add(int, E)} and
-     * {@code remove(int)} methods (and any other methods that it overrides
-     * that result in structural modifications to the list).  A single call to
-     * {@code add(int, E)} or {@code remove(int)} must add no more than
-     * one to this field, or the iterators (and list iterators) will throw
-     * bogus {@code ConcurrentModificationExceptions}.  If an implementation
-     * does not wish to provide fail-fast iterators, this field may be
-     * ignored.
-     */
-    protected transient int modCount = 0;
-
-    private void rangeCheckForAdd(int index) {
-        if (index < 0 || index > size())
-            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-    }
-
-    private String outOfBoundsMsg(int index) {
-        return "Index: "+index+", Size: "+size();
-    }
-}
-
-class SubList<E> extends AbstractList<E> {
-    private final AbstractList<E> l;
-    private final int offset;
-    private int size;
-
-    SubList(AbstractList<E> list, int fromIndex, int toIndex) {
-        if (fromIndex < 0)
-            throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
-        if (toIndex > list.size())
-            throw new IndexOutOfBoundsException("toIndex = " + toIndex);
-        if (fromIndex > toIndex)
-            throw new IllegalArgumentException("fromIndex(" + fromIndex +
-                                               ") > toIndex(" + toIndex + ")");
-        l = list;
-        offset = fromIndex;
-        size = toIndex - fromIndex;
-        this.modCount = l.modCount;
-    }
-
-    public E set(int index, E element) {
-        rangeCheck(index);
-        checkForComodification();
-        return l.set(index+offset, element);
-    }
-
-    public E get(int index) {
-        rangeCheck(index);
-        checkForComodification();
-        return l.get(index+offset);
-    }
-
-    public int size() {
-        checkForComodification();
-        return size;
-    }
-
-    public void add(int index, E element) {
-        rangeCheckForAdd(index);
-        checkForComodification();
-        l.add(index+offset, element);
-        this.modCount = l.modCount;
-        size++;
-    }
-
-    public E remove(int index) {
-        rangeCheck(index);
-        checkForComodification();
-        E result = l.remove(index+offset);
-        this.modCount = l.modCount;
-        size--;
-        return result;
-    }
-
-    protected void removeRange(int fromIndex, int toIndex) {
-        checkForComodification();
-        l.removeRange(fromIndex+offset, toIndex+offset);
-        this.modCount = l.modCount;
-        size -= (toIndex-fromIndex);
-    }
-
-    public boolean addAll(Collection<? extends E> c) {
-        return addAll(size, c);
-    }
-
-    public boolean addAll(int index, Collection<? extends E> c) {
-        rangeCheckForAdd(index);
-        int cSize = c.size();
-        if (cSize==0)
-            return false;
-
-        checkForComodification();
-        l.addAll(offset+index, c);
-        this.modCount = l.modCount;
-        size += cSize;
-        return true;
-    }
-
-    public Iterator<E> iterator() {
-        return listIterator();
-    }
-
-    public ListIterator<E> listIterator(final int index) {
-        checkForComodification();
-        rangeCheckForAdd(index);
-
-        return new ListIterator<E>() {
-            private final ListIterator<E> i = l.listIterator(index+offset);
-
-            public boolean hasNext() {
-                return nextIndex() < size;
-            }
-
-            public E next() {
-                if (hasNext())
-                    return i.next();
-                else
-                    throw new NoSuchElementException();
-            }
-
-            public boolean hasPrevious() {
-                return previousIndex() >= 0;
-            }
-
-            public E previous() {
-                if (hasPrevious())
-                    return i.previous();
-                else
-                    throw new NoSuchElementException();
-            }
-
-            public int nextIndex() {
-                return i.nextIndex() - offset;
-            }
-
-            public int previousIndex() {
-                return i.previousIndex() - offset;
-            }
-
-            public void remove() {
-                i.remove();
-                SubList.this.modCount = l.modCount;
-                size--;
-            }
-
-            public void set(E e) {
-                i.set(e);
-            }
-
-            public void add(E e) {
-                i.add(e);
-                SubList.this.modCount = l.modCount;
-                size++;
-            }
-        };
-    }
-
-    public List<E> subList(int fromIndex, int toIndex) {
-        return new SubList<>(this, fromIndex, toIndex);
-    }
-
-    private void rangeCheck(int index) {
-        if (index < 0 || index >= size)
-            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-    }
-
-    private void rangeCheckForAdd(int index) {
-        if (index < 0 || index > size)
-            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-    }
-
-    private String outOfBoundsMsg(int index) {
-        return "Index: "+index+", Size: "+size;
-    }
-
-    private void checkForComodification() {
-        if (this.modCount != l.modCount)
-            throw new ConcurrentModificationException();
-    }
-}
-
-class RandomAccessSubList<E> extends SubList<E> implements RandomAccess {
-    RandomAccessSubList(AbstractList<E> list, int fromIndex, int toIndex) {
-        super(list, fromIndex, toIndex);
-    }
-
-    public List<E> subList(int fromIndex, int toIndex) {
-        return new RandomAccessSubList<>(this, fromIndex, toIndex);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/AbstractMap.java
--- a/emul/compact/src/main/java/java/util/AbstractMap.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,822 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-import java.util.Map.Entry;
-
-/**
- * This class provides a skeletal implementation of the <tt>Map</tt>
- * interface, to minimize the effort required to implement this interface.
- *
- * <p>To implement an unmodifiable map, the programmer needs only to extend this
- * class and provide an implementation for the <tt>entrySet</tt> method, which
- * returns a set-view of the map's mappings.  Typically, the returned set
- * will, in turn, be implemented atop <tt>AbstractSet</tt>.  This set should
- * not support the <tt>add</tt> or <tt>remove</tt> methods, and its iterator
- * should not support the <tt>remove</tt> method.
- *
- * <p>To implement a modifiable map, the programmer must additionally override
- * this class's <tt>put</tt> method (which otherwise throws an
- * <tt>UnsupportedOperationException</tt>), and the iterator returned by
- * <tt>entrySet().iterator()</tt> must additionally implement its
- * <tt>remove</tt> method.
- *
- * <p>The programmer should generally provide a void (no argument) and map
- * constructor, as per the recommendation in the <tt>Map</tt> interface
- * specification.
- *
- * <p>The documentation for each non-abstract method in this class describes its
- * implementation in detail.  Each of these methods may be overridden if the
- * map being implemented admits a more efficient implementation.
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see Map
- * @see Collection
- * @since 1.2
- */
-
-public abstract class AbstractMap<K,V> implements Map<K,V> {
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    protected AbstractMap() {
-    }
-
-    // Query Operations
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns <tt>entrySet().size()</tt>.
-     */
-    public int size() {
-        return entrySet().size();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns <tt>size() == 0</tt>.
-     */
-    public boolean isEmpty() {
-        return size() == 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over <tt>entrySet()</tt> searching
-     * for an entry with the specified value.  If such an entry is found,
-     * <tt>true</tt> is returned.  If the iteration terminates without
-     * finding such an entry, <tt>false</tt> is returned.  Note that this
-     * implementation requires linear time in the size of the map.
-     *
-     * @throws ClassCastException   {@inheritDoc}
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public boolean containsValue(Object value) {
-        Iterator<Entry<K,V>> i = entrySet().iterator();
-        if (value==null) {
-            while (i.hasNext()) {
-                Entry<K,V> e = i.next();
-                if (e.getValue()==null)
-                    return true;
-            }
-        } else {
-            while (i.hasNext()) {
-                Entry<K,V> e = i.next();
-                if (value.equals(e.getValue()))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over <tt>entrySet()</tt> searching
-     * for an entry with the specified key.  If such an entry is found,
-     * <tt>true</tt> is returned.  If the iteration terminates without
-     * finding such an entry, <tt>false</tt> is returned.  Note that this
-     * implementation requires linear time in the size of the map; many
-     * implementations will override this method.
-     *
-     * @throws ClassCastException   {@inheritDoc}
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public boolean containsKey(Object key) {
-        Iterator<Map.Entry<K,V>> i = entrySet().iterator();
-        if (key==null) {
-            while (i.hasNext()) {
-                Entry<K,V> e = i.next();
-                if (e.getKey()==null)
-                    return true;
-            }
-        } else {
-            while (i.hasNext()) {
-                Entry<K,V> e = i.next();
-                if (key.equals(e.getKey()))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over <tt>entrySet()</tt> searching
-     * for an entry with the specified key.  If such an entry is found,
-     * the entry's value is returned.  If the iteration terminates without
-     * finding such an entry, <tt>null</tt> is returned.  Note that this
-     * implementation requires linear time in the size of the map; many
-     * implementations will override this method.
-     *
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     */
-    public V get(Object key) {
-        Iterator<Entry<K,V>> i = entrySet().iterator();
-        if (key==null) {
-            while (i.hasNext()) {
-                Entry<K,V> e = i.next();
-                if (e.getKey()==null)
-                    return e.getValue();
-            }
-        } else {
-            while (i.hasNext()) {
-                Entry<K,V> e = i.next();
-                if (key.equals(e.getKey()))
-                    return e.getValue();
-            }
-        }
-        return null;
-    }
-
-
-    // Modification Operations
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation always throws an
-     * <tt>UnsupportedOperationException</tt>.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     */
-    public V put(K key, V value) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over <tt>entrySet()</tt> searching for an
-     * entry with the specified key.  If such an entry is found, its value is
-     * obtained with its <tt>getValue</tt> operation, the entry is removed
-     * from the collection (and the backing map) with the iterator's
-     * <tt>remove</tt> operation, and the saved value is returned.  If the
-     * iteration terminates without finding such an entry, <tt>null</tt> is
-     * returned.  Note that this implementation requires linear time in the
-     * size of the map; many implementations will override this method.
-     *
-     * <p>Note that this implementation throws an
-     * <tt>UnsupportedOperationException</tt> if the <tt>entrySet</tt>
-     * iterator does not support the <tt>remove</tt> method and this map
-     * contains a mapping for the specified key.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     */
-    public V remove(Object key) {
-        Iterator<Entry<K,V>> i = entrySet().iterator();
-        Entry<K,V> correctEntry = null;
-        if (key==null) {
-            while (correctEntry==null && i.hasNext()) {
-                Entry<K,V> e = i.next();
-                if (e.getKey()==null)
-                    correctEntry = e;
-            }
-        } else {
-            while (correctEntry==null && i.hasNext()) {
-                Entry<K,V> e = i.next();
-                if (key.equals(e.getKey()))
-                    correctEntry = e;
-            }
-        }
-
-        V oldValue = null;
-        if (correctEntry !=null) {
-            oldValue = correctEntry.getValue();
-            i.remove();
-        }
-        return oldValue;
-    }
-
-
-    // Bulk Operations
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation iterates over the specified map's
-     * <tt>entrySet()</tt> collection, and calls this map's <tt>put</tt>
-     * operation once for each entry returned by the iteration.
-     *
-     * <p>Note that this implementation throws an
-     * <tt>UnsupportedOperationException</tt> if this map does not support
-     * the <tt>put</tt> operation and the specified map is nonempty.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     */
-    public void putAll(Map<? extends K, ? extends V> m) {
-        for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
-            put(e.getKey(), e.getValue());
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation calls <tt>entrySet().clear()</tt>.
-     *
-     * <p>Note that this implementation throws an
-     * <tt>UnsupportedOperationException</tt> if the <tt>entrySet</tt>
-     * does not support the <tt>clear</tt> operation.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     */
-    public void clear() {
-        entrySet().clear();
-    }
-
-
-    // Views
-
-    /**
-     * Each of these fields are initialized to contain an instance of the
-     * appropriate view the first time this view is requested.  The views are
-     * stateless, so there's no reason to create more than one of each.
-     */
-    transient volatile Set<K>        keySet = null;
-    transient volatile Collection<V> values = null;
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns a set that subclasses {@link AbstractSet}.
-     * The subclass's iterator method returns a "wrapper object" over this
-     * map's <tt>entrySet()</tt> iterator.  The <tt>size</tt> method
-     * delegates to this map's <tt>size</tt> method and the
-     * <tt>contains</tt> method delegates to this map's
-     * <tt>containsKey</tt> method.
-     *
-     * <p>The set is created the first time this method is called,
-     * and returned in response to all subsequent calls.  No synchronization
-     * is performed, so there is a slight chance that multiple calls to this
-     * method will not all return the same set.
-     */
-    public Set<K> keySet() {
-        if (keySet == null) {
-            keySet = new AbstractSet<K>() {
-                public Iterator<K> iterator() {
-                    return new Iterator<K>() {
-                        private Iterator<Entry<K,V>> i = entrySet().iterator();
-
-                        public boolean hasNext() {
-                            return i.hasNext();
-                        }
-
-                        public K next() {
-                            return i.next().getKey();
-                        }
-
-                        public void remove() {
-                            i.remove();
-                        }
-                    };
-                }
-
-                public int size() {
-                    return AbstractMap.this.size();
-                }
-
-                public boolean isEmpty() {
-                    return AbstractMap.this.isEmpty();
-                }
-
-                public void clear() {
-                    AbstractMap.this.clear();
-                }
-
-                public boolean contains(Object k) {
-                    return AbstractMap.this.containsKey(k);
-                }
-            };
-        }
-        return keySet;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>This implementation returns a collection that subclasses {@link
-     * AbstractCollection}.  The subclass's iterator method returns a
-     * "wrapper object" over this map's <tt>entrySet()</tt> iterator.
-     * The <tt>size</tt> method delegates to this map's <tt>size</tt>
-     * method and the <tt>contains</tt> method delegates to this map's
-     * <tt>containsValue</tt> method.
-     *
-     * <p>The collection is created the first time this method is called, and
-     * returned in response to all subsequent calls.  No synchronization is
-     * performed, so there is a slight chance that multiple calls to this
-     * method will not all return the same collection.
-     */
-    public Collection<V> values() {
-        if (values == null) {
-            values = new AbstractCollection<V>() {
-                public Iterator<V> iterator() {
-                    return new Iterator<V>() {
-                        private Iterator<Entry<K,V>> i = entrySet().iterator();
-
-                        public boolean hasNext() {
-                            return i.hasNext();
-                        }
-
-                        public V next() {
-                            return i.next().getValue();
-                        }
-
-                        public void remove() {
-                            i.remove();
-                        }
-                    };
-                }
-
-                public int size() {
-                    return AbstractMap.this.size();
-                }
-
-                public boolean isEmpty() {
-                    return AbstractMap.this.isEmpty();
-                }
-
-                public void clear() {
-                    AbstractMap.this.clear();
-                }
-
-                public boolean contains(Object v) {
-                    return AbstractMap.this.containsValue(v);
-                }
-            };
-        }
-        return values;
-    }
-
-    public abstract Set<Entry<K,V>> entrySet();
-
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified object with this map for equality.  Returns
-     * <tt>true</tt> if the given object is also a map and the two maps
-     * represent the same mappings.  More formally, two maps <tt>m1</tt> and
-     * <tt>m2</tt> represent the same mappings if
-     * <tt>m1.entrySet().equals(m2.entrySet())</tt>.  This ensures that the
-     * <tt>equals</tt> method works properly across different implementations
-     * of the <tt>Map</tt> interface.
-     *
-     * <p>This implementation first checks if the specified object is this map;
-     * if so it returns <tt>true</tt>.  Then, it checks if the specified
-     * object is a map whose size is identical to the size of this map; if
-     * not, it returns <tt>false</tt>.  If so, it iterates over this map's
-     * <tt>entrySet</tt> collection, and checks that the specified map
-     * contains each mapping that this map contains.  If the specified map
-     * fails to contain such a mapping, <tt>false</tt> is returned.  If the
-     * iteration completes, <tt>true</tt> is returned.
-     *
-     * @param o object to be compared for equality with this map
-     * @return <tt>true</tt> if the specified object is equal to this map
-     */
-    public boolean equals(Object o) {
-        if (o == this)
-            return true;
-
-        if (!(o instanceof Map))
-            return false;
-        Map<K,V> m = (Map<K,V>) o;
-        if (m.size() != size())
-            return false;
-
-        try {
-            Iterator<Entry<K,V>> i = entrySet().iterator();
-            while (i.hasNext()) {
-                Entry<K,V> e = i.next();
-                K key = e.getKey();
-                V value = e.getValue();
-                if (value == null) {
-                    if (!(m.get(key)==null && m.containsKey(key)))
-                        return false;
-                } else {
-                    if (!value.equals(m.get(key)))
-                        return false;
-                }
-            }
-        } catch (ClassCastException unused) {
-            return false;
-        } catch (NullPointerException unused) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the hash code value for this map.  The hash code of a map is
-     * defined to be the sum of the hash codes of each entry in the map's
-     * <tt>entrySet()</tt> view.  This ensures that <tt>m1.equals(m2)</tt>
-     * implies that <tt>m1.hashCode()==m2.hashCode()</tt> for any two maps
-     * <tt>m1</tt> and <tt>m2</tt>, as required by the general contract of
-     * {@link Object#hashCode}.
-     *
-     * <p>This implementation iterates over <tt>entrySet()</tt>, calling
-     * {@link Map.Entry#hashCode hashCode()} on each element (entry) in the
-     * set, and adding up the results.
-     *
-     * @return the hash code value for this map
-     * @see Map.Entry#hashCode()
-     * @see Object#equals(Object)
-     * @see Set#equals(Object)
-     */
-    public int hashCode() {
-        int h = 0;
-        Iterator<Entry<K,V>> i = entrySet().iterator();
-        while (i.hasNext())
-            h += i.next().hashCode();
-        return h;
-    }
-
-    /**
-     * Returns a string representation of this map.  The string representation
-     * consists of a list of key-value mappings in the order returned by the
-     * map's <tt>entrySet</tt> view's iterator, enclosed in braces
-     * (<tt>"{}"</tt>).  Adjacent mappings are separated by the characters
-     * <tt>", "</tt> (comma and space).  Each key-value mapping is rendered as
-     * the key followed by an equals sign (<tt>"="</tt>) followed by the
-     * associated value.  Keys and values are converted to strings as by
-     * {@link String#valueOf(Object)}.
-     *
-     * @return a string representation of this map
-     */
-    public String toString() {
-        Iterator<Entry<K,V>> i = entrySet().iterator();
-        if (! i.hasNext())
-            return "{}";
-
-        StringBuilder sb = new StringBuilder();
-        sb.append('{');
-        for (;;) {
-            Entry<K,V> e = i.next();
-            K key = e.getKey();
-            V value = e.getValue();
-            sb.append(key   == this ? "(this Map)" : key);
-            sb.append('=');
-            sb.append(value == this ? "(this Map)" : value);
-            if (! i.hasNext())
-                return sb.append('}').toString();
-            sb.append(',').append(' ');
-        }
-    }
-
-    /**
-     * Returns a shallow copy of this <tt>AbstractMap</tt> instance: the keys
-     * and values themselves are not cloned.
-     *
-     * @return a shallow copy of this map
-     */
-    protected Object clone() throws CloneNotSupportedException {
-        AbstractMap<K,V> result = (AbstractMap<K,V>)super.clone();
-        result.keySet = null;
-        result.values = null;
-        return result;
-    }
-
-    /**
-     * Utility method for SimpleEntry and SimpleImmutableEntry.
-     * Test for equality, checking for nulls.
-     */
-    private static boolean eq(Object o1, Object o2) {
-        return o1 == null ? o2 == null : o1.equals(o2);
-    }
-
-    // Implementation Note: SimpleEntry and SimpleImmutableEntry
-    // are distinct unrelated classes, even though they share
-    // some code. Since you can't add or subtract final-ness
-    // of a field in a subclass, they can't share representations,
-    // and the amount of duplicated code is too small to warrant
-    // exposing a common abstract class.
-
-
-    /**
-     * An Entry maintaining a key and a value.  The value may be
-     * changed using the <tt>setValue</tt> method.  This class
-     * facilitates the process of building custom map
-     * implementations. For example, it may be convenient to return
-     * arrays of <tt>SimpleEntry</tt> instances in method
-     * <tt>Map.entrySet().toArray</tt>.
-     *
-     * @since 1.6
-     */
-    public static class SimpleEntry<K,V>
-        implements Entry<K,V>, java.io.Serializable
-    {
-        private static final long serialVersionUID = -8499721149061103585L;
-
-        private final K key;
-        private V value;
-
-        /**
-         * Creates an entry representing a mapping from the specified
-         * key to the specified value.
-         *
-         * @param key the key represented by this entry
-         * @param value the value represented by this entry
-         */
-        public SimpleEntry(K key, V value) {
-            this.key   = key;
-            this.value = value;
-        }
-
-        /**
-         * Creates an entry representing the same mapping as the
-         * specified entry.
-         *
-         * @param entry the entry to copy
-         */
-        public SimpleEntry(Entry<? extends K, ? extends V> entry) {
-            this.key   = entry.getKey();
-            this.value = entry.getValue();
-        }
-
-        /**
-         * Returns the key corresponding to this entry.
-         *
-         * @return the key corresponding to this entry
-         */
-        public K getKey() {
-            return key;
-        }
-
-        /**
-         * Returns the value corresponding to this entry.
-         *
-         * @return the value corresponding to this entry
-         */
-        public V getValue() {
-            return value;
-        }
-
-        /**
-         * Replaces the value corresponding to this entry with the specified
-         * value.
-         *
-         * @param value new value to be stored in this entry
-         * @return the old value corresponding to the entry
-         */
-        public V setValue(V value) {
-            V oldValue = this.value;
-            this.value = value;
-            return oldValue;
-        }
-
-        /**
-         * Compares the specified object with this entry for equality.
-         * Returns {@code true} if the given object is also a map entry and
-         * the two entries represent the same mapping.  More formally, two
-         * entries {@code e1} and {@code e2} represent the same mapping
-         * if<pre>
-         *   (e1.getKey()==null ?
-         *    e2.getKey()==null :
-         *    e1.getKey().equals(e2.getKey()))
-         *   &amp;&amp;
-         *   (e1.getValue()==null ?
-         *    e2.getValue()==null :
-         *    e1.getValue().equals(e2.getValue()))</pre>
-         * This ensures that the {@code equals} method works properly across
-         * different implementations of the {@code Map.Entry} interface.
-         *
-         * @param o object to be compared for equality with this map entry
-         * @return {@code true} if the specified object is equal to this map
-         *         entry
-         * @see    #hashCode
-         */
-        public boolean equals(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry e = (Map.Entry)o;
-            return eq(key, e.getKey()) && eq(value, e.getValue());
-        }
-
-        /**
-         * Returns the hash code value for this map entry.  The hash code
-         * of a map entry {@code e} is defined to be: <pre>
-         *   (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
-         *   (e.getValue()==null ? 0 : e.getValue().hashCode())</pre>
-         * This ensures that {@code e1.equals(e2)} implies that
-         * {@code e1.hashCode()==e2.hashCode()} for any two Entries
-         * {@code e1} and {@code e2}, as required by the general
-         * contract of {@link Object#hashCode}.
-         *
-         * @return the hash code value for this map entry
-         * @see    #equals
-         */
-        public int hashCode() {
-            return (key   == null ? 0 :   key.hashCode()) ^
-                   (value == null ? 0 : value.hashCode());
-        }
-
-        /**
-         * Returns a String representation of this map entry.  This
-         * implementation returns the string representation of this
-         * entry's key followed by the equals character ("<tt>=</tt>")
-         * followed by the string representation of this entry's value.
-         *
-         * @return a String representation of this map entry
-         */
-        public String toString() {
-            return key + "=" + value;
-        }
-
-    }
-
-    /**
-     * An Entry maintaining an immutable key and value.  This class
-     * does not support method <tt>setValue</tt>.  This class may be
-     * convenient in methods that return thread-safe snapshots of
-     * key-value mappings.
-     *
-     * @since 1.6
-     */
-    public static class SimpleImmutableEntry<K,V>
-        implements Entry<K,V>, java.io.Serializable
-    {
-        private static final long serialVersionUID = 7138329143949025153L;
-
-        private final K key;
-        private final V value;
-
-        /**
-         * Creates an entry representing a mapping from the specified
-         * key to the specified value.
-         *
-         * @param key the key represented by this entry
-         * @param value the value represented by this entry
-         */
-        public SimpleImmutableEntry(K key, V value) {
-            this.key   = key;
-            this.value = value;
-        }
-
-        /**
-         * Creates an entry representing the same mapping as the
-         * specified entry.
-         *
-         * @param entry the entry to copy
-         */
-        public SimpleImmutableEntry(Entry<? extends K, ? extends V> entry) {
-            this.key   = entry.getKey();
-            this.value = entry.getValue();
-        }
-
-        /**
-         * Returns the key corresponding to this entry.
-         *
-         * @return the key corresponding to this entry
-         */
-        public K getKey() {
-            return key;
-        }
-
-        /**
-         * Returns the value corresponding to this entry.
-         *
-         * @return the value corresponding to this entry
-         */
-        public V getValue() {
-            return value;
-        }
-
-        /**
-         * Replaces the value corresponding to this entry with the specified
-         * value (optional operation).  This implementation simply throws
-         * <tt>UnsupportedOperationException</tt>, as this class implements
-         * an <i>immutable</i> map entry.
-         *
-         * @param value new value to be stored in this entry
-         * @return (Does not return)
-         * @throws UnsupportedOperationException always
-         */
-        public V setValue(V value) {
-            throw new UnsupportedOperationException();
-        }
-
-        /**
-         * Compares the specified object with this entry for equality.
-         * Returns {@code true} if the given object is also a map entry and
-         * the two entries represent the same mapping.  More formally, two
-         * entries {@code e1} and {@code e2} represent the same mapping
-         * if<pre>
-         *   (e1.getKey()==null ?
-         *    e2.getKey()==null :
-         *    e1.getKey().equals(e2.getKey()))
-         *   &amp;&amp;
-         *   (e1.getValue()==null ?
-         *    e2.getValue()==null :
-         *    e1.getValue().equals(e2.getValue()))</pre>
-         * This ensures that the {@code equals} method works properly across
-         * different implementations of the {@code Map.Entry} interface.
-         *
-         * @param o object to be compared for equality with this map entry
-         * @return {@code true} if the specified object is equal to this map
-         *         entry
-         * @see    #hashCode
-         */
-        public boolean equals(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry e = (Map.Entry)o;
-            return eq(key, e.getKey()) && eq(value, e.getValue());
-        }
-
-        /**
-         * Returns the hash code value for this map entry.  The hash code
-         * of a map entry {@code e} is defined to be: <pre>
-         *   (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
-         *   (e.getValue()==null ? 0 : e.getValue().hashCode())</pre>
-         * This ensures that {@code e1.equals(e2)} implies that
-         * {@code e1.hashCode()==e2.hashCode()} for any two Entries
-         * {@code e1} and {@code e2}, as required by the general
-         * contract of {@link Object#hashCode}.
-         *
-         * @return the hash code value for this map entry
-         * @see    #equals
-         */
-        public int hashCode() {
-            return (key   == null ? 0 :   key.hashCode()) ^
-                   (value == null ? 0 : value.hashCode());
-        }
-
-        /**
-         * Returns a String representation of this map entry.  This
-         * implementation returns the string representation of this
-         * entry's key followed by the equals character ("<tt>=</tt>")
-         * followed by the string representation of this entry's value.
-         *
-         * @return a String representation of this map entry
-         */
-        public String toString() {
-            return key + "=" + value;
-        }
-
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/AbstractQueue.java
--- a/emul/compact/src/main/java/java/util/AbstractQueue.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-package java.util;
-
-/**
- * This class provides skeletal implementations of some {@link Queue}
- * operations. The implementations in this class are appropriate when
- * the base implementation does <em>not</em> allow <tt>null</tt>
- * elements.  Methods {@link #add add}, {@link #remove remove}, and
- * {@link #element element} are based on {@link #offer offer}, {@link
- * #poll poll}, and {@link #peek peek}, respectively, but throw
- * exceptions instead of indicating failure via <tt>false</tt> or
- * <tt>null</tt> returns.
- *
- * <p>A <tt>Queue</tt> implementation that extends this class must
- * minimally define a method {@link Queue#offer} which does not permit
- * insertion of <tt>null</tt> elements, along with methods {@link
- * Queue#peek}, {@link Queue#poll}, {@link Collection#size}, and
- * {@link Collection#iterator}.  Typically, additional methods will be
- * overridden as well.  If these requirements cannot be met, consider
- * instead subclassing {@link AbstractCollection}.
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @since 1.5
- * @author Doug Lea
- * @param <E> the type of elements held in this collection
- */
-public abstract class AbstractQueue<E>
-    extends AbstractCollection<E>
-    implements Queue<E> {
-
-    /**
-     * Constructor for use by subclasses.
-     */
-    protected AbstractQueue() {
-    }
-
-    /**
-     * Inserts the specified element into this queue if it is possible to do so
-     * immediately without violating capacity restrictions, returning
-     * <tt>true</tt> upon success and throwing an <tt>IllegalStateException</tt>
-     * if no space is currently available.
-     *
-     * <p>This implementation returns <tt>true</tt> if <tt>offer</tt> succeeds,
-     * else throws an <tt>IllegalStateException</tt>.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> (as specified by {@link Collection#add})
-     * @throws IllegalStateException if the element cannot be added at this
-     *         time due to capacity restrictions
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this queue
-     * @throws NullPointerException if the specified element is null and
-     *         this queue does not permit null elements
-     * @throws IllegalArgumentException if some property of this element
-     *         prevents it from being added to this queue
-     */
-    public boolean add(E e) {
-        if (offer(e))
-            return true;
-        else
-            throw new IllegalStateException("Queue full");
-    }
-
-    /**
-     * Retrieves and removes the head of this queue.  This method differs
-     * from {@link #poll poll} only in that it throws an exception if this
-     * queue is empty.
-     *
-     * <p>This implementation returns the result of <tt>poll</tt>
-     * unless the queue is empty.
-     *
-     * @return the head of this queue
-     * @throws NoSuchElementException if this queue is empty
-     */
-    public E remove() {
-        E x = poll();
-        if (x != null)
-            return x;
-        else
-            throw new NoSuchElementException();
-    }
-
-    /**
-     * Retrieves, but does not remove, the head of this queue.  This method
-     * differs from {@link #peek peek} only in that it throws an exception if
-     * this queue is empty.
-     *
-     * <p>This implementation returns the result of <tt>peek</tt>
-     * unless the queue is empty.
-     *
-     * @return the head of this queue
-     * @throws NoSuchElementException if this queue is empty
-     */
-    public E element() {
-        E x = peek();
-        if (x != null)
-            return x;
-        else
-            throw new NoSuchElementException();
-    }
-
-    /**
-     * Removes all of the elements from this queue.
-     * The queue will be empty after this call returns.
-     *
-     * <p>This implementation repeatedly invokes {@link #poll poll} until it
-     * returns <tt>null</tt>.
-     */
-    public void clear() {
-        while (poll() != null)
-            ;
-    }
-
-    /**
-     * Adds all of the elements in the specified collection to this
-     * queue.  Attempts to addAll of a queue to itself result in
-     * <tt>IllegalArgumentException</tt>. Further, the behavior of
-     * this operation is undefined if the specified collection is
-     * modified while the operation is in progress.
-     *
-     * <p>This implementation iterates over the specified collection,
-     * and adds each element returned by the iterator to this
-     * queue, in turn.  A runtime exception encountered while
-     * trying to add an element (including, in particular, a
-     * <tt>null</tt> element) may result in only some of the elements
-     * having been successfully added when the associated exception is
-     * thrown.
-     *
-     * @param c collection containing elements to be added to this queue
-     * @return <tt>true</tt> if this queue changed as a result of the call
-     * @throws ClassCastException if the class of an element of the specified
-     *         collection prevents it from being added to this queue
-     * @throws NullPointerException if the specified collection contains a
-     *         null element and this queue does not permit null elements,
-     *         or if the specified collection is null
-     * @throws IllegalArgumentException if some property of an element of the
-     *         specified collection prevents it from being added to this
-     *         queue, or if the specified collection is this queue
-     * @throws IllegalStateException if not all the elements can be added at
-     *         this time due to insertion restrictions
-     * @see #add(Object)
-     */
-    public boolean addAll(Collection<? extends E> c) {
-        if (c == null)
-            throw new NullPointerException();
-        if (c == this)
-            throw new IllegalArgumentException();
-        boolean modified = false;
-        for (E e : c)
-            if (add(e))
-                modified = true;
-        return modified;
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/AbstractSequentialList.java
--- a/emul/compact/src/main/java/java/util/AbstractSequentialList.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * This class provides a skeletal implementation of the <tt>List</tt>
- * interface to minimize the effort required to implement this interface
- * backed by a "sequential access" data store (such as a linked list).  For
- * random access data (such as an array), <tt>AbstractList</tt> should be used
- * in preference to this class.<p>
- *
- * This class is the opposite of the <tt>AbstractList</tt> class in the sense
- * that it implements the "random access" methods (<tt>get(int index)</tt>,
- * <tt>set(int index, E element)</tt>, <tt>add(int index, E element)</tt> and
- * <tt>remove(int index)</tt>) on top of the list's list iterator, instead of
- * the other way around.<p>
- *
- * To implement a list the programmer needs only to extend this class and
- * provide implementations for the <tt>listIterator</tt> and <tt>size</tt>
- * methods.  For an unmodifiable list, the programmer need only implement the
- * list iterator's <tt>hasNext</tt>, <tt>next</tt>, <tt>hasPrevious</tt>,
- * <tt>previous</tt> and <tt>index</tt> methods.<p>
- *
- * For a modifiable list the programmer should additionally implement the list
- * iterator's <tt>set</tt> method.  For a variable-size list the programmer
- * should additionally implement the list iterator's <tt>remove</tt> and
- * <tt>add</tt> methods.<p>
- *
- * The programmer should generally provide a void (no argument) and collection
- * constructor, as per the recommendation in the <tt>Collection</tt> interface
- * specification.<p>
- *
- * This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see Collection
- * @see List
- * @see AbstractList
- * @see AbstractCollection
- * @since 1.2
- */
-
-public abstract class AbstractSequentialList<E> extends AbstractList<E> {
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    protected AbstractSequentialList() {
-    }
-
-    /**
-     * Returns the element at the specified position in this list.
-     *
-     * <p>This implementation first gets a list iterator pointing to the
-     * indexed element (with <tt>listIterator(index)</tt>).  Then, it gets
-     * the element using <tt>ListIterator.next</tt> and returns it.
-     *
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public E get(int index) {
-        try {
-            return listIterator(index).next();
-        } catch (NoSuchElementException exc) {
-            throw new IndexOutOfBoundsException("Index: "+index);
-        }
-    }
-
-    /**
-     * Replaces the element at the specified position in this list with the
-     * specified element (optional operation).
-     *
-     * <p>This implementation first gets a list iterator pointing to the
-     * indexed element (with <tt>listIterator(index)</tt>).  Then, it gets
-     * the current element using <tt>ListIterator.next</tt> and replaces it
-     * with <tt>ListIterator.set</tt>.
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> if the list iterator does not
-     * implement the <tt>set</tt> operation.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     * @throws IndexOutOfBoundsException     {@inheritDoc}
-     */
-    public E set(int index, E element) {
-        try {
-            ListIterator<E> e = listIterator(index);
-            E oldVal = e.next();
-            e.set(element);
-            return oldVal;
-        } catch (NoSuchElementException exc) {
-            throw new IndexOutOfBoundsException("Index: "+index);
-        }
-    }
-
-    /**
-     * Inserts the specified element at the specified position in this list
-     * (optional operation).  Shifts the element currently at that position
-     * (if any) and any subsequent elements to the right (adds one to their
-     * indices).
-     *
-     * <p>This implementation first gets a list iterator pointing to the
-     * indexed element (with <tt>listIterator(index)</tt>).  Then, it
-     * inserts the specified element with <tt>ListIterator.add</tt>.
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> if the list iterator does not
-     * implement the <tt>add</tt> operation.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     * @throws IndexOutOfBoundsException     {@inheritDoc}
-     */
-    public void add(int index, E element) {
-        try {
-            listIterator(index).add(element);
-        } catch (NoSuchElementException exc) {
-            throw new IndexOutOfBoundsException("Index: "+index);
-        }
-    }
-
-    /**
-     * Removes the element at the specified position in this list (optional
-     * operation).  Shifts any subsequent elements to the left (subtracts one
-     * from their indices).  Returns the element that was removed from the
-     * list.
-     *
-     * <p>This implementation first gets a list iterator pointing to the
-     * indexed element (with <tt>listIterator(index)</tt>).  Then, it removes
-     * the element with <tt>ListIterator.remove</tt>.
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> if the list iterator does not
-     * implement the <tt>remove</tt> operation.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws IndexOutOfBoundsException     {@inheritDoc}
-     */
-    public E remove(int index) {
-        try {
-            ListIterator<E> e = listIterator(index);
-            E outCast = e.next();
-            e.remove();
-            return outCast;
-        } catch (NoSuchElementException exc) {
-            throw new IndexOutOfBoundsException("Index: "+index);
-        }
-    }
-
-
-    // Bulk Operations
-
-    /**
-     * Inserts all of the elements in the specified collection into this
-     * list at the specified position (optional operation).  Shifts the
-     * element currently at that position (if any) and any subsequent
-     * elements to the right (increases their indices).  The new elements
-     * will appear in this list in the order that they are returned by the
-     * specified collection's iterator.  The behavior of this operation is
-     * undefined if the specified collection is modified while the
-     * operation is in progress.  (Note that this will occur if the specified
-     * collection is this list, and it's nonempty.)
-     *
-     * <p>This implementation gets an iterator over the specified collection and
-     * a list iterator over this list pointing to the indexed element (with
-     * <tt>listIterator(index)</tt>).  Then, it iterates over the specified
-     * collection, inserting the elements obtained from the iterator into this
-     * list, one at a time, using <tt>ListIterator.add</tt> followed by
-     * <tt>ListIterator.next</tt> (to skip over the added element).
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> if the list iterator returned by
-     * the <tt>listIterator</tt> method does not implement the <tt>add</tt>
-     * operation.
-     *
-     * @throws UnsupportedOperationException {@inheritDoc}
-     * @throws ClassCastException            {@inheritDoc}
-     * @throws NullPointerException          {@inheritDoc}
-     * @throws IllegalArgumentException      {@inheritDoc}
-     * @throws IndexOutOfBoundsException     {@inheritDoc}
-     */
-    public boolean addAll(int index, Collection<? extends E> c) {
-        try {
-            boolean modified = false;
-            ListIterator<E> e1 = listIterator(index);
-            Iterator<? extends E> e2 = c.iterator();
-            while (e2.hasNext()) {
-                e1.add(e2.next());
-                modified = true;
-            }
-            return modified;
-        } catch (NoSuchElementException exc) {
-            throw new IndexOutOfBoundsException("Index: "+index);
-        }
-    }
-
-
-    // Iterators
-
-    /**
-     * Returns an iterator over the elements in this list (in proper
-     * sequence).<p>
-     *
-     * This implementation merely returns a list iterator over the list.
-     *
-     * @return an iterator over the elements in this list (in proper sequence)
-     */
-    public Iterator<E> iterator() {
-        return listIterator();
-    }
-
-    /**
-     * Returns a list iterator over the elements in this list (in proper
-     * sequence).
-     *
-     * @param  index index of first element to be returned from the list
-     *         iterator (by a call to the <code>next</code> method)
-     * @return a list iterator over the elements in this list (in proper
-     *         sequence)
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public abstract ListIterator<E> listIterator(int index);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/AbstractSet.java
--- a/emul/compact/src/main/java/java/util/AbstractSet.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * This class provides a skeletal implementation of the <tt>Set</tt>
- * interface to minimize the effort required to implement this
- * interface. <p>
- *
- * The process of implementing a set by extending this class is identical
- * to that of implementing a Collection by extending AbstractCollection,
- * except that all of the methods and constructors in subclasses of this
- * class must obey the additional constraints imposed by the <tt>Set</tt>
- * interface (for instance, the add method must not permit addition of
- * multiple instances of an object to a set).<p>
- *
- * Note that this class does not override any of the implementations from
- * the <tt>AbstractCollection</tt> class.  It merely adds implementations
- * for <tt>equals</tt> and <tt>hashCode</tt>.<p>
- *
- * This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <E> the type of elements maintained by this set
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see Collection
- * @see AbstractCollection
- * @see Set
- * @since 1.2
- */
-
-public abstract class AbstractSet<E> extends AbstractCollection<E> implements Set<E> {
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    protected AbstractSet() {
-    }
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified object with this set for equality.  Returns
-     * <tt>true</tt> if the given object is also a set, the two sets have
-     * the same size, and every member of the given set is contained in
-     * this set.  This ensures that the <tt>equals</tt> method works
-     * properly across different implementations of the <tt>Set</tt>
-     * interface.<p>
-     *
-     * This implementation first checks if the specified object is this
-     * set; if so it returns <tt>true</tt>.  Then, it checks if the
-     * specified object is a set whose size is identical to the size of
-     * this set; if not, it returns false.  If so, it returns
-     * <tt>containsAll((Collection) o)</tt>.
-     *
-     * @param o object to be compared for equality with this set
-     * @return <tt>true</tt> if the specified object is equal to this set
-     */
-    public boolean equals(Object o) {
-        if (o == this)
-            return true;
-
-        if (!(o instanceof Set))
-            return false;
-        Collection c = (Collection) o;
-        if (c.size() != size())
-            return false;
-        try {
-            return containsAll(c);
-        } catch (ClassCastException unused)   {
-            return false;
-        } catch (NullPointerException unused) {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the hash code value for this set.  The hash code of a set is
-     * defined to be the sum of the hash codes of the elements in the set,
-     * where the hash code of a <tt>null</tt> element is defined to be zero.
-     * This ensures that <tt>s1.equals(s2)</tt> implies that
-     * <tt>s1.hashCode()==s2.hashCode()</tt> for any two sets <tt>s1</tt>
-     * and <tt>s2</tt>, as required by the general contract of
-     * {@link Object#hashCode}.
-     *
-     * <p>This implementation iterates over the set, calling the
-     * <tt>hashCode</tt> method on each element in the set, and adding up
-     * the results.
-     *
-     * @return the hash code value for this set
-     * @see Object#equals(Object)
-     * @see Set#equals(Object)
-     */
-    public int hashCode() {
-        int h = 0;
-        Iterator<E> i = iterator();
-        while (i.hasNext()) {
-            E obj = i.next();
-            if (obj != null)
-                h += obj.hashCode();
-        }
-        return h;
-    }
-
-    /**
-     * Removes from this set all of its elements that are contained in the
-     * specified collection (optional operation).  If the specified
-     * collection is also a set, this operation effectively modifies this
-     * set so that its value is the <i>asymmetric set difference</i> of
-     * the two sets.
-     *
-     * <p>This implementation determines which is the smaller of this set
-     * and the specified collection, by invoking the <tt>size</tt>
-     * method on each.  If this set has fewer elements, then the
-     * implementation iterates over this set, checking each element
-     * returned by the iterator in turn to see if it is contained in
-     * the specified collection.  If it is so contained, it is removed
-     * from this set with the iterator's <tt>remove</tt> method.  If
-     * the specified collection has fewer elements, then the
-     * implementation iterates over the specified collection, removing
-     * from this set each element returned by the iterator, using this
-     * set's <tt>remove</tt> method.
-     *
-     * <p>Note that this implementation will throw an
-     * <tt>UnsupportedOperationException</tt> if the iterator returned by the
-     * <tt>iterator</tt> method does not implement the <tt>remove</tt> method.
-     *
-     * @param  c collection containing elements to be removed from this set
-     * @return <tt>true</tt> if this set changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
-     *         is not supported by this set
-     * @throws ClassCastException if the class of an element of this set
-     *         is incompatible with the specified collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this set contains a null element and the
-     *         specified collection does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see #remove(Object)
-     * @see #contains(Object)
-     */
-    public boolean removeAll(Collection<?> c) {
-        boolean modified = false;
-
-        if (size() > c.size()) {
-            for (Iterator<?> i = c.iterator(); i.hasNext(); )
-                modified |= remove(i.next());
-        } else {
-            for (Iterator<?> i = iterator(); i.hasNext(); ) {
-                if (c.contains(i.next())) {
-                    i.remove();
-                    modified = true;
-                }
-            }
-        }
-        return modified;
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/ArrayDeque.java
--- a/emul/compact/src/main/java/java/util/ArrayDeque.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,830 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Josh Bloch of Google Inc. and released to the public domain,
- * as explained at http://creativecommons.org/publicdomain/zero/1.0/.
- */
-
-package java.util;
-import java.io.*;
-
-/**
- * Resizable-array implementation of the {@link Deque} interface.  Array
- * deques have no capacity restrictions; they grow as necessary to support
- * usage.  They are not thread-safe; in the absence of external
- * synchronization, they do not support concurrent access by multiple threads.
- * Null elements are prohibited.  This class is likely to be faster than
- * {@link Stack} when used as a stack, and faster than {@link LinkedList}
- * when used as a queue.
- *
- * <p>Most <tt>ArrayDeque</tt> operations run in amortized constant time.
- * Exceptions include {@link #remove(Object) remove}, {@link
- * #removeFirstOccurrence removeFirstOccurrence}, {@link #removeLastOccurrence
- * removeLastOccurrence}, {@link #contains contains}, {@link #iterator
- * iterator.remove()}, and the bulk operations, all of which run in linear
- * time.
- *
- * <p>The iterators returned by this class's <tt>iterator</tt> method are
- * <i>fail-fast</i>: If the deque is modified at any time after the iterator
- * is created, in any way except through the iterator's own <tt>remove</tt>
- * method, the iterator will generally throw a {@link
- * ConcurrentModificationException}.  Thus, in the face of concurrent
- * modification, the iterator fails quickly and cleanly, rather than risking
- * arbitrary, non-deterministic behavior at an undetermined time in the
- * future.
- *
- * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
- * as it is, generally speaking, impossible to make any hard guarantees in the
- * presence of unsynchronized concurrent modification.  Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness: <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i>
- *
- * <p>This class and its iterator implement all of the
- * <em>optional</em> methods of the {@link Collection} and {@link
- * Iterator} interfaces.
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch and Doug Lea
- * @since   1.6
- * @param <E> the type of elements held in this collection
- */
-public class ArrayDeque<E> extends AbstractCollection<E>
-                           implements Deque<E>, Cloneable, Serializable
-{
-    /**
-     * The array in which the elements of the deque are stored.
-     * The capacity of the deque is the length of this array, which is
-     * always a power of two. The array is never allowed to become
-     * full, except transiently within an addX method where it is
-     * resized (see doubleCapacity) immediately upon becoming full,
-     * thus avoiding head and tail wrapping around to equal each
-     * other.  We also guarantee that all array cells not holding
-     * deque elements are always null.
-     */
-    private transient E[] elements;
-
-    /**
-     * The index of the element at the head of the deque (which is the
-     * element that would be removed by remove() or pop()); or an
-     * arbitrary number equal to tail if the deque is empty.
-     */
-    private transient int head;
-
-    /**
-     * The index at which the next element would be added to the tail
-     * of the deque (via addLast(E), add(E), or push(E)).
-     */
-    private transient int tail;
-
-    /**
-     * The minimum capacity that we'll use for a newly created deque.
-     * Must be a power of 2.
-     */
-    private static final int MIN_INITIAL_CAPACITY = 8;
-
-    // ******  Array allocation and resizing utilities ******
-
-    /**
-     * Allocate empty array to hold the given number of elements.
-     *
-     * @param numElements  the number of elements to hold
-     */
-    private void allocateElements(int numElements) {
-        int initialCapacity = MIN_INITIAL_CAPACITY;
-        // Find the best power of two to hold elements.
-        // Tests "<=" because arrays aren't kept full.
-        if (numElements >= initialCapacity) {
-            initialCapacity = numElements;
-            initialCapacity |= (initialCapacity >>>  1);
-            initialCapacity |= (initialCapacity >>>  2);
-            initialCapacity |= (initialCapacity >>>  4);
-            initialCapacity |= (initialCapacity >>>  8);
-            initialCapacity |= (initialCapacity >>> 16);
-            initialCapacity++;
-
-            if (initialCapacity < 0)   // Too many elements, must back off
-                initialCapacity >>>= 1;// Good luck allocating 2 ^ 30 elements
-        }
-        elements = (E[]) new Object[initialCapacity];
-    }
-
-    /**
-     * Double the capacity of this deque.  Call only when full, i.e.,
-     * when head and tail have wrapped around to become equal.
-     */
-    private void doubleCapacity() {
-        assert head == tail;
-        int p = head;
-        int n = elements.length;
-        int r = n - p; // number of elements to the right of p
-        int newCapacity = n << 1;
-        if (newCapacity < 0)
-            throw new IllegalStateException("Sorry, deque too big");
-        Object[] a = new Object[newCapacity];
-        System.arraycopy(elements, p, a, 0, r);
-        System.arraycopy(elements, 0, a, r, p);
-        elements = (E[])a;
-        head = 0;
-        tail = n;
-    }
-
-    /**
-     * Copies the elements from our element array into the specified array,
-     * in order (from first to last element in the deque).  It is assumed
-     * that the array is large enough to hold all elements in the deque.
-     *
-     * @return its argument
-     */
-    private <T> T[] copyElements(T[] a) {
-        if (head < tail) {
-            System.arraycopy(elements, head, a, 0, size());
-        } else if (head > tail) {
-            int headPortionLen = elements.length - head;
-            System.arraycopy(elements, head, a, 0, headPortionLen);
-            System.arraycopy(elements, 0, a, headPortionLen, tail);
-        }
-        return a;
-    }
-
-    /**
-     * Constructs an empty array deque with an initial capacity
-     * sufficient to hold 16 elements.
-     */
-    public ArrayDeque() {
-        elements = (E[]) new Object[16];
-    }
-
-    /**
-     * Constructs an empty array deque with an initial capacity
-     * sufficient to hold the specified number of elements.
-     *
-     * @param numElements  lower bound on initial capacity of the deque
-     */
-    public ArrayDeque(int numElements) {
-        allocateElements(numElements);
-    }
-
-    /**
-     * Constructs a deque containing the elements of the specified
-     * collection, in the order they are returned by the collection's
-     * iterator.  (The first element returned by the collection's
-     * iterator becomes the first element, or <i>front</i> of the
-     * deque.)
-     *
-     * @param c the collection whose elements are to be placed into the deque
-     * @throws NullPointerException if the specified collection is null
-     */
-    public ArrayDeque(Collection<? extends E> c) {
-        allocateElements(c.size());
-        addAll(c);
-    }
-
-    // The main insertion and extraction methods are addFirst,
-    // addLast, pollFirst, pollLast. The other methods are defined in
-    // terms of these.
-
-    /**
-     * Inserts the specified element at the front of this deque.
-     *
-     * @param e the element to add
-     * @throws NullPointerException if the specified element is null
-     */
-    public void addFirst(E e) {
-        if (e == null)
-            throw new NullPointerException();
-        elements[head = (head - 1) & (elements.length - 1)] = e;
-        if (head == tail)
-            doubleCapacity();
-    }
-
-    /**
-     * Inserts the specified element at the end of this deque.
-     *
-     * <p>This method is equivalent to {@link #add}.
-     *
-     * @param e the element to add
-     * @throws NullPointerException if the specified element is null
-     */
-    public void addLast(E e) {
-        if (e == null)
-            throw new NullPointerException();
-        elements[tail] = e;
-        if ( (tail = (tail + 1) & (elements.length - 1)) == head)
-            doubleCapacity();
-    }
-
-    /**
-     * Inserts the specified element at the front of this deque.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> (as specified by {@link Deque#offerFirst})
-     * @throws NullPointerException if the specified element is null
-     */
-    public boolean offerFirst(E e) {
-        addFirst(e);
-        return true;
-    }
-
-    /**
-     * Inserts the specified element at the end of this deque.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> (as specified by {@link Deque#offerLast})
-     * @throws NullPointerException if the specified element is null
-     */
-    public boolean offerLast(E e) {
-        addLast(e);
-        return true;
-    }
-
-    /**
-     * @throws NoSuchElementException {@inheritDoc}
-     */
-    public E removeFirst() {
-        E x = pollFirst();
-        if (x == null)
-            throw new NoSuchElementException();
-        return x;
-    }
-
-    /**
-     * @throws NoSuchElementException {@inheritDoc}
-     */
-    public E removeLast() {
-        E x = pollLast();
-        if (x == null)
-            throw new NoSuchElementException();
-        return x;
-    }
-
-    public E pollFirst() {
-        int h = head;
-        E result = elements[h]; // Element is null if deque empty
-        if (result == null)
-            return null;
-        elements[h] = null;     // Must null out slot
-        head = (h + 1) & (elements.length - 1);
-        return result;
-    }
-
-    public E pollLast() {
-        int t = (tail - 1) & (elements.length - 1);
-        E result = elements[t];
-        if (result == null)
-            return null;
-        elements[t] = null;
-        tail = t;
-        return result;
-    }
-
-    /**
-     * @throws NoSuchElementException {@inheritDoc}
-     */
-    public E getFirst() {
-        E x = elements[head];
-        if (x == null)
-            throw new NoSuchElementException();
-        return x;
-    }
-
-    /**
-     * @throws NoSuchElementException {@inheritDoc}
-     */
-    public E getLast() {
-        E x = elements[(tail - 1) & (elements.length - 1)];
-        if (x == null)
-            throw new NoSuchElementException();
-        return x;
-    }
-
-    public E peekFirst() {
-        return elements[head]; // elements[head] is null if deque empty
-    }
-
-    public E peekLast() {
-        return elements[(tail - 1) & (elements.length - 1)];
-    }
-
-    /**
-     * Removes the first occurrence of the specified element in this
-     * deque (when traversing the deque from head to tail).
-     * If the deque does not contain the element, it is unchanged.
-     * More formally, removes the first element <tt>e</tt> such that
-     * <tt>o.equals(e)</tt> (if such an element exists).
-     * Returns <tt>true</tt> if this deque contained the specified element
-     * (or equivalently, if this deque changed as a result of the call).
-     *
-     * @param o element to be removed from this deque, if present
-     * @return <tt>true</tt> if the deque contained the specified element
-     */
-    public boolean removeFirstOccurrence(Object o) {
-        if (o == null)
-            return false;
-        int mask = elements.length - 1;
-        int i = head;
-        E x;
-        while ( (x = elements[i]) != null) {
-            if (o.equals(x)) {
-                delete(i);
-                return true;
-            }
-            i = (i + 1) & mask;
-        }
-        return false;
-    }
-
-    /**
-     * Removes the last occurrence of the specified element in this
-     * deque (when traversing the deque from head to tail).
-     * If the deque does not contain the element, it is unchanged.
-     * More formally, removes the last element <tt>e</tt> such that
-     * <tt>o.equals(e)</tt> (if such an element exists).
-     * Returns <tt>true</tt> if this deque contained the specified element
-     * (or equivalently, if this deque changed as a result of the call).
-     *
-     * @param o element to be removed from this deque, if present
-     * @return <tt>true</tt> if the deque contained the specified element
-     */
-    public boolean removeLastOccurrence(Object o) {
-        if (o == null)
-            return false;
-        int mask = elements.length - 1;
-        int i = (tail - 1) & mask;
-        E x;
-        while ( (x = elements[i]) != null) {
-            if (o.equals(x)) {
-                delete(i);
-                return true;
-            }
-            i = (i - 1) & mask;
-        }
-        return false;
-    }
-
-    // *** Queue methods ***
-
-    /**
-     * Inserts the specified element at the end of this deque.
-     *
-     * <p>This method is equivalent to {@link #addLast}.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> (as specified by {@link Collection#add})
-     * @throws NullPointerException if the specified element is null
-     */
-    public boolean add(E e) {
-        addLast(e);
-        return true;
-    }
-
-    /**
-     * Inserts the specified element at the end of this deque.
-     *
-     * <p>This method is equivalent to {@link #offerLast}.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> (as specified by {@link Queue#offer})
-     * @throws NullPointerException if the specified element is null
-     */
-    public boolean offer(E e) {
-        return offerLast(e);
-    }
-
-    /**
-     * Retrieves and removes the head of the queue represented by this deque.
-     *
-     * This method differs from {@link #poll poll} only in that it throws an
-     * exception if this deque is empty.
-     *
-     * <p>This method is equivalent to {@link #removeFirst}.
-     *
-     * @return the head of the queue represented by this deque
-     * @throws NoSuchElementException {@inheritDoc}
-     */
-    public E remove() {
-        return removeFirst();
-    }
-
-    /**
-     * Retrieves and removes the head of the queue represented by this deque
-     * (in other words, the first element of this deque), or returns
-     * <tt>null</tt> if this deque is empty.
-     *
-     * <p>This method is equivalent to {@link #pollFirst}.
-     *
-     * @return the head of the queue represented by this deque, or
-     *         <tt>null</tt> if this deque is empty
-     */
-    public E poll() {
-        return pollFirst();
-    }
-
-    /**
-     * Retrieves, but does not remove, the head of the queue represented by
-     * this deque.  This method differs from {@link #peek peek} only in
-     * that it throws an exception if this deque is empty.
-     *
-     * <p>This method is equivalent to {@link #getFirst}.
-     *
-     * @return the head of the queue represented by this deque
-     * @throws NoSuchElementException {@inheritDoc}
-     */
-    public E element() {
-        return getFirst();
-    }
-
-    /**
-     * Retrieves, but does not remove, the head of the queue represented by
-     * this deque, or returns <tt>null</tt> if this deque is empty.
-     *
-     * <p>This method is equivalent to {@link #peekFirst}.
-     *
-     * @return the head of the queue represented by this deque, or
-     *         <tt>null</tt> if this deque is empty
-     */
-    public E peek() {
-        return peekFirst();
-    }
-
-    // *** Stack methods ***
-
-    /**
-     * Pushes an element onto the stack represented by this deque.  In other
-     * words, inserts the element at the front of this deque.
-     *
-     * <p>This method is equivalent to {@link #addFirst}.
-     *
-     * @param e the element to push
-     * @throws NullPointerException if the specified element is null
-     */
-    public void push(E e) {
-        addFirst(e);
-    }
-
-    /**
-     * Pops an element from the stack represented by this deque.  In other
-     * words, removes and returns the first element of this deque.
-     *
-     * <p>This method is equivalent to {@link #removeFirst()}.
-     *
-     * @return the element at the front of this deque (which is the top
-     *         of the stack represented by this deque)
-     * @throws NoSuchElementException {@inheritDoc}
-     */
-    public E pop() {
-        return removeFirst();
-    }
-
-    private void checkInvariants() {
-        assert elements[tail] == null;
-        assert head == tail ? elements[head] == null :
-            (elements[head] != null &&
-             elements[(tail - 1) & (elements.length - 1)] != null);
-        assert elements[(head - 1) & (elements.length - 1)] == null;
-    }
-
-    /**
-     * Removes the element at the specified position in the elements array,
-     * adjusting head and tail as necessary.  This can result in motion of
-     * elements backwards or forwards in the array.
-     *
-     * <p>This method is called delete rather than remove to emphasize
-     * that its semantics differ from those of {@link List#remove(int)}.
-     *
-     * @return true if elements moved backwards
-     */
-    private boolean delete(int i) {
-        checkInvariants();
-        final E[] elements = this.elements;
-        final int mask = elements.length - 1;
-        final int h = head;
-        final int t = tail;
-        final int front = (i - h) & mask;
-        final int back  = (t - i) & mask;
-
-        // Invariant: head <= i < tail mod circularity
-        if (front >= ((t - h) & mask))
-            throw new ConcurrentModificationException();
-
-        // Optimize for least element motion
-        if (front < back) {
-            if (h <= i) {
-                System.arraycopy(elements, h, elements, h + 1, front);
-            } else { // Wrap around
-                System.arraycopy(elements, 0, elements, 1, i);
-                elements[0] = elements[mask];
-                System.arraycopy(elements, h, elements, h + 1, mask - h);
-            }
-            elements[h] = null;
-            head = (h + 1) & mask;
-            return false;
-        } else {
-            if (i < t) { // Copy the null tail as well
-                System.arraycopy(elements, i + 1, elements, i, back);
-                tail = t - 1;
-            } else { // Wrap around
-                System.arraycopy(elements, i + 1, elements, i, mask - i);
-                elements[mask] = elements[0];
-                System.arraycopy(elements, 1, elements, 0, t);
-                tail = (t - 1) & mask;
-            }
-            return true;
-        }
-    }
-
-    // *** Collection Methods ***
-
-    /**
-     * Returns the number of elements in this deque.
-     *
-     * @return the number of elements in this deque
-     */
-    public int size() {
-        return (tail - head) & (elements.length - 1);
-    }
-
-    /**
-     * Returns <tt>true</tt> if this deque contains no elements.
-     *
-     * @return <tt>true</tt> if this deque contains no elements
-     */
-    public boolean isEmpty() {
-        return head == tail;
-    }
-
-    /**
-     * Returns an iterator over the elements in this deque.  The elements
-     * will be ordered from first (head) to last (tail).  This is the same
-     * order that elements would be dequeued (via successive calls to
-     * {@link #remove} or popped (via successive calls to {@link #pop}).
-     *
-     * @return an iterator over the elements in this deque
-     */
-    public Iterator<E> iterator() {
-        return new DeqIterator();
-    }
-
-    public Iterator<E> descendingIterator() {
-        return new DescendingIterator();
-    }
-
-    private class DeqIterator implements Iterator<E> {
-        /**
-         * Index of element to be returned by subsequent call to next.
-         */
-        private int cursor = head;
-
-        /**
-         * Tail recorded at construction (also in remove), to stop
-         * iterator and also to check for comodification.
-         */
-        private int fence = tail;
-
-        /**
-         * Index of element returned by most recent call to next.
-         * Reset to -1 if element is deleted by a call to remove.
-         */
-        private int lastRet = -1;
-
-        public boolean hasNext() {
-            return cursor != fence;
-        }
-
-        public E next() {
-            if (cursor == fence)
-                throw new NoSuchElementException();
-            E result = elements[cursor];
-            // This check doesn't catch all possible comodifications,
-            // but does catch the ones that corrupt traversal
-            if (tail != fence || result == null)
-                throw new ConcurrentModificationException();
-            lastRet = cursor;
-            cursor = (cursor + 1) & (elements.length - 1);
-            return result;
-        }
-
-        public void remove() {
-            if (lastRet < 0)
-                throw new IllegalStateException();
-            if (delete(lastRet)) { // if left-shifted, undo increment in next()
-                cursor = (cursor - 1) & (elements.length - 1);
-                fence = tail;
-            }
-            lastRet = -1;
-        }
-    }
-
-    private class DescendingIterator implements Iterator<E> {
-        /*
-         * This class is nearly a mirror-image of DeqIterator, using
-         * tail instead of head for initial cursor, and head instead of
-         * tail for fence.
-         */
-        private int cursor = tail;
-        private int fence = head;
-        private int lastRet = -1;
-
-        public boolean hasNext() {
-            return cursor != fence;
-        }
-
-        public E next() {
-            if (cursor == fence)
-                throw new NoSuchElementException();
-            cursor = (cursor - 1) & (elements.length - 1);
-            E result = elements[cursor];
-            if (head != fence || result == null)
-                throw new ConcurrentModificationException();
-            lastRet = cursor;
-            return result;
-        }
-
-        public void remove() {
-            if (lastRet < 0)
-                throw new IllegalStateException();
-            if (!delete(lastRet)) {
-                cursor = (cursor + 1) & (elements.length - 1);
-                fence = head;
-            }
-            lastRet = -1;
-        }
-    }
-
-    /**
-     * Returns <tt>true</tt> if this deque contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this deque contains
-     * at least one element <tt>e</tt> such that <tt>o.equals(e)</tt>.
-     *
-     * @param o object to be checked for containment in this deque
-     * @return <tt>true</tt> if this deque contains the specified element
-     */
-    public boolean contains(Object o) {
-        if (o == null)
-            return false;
-        int mask = elements.length - 1;
-        int i = head;
-        E x;
-        while ( (x = elements[i]) != null) {
-            if (o.equals(x))
-                return true;
-            i = (i + 1) & mask;
-        }
-        return false;
-    }
-
-    /**
-     * Removes a single instance of the specified element from this deque.
-     * If the deque does not contain the element, it is unchanged.
-     * More formally, removes the first element <tt>e</tt> such that
-     * <tt>o.equals(e)</tt> (if such an element exists).
-     * Returns <tt>true</tt> if this deque contained the specified element
-     * (or equivalently, if this deque changed as a result of the call).
-     *
-     * <p>This method is equivalent to {@link #removeFirstOccurrence}.
-     *
-     * @param o element to be removed from this deque, if present
-     * @return <tt>true</tt> if this deque contained the specified element
-     */
-    public boolean remove(Object o) {
-        return removeFirstOccurrence(o);
-    }
-
-    /**
-     * Removes all of the elements from this deque.
-     * The deque will be empty after this call returns.
-     */
-    public void clear() {
-        int h = head;
-        int t = tail;
-        if (h != t) { // clear all cells
-            head = tail = 0;
-            int i = h;
-            int mask = elements.length - 1;
-            do {
-                elements[i] = null;
-                i = (i + 1) & mask;
-            } while (i != t);
-        }
-    }
-
-    /**
-     * Returns an array containing all of the elements in this deque
-     * in proper sequence (from first to last element).
-     *
-     * <p>The returned array will be "safe" in that no references to it are
-     * maintained by this deque.  (In other words, this method must allocate
-     * a new array).  The caller is thus free to modify the returned array.
-     *
-     * <p>This method acts as bridge between array-based and collection-based
-     * APIs.
-     *
-     * @return an array containing all of the elements in this deque
-     */
-    public Object[] toArray() {
-        return copyElements(new Object[size()]);
-    }
-
-    /**
-     * Returns an array containing all of the elements in this deque in
-     * proper sequence (from first to last element); the runtime type of the
-     * returned array is that of the specified array.  If the deque fits in
-     * the specified array, it is returned therein.  Otherwise, a new array
-     * is allocated with the runtime type of the specified array and the
-     * size of this deque.
-     *
-     * <p>If this deque fits in the specified array with room to spare
-     * (i.e., the array has more elements than this deque), the element in
-     * the array immediately following the end of the deque is set to
-     * <tt>null</tt>.
-     *
-     * <p>Like the {@link #toArray()} method, this method acts as bridge between
-     * array-based and collection-based APIs.  Further, this method allows
-     * precise control over the runtime type of the output array, and may,
-     * under certain circumstances, be used to save allocation costs.
-     *
-     * <p>Suppose <tt>x</tt> is a deque known to contain only strings.
-     * The following code can be used to dump the deque into a newly
-     * allocated array of <tt>String</tt>:
-     *
-     * <pre>
-     *     String[] y = x.toArray(new String[0]);</pre>
-     *
-     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
-     * <tt>toArray()</tt>.
-     *
-     * @param a the array into which the elements of the deque are to
-     *          be stored, if it is big enough; otherwise, a new array of the
-     *          same runtime type is allocated for this purpose
-     * @return an array containing all of the elements in this deque
-     * @throws ArrayStoreException if the runtime type of the specified array
-     *         is not a supertype of the runtime type of every element in
-     *         this deque
-     * @throws NullPointerException if the specified array is null
-     */
-    public <T> T[] toArray(T[] a) {
-        int size = size();
-        if (a.length < size)
-            a = (T[])java.lang.reflect.Array.newInstance(
-                    a.getClass().getComponentType(), size);
-        copyElements(a);
-        if (a.length > size)
-            a[size] = null;
-        return a;
-    }
-
-    // *** Object methods ***
-
-    /**
-     * Returns a copy of this deque.
-     *
-     * @return a copy of this deque
-     */
-    public ArrayDeque<E> clone() {
-        try {
-            ArrayDeque<E> result = (ArrayDeque<E>) super.clone();
-            result.elements = Arrays.copyOf(elements, elements.length);
-            return result;
-
-        } catch (CloneNotSupportedException e) {
-            throw new AssertionError();
-        }
-    }
-
-    /**
-     * Appease the serialization gods.
-     */
-    private static final long serialVersionUID = 2340985798034038923L;
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/ArrayList.java
--- a/emul/compact/src/main/java/java/util/ArrayList.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1088 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-
-/**
- * Resizable-array implementation of the <tt>List</tt> interface.  Implements
- * all optional list operations, and permits all elements, including
- * <tt>null</tt>.  In addition to implementing the <tt>List</tt> interface,
- * this class provides methods to manipulate the size of the array that is
- * used internally to store the list.  (This class is roughly equivalent to
- * <tt>Vector</tt>, except that it is unsynchronized.)
- *
- * <p>The <tt>size</tt>, <tt>isEmpty</tt>, <tt>get</tt>, <tt>set</tt>,
- * <tt>iterator</tt>, and <tt>listIterator</tt> operations run in constant
- * time.  The <tt>add</tt> operation runs in <i>amortized constant time</i>,
- * that is, adding n elements requires O(n) time.  All of the other operations
- * run in linear time (roughly speaking).  The constant factor is low compared
- * to that for the <tt>LinkedList</tt> implementation.
- *
- * <p>Each <tt>ArrayList</tt> instance has a <i>capacity</i>.  The capacity is
- * the size of the array used to store the elements in the list.  It is always
- * at least as large as the list size.  As elements are added to an ArrayList,
- * its capacity grows automatically.  The details of the growth policy are not
- * specified beyond the fact that adding an element has constant amortized
- * time cost.
- *
- * <p>An application can increase the capacity of an <tt>ArrayList</tt> instance
- * before adding a large number of elements using the <tt>ensureCapacity</tt>
- * operation.  This may reduce the amount of incremental reallocation.
- *
- * <p><strong>Note that this implementation is not synchronized.</strong>
- * If multiple threads access an <tt>ArrayList</tt> instance concurrently,
- * and at least one of the threads modifies the list structurally, it
- * <i>must</i> be synchronized externally.  (A structural modification is
- * any operation that adds or deletes one or more elements, or explicitly
- * resizes the backing array; merely setting the value of an element is not
- * a structural modification.)  This is typically accomplished by
- * synchronizing on some object that naturally encapsulates the list.
- *
- * If no such object exists, the list should be "wrapped" using the
- * {@link Collections#synchronizedList Collections.synchronizedList}
- * method.  This is best done at creation time, to prevent accidental
- * unsynchronized access to the list:<pre>
- *   List list = Collections.synchronizedList(new ArrayList(...));</pre>
- *
- * <p><a name="fail-fast"/>
- * The iterators returned by this class's {@link #iterator() iterator} and
- * {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>:
- * if the list is structurally modified at any time after the iterator is
- * created, in any way except through the iterator's own
- * {@link ListIterator#remove() remove} or
- * {@link ListIterator#add(Object) add} methods, the iterator will throw a
- * {@link ConcurrentModificationException}.  Thus, in the face of
- * concurrent modification, the iterator fails quickly and cleanly, rather
- * than risking arbitrary, non-deterministic behavior at an undetermined
- * time in the future.
- *
- * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
- * as it is, generally speaking, impossible to make any hard guarantees in the
- * presence of unsynchronized concurrent modification.  Fail-fast iterators
- * throw {@code ConcurrentModificationException} on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness:  <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i>
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see     Collection
- * @see     List
- * @see     LinkedList
- * @see     Vector
- * @since   1.2
- */
-
-public class ArrayList<E> extends AbstractList<E>
-        implements List<E>, RandomAccess, Cloneable, java.io.Serializable
-{
-    private static final long serialVersionUID = 8683452581122892189L;
-
-    /**
-     * The array buffer into which the elements of the ArrayList are stored.
-     * The capacity of the ArrayList is the length of this array buffer.
-     */
-    private transient Object[] elementData;
-
-    /**
-     * The size of the ArrayList (the number of elements it contains).
-     *
-     * @serial
-     */
-    private int size;
-
-    /**
-     * Constructs an empty list with the specified initial capacity.
-     *
-     * @param  initialCapacity  the initial capacity of the list
-     * @throws IllegalArgumentException if the specified initial capacity
-     *         is negative
-     */
-    public ArrayList(int initialCapacity) {
-        super();
-        if (initialCapacity < 0)
-            throw new IllegalArgumentException("Illegal Capacity: "+
-                                               initialCapacity);
-        this.elementData = new Object[initialCapacity];
-    }
-
-    /**
-     * Constructs an empty list with an initial capacity of ten.
-     */
-    public ArrayList() {
-        this(10);
-    }
-
-    /**
-     * Constructs a list containing the elements of the specified
-     * collection, in the order they are returned by the collection's
-     * iterator.
-     *
-     * @param c the collection whose elements are to be placed into this list
-     * @throws NullPointerException if the specified collection is null
-     */
-    public ArrayList(Collection<? extends E> c) {
-        elementData = c.toArray();
-        size = elementData.length;
-        // c.toArray might (incorrectly) not return Object[] (see 6260652)
-        if (elementData.getClass() != Object[].class)
-            elementData = Arrays.copyOf(elementData, size, Object[].class);
-    }
-
-    /**
-     * Trims the capacity of this <tt>ArrayList</tt> instance to be the
-     * list's current size.  An application can use this operation to minimize
-     * the storage of an <tt>ArrayList</tt> instance.
-     */
-    public void trimToSize() {
-        modCount++;
-        int oldCapacity = elementData.length;
-        if (size < oldCapacity) {
-            elementData = Arrays.copyOf(elementData, size);
-        }
-    }
-
-    /**
-     * Increases the capacity of this <tt>ArrayList</tt> instance, if
-     * necessary, to ensure that it can hold at least the number of elements
-     * specified by the minimum capacity argument.
-     *
-     * @param   minCapacity   the desired minimum capacity
-     */
-    public void ensureCapacity(int minCapacity) {
-        if (minCapacity > 0)
-            ensureCapacityInternal(minCapacity);
-    }
-
-    private void ensureCapacityInternal(int minCapacity) {
-        modCount++;
-        // overflow-conscious code
-        if (minCapacity - elementData.length > 0)
-            grow(minCapacity);
-    }
-
-    /**
-     * The maximum size of array to allocate.
-     * Some VMs reserve some header words in an array.
-     * Attempts to allocate larger arrays may result in
-     * OutOfMemoryError: Requested array size exceeds VM limit
-     */
-    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
-    /**
-     * Increases the capacity to ensure that it can hold at least the
-     * number of elements specified by the minimum capacity argument.
-     *
-     * @param minCapacity the desired minimum capacity
-     */
-    private void grow(int minCapacity) {
-        // overflow-conscious code
-        int oldCapacity = elementData.length;
-        int newCapacity = oldCapacity + (oldCapacity >> 1);
-        if (newCapacity - minCapacity < 0)
-            newCapacity = minCapacity;
-        if (newCapacity - MAX_ARRAY_SIZE > 0)
-            newCapacity = hugeCapacity(minCapacity);
-        // minCapacity is usually close to size, so this is a win:
-        elementData = Arrays.copyOf(elementData, newCapacity);
-    }
-
-    private static int hugeCapacity(int minCapacity) {
-        if (minCapacity < 0) // overflow
-            throw new OutOfMemoryError();
-        return (minCapacity > MAX_ARRAY_SIZE) ?
-            Integer.MAX_VALUE :
-            MAX_ARRAY_SIZE;
-    }
-
-    /**
-     * Returns the number of elements in this list.
-     *
-     * @return the number of elements in this list
-     */
-    public int size() {
-        return size;
-    }
-
-    /**
-     * Returns <tt>true</tt> if this list contains no elements.
-     *
-     * @return <tt>true</tt> if this list contains no elements
-     */
-    public boolean isEmpty() {
-        return size == 0;
-    }
-
-    /**
-     * Returns <tt>true</tt> if this list contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this list contains
-     * at least one element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
-     *
-     * @param o element whose presence in this list is to be tested
-     * @return <tt>true</tt> if this list contains the specified element
-     */
-    public boolean contains(Object o) {
-        return indexOf(o) >= 0;
-    }
-
-    /**
-     * Returns the index of the first occurrence of the specified element
-     * in this list, or -1 if this list does not contain the element.
-     * More formally, returns the lowest index <tt>i</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-     * or -1 if there is no such index.
-     */
-    public int indexOf(Object o) {
-        if (o == null) {
-            for (int i = 0; i < size; i++)
-                if (elementData[i]==null)
-                    return i;
-        } else {
-            for (int i = 0; i < size; i++)
-                if (o.equals(elementData[i]))
-                    return i;
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index of the last occurrence of the specified element
-     * in this list, or -1 if this list does not contain the element.
-     * More formally, returns the highest index <tt>i</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-     * or -1 if there is no such index.
-     */
-    public int lastIndexOf(Object o) {
-        if (o == null) {
-            for (int i = size-1; i >= 0; i--)
-                if (elementData[i]==null)
-                    return i;
-        } else {
-            for (int i = size-1; i >= 0; i--)
-                if (o.equals(elementData[i]))
-                    return i;
-        }
-        return -1;
-    }
-
-    /**
-     * Returns a shallow copy of this <tt>ArrayList</tt> instance.  (The
-     * elements themselves are not copied.)
-     *
-     * @return a clone of this <tt>ArrayList</tt> instance
-     */
-    public Object clone() {
-        try {
-            @SuppressWarnings("unchecked")
-                ArrayList<E> v = (ArrayList<E>) super.clone();
-            v.elementData = Arrays.copyOf(elementData, size);
-            v.modCount = 0;
-            return v;
-        } catch (CloneNotSupportedException e) {
-            // this shouldn't happen, since we are Cloneable
-            throw new InternalError();
-        }
-    }
-
-    /**
-     * Returns an array containing all of the elements in this list
-     * in proper sequence (from first to last element).
-     *
-     * <p>The returned array will be "safe" in that no references to it are
-     * maintained by this list.  (In other words, this method must allocate
-     * a new array).  The caller is thus free to modify the returned array.
-     *
-     * <p>This method acts as bridge between array-based and collection-based
-     * APIs.
-     *
-     * @return an array containing all of the elements in this list in
-     *         proper sequence
-     */
-    public Object[] toArray() {
-        return Arrays.copyOf(elementData, size);
-    }
-
-    /**
-     * Returns an array containing all of the elements in this list in proper
-     * sequence (from first to last element); the runtime type of the returned
-     * array is that of the specified array.  If the list fits in the
-     * specified array, it is returned therein.  Otherwise, a new array is
-     * allocated with the runtime type of the specified array and the size of
-     * this list.
-     *
-     * <p>If the list fits in the specified array with room to spare
-     * (i.e., the array has more elements than the list), the element in
-     * the array immediately following the end of the collection is set to
-     * <tt>null</tt>.  (This is useful in determining the length of the
-     * list <i>only</i> if the caller knows that the list does not contain
-     * any null elements.)
-     *
-     * @param a the array into which the elements of the list are to
-     *          be stored, if it is big enough; otherwise, a new array of the
-     *          same runtime type is allocated for this purpose.
-     * @return an array containing the elements of the list
-     * @throws ArrayStoreException if the runtime type of the specified array
-     *         is not a supertype of the runtime type of every element in
-     *         this list
-     * @throws NullPointerException if the specified array is null
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T[] toArray(T[] a) {
-        if (a.length < size)
-            // Make a new array of a's runtime type, but my contents:
-            return (T[]) Arrays.copyOf(elementData, size, a.getClass());
-        System.arraycopy(elementData, 0, a, 0, size);
-        if (a.length > size)
-            a[size] = null;
-        return a;
-    }
-
-    // Positional Access Operations
-
-    @SuppressWarnings("unchecked")
-    E elementData(int index) {
-        return (E) elementData[index];
-    }
-
-    /**
-     * Returns the element at the specified position in this list.
-     *
-     * @param  index index of the element to return
-     * @return the element at the specified position in this list
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public E get(int index) {
-        rangeCheck(index);
-
-        return elementData(index);
-    }
-
-    /**
-     * Replaces the element at the specified position in this list with
-     * the specified element.
-     *
-     * @param index index of the element to replace
-     * @param element element to be stored at the specified position
-     * @return the element previously at the specified position
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public E set(int index, E element) {
-        rangeCheck(index);
-
-        E oldValue = elementData(index);
-        elementData[index] = element;
-        return oldValue;
-    }
-
-    /**
-     * Appends the specified element to the end of this list.
-     *
-     * @param e element to be appended to this list
-     * @return <tt>true</tt> (as specified by {@link Collection#add})
-     */
-    public boolean add(E e) {
-        ensureCapacityInternal(size + 1);  // Increments modCount!!
-        elementData[size++] = e;
-        return true;
-    }
-
-    /**
-     * Inserts the specified element at the specified position in this
-     * list. Shifts the element currently at that position (if any) and
-     * any subsequent elements to the right (adds one to their indices).
-     *
-     * @param index index at which the specified element is to be inserted
-     * @param element element to be inserted
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public void add(int index, E element) {
-        rangeCheckForAdd(index);
-
-        ensureCapacityInternal(size + 1);  // Increments modCount!!
-        System.arraycopy(elementData, index, elementData, index + 1,
-                         size - index);
-        elementData[index] = element;
-        size++;
-    }
-
-    /**
-     * Removes the element at the specified position in this list.
-     * Shifts any subsequent elements to the left (subtracts one from their
-     * indices).
-     *
-     * @param index the index of the element to be removed
-     * @return the element that was removed from the list
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public E remove(int index) {
-        rangeCheck(index);
-
-        modCount++;
-        E oldValue = elementData(index);
-
-        int numMoved = size - index - 1;
-        if (numMoved > 0)
-            System.arraycopy(elementData, index+1, elementData, index,
-                             numMoved);
-        elementData[--size] = null; // Let gc do its work
-
-        return oldValue;
-    }
-
-    /**
-     * Removes the first occurrence of the specified element from this list,
-     * if it is present.  If the list does not contain the element, it is
-     * unchanged.  More formally, removes the element with the lowest index
-     * <tt>i</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>
-     * (if such an element exists).  Returns <tt>true</tt> if this list
-     * contained the specified element (or equivalently, if this list
-     * changed as a result of the call).
-     *
-     * @param o element to be removed from this list, if present
-     * @return <tt>true</tt> if this list contained the specified element
-     */
-    public boolean remove(Object o) {
-        if (o == null) {
-            for (int index = 0; index < size; index++)
-                if (elementData[index] == null) {
-                    fastRemove(index);
-                    return true;
-                }
-        } else {
-            for (int index = 0; index < size; index++)
-                if (o.equals(elementData[index])) {
-                    fastRemove(index);
-                    return true;
-                }
-        }
-        return false;
-    }
-
-    /*
-     * Private remove method that skips bounds checking and does not
-     * return the value removed.
-     */
-    private void fastRemove(int index) {
-        modCount++;
-        int numMoved = size - index - 1;
-        if (numMoved > 0)
-            System.arraycopy(elementData, index+1, elementData, index,
-                             numMoved);
-        elementData[--size] = null; // Let gc do its work
-    }
-
-    /**
-     * Removes all of the elements from this list.  The list will
-     * be empty after this call returns.
-     */
-    public void clear() {
-        modCount++;
-
-        // Let gc do its work
-        for (int i = 0; i < size; i++)
-            elementData[i] = null;
-
-        size = 0;
-    }
-
-    /**
-     * Appends all of the elements in the specified collection to the end of
-     * this list, in the order that they are returned by the
-     * specified collection's Iterator.  The behavior of this operation is
-     * undefined if the specified collection is modified while the operation
-     * is in progress.  (This implies that the behavior of this call is
-     * undefined if the specified collection is this list, and this
-     * list is nonempty.)
-     *
-     * @param c collection containing elements to be added to this list
-     * @return <tt>true</tt> if this list changed as a result of the call
-     * @throws NullPointerException if the specified collection is null
-     */
-    public boolean addAll(Collection<? extends E> c) {
-        Object[] a = c.toArray();
-        int numNew = a.length;
-        ensureCapacityInternal(size + numNew);  // Increments modCount
-        System.arraycopy(a, 0, elementData, size, numNew);
-        size += numNew;
-        return numNew != 0;
-    }
-
-    /**
-     * Inserts all of the elements in the specified collection into this
-     * list, starting at the specified position.  Shifts the element
-     * currently at that position (if any) and any subsequent elements to
-     * the right (increases their indices).  The new elements will appear
-     * in the list in the order that they are returned by the
-     * specified collection's iterator.
-     *
-     * @param index index at which to insert the first element from the
-     *              specified collection
-     * @param c collection containing elements to be added to this list
-     * @return <tt>true</tt> if this list changed as a result of the call
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @throws NullPointerException if the specified collection is null
-     */
-    public boolean addAll(int index, Collection<? extends E> c) {
-        rangeCheckForAdd(index);
-
-        Object[] a = c.toArray();
-        int numNew = a.length;
-        ensureCapacityInternal(size + numNew);  // Increments modCount
-
-        int numMoved = size - index;
-        if (numMoved > 0)
-            System.arraycopy(elementData, index, elementData, index + numNew,
-                             numMoved);
-
-        System.arraycopy(a, 0, elementData, index, numNew);
-        size += numNew;
-        return numNew != 0;
-    }
-
-    /**
-     * Removes from this list all of the elements whose index is between
-     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
-     * Shifts any succeeding elements to the left (reduces their index).
-     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
-     * (If {@code toIndex==fromIndex}, this operation has no effect.)
-     *
-     * @throws IndexOutOfBoundsException if {@code fromIndex} or
-     *         {@code toIndex} is out of range
-     *         ({@code fromIndex < 0 ||
-     *          fromIndex >= size() ||
-     *          toIndex > size() ||
-     *          toIndex < fromIndex})
-     */
-    protected void removeRange(int fromIndex, int toIndex) {
-        modCount++;
-        int numMoved = size - toIndex;
-        System.arraycopy(elementData, toIndex, elementData, fromIndex,
-                         numMoved);
-
-        // Let gc do its work
-        int newSize = size - (toIndex-fromIndex);
-        while (size != newSize)
-            elementData[--size] = null;
-    }
-
-    /**
-     * Checks if the given index is in range.  If not, throws an appropriate
-     * runtime exception.  This method does *not* check if the index is
-     * negative: It is always used immediately prior to an array access,
-     * which throws an ArrayIndexOutOfBoundsException if index is negative.
-     */
-    private void rangeCheck(int index) {
-        if (index >= size)
-            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-    }
-
-    /**
-     * A version of rangeCheck used by add and addAll.
-     */
-    private void rangeCheckForAdd(int index) {
-        if (index > size || index < 0)
-            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-    }
-
-    /**
-     * Constructs an IndexOutOfBoundsException detail message.
-     * Of the many possible refactorings of the error handling code,
-     * this "outlining" performs best with both server and client VMs.
-     */
-    private String outOfBoundsMsg(int index) {
-        return "Index: "+index+", Size: "+size;
-    }
-
-    /**
-     * Removes from this list all of its elements that are contained in the
-     * specified collection.
-     *
-     * @param c collection containing elements to be removed from this list
-     * @return {@code true} if this list changed as a result of the call
-     * @throws ClassCastException if the class of an element of this list
-     *         is incompatible with the specified collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this list contains a null element and the
-     *         specified collection does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see Collection#contains(Object)
-     */
-    public boolean removeAll(Collection<?> c) {
-        return batchRemove(c, false);
-    }
-
-    /**
-     * Retains only the elements in this list that are contained in the
-     * specified collection.  In other words, removes from this list all
-     * of its elements that are not contained in the specified collection.
-     *
-     * @param c collection containing elements to be retained in this list
-     * @return {@code true} if this list changed as a result of the call
-     * @throws ClassCastException if the class of an element of this list
-     *         is incompatible with the specified collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this list contains a null element and the
-     *         specified collection does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see Collection#contains(Object)
-     */
-    public boolean retainAll(Collection<?> c) {
-        return batchRemove(c, true);
-    }
-
-    private boolean batchRemove(Collection<?> c, boolean complement) {
-        final Object[] elementData = this.elementData;
-        int r = 0, w = 0;
-        boolean modified = false;
-        try {
-            for (; r < size; r++)
-                if (c.contains(elementData[r]) == complement)
-                    elementData[w++] = elementData[r];
-        } finally {
-            // Preserve behavioral compatibility with AbstractCollection,
-            // even if c.contains() throws.
-            if (r != size) {
-                System.arraycopy(elementData, r,
-                                 elementData, w,
-                                 size - r);
-                w += size - r;
-            }
-            if (w != size) {
-                for (int i = w; i < size; i++)
-                    elementData[i] = null;
-                modCount += size - w;
-                size = w;
-                modified = true;
-            }
-        }
-        return modified;
-    }
-
-    /**
-     * Returns a list iterator over the elements in this list (in proper
-     * sequence), starting at the specified position in the list.
-     * The specified index indicates the first element that would be
-     * returned by an initial call to {@link ListIterator#next next}.
-     * An initial call to {@link ListIterator#previous previous} would
-     * return the element with the specified index minus one.
-     *
-     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
-     *
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public ListIterator<E> listIterator(int index) {
-        if (index < 0 || index > size)
-            throw new IndexOutOfBoundsException("Index: "+index);
-        return new ListItr(index);
-    }
-
-    /**
-     * Returns a list iterator over the elements in this list (in proper
-     * sequence).
-     *
-     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
-     *
-     * @see #listIterator(int)
-     */
-    public ListIterator<E> listIterator() {
-        return new ListItr(0);
-    }
-
-    /**
-     * Returns an iterator over the elements in this list in proper sequence.
-     *
-     * <p>The returned iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
-     *
-     * @return an iterator over the elements in this list in proper sequence
-     */
-    public Iterator<E> iterator() {
-        return new Itr();
-    }
-
-    /**
-     * An optimized version of AbstractList.Itr
-     */
-    private class Itr implements Iterator<E> {
-        int cursor;       // index of next element to return
-        int lastRet = -1; // index of last element returned; -1 if no such
-        int expectedModCount = modCount;
-
-        public boolean hasNext() {
-            return cursor != size;
-        }
-
-        @SuppressWarnings("unchecked")
-        public E next() {
-            checkForComodification();
-            int i = cursor;
-            if (i >= size)
-                throw new NoSuchElementException();
-            Object[] elementData = ArrayList.this.elementData;
-            if (i >= elementData.length)
-                throw new ConcurrentModificationException();
-            cursor = i + 1;
-            return (E) elementData[lastRet = i];
-        }
-
-        public void remove() {
-            if (lastRet < 0)
-                throw new IllegalStateException();
-            checkForComodification();
-
-            try {
-                ArrayList.this.remove(lastRet);
-                cursor = lastRet;
-                lastRet = -1;
-                expectedModCount = modCount;
-            } catch (IndexOutOfBoundsException ex) {
-                throw new ConcurrentModificationException();
-            }
-        }
-
-        final void checkForComodification() {
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-        }
-    }
-
-    /**
-     * An optimized version of AbstractList.ListItr
-     */
-    private class ListItr extends Itr implements ListIterator<E> {
-        ListItr(int index) {
-            super();
-            cursor = index;
-        }
-
-        public boolean hasPrevious() {
-            return cursor != 0;
-        }
-
-        public int nextIndex() {
-            return cursor;
-        }
-
-        public int previousIndex() {
-            return cursor - 1;
-        }
-
-        @SuppressWarnings("unchecked")
-        public E previous() {
-            checkForComodification();
-            int i = cursor - 1;
-            if (i < 0)
-                throw new NoSuchElementException();
-            Object[] elementData = ArrayList.this.elementData;
-            if (i >= elementData.length)
-                throw new ConcurrentModificationException();
-            cursor = i;
-            return (E) elementData[lastRet = i];
-        }
-
-        public void set(E e) {
-            if (lastRet < 0)
-                throw new IllegalStateException();
-            checkForComodification();
-
-            try {
-                ArrayList.this.set(lastRet, e);
-            } catch (IndexOutOfBoundsException ex) {
-                throw new ConcurrentModificationException();
-            }
-        }
-
-        public void add(E e) {
-            checkForComodification();
-
-            try {
-                int i = cursor;
-                ArrayList.this.add(i, e);
-                cursor = i + 1;
-                lastRet = -1;
-                expectedModCount = modCount;
-            } catch (IndexOutOfBoundsException ex) {
-                throw new ConcurrentModificationException();
-            }
-        }
-    }
-
-    /**
-     * Returns a view of the portion of this list between the specified
-     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.  (If
-     * {@code fromIndex} and {@code toIndex} are equal, the returned list is
-     * empty.)  The returned list is backed by this list, so non-structural
-     * changes in the returned list are reflected in this list, and vice-versa.
-     * The returned list supports all of the optional list operations.
-     *
-     * <p>This method eliminates the need for explicit range operations (of
-     * the sort that commonly exist for arrays).  Any operation that expects
-     * a list can be used as a range operation by passing a subList view
-     * instead of a whole list.  For example, the following idiom
-     * removes a range of elements from a list:
-     * <pre>
-     *      list.subList(from, to).clear();
-     * </pre>
-     * Similar idioms may be constructed for {@link #indexOf(Object)} and
-     * {@link #lastIndexOf(Object)}, and all of the algorithms in the
-     * {@link Collections} class can be applied to a subList.
-     *
-     * <p>The semantics of the list returned by this method become undefined if
-     * the backing list (i.e., this list) is <i>structurally modified</i> in
-     * any way other than via the returned list.  (Structural modifications are
-     * those that change the size of this list, or otherwise perturb it in such
-     * a fashion that iterations in progress may yield incorrect results.)
-     *
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @throws IllegalArgumentException {@inheritDoc}
-     */
-    public List<E> subList(int fromIndex, int toIndex) {
-        subListRangeCheck(fromIndex, toIndex, size);
-        return new SubList(this, 0, fromIndex, toIndex);
-    }
-
-    static void subListRangeCheck(int fromIndex, int toIndex, int size) {
-        if (fromIndex < 0)
-            throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
-        if (toIndex > size)
-            throw new IndexOutOfBoundsException("toIndex = " + toIndex);
-        if (fromIndex > toIndex)
-            throw new IllegalArgumentException("fromIndex(" + fromIndex +
-                                               ") > toIndex(" + toIndex + ")");
-    }
-
-    private class SubList extends AbstractList<E> implements RandomAccess {
-        private final AbstractList<E> parent;
-        private final int parentOffset;
-        private final int offset;
-        int size;
-
-        SubList(AbstractList<E> parent,
-                int offset, int fromIndex, int toIndex) {
-            this.parent = parent;
-            this.parentOffset = fromIndex;
-            this.offset = offset + fromIndex;
-            this.size = toIndex - fromIndex;
-            this.modCount = ArrayList.this.modCount;
-        }
-
-        public E set(int index, E e) {
-            rangeCheck(index);
-            checkForComodification();
-            E oldValue = ArrayList.this.elementData(offset + index);
-            ArrayList.this.elementData[offset + index] = e;
-            return oldValue;
-        }
-
-        public E get(int index) {
-            rangeCheck(index);
-            checkForComodification();
-            return ArrayList.this.elementData(offset + index);
-        }
-
-        public int size() {
-            checkForComodification();
-            return this.size;
-        }
-
-        public void add(int index, E e) {
-            rangeCheckForAdd(index);
-            checkForComodification();
-            parent.add(parentOffset + index, e);
-            this.modCount = parent.modCount;
-            this.size++;
-        }
-
-        public E remove(int index) {
-            rangeCheck(index);
-            checkForComodification();
-            E result = parent.remove(parentOffset + index);
-            this.modCount = parent.modCount;
-            this.size--;
-            return result;
-        }
-
-        protected void removeRange(int fromIndex, int toIndex) {
-            checkForComodification();
-            parent.removeRange(parentOffset + fromIndex,
-                               parentOffset + toIndex);
-            this.modCount = parent.modCount;
-            this.size -= toIndex - fromIndex;
-        }
-
-        public boolean addAll(Collection<? extends E> c) {
-            return addAll(this.size, c);
-        }
-
-        public boolean addAll(int index, Collection<? extends E> c) {
-            rangeCheckForAdd(index);
-            int cSize = c.size();
-            if (cSize==0)
-                return false;
-
-            checkForComodification();
-            parent.addAll(parentOffset + index, c);
-            this.modCount = parent.modCount;
-            this.size += cSize;
-            return true;
-        }
-
-        public Iterator<E> iterator() {
-            return listIterator();
-        }
-
-        public ListIterator<E> listIterator(final int index) {
-            checkForComodification();
-            rangeCheckForAdd(index);
-            final int offset = this.offset;
-
-            return new ListIterator<E>() {
-                int cursor = index;
-                int lastRet = -1;
-                int expectedModCount = ArrayList.this.modCount;
-
-                public boolean hasNext() {
-                    return cursor != SubList.this.size;
-                }
-
-                @SuppressWarnings("unchecked")
-                public E next() {
-                    checkForComodification();
-                    int i = cursor;
-                    if (i >= SubList.this.size)
-                        throw new NoSuchElementException();
-                    Object[] elementData = ArrayList.this.elementData;
-                    if (offset + i >= elementData.length)
-                        throw new ConcurrentModificationException();
-                    cursor = i + 1;
-                    return (E) elementData[offset + (lastRet = i)];
-                }
-
-                public boolean hasPrevious() {
-                    return cursor != 0;
-                }
-
-                @SuppressWarnings("unchecked")
-                public E previous() {
-                    checkForComodification();
-                    int i = cursor - 1;
-                    if (i < 0)
-                        throw new NoSuchElementException();
-                    Object[] elementData = ArrayList.this.elementData;
-                    if (offset + i >= elementData.length)
-                        throw new ConcurrentModificationException();
-                    cursor = i;
-                    return (E) elementData[offset + (lastRet = i)];
-                }
-
-                public int nextIndex() {
-                    return cursor;
-                }
-
-                public int previousIndex() {
-                    return cursor - 1;
-                }
-
-                public void remove() {
-                    if (lastRet < 0)
-                        throw new IllegalStateException();
-                    checkForComodification();
-
-                    try {
-                        SubList.this.remove(lastRet);
-                        cursor = lastRet;
-                        lastRet = -1;
-                        expectedModCount = ArrayList.this.modCount;
-                    } catch (IndexOutOfBoundsException ex) {
-                        throw new ConcurrentModificationException();
-                    }
-                }
-
-                public void set(E e) {
-                    if (lastRet < 0)
-                        throw new IllegalStateException();
-                    checkForComodification();
-
-                    try {
-                        ArrayList.this.set(offset + lastRet, e);
-                    } catch (IndexOutOfBoundsException ex) {
-                        throw new ConcurrentModificationException();
-                    }
-                }
-
-                public void add(E e) {
-                    checkForComodification();
-
-                    try {
-                        int i = cursor;
-                        SubList.this.add(i, e);
-                        cursor = i + 1;
-                        lastRet = -1;
-                        expectedModCount = ArrayList.this.modCount;
-                    } catch (IndexOutOfBoundsException ex) {
-                        throw new ConcurrentModificationException();
-                    }
-                }
-
-                final void checkForComodification() {
-                    if (expectedModCount != ArrayList.this.modCount)
-                        throw new ConcurrentModificationException();
-                }
-            };
-        }
-
-        public List<E> subList(int fromIndex, int toIndex) {
-            subListRangeCheck(fromIndex, toIndex, size);
-            return new SubList(this, offset, fromIndex, toIndex);
-        }
-
-        private void rangeCheck(int index) {
-            if (index < 0 || index >= this.size)
-                throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-        }
-
-        private void rangeCheckForAdd(int index) {
-            if (index < 0 || index > this.size)
-                throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-        }
-
-        private String outOfBoundsMsg(int index) {
-            return "Index: "+index+", Size: "+this.size;
-        }
-
-        private void checkForComodification() {
-            if (ArrayList.this.modCount != this.modCount)
-                throw new ConcurrentModificationException();
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Arrays.java
--- a/emul/compact/src/main/java/java/util/Arrays.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3670 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-import java.lang.reflect.*;
-
-/**
- * This class contains various methods for manipulating arrays (such as
- * sorting and searching). This class also contains a static factory
- * that allows arrays to be viewed as lists.
- *
- * <p>The methods in this class all throw a {@code NullPointerException},
- * if the specified array reference is null, except where noted.
- *
- * <p>The documentation for the methods contained in this class includes
- * briefs description of the <i>implementations</i>. Such descriptions should
- * be regarded as <i>implementation notes</i>, rather than parts of the
- * <i>specification</i>. Implementors should feel free to substitute other
- * algorithms, so long as the specification itself is adhered to. (For
- * example, the algorithm used by {@code sort(Object[])} does not have to be
- * a MergeSort, but it does have to be <i>stable</i>.)
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author Josh Bloch
- * @author Neal Gafter
- * @author John Rose
- * @since  1.2
- */
-public class Arrays {
-
-    // Suppresses default constructor, ensuring non-instantiability.
-    private Arrays() {}
-
-    /*
-     * Sorting of primitive type arrays.
-     */
-
-    /**
-     * Sorts the specified array into ascending numerical order.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(int[] a) {
-        DualPivotQuicksort.sort(a);
-    }
-
-    /**
-     * Sorts the specified range of the array into ascending order. The range
-     * to be sorted extends from the index {@code fromIndex}, inclusive, to
-     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
-     * the range to be sorted is empty.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element, inclusive, to be sorted
-     * @param toIndex the index of the last element, exclusive, to be sorted
-     *
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
-     */
-    public static void sort(int[] a, int fromIndex, int toIndex) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
-    }
-
-    /**
-     * Sorts the specified array into ascending numerical order.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(long[] a) {
-        DualPivotQuicksort.sort(a);
-    }
-
-    /**
-     * Sorts the specified range of the array into ascending order. The range
-     * to be sorted extends from the index {@code fromIndex}, inclusive, to
-     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
-     * the range to be sorted is empty.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element, inclusive, to be sorted
-     * @param toIndex the index of the last element, exclusive, to be sorted
-     *
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
-     */
-    public static void sort(long[] a, int fromIndex, int toIndex) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
-    }
-
-    /**
-     * Sorts the specified array into ascending numerical order.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(short[] a) {
-        DualPivotQuicksort.sort(a);
-    }
-
-    /**
-     * Sorts the specified range of the array into ascending order. The range
-     * to be sorted extends from the index {@code fromIndex}, inclusive, to
-     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
-     * the range to be sorted is empty.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element, inclusive, to be sorted
-     * @param toIndex the index of the last element, exclusive, to be sorted
-     *
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
-     */
-    public static void sort(short[] a, int fromIndex, int toIndex) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
-    }
-
-    /**
-     * Sorts the specified array into ascending numerical order.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(char[] a) {
-        DualPivotQuicksort.sort(a);
-    }
-
-    /**
-     * Sorts the specified range of the array into ascending order. The range
-     * to be sorted extends from the index {@code fromIndex}, inclusive, to
-     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
-     * the range to be sorted is empty.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element, inclusive, to be sorted
-     * @param toIndex the index of the last element, exclusive, to be sorted
-     *
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
-     */
-    public static void sort(char[] a, int fromIndex, int toIndex) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
-    }
-
-    /**
-     * Sorts the specified array into ascending numerical order.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(byte[] a) {
-        DualPivotQuicksort.sort(a);
-    }
-
-    /**
-     * Sorts the specified range of the array into ascending order. The range
-     * to be sorted extends from the index {@code fromIndex}, inclusive, to
-     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
-     * the range to be sorted is empty.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element, inclusive, to be sorted
-     * @param toIndex the index of the last element, exclusive, to be sorted
-     *
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
-     */
-    public static void sort(byte[] a, int fromIndex, int toIndex) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
-    }
-
-    /**
-     * Sorts the specified array into ascending numerical order.
-     *
-     * <p>The {@code <} relation does not provide a total order on all float
-     * values: {@code -0.0f == 0.0f} is {@code true} and a {@code Float.NaN}
-     * value compares neither less than, greater than, nor equal to any value,
-     * even itself. This method uses the total order imposed by the method
-     * {@link Float#compareTo}: {@code -0.0f} is treated as less than value
-     * {@code 0.0f} and {@code Float.NaN} is considered greater than any
-     * other value and all {@code Float.NaN} values are considered equal.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(float[] a) {
-        DualPivotQuicksort.sort(a);
-    }
-
-    /**
-     * Sorts the specified range of the array into ascending order. The range
-     * to be sorted extends from the index {@code fromIndex}, inclusive, to
-     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
-     * the range to be sorted is empty.
-     *
-     * <p>The {@code <} relation does not provide a total order on all float
-     * values: {@code -0.0f == 0.0f} is {@code true} and a {@code Float.NaN}
-     * value compares neither less than, greater than, nor equal to any value,
-     * even itself. This method uses the total order imposed by the method
-     * {@link Float#compareTo}: {@code -0.0f} is treated as less than value
-     * {@code 0.0f} and {@code Float.NaN} is considered greater than any
-     * other value and all {@code Float.NaN} values are considered equal.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element, inclusive, to be sorted
-     * @param toIndex the index of the last element, exclusive, to be sorted
-     *
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
-     */
-    public static void sort(float[] a, int fromIndex, int toIndex) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
-    }
-
-    /**
-     * Sorts the specified array into ascending numerical order.
-     *
-     * <p>The {@code <} relation does not provide a total order on all double
-     * values: {@code -0.0d == 0.0d} is {@code true} and a {@code Double.NaN}
-     * value compares neither less than, greater than, nor equal to any value,
-     * even itself. This method uses the total order imposed by the method
-     * {@link Double#compareTo}: {@code -0.0d} is treated as less than value
-     * {@code 0.0d} and {@code Double.NaN} is considered greater than any
-     * other value and all {@code Double.NaN} values are considered equal.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(double[] a) {
-        DualPivotQuicksort.sort(a);
-    }
-
-    /**
-     * Sorts the specified range of the array into ascending order. The range
-     * to be sorted extends from the index {@code fromIndex}, inclusive, to
-     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
-     * the range to be sorted is empty.
-     *
-     * <p>The {@code <} relation does not provide a total order on all double
-     * values: {@code -0.0d == 0.0d} is {@code true} and a {@code Double.NaN}
-     * value compares neither less than, greater than, nor equal to any value,
-     * even itself. This method uses the total order imposed by the method
-     * {@link Double#compareTo}: {@code -0.0d} is treated as less than value
-     * {@code 0.0d} and {@code Double.NaN} is considered greater than any
-     * other value and all {@code Double.NaN} values are considered equal.
-     *
-     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
-     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
-     * offers O(n log(n)) performance on many data sets that cause other
-     * quicksorts to degrade to quadratic performance, and is typically
-     * faster than traditional (one-pivot) Quicksort implementations.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element, inclusive, to be sorted
-     * @param toIndex the index of the last element, exclusive, to be sorted
-     *
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
-     */
-    public static void sort(double[] a, int fromIndex, int toIndex) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
-    }
-
-    /*
-     * Sorting of complex type arrays.
-     */
-
-    /**
-     * Old merge sort implementation can be selected (for
-     * compatibility with broken comparators) using a system property.
-     * Cannot be a static boolean in the enclosing class due to
-     * circular dependencies. To be removed in a future release.
-     */
-    static final class LegacyMergeSort {
-        private static final boolean userRequested = false;
-    }
-
-    /*
-     * If this platform has an optimizing VM, check whether ComparableTimSort
-     * offers any performance benefit over TimSort in conjunction with a
-     * comparator that returns:
-     *    {@code ((Comparable)first).compareTo(Second)}.
-     * If not, you are better off deleting ComparableTimSort to
-     * eliminate the code duplication.  In other words, the commented
-     * out code below is the preferable implementation for sorting
-     * arrays of Comparables if it offers sufficient performance.
-     */
-
-//    /**
-//     * A comparator that implements the natural ordering of a group of
-//     * mutually comparable elements.  Using this comparator saves us
-//     * from duplicating most of the code in this file (one version for
-//     * Comparables, one for explicit Comparators).
-//     */
-//    private static final Comparator<Object> NATURAL_ORDER =
-//            new Comparator<Object>() {
-//        @SuppressWarnings("unchecked")
-//        public int compare(Object first, Object second) {
-//            return ((Comparable<Object>)first).compareTo(second);
-//        }
-//    };
-//
-//    public static void sort(Object[] a) {
-//        sort(a, 0, a.length, NATURAL_ORDER);
-//    }
-//
-//    public static void sort(Object[] a, int fromIndex, int toIndex) {
-//        sort(a, fromIndex, toIndex, NATURAL_ORDER);
-//    }
-
-    /**
-     * Sorts the specified array of objects into ascending order, according
-     * to the {@linkplain Comparable natural ordering} of its elements.
-     * All elements in the array must implement the {@link Comparable}
-     * interface.  Furthermore, all elements in the array must be
-     * <i>mutually comparable</i> (that is, {@code e1.compareTo(e2)} must
-     * not throw a {@code ClassCastException} for any elements {@code e1}
-     * and {@code e2} in the array).
-     *
-     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.
-     *
-     * <p>Implementation note: This implementation is a stable, adaptive,
-     * iterative mergesort that requires far fewer than n lg(n) comparisons
-     * when the input array is partially sorted, while offering the
-     * performance of a traditional mergesort when the input array is
-     * randomly ordered.  If the input array is nearly sorted, the
-     * implementation requires approximately n comparisons.  Temporary
-     * storage requirements vary from a small constant for nearly sorted
-     * input arrays to n/2 object references for randomly ordered input
-     * arrays.
-     *
-     * <p>The implementation takes equal advantage of ascending and
-     * descending order in its input array, and can take advantage of
-     * ascending and descending order in different parts of the the same
-     * input array.  It is well-suited to merging two or more sorted arrays:
-     * simply concatenate the arrays and sort the resulting array.
-     *
-     * <p>The implementation was adapted from Tim Peters's list sort for Python
-     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
-     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
-     * Sorting and Information Theoretic Complexity", in Proceedings of the
-     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
-     * January 1993.
-     *
-     * @param a the array to be sorted
-     * @throws ClassCastException if the array contains elements that are not
-     *         <i>mutually comparable</i> (for example, strings and integers)
-     * @throws IllegalArgumentException (optional) if the natural
-     *         ordering of the array elements is found to violate the
-     *         {@link Comparable} contract
-     */
-    public static void sort(Object[] a) {
-        if (LegacyMergeSort.userRequested)
-            legacyMergeSort(a);
-        else
-            ComparableTimSort.sort(a);
-    }
-
-    /** To be removed in a future release. */
-    private static void legacyMergeSort(Object[] a) {
-        Object[] aux = a.clone();
-        mergeSort(aux, a, 0, a.length, 0);
-    }
-
-    /**
-     * Sorts the specified range of the specified array of objects into
-     * ascending order, according to the
-     * {@linkplain Comparable natural ordering} of its
-     * elements.  The range to be sorted extends from index
-     * {@code fromIndex}, inclusive, to index {@code toIndex}, exclusive.
-     * (If {@code fromIndex==toIndex}, the range to be sorted is empty.)  All
-     * elements in this range must implement the {@link Comparable}
-     * interface.  Furthermore, all elements in this range must be <i>mutually
-     * comparable</i> (that is, {@code e1.compareTo(e2)} must not throw a
-     * {@code ClassCastException} for any elements {@code e1} and
-     * {@code e2} in the array).
-     *
-     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.
-     *
-     * <p>Implementation note: This implementation is a stable, adaptive,
-     * iterative mergesort that requires far fewer than n lg(n) comparisons
-     * when the input array is partially sorted, while offering the
-     * performance of a traditional mergesort when the input array is
-     * randomly ordered.  If the input array is nearly sorted, the
-     * implementation requires approximately n comparisons.  Temporary
-     * storage requirements vary from a small constant for nearly sorted
-     * input arrays to n/2 object references for randomly ordered input
-     * arrays.
-     *
-     * <p>The implementation takes equal advantage of ascending and
-     * descending order in its input array, and can take advantage of
-     * ascending and descending order in different parts of the the same
-     * input array.  It is well-suited to merging two or more sorted arrays:
-     * simply concatenate the arrays and sort the resulting array.
-     *
-     * <p>The implementation was adapted from Tim Peters's list sort for Python
-     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
-     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
-     * Sorting and Information Theoretic Complexity", in Proceedings of the
-     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
-     * January 1993.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        sorted
-     * @param toIndex the index of the last element (exclusive) to be sorted
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex} or
-     *         (optional) if the natural ordering of the array elements is
-     *         found to violate the {@link Comparable} contract
-     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
-     *         {@code toIndex > a.length}
-     * @throws ClassCastException if the array contains elements that are
-     *         not <i>mutually comparable</i> (for example, strings and
-     *         integers).
-     */
-    public static void sort(Object[] a, int fromIndex, int toIndex) {
-        if (LegacyMergeSort.userRequested)
-            legacyMergeSort(a, fromIndex, toIndex);
-        else
-            ComparableTimSort.sort(a, fromIndex, toIndex);
-    }
-
-    /** To be removed in a future release. */
-    private static void legacyMergeSort(Object[] a,
-                                        int fromIndex, int toIndex) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        Object[] aux = copyOfRange(a, fromIndex, toIndex);
-        mergeSort(aux, a, fromIndex, toIndex, -fromIndex);
-    }
-
-    /**
-     * Tuning parameter: list size at or below which insertion sort will be
-     * used in preference to mergesort.
-     * To be removed in a future release.
-     */
-    private static final int INSERTIONSORT_THRESHOLD = 7;
-
-    /**
-     * Src is the source array that starts at index 0
-     * Dest is the (possibly larger) array destination with a possible offset
-     * low is the index in dest to start sorting
-     * high is the end index in dest to end sorting
-     * off is the offset to generate corresponding low, high in src
-     * To be removed in a future release.
-     */
-    private static void mergeSort(Object[] src,
-                                  Object[] dest,
-                                  int low,
-                                  int high,
-                                  int off) {
-        int length = high - low;
-
-        // Insertion sort on smallest arrays
-        if (length < INSERTIONSORT_THRESHOLD) {
-            for (int i=low; i<high; i++)
-                for (int j=i; j>low &&
-                         ((Comparable) dest[j-1]).compareTo(dest[j])>0; j--)
-                    swap(dest, j, j-1);
-            return;
-        }
-
-        // Recursively sort halves of dest into src
-        int destLow  = low;
-        int destHigh = high;
-        low  += off;
-        high += off;
-        int mid = (low + high) >>> 1;
-        mergeSort(dest, src, low, mid, -off);
-        mergeSort(dest, src, mid, high, -off);
-
-        // If list is already sorted, just copy from src to dest.  This is an
-        // optimization that results in faster sorts for nearly ordered lists.
-        if (((Comparable)src[mid-1]).compareTo(src[mid]) <= 0) {
-            System.arraycopy(src, low, dest, destLow, length);
-            return;
-        }
-
-        // Merge sorted halves (now in src) into dest
-        for(int i = destLow, p = low, q = mid; i < destHigh; i++) {
-            if (q >= high || p < mid && ((Comparable)src[p]).compareTo(src[q])<=0)
-                dest[i] = src[p++];
-            else
-                dest[i] = src[q++];
-        }
-    }
-
-    /**
-     * Swaps x[a] with x[b].
-     */
-    private static void swap(Object[] x, int a, int b) {
-        Object t = x[a];
-        x[a] = x[b];
-        x[b] = t;
-    }
-
-    /**
-     * Sorts the specified array of objects according to the order induced by
-     * the specified comparator.  All elements in the array must be
-     * <i>mutually comparable</i> by the specified comparator (that is,
-     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
-     * for any elements {@code e1} and {@code e2} in the array).
-     *
-     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.
-     *
-     * <p>Implementation note: This implementation is a stable, adaptive,
-     * iterative mergesort that requires far fewer than n lg(n) comparisons
-     * when the input array is partially sorted, while offering the
-     * performance of a traditional mergesort when the input array is
-     * randomly ordered.  If the input array is nearly sorted, the
-     * implementation requires approximately n comparisons.  Temporary
-     * storage requirements vary from a small constant for nearly sorted
-     * input arrays to n/2 object references for randomly ordered input
-     * arrays.
-     *
-     * <p>The implementation takes equal advantage of ascending and
-     * descending order in its input array, and can take advantage of
-     * ascending and descending order in different parts of the the same
-     * input array.  It is well-suited to merging two or more sorted arrays:
-     * simply concatenate the arrays and sort the resulting array.
-     *
-     * <p>The implementation was adapted from Tim Peters's list sort for Python
-     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
-     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
-     * Sorting and Information Theoretic Complexity", in Proceedings of the
-     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
-     * January 1993.
-     *
-     * @param a the array to be sorted
-     * @param c the comparator to determine the order of the array.  A
-     *        {@code null} value indicates that the elements'
-     *        {@linkplain Comparable natural ordering} should be used.
-     * @throws ClassCastException if the array contains elements that are
-     *         not <i>mutually comparable</i> using the specified comparator
-     * @throws IllegalArgumentException (optional) if the comparator is
-     *         found to violate the {@link Comparator} contract
-     */
-    public static <T> void sort(T[] a, Comparator<? super T> c) {
-        if (LegacyMergeSort.userRequested)
-            legacyMergeSort(a, c);
-        else
-            TimSort.sort(a, c);
-    }
-
-    /** To be removed in a future release. */
-    private static <T> void legacyMergeSort(T[] a, Comparator<? super T> c) {
-        T[] aux = a.clone();
-        if (c==null)
-            mergeSort(aux, a, 0, a.length, 0);
-        else
-            mergeSort(aux, a, 0, a.length, 0, c);
-    }
-
-    /**
-     * Sorts the specified range of the specified array of objects according
-     * to the order induced by the specified comparator.  The range to be
-     * sorted extends from index {@code fromIndex}, inclusive, to index
-     * {@code toIndex}, exclusive.  (If {@code fromIndex==toIndex}, the
-     * range to be sorted is empty.)  All elements in the range must be
-     * <i>mutually comparable</i> by the specified comparator (that is,
-     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
-     * for any elements {@code e1} and {@code e2} in the range).
-     *
-     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.
-     *
-     * <p>Implementation note: This implementation is a stable, adaptive,
-     * iterative mergesort that requires far fewer than n lg(n) comparisons
-     * when the input array is partially sorted, while offering the
-     * performance of a traditional mergesort when the input array is
-     * randomly ordered.  If the input array is nearly sorted, the
-     * implementation requires approximately n comparisons.  Temporary
-     * storage requirements vary from a small constant for nearly sorted
-     * input arrays to n/2 object references for randomly ordered input
-     * arrays.
-     *
-     * <p>The implementation takes equal advantage of ascending and
-     * descending order in its input array, and can take advantage of
-     * ascending and descending order in different parts of the the same
-     * input array.  It is well-suited to merging two or more sorted arrays:
-     * simply concatenate the arrays and sort the resulting array.
-     *
-     * <p>The implementation was adapted from Tim Peters's list sort for Python
-     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
-     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
-     * Sorting and Information Theoretic Complexity", in Proceedings of the
-     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
-     * January 1993.
-     *
-     * @param a the array to be sorted
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        sorted
-     * @param toIndex the index of the last element (exclusive) to be sorted
-     * @param c the comparator to determine the order of the array.  A
-     *        {@code null} value indicates that the elements'
-     *        {@linkplain Comparable natural ordering} should be used.
-     * @throws ClassCastException if the array contains elements that are not
-     *         <i>mutually comparable</i> using the specified comparator.
-     * @throws IllegalArgumentException if {@code fromIndex > toIndex} or
-     *         (optional) if the comparator is found to violate the
-     *         {@link Comparator} contract
-     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
-     *         {@code toIndex > a.length}
-     */
-    public static <T> void sort(T[] a, int fromIndex, int toIndex,
-                                Comparator<? super T> c) {
-        if (LegacyMergeSort.userRequested)
-            legacyMergeSort(a, fromIndex, toIndex, c);
-        else
-            TimSort.sort(a, fromIndex, toIndex, c);
-    }
-
-    /** To be removed in a future release. */
-    private static <T> void legacyMergeSort(T[] a, int fromIndex, int toIndex,
-                                            Comparator<? super T> c) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        T[] aux = copyOfRange(a, fromIndex, toIndex);
-        if (c==null)
-            mergeSort(aux, a, fromIndex, toIndex, -fromIndex);
-        else
-            mergeSort(aux, a, fromIndex, toIndex, -fromIndex, c);
-    }
-
-    /**
-     * Src is the source array that starts at index 0
-     * Dest is the (possibly larger) array destination with a possible offset
-     * low is the index in dest to start sorting
-     * high is the end index in dest to end sorting
-     * off is the offset into src corresponding to low in dest
-     * To be removed in a future release.
-     */
-    private static void mergeSort(Object[] src,
-                                  Object[] dest,
-                                  int low, int high, int off,
-                                  Comparator c) {
-        int length = high - low;
-
-        // Insertion sort on smallest arrays
-        if (length < INSERTIONSORT_THRESHOLD) {
-            for (int i=low; i<high; i++)
-                for (int j=i; j>low && c.compare(dest[j-1], dest[j])>0; j--)
-                    swap(dest, j, j-1);
-            return;
-        }
-
-        // Recursively sort halves of dest into src
-        int destLow  = low;
-        int destHigh = high;
-        low  += off;
-        high += off;
-        int mid = (low + high) >>> 1;
-        mergeSort(dest, src, low, mid, -off, c);
-        mergeSort(dest, src, mid, high, -off, c);
-
-        // If list is already sorted, just copy from src to dest.  This is an
-        // optimization that results in faster sorts for nearly ordered lists.
-        if (c.compare(src[mid-1], src[mid]) <= 0) {
-           System.arraycopy(src, low, dest, destLow, length);
-           return;
-        }
-
-        // Merge sorted halves (now in src) into dest
-        for(int i = destLow, p = low, q = mid; i < destHigh; i++) {
-            if (q >= high || p < mid && c.compare(src[p], src[q]) <= 0)
-                dest[i] = src[p++];
-            else
-                dest[i] = src[q++];
-        }
-    }
-
-    /**
-     * Checks that {@code fromIndex} and {@code toIndex} are in
-     * the range and throws an appropriate exception, if they aren't.
-     */
-    private static void rangeCheck(int length, int fromIndex, int toIndex) {
-        if (fromIndex > toIndex) {
-            throw new IllegalArgumentException(
-                "fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")");
-        }
-        if (fromIndex < 0) {
-            throw new ArrayIndexOutOfBoundsException(fromIndex);
-        }
-        if (toIndex > length) {
-            throw new ArrayIndexOutOfBoundsException(toIndex);
-        }
-    }
-
-    // Searching
-
-    /**
-     * Searches the specified array of longs for the specified value using the
-     * binary search algorithm.  The array must be sorted (as
-     * by the {@link #sort(long[])} method) prior to making this call.  If it
-     * is not sorted, the results are undefined.  If the array contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     */
-    public static int binarySearch(long[] a, long key) {
-        return binarySearch0(a, 0, a.length, key);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array of longs for the specified value using the
-     * binary search algorithm.
-     * The range must be sorted (as
-     * by the {@link #sort(long[], int, int)} method)
-     * prior to making this call.  If it
-     * is not sorted, the results are undefined.  If the range contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static int binarySearch(long[] a, int fromIndex, int toIndex,
-                                   long key) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key);
-    }
-
-    // Like public version, but without range checks.
-    private static int binarySearch0(long[] a, int fromIndex, int toIndex,
-                                     long key) {
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            long midVal = a[mid];
-
-            if (midVal < key)
-                low = mid + 1;
-            else if (midVal > key)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    /**
-     * Searches the specified array of ints for the specified value using the
-     * binary search algorithm.  The array must be sorted (as
-     * by the {@link #sort(int[])} method) prior to making this call.  If it
-     * is not sorted, the results are undefined.  If the array contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     */
-    public static int binarySearch(int[] a, int key) {
-        return binarySearch0(a, 0, a.length, key);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array of ints for the specified value using the
-     * binary search algorithm.
-     * The range must be sorted (as
-     * by the {@link #sort(int[], int, int)} method)
-     * prior to making this call.  If it
-     * is not sorted, the results are undefined.  If the range contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static int binarySearch(int[] a, int fromIndex, int toIndex,
-                                   int key) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key);
-    }
-
-    // Like public version, but without range checks.
-    private static int binarySearch0(int[] a, int fromIndex, int toIndex,
-                                     int key) {
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            int midVal = a[mid];
-
-            if (midVal < key)
-                low = mid + 1;
-            else if (midVal > key)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    /**
-     * Searches the specified array of shorts for the specified value using
-     * the binary search algorithm.  The array must be sorted
-     * (as by the {@link #sort(short[])} method) prior to making this call.  If
-     * it is not sorted, the results are undefined.  If the array contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     */
-    public static int binarySearch(short[] a, short key) {
-        return binarySearch0(a, 0, a.length, key);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array of shorts for the specified value using
-     * the binary search algorithm.
-     * The range must be sorted
-     * (as by the {@link #sort(short[], int, int)} method)
-     * prior to making this call.  If
-     * it is not sorted, the results are undefined.  If the range contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static int binarySearch(short[] a, int fromIndex, int toIndex,
-                                   short key) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key);
-    }
-
-    // Like public version, but without range checks.
-    private static int binarySearch0(short[] a, int fromIndex, int toIndex,
-                                     short key) {
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            short midVal = a[mid];
-
-            if (midVal < key)
-                low = mid + 1;
-            else if (midVal > key)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    /**
-     * Searches the specified array of chars for the specified value using the
-     * binary search algorithm.  The array must be sorted (as
-     * by the {@link #sort(char[])} method) prior to making this call.  If it
-     * is not sorted, the results are undefined.  If the array contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     */
-    public static int binarySearch(char[] a, char key) {
-        return binarySearch0(a, 0, a.length, key);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array of chars for the specified value using the
-     * binary search algorithm.
-     * The range must be sorted (as
-     * by the {@link #sort(char[], int, int)} method)
-     * prior to making this call.  If it
-     * is not sorted, the results are undefined.  If the range contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static int binarySearch(char[] a, int fromIndex, int toIndex,
-                                   char key) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key);
-    }
-
-    // Like public version, but without range checks.
-    private static int binarySearch0(char[] a, int fromIndex, int toIndex,
-                                     char key) {
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            char midVal = a[mid];
-
-            if (midVal < key)
-                low = mid + 1;
-            else if (midVal > key)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    /**
-     * Searches the specified array of bytes for the specified value using the
-     * binary search algorithm.  The array must be sorted (as
-     * by the {@link #sort(byte[])} method) prior to making this call.  If it
-     * is not sorted, the results are undefined.  If the array contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     */
-    public static int binarySearch(byte[] a, byte key) {
-        return binarySearch0(a, 0, a.length, key);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array of bytes for the specified value using the
-     * binary search algorithm.
-     * The range must be sorted (as
-     * by the {@link #sort(byte[], int, int)} method)
-     * prior to making this call.  If it
-     * is not sorted, the results are undefined.  If the range contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static int binarySearch(byte[] a, int fromIndex, int toIndex,
-                                   byte key) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key);
-    }
-
-    // Like public version, but without range checks.
-    private static int binarySearch0(byte[] a, int fromIndex, int toIndex,
-                                     byte key) {
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            byte midVal = a[mid];
-
-            if (midVal < key)
-                low = mid + 1;
-            else if (midVal > key)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    /**
-     * Searches the specified array of doubles for the specified value using
-     * the binary search algorithm.  The array must be sorted
-     * (as by the {@link #sort(double[])} method) prior to making this call.
-     * If it is not sorted, the results are undefined.  If the array contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.  This method considers all NaN values to be
-     * equivalent and equal.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     */
-    public static int binarySearch(double[] a, double key) {
-        return binarySearch0(a, 0, a.length, key);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array of doubles for the specified value using
-     * the binary search algorithm.
-     * The range must be sorted
-     * (as by the {@link #sort(double[], int, int)} method)
-     * prior to making this call.
-     * If it is not sorted, the results are undefined.  If the range contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found.  This method considers all NaN values to be
-     * equivalent and equal.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static int binarySearch(double[] a, int fromIndex, int toIndex,
-                                   double key) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key);
-    }
-
-    // Like public version, but without range checks.
-    private static int binarySearch0(double[] a, int fromIndex, int toIndex,
-                                     double key) {
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            double midVal = a[mid];
-
-            if (midVal < key)
-                low = mid + 1;  // Neither val is NaN, thisVal is smaller
-            else if (midVal > key)
-                high = mid - 1; // Neither val is NaN, thisVal is larger
-            else {
-                long midBits = Double.doubleToLongBits(midVal);
-                long keyBits = Double.doubleToLongBits(key);
-                if (midBits == keyBits)     // Values are equal
-                    return mid;             // Key found
-                else if (midBits < keyBits) // (-0.0, 0.0) or (!NaN, NaN)
-                    low = mid + 1;
-                else                        // (0.0, -0.0) or (NaN, !NaN)
-                    high = mid - 1;
-            }
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    /**
-     * Searches the specified array of floats for the specified value using
-     * the binary search algorithm. The array must be sorted
-     * (as by the {@link #sort(float[])} method) prior to making this call. If
-     * it is not sorted, the results are undefined. If the array contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found. This method considers all NaN values to be
-     * equivalent and equal.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key. Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     */
-    public static int binarySearch(float[] a, float key) {
-        return binarySearch0(a, 0, a.length, key);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array of floats for the specified value using
-     * the binary search algorithm.
-     * The range must be sorted
-     * (as by the {@link #sort(float[], int, int)} method)
-     * prior to making this call. If
-     * it is not sorted, the results are undefined. If the range contains
-     * multiple elements with the specified value, there is no guarantee which
-     * one will be found. This method considers all NaN values to be
-     * equivalent and equal.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key. Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static int binarySearch(float[] a, int fromIndex, int toIndex,
-                                   float key) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key);
-    }
-
-    // Like public version, but without range checks.
-    private static int binarySearch0(float[] a, int fromIndex, int toIndex,
-                                     float key) {
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            float midVal = a[mid];
-
-            if (midVal < key)
-                low = mid + 1;  // Neither val is NaN, thisVal is smaller
-            else if (midVal > key)
-                high = mid - 1; // Neither val is NaN, thisVal is larger
-            else {
-                int midBits = Float.floatToIntBits(midVal);
-                int keyBits = Float.floatToIntBits(key);
-                if (midBits == keyBits)     // Values are equal
-                    return mid;             // Key found
-                else if (midBits < keyBits) // (-0.0, 0.0) or (!NaN, NaN)
-                    low = mid + 1;
-                else                        // (0.0, -0.0) or (NaN, !NaN)
-                    high = mid - 1;
-            }
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    /**
-     * Searches the specified array for the specified object using the binary
-     * search algorithm. The array must be sorted into ascending order
-     * according to the
-     * {@linkplain Comparable natural ordering}
-     * of its elements (as by the
-     * {@link #sort(Object[])} method) prior to making this call.
-     * If it is not sorted, the results are undefined.
-     * (If the array contains elements that are not mutually comparable (for
-     * example, strings and integers), it <i>cannot</i> be sorted according
-     * to the natural ordering of its elements, hence results are undefined.)
-     * If the array contains multiple
-     * elements equal to the specified object, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws ClassCastException if the search key is not comparable to the
-     *         elements of the array.
-     */
-    public static int binarySearch(Object[] a, Object key) {
-        return binarySearch0(a, 0, a.length, key);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array for the specified object using the binary
-     * search algorithm.
-     * The range must be sorted into ascending order
-     * according to the
-     * {@linkplain Comparable natural ordering}
-     * of its elements (as by the
-     * {@link #sort(Object[], int, int)} method) prior to making this
-     * call.  If it is not sorted, the results are undefined.
-     * (If the range contains elements that are not mutually comparable (for
-     * example, strings and integers), it <i>cannot</i> be sorted according
-     * to the natural ordering of its elements, hence results are undefined.)
-     * If the range contains multiple
-     * elements equal to the specified object, there is no guarantee which
-     * one will be found.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws ClassCastException if the search key is not comparable to the
-     *         elements of the array within the specified range.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static int binarySearch(Object[] a, int fromIndex, int toIndex,
-                                   Object key) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key);
-    }
-
-    // Like public version, but without range checks.
-    private static int binarySearch0(Object[] a, int fromIndex, int toIndex,
-                                     Object key) {
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            Comparable midVal = (Comparable)a[mid];
-            int cmp = midVal.compareTo(key);
-
-            if (cmp < 0)
-                low = mid + 1;
-            else if (cmp > 0)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    /**
-     * Searches the specified array for the specified object using the binary
-     * search algorithm.  The array must be sorted into ascending order
-     * according to the specified comparator (as by the
-     * {@link #sort(Object[], Comparator) sort(T[], Comparator)}
-     * method) prior to making this call.  If it is
-     * not sorted, the results are undefined.
-     * If the array contains multiple
-     * elements equal to the specified object, there is no guarantee which one
-     * will be found.
-     *
-     * @param a the array to be searched
-     * @param key the value to be searched for
-     * @param c the comparator by which the array is ordered.  A
-     *        <tt>null</tt> value indicates that the elements'
-     *        {@linkplain Comparable natural ordering} should be used.
-     * @return index of the search key, if it is contained in the array;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element greater than the key, or <tt>a.length</tt> if all
-     *         elements in the array are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws ClassCastException if the array contains elements that are not
-     *         <i>mutually comparable</i> using the specified comparator,
-     *         or the search key is not comparable to the
-     *         elements of the array using this comparator.
-     */
-    public static <T> int binarySearch(T[] a, T key, Comparator<? super T> c) {
-        return binarySearch0(a, 0, a.length, key, c);
-    }
-
-    /**
-     * Searches a range of
-     * the specified array for the specified object using the binary
-     * search algorithm.
-     * The range must be sorted into ascending order
-     * according to the specified comparator (as by the
-     * {@link #sort(Object[], int, int, Comparator)
-     * sort(T[], int, int, Comparator)}
-     * method) prior to making this call.
-     * If it is not sorted, the results are undefined.
-     * If the range contains multiple elements equal to the specified object,
-     * there is no guarantee which one will be found.
-     *
-     * @param a the array to be searched
-     * @param fromIndex the index of the first element (inclusive) to be
-     *          searched
-     * @param toIndex the index of the last element (exclusive) to be searched
-     * @param key the value to be searched for
-     * @param c the comparator by which the array is ordered.  A
-     *        <tt>null</tt> value indicates that the elements'
-     *        {@linkplain Comparable natural ordering} should be used.
-     * @return index of the search key, if it is contained in the array
-     *         within the specified range;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the array: the index of the first
-     *         element in the range greater than the key,
-     *         or <tt>toIndex</tt> if all
-     *         elements in the range are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws ClassCastException if the range contains elements that are not
-     *         <i>mutually comparable</i> using the specified comparator,
-     *         or the search key is not comparable to the
-     *         elements in the range using this comparator.
-     * @throws IllegalArgumentException
-     *         if {@code fromIndex > toIndex}
-     * @throws ArrayIndexOutOfBoundsException
-     *         if {@code fromIndex < 0 or toIndex > a.length}
-     * @since 1.6
-     */
-    public static <T> int binarySearch(T[] a, int fromIndex, int toIndex,
-                                       T key, Comparator<? super T> c) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        return binarySearch0(a, fromIndex, toIndex, key, c);
-    }
-
-    // Like public version, but without range checks.
-    private static <T> int binarySearch0(T[] a, int fromIndex, int toIndex,
-                                         T key, Comparator<? super T> c) {
-        if (c == null) {
-            return binarySearch0(a, fromIndex, toIndex, key);
-        }
-        int low = fromIndex;
-        int high = toIndex - 1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            T midVal = a[mid];
-            int cmp = c.compare(midVal, key);
-            if (cmp < 0)
-                low = mid + 1;
-            else if (cmp > 0)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found.
-    }
-
-    // Equality Testing
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of longs are
-     * <i>equal</i> to one another.  Two arrays are considered equal if both
-     * arrays contain the same number of elements, and all corresponding pairs
-     * of elements in the two arrays are equal.  In other words, two arrays
-     * are equal if they contain the same elements in the same order.  Also,
-     * two array references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     */
-    public static boolean equals(long[] a, long[] a2) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++)
-            if (a[i] != a2[i])
-                return false;
-
-        return true;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of ints are
-     * <i>equal</i> to one another.  Two arrays are considered equal if both
-     * arrays contain the same number of elements, and all corresponding pairs
-     * of elements in the two arrays are equal.  In other words, two arrays
-     * are equal if they contain the same elements in the same order.  Also,
-     * two array references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     */
-    public static boolean equals(int[] a, int[] a2) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++)
-            if (a[i] != a2[i])
-                return false;
-
-        return true;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of shorts are
-     * <i>equal</i> to one another.  Two arrays are considered equal if both
-     * arrays contain the same number of elements, and all corresponding pairs
-     * of elements in the two arrays are equal.  In other words, two arrays
-     * are equal if they contain the same elements in the same order.  Also,
-     * two array references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     */
-    public static boolean equals(short[] a, short a2[]) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++)
-            if (a[i] != a2[i])
-                return false;
-
-        return true;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of chars are
-     * <i>equal</i> to one another.  Two arrays are considered equal if both
-     * arrays contain the same number of elements, and all corresponding pairs
-     * of elements in the two arrays are equal.  In other words, two arrays
-     * are equal if they contain the same elements in the same order.  Also,
-     * two array references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     */
-    public static boolean equals(char[] a, char[] a2) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++)
-            if (a[i] != a2[i])
-                return false;
-
-        return true;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of bytes are
-     * <i>equal</i> to one another.  Two arrays are considered equal if both
-     * arrays contain the same number of elements, and all corresponding pairs
-     * of elements in the two arrays are equal.  In other words, two arrays
-     * are equal if they contain the same elements in the same order.  Also,
-     * two array references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     */
-    public static boolean equals(byte[] a, byte[] a2) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++)
-            if (a[i] != a2[i])
-                return false;
-
-        return true;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of booleans are
-     * <i>equal</i> to one another.  Two arrays are considered equal if both
-     * arrays contain the same number of elements, and all corresponding pairs
-     * of elements in the two arrays are equal.  In other words, two arrays
-     * are equal if they contain the same elements in the same order.  Also,
-     * two array references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     */
-    public static boolean equals(boolean[] a, boolean[] a2) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++)
-            if (a[i] != a2[i])
-                return false;
-
-        return true;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of doubles are
-     * <i>equal</i> to one another.  Two arrays are considered equal if both
-     * arrays contain the same number of elements, and all corresponding pairs
-     * of elements in the two arrays are equal.  In other words, two arrays
-     * are equal if they contain the same elements in the same order.  Also,
-     * two array references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * Two doubles <tt>d1</tt> and <tt>d2</tt> are considered equal if:
-     * <pre>    <tt>new Double(d1).equals(new Double(d2))</tt></pre>
-     * (Unlike the <tt>==</tt> operator, this method considers
-     * <tt>NaN</tt> equals to itself, and 0.0d unequal to -0.0d.)
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     * @see Double#equals(Object)
-     */
-    public static boolean equals(double[] a, double[] a2) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++)
-            if (Double.doubleToLongBits(a[i])!=Double.doubleToLongBits(a2[i]))
-                return false;
-
-        return true;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of floats are
-     * <i>equal</i> to one another.  Two arrays are considered equal if both
-     * arrays contain the same number of elements, and all corresponding pairs
-     * of elements in the two arrays are equal.  In other words, two arrays
-     * are equal if they contain the same elements in the same order.  Also,
-     * two array references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * Two floats <tt>f1</tt> and <tt>f2</tt> are considered equal if:
-     * <pre>    <tt>new Float(f1).equals(new Float(f2))</tt></pre>
-     * (Unlike the <tt>==</tt> operator, this method considers
-     * <tt>NaN</tt> equals to itself, and 0.0f unequal to -0.0f.)
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     * @see Float#equals(Object)
-     */
-    public static boolean equals(float[] a, float[] a2) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++)
-            if (Float.floatToIntBits(a[i])!=Float.floatToIntBits(a2[i]))
-                return false;
-
-        return true;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays of Objects are
-     * <i>equal</i> to one another.  The two arrays are considered equal if
-     * both arrays contain the same number of elements, and all corresponding
-     * pairs of elements in the two arrays are equal.  Two objects <tt>e1</tt>
-     * and <tt>e2</tt> are considered <i>equal</i> if <tt>(e1==null ? e2==null
-     * : e1.equals(e2))</tt>.  In other words, the two arrays are equal if
-     * they contain the same elements in the same order.  Also, two array
-     * references are considered equal if both are <tt>null</tt>.<p>
-     *
-     * @param a one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     */
-    public static boolean equals(Object[] a, Object[] a2) {
-        if (a==a2)
-            return true;
-        if (a==null || a2==null)
-            return false;
-
-        int length = a.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i=0; i<length; i++) {
-            Object o1 = a[i];
-            Object o2 = a2[i];
-            if (!(o1==null ? o2==null : o1.equals(o2)))
-                return false;
-        }
-
-        return true;
-    }
-
-    // Filling
-
-    /**
-     * Assigns the specified long value to each element of the specified array
-     * of longs.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     */
-    public static void fill(long[] a, long val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified long value to each element of the specified
-     * range of the specified array of longs.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     */
-    public static void fill(long[] a, int fromIndex, int toIndex, long val) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified int value to each element of the specified array
-     * of ints.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     */
-    public static void fill(int[] a, int val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified int value to each element of the specified
-     * range of the specified array of ints.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     */
-    public static void fill(int[] a, int fromIndex, int toIndex, int val) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified short value to each element of the specified array
-     * of shorts.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     */
-    public static void fill(short[] a, short val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified short value to each element of the specified
-     * range of the specified array of shorts.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     */
-    public static void fill(short[] a, int fromIndex, int toIndex, short val) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified char value to each element of the specified array
-     * of chars.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     */
-    public static void fill(char[] a, char val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified char value to each element of the specified
-     * range of the specified array of chars.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     */
-    public static void fill(char[] a, int fromIndex, int toIndex, char val) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified byte value to each element of the specified array
-     * of bytes.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     */
-    public static void fill(byte[] a, byte val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified byte value to each element of the specified
-     * range of the specified array of bytes.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     */
-    public static void fill(byte[] a, int fromIndex, int toIndex, byte val) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified boolean value to each element of the specified
-     * array of booleans.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     */
-    public static void fill(boolean[] a, boolean val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified boolean value to each element of the specified
-     * range of the specified array of booleans.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     */
-    public static void fill(boolean[] a, int fromIndex, int toIndex,
-                            boolean val) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified double value to each element of the specified
-     * array of doubles.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     */
-    public static void fill(double[] a, double val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified double value to each element of the specified
-     * range of the specified array of doubles.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     */
-    public static void fill(double[] a, int fromIndex, int toIndex,double val){
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified float value to each element of the specified array
-     * of floats.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     */
-    public static void fill(float[] a, float val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified float value to each element of the specified
-     * range of the specified array of floats.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     */
-    public static void fill(float[] a, int fromIndex, int toIndex, float val) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified Object reference to each element of the specified
-     * array of Objects.
-     *
-     * @param a the array to be filled
-     * @param val the value to be stored in all elements of the array
-     * @throws ArrayStoreException if the specified value is not of a
-     *         runtime type that can be stored in the specified array
-     */
-    public static void fill(Object[] a, Object val) {
-        for (int i = 0, len = a.length; i < len; i++)
-            a[i] = val;
-    }
-
-    /**
-     * Assigns the specified Object reference to each element of the specified
-     * range of the specified array of Objects.  The range to be filled
-     * extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
-     * range to be filled is empty.)
-     *
-     * @param a the array to be filled
-     * @param fromIndex the index of the first element (inclusive) to be
-     *        filled with the specified value
-     * @param toIndex the index of the last element (exclusive) to be
-     *        filled with the specified value
-     * @param val the value to be stored in all elements of the array
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     * @throws ArrayStoreException if the specified value is not of a
-     *         runtime type that can be stored in the specified array
-     */
-    public static void fill(Object[] a, int fromIndex, int toIndex, Object val) {
-        rangeCheck(a.length, fromIndex, toIndex);
-        for (int i = fromIndex; i < toIndex; i++)
-            a[i] = val;
-    }
-
-    // Cloning
-
-    /**
-     * Copies the specified array, truncating or padding with nulls (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>null</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     * The resulting array is of exactly the same class as the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with nulls
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static <T> T[] copyOf(T[] original, int newLength) {
-        return (T[]) copyOf(original, newLength, original.getClass());
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with nulls (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>null</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     * The resulting array is of the class <tt>newType</tt>.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @param newType the class of the copy to be returned
-     * @return a copy of the original array, truncated or padded with nulls
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @throws ArrayStoreException if an element copied from
-     *     <tt>original</tt> is not of a runtime type that can be stored in
-     *     an array of class <tt>newType</tt>
-     * @since 1.6
-     */
-    public static <T,U> T[] copyOf(U[] original, int newLength, Class<? extends T[]> newType) {
-        T[] copy = ((Object)newType == (Object)Object[].class)
-            ? (T[]) new Object[newLength]
-            : (T[]) Array.newInstance(newType.getComponentType(), newLength);
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with zeros (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>(byte)0</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with zeros
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static byte[] copyOf(byte[] original, int newLength) {
-        byte[] copy = new byte[newLength];
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with zeros (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>(short)0</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with zeros
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static short[] copyOf(short[] original, int newLength) {
-        short[] copy = new short[newLength];
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with zeros (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>0</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with zeros
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static int[] copyOf(int[] original, int newLength) {
-        int[] copy = new int[newLength];
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with zeros (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>0L</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with zeros
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static long[] copyOf(long[] original, int newLength) {
-        long[] copy = new long[newLength];
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with null characters (if necessary)
-     * so the copy has the specified length.  For all indices that are valid
-     * in both the original array and the copy, the two arrays will contain
-     * identical values.  For any indices that are valid in the copy but not
-     * the original, the copy will contain <tt>'\\u000'</tt>.  Such indices
-     * will exist if and only if the specified length is greater than that of
-     * the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with null characters
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static char[] copyOf(char[] original, int newLength) {
-        char[] copy = new char[newLength];
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with zeros (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>0f</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with zeros
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static float[] copyOf(float[] original, int newLength) {
-        float[] copy = new float[newLength];
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with zeros (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>0d</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with zeros
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static double[] copyOf(double[] original, int newLength) {
-        double[] copy = new double[newLength];
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified array, truncating or padding with <tt>false</tt> (if necessary)
-     * so the copy has the specified length.  For all indices that are
-     * valid in both the original array and the copy, the two arrays will
-     * contain identical values.  For any indices that are valid in the
-     * copy but not the original, the copy will contain <tt>false</tt>.
-     * Such indices will exist if and only if the specified length
-     * is greater than that of the original array.
-     *
-     * @param original the array to be copied
-     * @param newLength the length of the copy to be returned
-     * @return a copy of the original array, truncated or padded with false elements
-     *     to obtain the specified length
-     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static boolean[] copyOf(boolean[] original, int newLength) {
-        boolean[] copy = new boolean[newLength];
-        System.arraycopy(original, 0, copy, 0,
-                         Math.min(original.length, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>null</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     * <p>
-     * The resulting array is of exactly the same class as the original array.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with nulls to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static <T> T[] copyOfRange(T[] original, int from, int to) {
-        return copyOfRange(original, from, to, (Class<T[]>) original.getClass());
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>null</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     * The resulting array is of the class <tt>newType</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @param newType the class of the copy to be returned
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with nulls to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @throws ArrayStoreException if an element copied from
-     *     <tt>original</tt> is not of a runtime type that can be stored in
-     *     an array of class <tt>newType</tt>.
-     * @since 1.6
-     */
-    public static <T,U> T[] copyOfRange(U[] original, int from, int to, Class<? extends T[]> newType) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        T[] copy = ((Object)newType == (Object)Object[].class)
-            ? (T[]) new Object[newLength]
-            : (T[]) Array.newInstance(newType.getComponentType(), newLength);
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>(byte)0</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with zeros to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static byte[] copyOfRange(byte[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        byte[] copy = new byte[newLength];
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>(short)0</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with zeros to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static short[] copyOfRange(short[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        short[] copy = new short[newLength];
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>0</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with zeros to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static int[] copyOfRange(int[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        int[] copy = new int[newLength];
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>0L</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with zeros to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static long[] copyOfRange(long[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        long[] copy = new long[newLength];
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>'\\u000'</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with null characters to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static char[] copyOfRange(char[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        char[] copy = new char[newLength];
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>0f</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with zeros to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static float[] copyOfRange(float[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        float[] copy = new float[newLength];
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>0d</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with zeros to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static double[] copyOfRange(double[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        double[] copy = new double[newLength];
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    /**
-     * Copies the specified range of the specified array into a new array.
-     * The initial index of the range (<tt>from</tt>) must lie between zero
-     * and <tt>original.length</tt>, inclusive.  The value at
-     * <tt>original[from]</tt> is placed into the initial element of the copy
-     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
-     * Values from subsequent elements in the original array are placed into
-     * subsequent elements in the copy.  The final index of the range
-     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
-     * may be greater than <tt>original.length</tt>, in which case
-     * <tt>false</tt> is placed in all elements of the copy whose index is
-     * greater than or equal to <tt>original.length - from</tt>.  The length
-     * of the returned array will be <tt>to - from</tt>.
-     *
-     * @param original the array from which a range is to be copied
-     * @param from the initial index of the range to be copied, inclusive
-     * @param to the final index of the range to be copied, exclusive.
-     *     (This index may lie outside the array.)
-     * @return a new array containing the specified range from the original array,
-     *     truncated or padded with false elements to obtain the required length
-     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
-     *     or {@code from > original.length}
-     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
-     * @throws NullPointerException if <tt>original</tt> is null
-     * @since 1.6
-     */
-    public static boolean[] copyOfRange(boolean[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        boolean[] copy = new boolean[newLength];
-        System.arraycopy(original, from, copy, 0,
-                         Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    // Misc
-
-    /**
-     * Returns a fixed-size list backed by the specified array.  (Changes to
-     * the returned list "write through" to the array.)  This method acts
-     * as bridge between array-based and collection-based APIs, in
-     * combination with {@link Collection#toArray}.  The returned list is
-     * serializable and implements {@link RandomAccess}.
-     *
-     * <p>This method also provides a convenient way to create a fixed-size
-     * list initialized to contain several elements:
-     * <pre>
-     *     List&lt;String&gt; stooges = Arrays.asList("Larry", "Moe", "Curly");
-     * </pre>
-     *
-     * @param a the array by which the list will be backed
-     * @return a list view of the specified array
-     */
-    @SafeVarargs
-    public static <T> List<T> asList(T... a) {
-        return new ArrayList<>(a);
-    }
-
-    /**
-     * @serial include
-     */
-    private static class ArrayList<E> extends AbstractList<E>
-        implements RandomAccess, java.io.Serializable
-    {
-        private static final long serialVersionUID = -2764017481108945198L;
-        private final E[] a;
-
-        ArrayList(E[] array) {
-            if (array==null)
-                throw new NullPointerException();
-            a = array;
-        }
-
-        public int size() {
-            return a.length;
-        }
-
-        public Object[] toArray() {
-            return a.clone();
-        }
-
-        public <T> T[] toArray(T[] a) {
-            int size = size();
-            if (a.length < size)
-                return Arrays.copyOf(this.a, size,
-                                     (Class<? extends T[]>) a.getClass());
-            System.arraycopy(this.a, 0, a, 0, size);
-            if (a.length > size)
-                a[size] = null;
-            return a;
-        }
-
-        public E get(int index) {
-            return a[index];
-        }
-
-        public E set(int index, E element) {
-            E oldValue = a[index];
-            a[index] = element;
-            return oldValue;
-        }
-
-        public int indexOf(Object o) {
-            if (o==null) {
-                for (int i=0; i<a.length; i++)
-                    if (a[i]==null)
-                        return i;
-            } else {
-                for (int i=0; i<a.length; i++)
-                    if (o.equals(a[i]))
-                        return i;
-            }
-            return -1;
-        }
-
-        public boolean contains(Object o) {
-            return indexOf(o) != -1;
-        }
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.
-     * For any two <tt>long</tt> arrays <tt>a</tt> and <tt>b</tt>
-     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is the same value that would be
-     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
-     * method on a {@link List} containing a sequence of {@link Long}
-     * instances representing the elements of <tt>a</tt> in the same order.
-     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
-     *
-     * @param a the array whose hash value to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @since 1.5
-     */
-    public static int hashCode(long a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-        for (long element : a) {
-            int elementHash = (int)(element ^ (element >>> 32));
-            result = 31 * result + elementHash;
-        }
-
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.
-     * For any two non-null <tt>int</tt> arrays <tt>a</tt> and <tt>b</tt>
-     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is the same value that would be
-     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
-     * method on a {@link List} containing a sequence of {@link Integer}
-     * instances representing the elements of <tt>a</tt> in the same order.
-     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
-     *
-     * @param a the array whose hash value to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @since 1.5
-     */
-    public static int hashCode(int a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-        for (int element : a)
-            result = 31 * result + element;
-
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.
-     * For any two <tt>short</tt> arrays <tt>a</tt> and <tt>b</tt>
-     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is the same value that would be
-     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
-     * method on a {@link List} containing a sequence of {@link Short}
-     * instances representing the elements of <tt>a</tt> in the same order.
-     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
-     *
-     * @param a the array whose hash value to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @since 1.5
-     */
-    public static int hashCode(short a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-        for (short element : a)
-            result = 31 * result + element;
-
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.
-     * For any two <tt>char</tt> arrays <tt>a</tt> and <tt>b</tt>
-     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is the same value that would be
-     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
-     * method on a {@link List} containing a sequence of {@link Character}
-     * instances representing the elements of <tt>a</tt> in the same order.
-     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
-     *
-     * @param a the array whose hash value to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @since 1.5
-     */
-    public static int hashCode(char a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-        for (char element : a)
-            result = 31 * result + element;
-
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.
-     * For any two <tt>byte</tt> arrays <tt>a</tt> and <tt>b</tt>
-     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is the same value that would be
-     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
-     * method on a {@link List} containing a sequence of {@link Byte}
-     * instances representing the elements of <tt>a</tt> in the same order.
-     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
-     *
-     * @param a the array whose hash value to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @since 1.5
-     */
-    public static int hashCode(byte a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-        for (byte element : a)
-            result = 31 * result + element;
-
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.
-     * For any two <tt>boolean</tt> arrays <tt>a</tt> and <tt>b</tt>
-     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is the same value that would be
-     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
-     * method on a {@link List} containing a sequence of {@link Boolean}
-     * instances representing the elements of <tt>a</tt> in the same order.
-     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
-     *
-     * @param a the array whose hash value to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @since 1.5
-     */
-    public static int hashCode(boolean a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-        for (boolean element : a)
-            result = 31 * result + (element ? 1231 : 1237);
-
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.
-     * For any two <tt>float</tt> arrays <tt>a</tt> and <tt>b</tt>
-     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is the same value that would be
-     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
-     * method on a {@link List} containing a sequence of {@link Float}
-     * instances representing the elements of <tt>a</tt> in the same order.
-     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
-     *
-     * @param a the array whose hash value to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @since 1.5
-     */
-    public static int hashCode(float a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-        for (float element : a)
-            result = 31 * result + Float.floatToIntBits(element);
-
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.
-     * For any two <tt>double</tt> arrays <tt>a</tt> and <tt>b</tt>
-     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is the same value that would be
-     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
-     * method on a {@link List} containing a sequence of {@link Double}
-     * instances representing the elements of <tt>a</tt> in the same order.
-     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
-     *
-     * @param a the array whose hash value to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @since 1.5
-     */
-    public static int hashCode(double a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-        for (double element : a) {
-            long bits = Double.doubleToLongBits(element);
-            result = 31 * result + (int)(bits ^ (bits >>> 32));
-        }
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the contents of the specified array.  If
-     * the array contains other arrays as elements, the hash code is based on
-     * their identities rather than their contents.  It is therefore
-     * acceptable to invoke this method on an array that contains itself as an
-     * element,  either directly or indirectly through one or more levels of
-     * arrays.
-     *
-     * <p>For any two arrays <tt>a</tt> and <tt>b</tt> such that
-     * <tt>Arrays.equals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
-     *
-     * <p>The value returned by this method is equal to the value that would
-     * be returned by <tt>Arrays.asList(a).hashCode()</tt>, unless <tt>a</tt>
-     * is <tt>null</tt>, in which case <tt>0</tt> is returned.
-     *
-     * @param a the array whose content-based hash code to compute
-     * @return a content-based hash code for <tt>a</tt>
-     * @see #deepHashCode(Object[])
-     * @since 1.5
-     */
-    public static int hashCode(Object a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-
-        for (Object element : a)
-            result = 31 * result + (element == null ? 0 : element.hashCode());
-
-        return result;
-    }
-
-    /**
-     * Returns a hash code based on the "deep contents" of the specified
-     * array.  If the array contains other arrays as elements, the
-     * hash code is based on their contents and so on, ad infinitum.
-     * It is therefore unacceptable to invoke this method on an array that
-     * contains itself as an element, either directly or indirectly through
-     * one or more levels of arrays.  The behavior of such an invocation is
-     * undefined.
-     *
-     * <p>For any two arrays <tt>a</tt> and <tt>b</tt> such that
-     * <tt>Arrays.deepEquals(a, b)</tt>, it is also the case that
-     * <tt>Arrays.deepHashCode(a) == Arrays.deepHashCode(b)</tt>.
-     *
-     * <p>The computation of the value returned by this method is similar to
-     * that of the value returned by {@link List#hashCode()} on a list
-     * containing the same elements as <tt>a</tt> in the same order, with one
-     * difference: If an element <tt>e</tt> of <tt>a</tt> is itself an array,
-     * its hash code is computed not by calling <tt>e.hashCode()</tt>, but as
-     * by calling the appropriate overloading of <tt>Arrays.hashCode(e)</tt>
-     * if <tt>e</tt> is an array of a primitive type, or as by calling
-     * <tt>Arrays.deepHashCode(e)</tt> recursively if <tt>e</tt> is an array
-     * of a reference type.  If <tt>a</tt> is <tt>null</tt>, this method
-     * returns 0.
-     *
-     * @param a the array whose deep-content-based hash code to compute
-     * @return a deep-content-based hash code for <tt>a</tt>
-     * @see #hashCode(Object[])
-     * @since 1.5
-     */
-    public static int deepHashCode(Object a[]) {
-        if (a == null)
-            return 0;
-
-        int result = 1;
-
-        for (Object element : a) {
-            int elementHash = 0;
-            if (element instanceof Object[])
-                elementHash = deepHashCode((Object[]) element);
-            else if (element instanceof byte[])
-                elementHash = hashCode((byte[]) element);
-            else if (element instanceof short[])
-                elementHash = hashCode((short[]) element);
-            else if (element instanceof int[])
-                elementHash = hashCode((int[]) element);
-            else if (element instanceof long[])
-                elementHash = hashCode((long[]) element);
-            else if (element instanceof char[])
-                elementHash = hashCode((char[]) element);
-            else if (element instanceof float[])
-                elementHash = hashCode((float[]) element);
-            else if (element instanceof double[])
-                elementHash = hashCode((double[]) element);
-            else if (element instanceof boolean[])
-                elementHash = hashCode((boolean[]) element);
-            else if (element != null)
-                elementHash = element.hashCode();
-
-            result = 31 * result + elementHash;
-        }
-
-        return result;
-    }
-
-    /**
-     * Returns <tt>true</tt> if the two specified arrays are <i>deeply
-     * equal</i> to one another.  Unlike the {@link #equals(Object[],Object[])}
-     * method, this method is appropriate for use with nested arrays of
-     * arbitrary depth.
-     *
-     * <p>Two array references are considered deeply equal if both
-     * are <tt>null</tt>, or if they refer to arrays that contain the same
-     * number of elements and all corresponding pairs of elements in the two
-     * arrays are deeply equal.
-     *
-     * <p>Two possibly <tt>null</tt> elements <tt>e1</tt> and <tt>e2</tt> are
-     * deeply equal if any of the following conditions hold:
-     * <ul>
-     *    <li> <tt>e1</tt> and <tt>e2</tt> are both arrays of object reference
-     *         types, and <tt>Arrays.deepEquals(e1, e2) would return true</tt>
-     *    <li> <tt>e1</tt> and <tt>e2</tt> are arrays of the same primitive
-     *         type, and the appropriate overloading of
-     *         <tt>Arrays.equals(e1, e2)</tt> would return true.
-     *    <li> <tt>e1 == e2</tt>
-     *    <li> <tt>e1.equals(e2)</tt> would return true.
-     * </ul>
-     * Note that this definition permits <tt>null</tt> elements at any depth.
-     *
-     * <p>If either of the specified arrays contain themselves as elements
-     * either directly or indirectly through one or more levels of arrays,
-     * the behavior of this method is undefined.
-     *
-     * @param a1 one array to be tested for equality
-     * @param a2 the other array to be tested for equality
-     * @return <tt>true</tt> if the two arrays are equal
-     * @see #equals(Object[],Object[])
-     * @see Objects#deepEquals(Object, Object)
-     * @since 1.5
-     */
-    public static boolean deepEquals(Object[] a1, Object[] a2) {
-        if (a1 == a2)
-            return true;
-        if (a1 == null || a2==null)
-            return false;
-        int length = a1.length;
-        if (a2.length != length)
-            return false;
-
-        for (int i = 0; i < length; i++) {
-            Object e1 = a1[i];
-            Object e2 = a2[i];
-
-            if (e1 == e2)
-                continue;
-            if (e1 == null)
-                return false;
-
-            // Figure out whether the two elements are equal
-            boolean eq = deepEquals0(e1, e2);
-
-            if (!eq)
-                return false;
-        }
-        return true;
-    }
-
-    static boolean deepEquals0(Object e1, Object e2) {
-        assert e1 != null;
-        boolean eq;
-        if (e1 instanceof Object[] && e2 instanceof Object[])
-            eq = deepEquals ((Object[]) e1, (Object[]) e2);
-        else if (e1 instanceof byte[] && e2 instanceof byte[])
-            eq = equals((byte[]) e1, (byte[]) e2);
-        else if (e1 instanceof short[] && e2 instanceof short[])
-            eq = equals((short[]) e1, (short[]) e2);
-        else if (e1 instanceof int[] && e2 instanceof int[])
-            eq = equals((int[]) e1, (int[]) e2);
-        else if (e1 instanceof long[] && e2 instanceof long[])
-            eq = equals((long[]) e1, (long[]) e2);
-        else if (e1 instanceof char[] && e2 instanceof char[])
-            eq = equals((char[]) e1, (char[]) e2);
-        else if (e1 instanceof float[] && e2 instanceof float[])
-            eq = equals((float[]) e1, (float[]) e2);
-        else if (e1 instanceof double[] && e2 instanceof double[])
-            eq = equals((double[]) e1, (double[]) e2);
-        else if (e1 instanceof boolean[] && e2 instanceof boolean[])
-            eq = equals((boolean[]) e1, (boolean[]) e2);
-        else
-            eq = e1.equals(e2);
-        return eq;
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * The string representation consists of a list of the array's elements,
-     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
-     * separated by the characters <tt>", "</tt> (a comma followed by a
-     * space).  Elements are converted to strings as by
-     * <tt>String.valueOf(long)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
-     * is <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @since 1.5
-     */
-    public static String toString(long[] a) {
-        if (a == null)
-            return "null";
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(a[i]);
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * The string representation consists of a list of the array's elements,
-     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
-     * separated by the characters <tt>", "</tt> (a comma followed by a
-     * space).  Elements are converted to strings as by
-     * <tt>String.valueOf(int)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt> is
-     * <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @since 1.5
-     */
-    public static String toString(int[] a) {
-        if (a == null)
-            return "null";
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(a[i]);
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * The string representation consists of a list of the array's elements,
-     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
-     * separated by the characters <tt>", "</tt> (a comma followed by a
-     * space).  Elements are converted to strings as by
-     * <tt>String.valueOf(short)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
-     * is <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @since 1.5
-     */
-    public static String toString(short[] a) {
-        if (a == null)
-            return "null";
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(a[i]);
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * The string representation consists of a list of the array's elements,
-     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
-     * separated by the characters <tt>", "</tt> (a comma followed by a
-     * space).  Elements are converted to strings as by
-     * <tt>String.valueOf(char)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
-     * is <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @since 1.5
-     */
-    public static String toString(char[] a) {
-        if (a == null)
-            return "null";
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(a[i]);
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * The string representation consists of a list of the array's elements,
-     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements
-     * are separated by the characters <tt>", "</tt> (a comma followed
-     * by a space).  Elements are converted to strings as by
-     * <tt>String.valueOf(byte)</tt>.  Returns <tt>"null"</tt> if
-     * <tt>a</tt> is <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @since 1.5
-     */
-    public static String toString(byte[] a) {
-        if (a == null)
-            return "null";
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(a[i]);
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * The string representation consists of a list of the array's elements,
-     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
-     * separated by the characters <tt>", "</tt> (a comma followed by a
-     * space).  Elements are converted to strings as by
-     * <tt>String.valueOf(boolean)</tt>.  Returns <tt>"null"</tt> if
-     * <tt>a</tt> is <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @since 1.5
-     */
-    public static String toString(boolean[] a) {
-        if (a == null)
-            return "null";
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(a[i]);
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * The string representation consists of a list of the array's elements,
-     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
-     * separated by the characters <tt>", "</tt> (a comma followed by a
-     * space).  Elements are converted to strings as by
-     * <tt>String.valueOf(float)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
-     * is <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @since 1.5
-     */
-    public static String toString(float[] a) {
-        if (a == null)
-            return "null";
-
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(a[i]);
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * The string representation consists of a list of the array's elements,
-     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
-     * separated by the characters <tt>", "</tt> (a comma followed by a
-     * space).  Elements are converted to strings as by
-     * <tt>String.valueOf(double)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
-     * is <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @since 1.5
-     */
-    public static String toString(double[] a) {
-        if (a == null)
-            return "null";
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(a[i]);
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the contents of the specified array.
-     * If the array contains other arrays as elements, they are converted to
-     * strings by the {@link Object#toString} method inherited from
-     * <tt>Object</tt>, which describes their <i>identities</i> rather than
-     * their contents.
-     *
-     * <p>The value returned by this method is equal to the value that would
-     * be returned by <tt>Arrays.asList(a).toString()</tt>, unless <tt>a</tt>
-     * is <tt>null</tt>, in which case <tt>"null"</tt> is returned.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @see #deepToString(Object[])
-     * @since 1.5
-     */
-    public static String toString(Object[] a) {
-        if (a == null)
-            return "null";
-
-        int iMax = a.length - 1;
-        if (iMax == -1)
-            return "[]";
-
-        StringBuilder b = new StringBuilder();
-        b.append('[');
-        for (int i = 0; ; i++) {
-            b.append(String.valueOf(a[i]));
-            if (i == iMax)
-                return b.append(']').toString();
-            b.append(", ");
-        }
-    }
-
-    /**
-     * Returns a string representation of the "deep contents" of the specified
-     * array.  If the array contains other arrays as elements, the string
-     * representation contains their contents and so on.  This method is
-     * designed for converting multidimensional arrays to strings.
-     *
-     * <p>The string representation consists of a list of the array's
-     * elements, enclosed in square brackets (<tt>"[]"</tt>).  Adjacent
-     * elements are separated by the characters <tt>", "</tt> (a comma
-     * followed by a space).  Elements are converted to strings as by
-     * <tt>String.valueOf(Object)</tt>, unless they are themselves
-     * arrays.
-     *
-     * <p>If an element <tt>e</tt> is an array of a primitive type, it is
-     * converted to a string as by invoking the appropriate overloading of
-     * <tt>Arrays.toString(e)</tt>.  If an element <tt>e</tt> is an array of a
-     * reference type, it is converted to a string as by invoking
-     * this method recursively.
-     *
-     * <p>To avoid infinite recursion, if the specified array contains itself
-     * as an element, or contains an indirect reference to itself through one
-     * or more levels of arrays, the self-reference is converted to the string
-     * <tt>"[...]"</tt>.  For example, an array containing only a reference
-     * to itself would be rendered as <tt>"[[...]]"</tt>.
-     *
-     * <p>This method returns <tt>"null"</tt> if the specified array
-     * is <tt>null</tt>.
-     *
-     * @param a the array whose string representation to return
-     * @return a string representation of <tt>a</tt>
-     * @see #toString(Object[])
-     * @since 1.5
-     */
-    public static String deepToString(Object[] a) {
-        if (a == null)
-            return "null";
-
-        int bufLen = 20 * a.length;
-        if (a.length != 0 && bufLen <= 0)
-            bufLen = Integer.MAX_VALUE;
-        StringBuilder buf = new StringBuilder(bufLen);
-        deepToString(a, buf, new HashSet<Object[]>());
-        return buf.toString();
-    }
-
-    private static void deepToString(Object[] a, StringBuilder buf,
-                                     Set<Object[]> dejaVu) {
-        if (a == null) {
-            buf.append("null");
-            return;
-        }
-        int iMax = a.length - 1;
-        if (iMax == -1) {
-            buf.append("[]");
-            return;
-        }
-
-        dejaVu.add(a);
-        buf.append('[');
-        for (int i = 0; ; i++) {
-
-            Object element = a[i];
-            if (element == null) {
-                buf.append("null");
-            } else {
-                Class eClass = element.getClass();
-
-                if (eClass.isArray()) {
-                    if (eClass == byte[].class)
-                        buf.append(toString((byte[]) element));
-                    else if (eClass == short[].class)
-                        buf.append(toString((short[]) element));
-                    else if (eClass == int[].class)
-                        buf.append(toString((int[]) element));
-                    else if (eClass == long[].class)
-                        buf.append(toString((long[]) element));
-                    else if (eClass == char[].class)
-                        buf.append(toString((char[]) element));
-                    else if (eClass == float[].class)
-                        buf.append(toString((float[]) element));
-                    else if (eClass == double[].class)
-                        buf.append(toString((double[]) element));
-                    else if (eClass == boolean[].class)
-                        buf.append(toString((boolean[]) element));
-                    else { // element is an array of object references
-                        if (dejaVu.contains(element))
-                            buf.append("[...]");
-                        else
-                            deepToString((Object[])element, buf, dejaVu);
-                    }
-                } else {  // element is non-null and not an array
-                    buf.append(element.toString());
-                }
-            }
-            if (i == iMax)
-                break;
-            buf.append(", ");
-        }
-        buf.append(']');
-        dejaVu.remove(a);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Collection.java
--- a/emul/compact/src/main/java/java/util/Collection.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,456 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * The root interface in the <i>collection hierarchy</i>.  A collection
- * represents a group of objects, known as its <i>elements</i>.  Some
- * collections allow duplicate elements and others do not.  Some are ordered
- * and others unordered.  The JDK does not provide any <i>direct</i>
- * implementations of this interface: it provides implementations of more
- * specific subinterfaces like <tt>Set</tt> and <tt>List</tt>.  This interface
- * is typically used to pass collections around and manipulate them where
- * maximum generality is desired.
- *
- * <p><i>Bags</i> or <i>multisets</i> (unordered collections that may contain
- * duplicate elements) should implement this interface directly.
- *
- * <p>All general-purpose <tt>Collection</tt> implementation classes (which
- * typically implement <tt>Collection</tt> indirectly through one of its
- * subinterfaces) should provide two "standard" constructors: a void (no
- * arguments) constructor, which creates an empty collection, and a
- * constructor with a single argument of type <tt>Collection</tt>, which
- * creates a new collection with the same elements as its argument.  In
- * effect, the latter constructor allows the user to copy any collection,
- * producing an equivalent collection of the desired implementation type.
- * There is no way to enforce this convention (as interfaces cannot contain
- * constructors) but all of the general-purpose <tt>Collection</tt>
- * implementations in the Java platform libraries comply.
- *
- * <p>The "destructive" methods contained in this interface, that is, the
- * methods that modify the collection on which they operate, are specified to
- * throw <tt>UnsupportedOperationException</tt> if this collection does not
- * support the operation.  If this is the case, these methods may, but are not
- * required to, throw an <tt>UnsupportedOperationException</tt> if the
- * invocation would have no effect on the collection.  For example, invoking
- * the {@link #addAll(Collection)} method on an unmodifiable collection may,
- * but is not required to, throw the exception if the collection to be added
- * is empty.
- *
- * <p><a name="optional-restrictions"/>
- * Some collection implementations have restrictions on the elements that
- * they may contain.  For example, some implementations prohibit null elements,
- * and some have restrictions on the types of their elements.  Attempting to
- * add an ineligible element throws an unchecked exception, typically
- * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.  Attempting
- * to query the presence of an ineligible element may throw an exception,
- * or it may simply return false; some implementations will exhibit the former
- * behavior and some will exhibit the latter.  More generally, attempting an
- * operation on an ineligible element whose completion would not result in
- * the insertion of an ineligible element into the collection may throw an
- * exception or it may succeed, at the option of the implementation.
- * Such exceptions are marked as "optional" in the specification for this
- * interface.
- *
- * <p>It is up to each collection to determine its own synchronization
- * policy.  In the absence of a stronger guarantee by the
- * implementation, undefined behavior may result from the invocation
- * of any method on a collection that is being mutated by another
- * thread; this includes direct invocations, passing the collection to
- * a method that might perform invocations, and using an existing
- * iterator to examine the collection.
- *
- * <p>Many methods in Collections Framework interfaces are defined in
- * terms of the {@link Object#equals(Object) equals} method.  For example,
- * the specification for the {@link #contains(Object) contains(Object o)}
- * method says: "returns <tt>true</tt> if and only if this collection
- * contains at least one element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>."  This specification should
- * <i>not</i> be construed to imply that invoking <tt>Collection.contains</tt>
- * with a non-null argument <tt>o</tt> will cause <tt>o.equals(e)</tt> to be
- * invoked for any element <tt>e</tt>.  Implementations are free to implement
- * optimizations whereby the <tt>equals</tt> invocation is avoided, for
- * example, by first comparing the hash codes of the two elements.  (The
- * {@link Object#hashCode()} specification guarantees that two objects with
- * unequal hash codes cannot be equal.)  More generally, implementations of
- * the various Collections Framework interfaces are free to take advantage of
- * the specified behavior of underlying {@link Object} methods wherever the
- * implementor deems it appropriate.
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <E> the type of elements in this collection
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see     Set
- * @see     List
- * @see     Map
- * @see     SortedSet
- * @see     SortedMap
- * @see     HashSet
- * @see     TreeSet
- * @see     ArrayList
- * @see     LinkedList
- * @see     Vector
- * @see     Collections
- * @see     Arrays
- * @see     AbstractCollection
- * @since 1.2
- */
-
-public interface Collection<E> extends Iterable<E> {
-    // Query Operations
-
-    /**
-     * Returns the number of elements in this collection.  If this collection
-     * contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
-     * <tt>Integer.MAX_VALUE</tt>.
-     *
-     * @return the number of elements in this collection
-     */
-    int size();
-
-    /**
-     * Returns <tt>true</tt> if this collection contains no elements.
-     *
-     * @return <tt>true</tt> if this collection contains no elements
-     */
-    boolean isEmpty();
-
-    /**
-     * Returns <tt>true</tt> if this collection contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this collection
-     * contains at least one element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
-     *
-     * @param o element whose presence in this collection is to be tested
-     * @return <tt>true</tt> if this collection contains the specified
-     *         element
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this collection
-     *         (<a href="#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         collection does not permit null elements
-     *         (<a href="#optional-restrictions">optional</a>)
-     */
-    boolean contains(Object o);
-
-    /**
-     * Returns an iterator over the elements in this collection.  There are no
-     * guarantees concerning the order in which the elements are returned
-     * (unless this collection is an instance of some class that provides a
-     * guarantee).
-     *
-     * @return an <tt>Iterator</tt> over the elements in this collection
-     */
-    Iterator<E> iterator();
-
-    /**
-     * Returns an array containing all of the elements in this collection.
-     * If this collection makes any guarantees as to what order its elements
-     * are returned by its iterator, this method must return the elements in
-     * the same order.
-     *
-     * <p>The returned array will be "safe" in that no references to it are
-     * maintained by this collection.  (In other words, this method must
-     * allocate a new array even if this collection is backed by an array).
-     * The caller is thus free to modify the returned array.
-     *
-     * <p>This method acts as bridge between array-based and collection-based
-     * APIs.
-     *
-     * @return an array containing all of the elements in this collection
-     */
-    Object[] toArray();
-
-    /**
-     * Returns an array containing all of the elements in this collection;
-     * the runtime type of the returned array is that of the specified array.
-     * If the collection fits in the specified array, it is returned therein.
-     * Otherwise, a new array is allocated with the runtime type of the
-     * specified array and the size of this collection.
-     *
-     * <p>If this collection fits in the specified array with room to spare
-     * (i.e., the array has more elements than this collection), the element
-     * in the array immediately following the end of the collection is set to
-     * <tt>null</tt>.  (This is useful in determining the length of this
-     * collection <i>only</i> if the caller knows that this collection does
-     * not contain any <tt>null</tt> elements.)
-     *
-     * <p>If this collection makes any guarantees as to what order its elements
-     * are returned by its iterator, this method must return the elements in
-     * the same order.
-     *
-     * <p>Like the {@link #toArray()} method, this method acts as bridge between
-     * array-based and collection-based APIs.  Further, this method allows
-     * precise control over the runtime type of the output array, and may,
-     * under certain circumstances, be used to save allocation costs.
-     *
-     * <p>Suppose <tt>x</tt> is a collection known to contain only strings.
-     * The following code can be used to dump the collection into a newly
-     * allocated array of <tt>String</tt>:
-     *
-     * <pre>
-     *     String[] y = x.toArray(new String[0]);</pre>
-     *
-     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
-     * <tt>toArray()</tt>.
-     *
-     * @param a the array into which the elements of this collection are to be
-     *        stored, if it is big enough; otherwise, a new array of the same
-     *        runtime type is allocated for this purpose.
-     * @return an array containing all of the elements in this collection
-     * @throws ArrayStoreException if the runtime type of the specified array
-     *         is not a supertype of the runtime type of every element in
-     *         this collection
-     * @throws NullPointerException if the specified array is null
-     */
-    <T> T[] toArray(T[] a);
-
-    // Modification Operations
-
-    /**
-     * Ensures that this collection contains the specified element (optional
-     * operation).  Returns <tt>true</tt> if this collection changed as a
-     * result of the call.  (Returns <tt>false</tt> if this collection does
-     * not permit duplicates and already contains the specified element.)<p>
-     *
-     * Collections that support this operation may place limitations on what
-     * elements may be added to this collection.  In particular, some
-     * collections will refuse to add <tt>null</tt> elements, and others will
-     * impose restrictions on the type of elements that may be added.
-     * Collection classes should clearly specify in their documentation any
-     * restrictions on what elements may be added.<p>
-     *
-     * If a collection refuses to add a particular element for any reason
-     * other than that it already contains the element, it <i>must</i> throw
-     * an exception (rather than returning <tt>false</tt>).  This preserves
-     * the invariant that a collection always contains the specified element
-     * after this call returns.
-     *
-     * @param e element whose presence in this collection is to be ensured
-     * @return <tt>true</tt> if this collection changed as a result of the
-     *         call
-     * @throws UnsupportedOperationException if the <tt>add</tt> operation
-     *         is not supported by this collection
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this collection
-     * @throws NullPointerException if the specified element is null and this
-     *         collection does not permit null elements
-     * @throws IllegalArgumentException if some property of the element
-     *         prevents it from being added to this collection
-     * @throws IllegalStateException if the element cannot be added at this
-     *         time due to insertion restrictions
-     */
-    boolean add(E e);
-
-    /**
-     * Removes a single instance of the specified element from this
-     * collection, if it is present (optional operation).  More formally,
-     * removes an element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>, if
-     * this collection contains one or more such elements.  Returns
-     * <tt>true</tt> if this collection contained the specified element (or
-     * equivalently, if this collection changed as a result of the call).
-     *
-     * @param o element to be removed from this collection, if present
-     * @return <tt>true</tt> if an element was removed as a result of this call
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this collection
-     *         (<a href="#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         collection does not permit null elements
-     *         (<a href="#optional-restrictions">optional</a>)
-     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
-     *         is not supported by this collection
-     */
-    boolean remove(Object o);
-
-
-    // Bulk Operations
-
-    /**
-     * Returns <tt>true</tt> if this collection contains all of the elements
-     * in the specified collection.
-     *
-     * @param  c collection to be checked for containment in this collection
-     * @return <tt>true</tt> if this collection contains all of the elements
-     *         in the specified collection
-     * @throws ClassCastException if the types of one or more elements
-     *         in the specified collection are incompatible with this
-     *         collection
-     *         (<a href="#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified collection contains one
-     *         or more null elements and this collection does not permit null
-     *         elements
-     *         (<a href="#optional-restrictions">optional</a>),
-     *         or if the specified collection is null.
-     * @see    #contains(Object)
-     */
-    boolean containsAll(Collection<?> c);
-
-    /**
-     * Adds all of the elements in the specified collection to this collection
-     * (optional operation).  The behavior of this operation is undefined if
-     * the specified collection is modified while the operation is in progress.
-     * (This implies that the behavior of this call is undefined if the
-     * specified collection is this collection, and this collection is
-     * nonempty.)
-     *
-     * @param c collection containing elements to be added to this collection
-     * @return <tt>true</tt> if this collection changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
-     *         is not supported by this collection
-     * @throws ClassCastException if the class of an element of the specified
-     *         collection prevents it from being added to this collection
-     * @throws NullPointerException if the specified collection contains a
-     *         null element and this collection does not permit null elements,
-     *         or if the specified collection is null
-     * @throws IllegalArgumentException if some property of an element of the
-     *         specified collection prevents it from being added to this
-     *         collection
-     * @throws IllegalStateException if not all the elements can be added at
-     *         this time due to insertion restrictions
-     * @see #add(Object)
-     */
-    boolean addAll(Collection<? extends E> c);
-
-    /**
-     * Removes all of this collection's elements that are also contained in the
-     * specified collection (optional operation).  After this call returns,
-     * this collection will contain no elements in common with the specified
-     * collection.
-     *
-     * @param c collection containing elements to be removed from this collection
-     * @return <tt>true</tt> if this collection changed as a result of the
-     *         call
-     * @throws UnsupportedOperationException if the <tt>removeAll</tt> method
-     *         is not supported by this collection
-     * @throws ClassCastException if the types of one or more elements
-     *         in this collection are incompatible with the specified
-     *         collection
-     *         (<a href="#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this collection contains one or more
-     *         null elements and the specified collection does not support
-     *         null elements
-     *         (<a href="#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see #remove(Object)
-     * @see #contains(Object)
-     */
-    boolean removeAll(Collection<?> c);
-
-    /**
-     * Retains only the elements in this collection that are contained in the
-     * specified collection (optional operation).  In other words, removes from
-     * this collection all of its elements that are not contained in the
-     * specified collection.
-     *
-     * @param c collection containing elements to be retained in this collection
-     * @return <tt>true</tt> if this collection changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
-     *         is not supported by this collection
-     * @throws ClassCastException if the types of one or more elements
-     *         in this collection are incompatible with the specified
-     *         collection
-     *         (<a href="#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this collection contains one or more
-     *         null elements and the specified collection does not permit null
-     *         elements
-     *         (<a href="#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see #remove(Object)
-     * @see #contains(Object)
-     */
-    boolean retainAll(Collection<?> c);
-
-    /**
-     * Removes all of the elements from this collection (optional operation).
-     * The collection will be empty after this method returns.
-     *
-     * @throws UnsupportedOperationException if the <tt>clear</tt> operation
-     *         is not supported by this collection
-     */
-    void clear();
-
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified object with this collection for equality. <p>
-     *
-     * While the <tt>Collection</tt> interface adds no stipulations to the
-     * general contract for the <tt>Object.equals</tt>, programmers who
-     * implement the <tt>Collection</tt> interface "directly" (in other words,
-     * create a class that is a <tt>Collection</tt> but is not a <tt>Set</tt>
-     * or a <tt>List</tt>) must exercise care if they choose to override the
-     * <tt>Object.equals</tt>.  It is not necessary to do so, and the simplest
-     * course of action is to rely on <tt>Object</tt>'s implementation, but
-     * the implementor may wish to implement a "value comparison" in place of
-     * the default "reference comparison."  (The <tt>List</tt> and
-     * <tt>Set</tt> interfaces mandate such value comparisons.)<p>
-     *
-     * The general contract for the <tt>Object.equals</tt> method states that
-     * equals must be symmetric (in other words, <tt>a.equals(b)</tt> if and
-     * only if <tt>b.equals(a)</tt>).  The contracts for <tt>List.equals</tt>
-     * and <tt>Set.equals</tt> state that lists are only equal to other lists,
-     * and sets to other sets.  Thus, a custom <tt>equals</tt> method for a
-     * collection class that implements neither the <tt>List</tt> nor
-     * <tt>Set</tt> interface must return <tt>false</tt> when this collection
-     * is compared to any list or set.  (By the same logic, it is not possible
-     * to write a class that correctly implements both the <tt>Set</tt> and
-     * <tt>List</tt> interfaces.)
-     *
-     * @param o object to be compared for equality with this collection
-     * @return <tt>true</tt> if the specified object is equal to this
-     * collection
-     *
-     * @see Object#equals(Object)
-     * @see Set#equals(Object)
-     * @see List#equals(Object)
-     */
-    boolean equals(Object o);
-
-    /**
-     * Returns the hash code value for this collection.  While the
-     * <tt>Collection</tt> interface adds no stipulations to the general
-     * contract for the <tt>Object.hashCode</tt> method, programmers should
-     * take note that any class that overrides the <tt>Object.equals</tt>
-     * method must also override the <tt>Object.hashCode</tt> method in order
-     * to satisfy the general contract for the <tt>Object.hashCode</tt> method.
-     * In particular, <tt>c1.equals(c2)</tt> implies that
-     * <tt>c1.hashCode()==c2.hashCode()</tt>.
-     *
-     * @return the hash code value for this collection
-     *
-     * @see Object#hashCode()
-     * @see Object#equals(Object)
-     */
-    int hashCode();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Collections.java
--- a/emul/compact/src/main/java/java/util/Collections.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3953 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-import java.io.Serializable;
-import java.io.IOException;
-import java.lang.reflect.Array;
-
-/**
- * This class consists exclusively of static methods that operate on or return
- * collections.  It contains polymorphic algorithms that operate on
- * collections, "wrappers", which return a new collection backed by a
- * specified collection, and a few other odds and ends.
- *
- * <p>The methods of this class all throw a <tt>NullPointerException</tt>
- * if the collections or class objects provided to them are null.
- *
- * <p>The documentation for the polymorphic algorithms contained in this class
- * generally includes a brief description of the <i>implementation</i>.  Such
- * descriptions should be regarded as <i>implementation notes</i>, rather than
- * parts of the <i>specification</i>.  Implementors should feel free to
- * substitute other algorithms, so long as the specification itself is adhered
- * to.  (For example, the algorithm used by <tt>sort</tt> does not have to be
- * a mergesort, but it does have to be <i>stable</i>.)
- *
- * <p>The "destructive" algorithms contained in this class, that is, the
- * algorithms that modify the collection on which they operate, are specified
- * to throw <tt>UnsupportedOperationException</tt> if the collection does not
- * support the appropriate mutation primitive(s), such as the <tt>set</tt>
- * method.  These algorithms may, but are not required to, throw this
- * exception if an invocation would have no effect on the collection.  For
- * example, invoking the <tt>sort</tt> method on an unmodifiable list that is
- * already sorted may or may not throw <tt>UnsupportedOperationException</tt>.
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see     Collection
- * @see     Set
- * @see     List
- * @see     Map
- * @since   1.2
- */
-
-public class Collections {
-    // Suppresses default constructor, ensuring non-instantiability.
-    private Collections() {
-    }
-
-    // Algorithms
-
-    /*
-     * Tuning parameters for algorithms - Many of the List algorithms have
-     * two implementations, one of which is appropriate for RandomAccess
-     * lists, the other for "sequential."  Often, the random access variant
-     * yields better performance on small sequential access lists.  The
-     * tuning parameters below determine the cutoff point for what constitutes
-     * a "small" sequential access list for each algorithm.  The values below
-     * were empirically determined to work well for LinkedList. Hopefully
-     * they should be reasonable for other sequential access List
-     * implementations.  Those doing performance work on this code would
-     * do well to validate the values of these parameters from time to time.
-     * (The first word of each tuning parameter name is the algorithm to which
-     * it applies.)
-     */
-    private static final int BINARYSEARCH_THRESHOLD   = 5000;
-    private static final int REVERSE_THRESHOLD        =   18;
-    private static final int SHUFFLE_THRESHOLD        =    5;
-    private static final int FILL_THRESHOLD           =   25;
-    private static final int ROTATE_THRESHOLD         =  100;
-    private static final int COPY_THRESHOLD           =   10;
-    private static final int REPLACEALL_THRESHOLD     =   11;
-    private static final int INDEXOFSUBLIST_THRESHOLD =   35;
-
-    /**
-     * Sorts the specified list into ascending order, according to the
-     * {@linkplain Comparable natural ordering} of its elements.
-     * All elements in the list must implement the {@link Comparable}
-     * interface.  Furthermore, all elements in the list must be
-     * <i>mutually comparable</i> (that is, {@code e1.compareTo(e2)}
-     * must not throw a {@code ClassCastException} for any elements
-     * {@code e1} and {@code e2} in the list).
-     *
-     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.
-     *
-     * <p>The specified list must be modifiable, but need not be resizable.
-     *
-     * <p>Implementation note: This implementation is a stable, adaptive,
-     * iterative mergesort that requires far fewer than n lg(n) comparisons
-     * when the input array is partially sorted, while offering the
-     * performance of a traditional mergesort when the input array is
-     * randomly ordered.  If the input array is nearly sorted, the
-     * implementation requires approximately n comparisons.  Temporary
-     * storage requirements vary from a small constant for nearly sorted
-     * input arrays to n/2 object references for randomly ordered input
-     * arrays.
-     *
-     * <p>The implementation takes equal advantage of ascending and
-     * descending order in its input array, and can take advantage of
-     * ascending and descending order in different parts of the same
-     * input array.  It is well-suited to merging two or more sorted arrays:
-     * simply concatenate the arrays and sort the resulting array.
-     *
-     * <p>The implementation was adapted from Tim Peters's list sort for Python
-     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
-     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
-     * Sorting and Information Theoretic Complexity", in Proceedings of the
-     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
-     * January 1993.
-     *
-     * <p>This implementation dumps the specified list into an array, sorts
-     * the array, and iterates over the list resetting each element
-     * from the corresponding position in the array.  This avoids the
-     * n<sup>2</sup> log(n) performance that would result from attempting
-     * to sort a linked list in place.
-     *
-     * @param  list the list to be sorted.
-     * @throws ClassCastException if the list contains elements that are not
-     *         <i>mutually comparable</i> (for example, strings and integers).
-     * @throws UnsupportedOperationException if the specified list's
-     *         list-iterator does not support the {@code set} operation.
-     * @throws IllegalArgumentException (optional) if the implementation
-     *         detects that the natural ordering of the list elements is
-     *         found to violate the {@link Comparable} contract
-     */
-    public static <T extends Comparable<? super T>> void sort(List<T> list) {
-        Object[] a = list.toArray();
-        Arrays.sort(a);
-        ListIterator<T> i = list.listIterator();
-        for (int j=0; j<a.length; j++) {
-            i.next();
-            i.set((T)a[j]);
-        }
-    }
-
-    /**
-     * Sorts the specified list according to the order induced by the
-     * specified comparator.  All elements in the list must be <i>mutually
-     * comparable</i> using the specified comparator (that is,
-     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
-     * for any elements {@code e1} and {@code e2} in the list).
-     *
-     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.
-     *
-     * <p>The specified list must be modifiable, but need not be resizable.
-     *
-     * <p>Implementation note: This implementation is a stable, adaptive,
-     * iterative mergesort that requires far fewer than n lg(n) comparisons
-     * when the input array is partially sorted, while offering the
-     * performance of a traditional mergesort when the input array is
-     * randomly ordered.  If the input array is nearly sorted, the
-     * implementation requires approximately n comparisons.  Temporary
-     * storage requirements vary from a small constant for nearly sorted
-     * input arrays to n/2 object references for randomly ordered input
-     * arrays.
-     *
-     * <p>The implementation takes equal advantage of ascending and
-     * descending order in its input array, and can take advantage of
-     * ascending and descending order in different parts of the same
-     * input array.  It is well-suited to merging two or more sorted arrays:
-     * simply concatenate the arrays and sort the resulting array.
-     *
-     * <p>The implementation was adapted from Tim Peters's list sort for Python
-     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
-     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
-     * Sorting and Information Theoretic Complexity", in Proceedings of the
-     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
-     * January 1993.
-     *
-     * <p>This implementation dumps the specified list into an array, sorts
-     * the array, and iterates over the list resetting each element
-     * from the corresponding position in the array.  This avoids the
-     * n<sup>2</sup> log(n) performance that would result from attempting
-     * to sort a linked list in place.
-     *
-     * @param  list the list to be sorted.
-     * @param  c the comparator to determine the order of the list.  A
-     *        {@code null} value indicates that the elements' <i>natural
-     *        ordering</i> should be used.
-     * @throws ClassCastException if the list contains elements that are not
-     *         <i>mutually comparable</i> using the specified comparator.
-     * @throws UnsupportedOperationException if the specified list's
-     *         list-iterator does not support the {@code set} operation.
-     * @throws IllegalArgumentException (optional) if the comparator is
-     *         found to violate the {@link Comparator} contract
-     */
-    public static <T> void sort(List<T> list, Comparator<? super T> c) {
-        Object[] a = list.toArray();
-        Arrays.sort(a, (Comparator)c);
-        ListIterator i = list.listIterator();
-        for (int j=0; j<a.length; j++) {
-            i.next();
-            i.set(a[j]);
-        }
-    }
-
-
-    /**
-     * Searches the specified list for the specified object using the binary
-     * search algorithm.  The list must be sorted into ascending order
-     * according to the {@linkplain Comparable natural ordering} of its
-     * elements (as by the {@link #sort(List)} method) prior to making this
-     * call.  If it is not sorted, the results are undefined.  If the list
-     * contains multiple elements equal to the specified object, there is no
-     * guarantee which one will be found.
-     *
-     * <p>This method runs in log(n) time for a "random access" list (which
-     * provides near-constant-time positional access).  If the specified list
-     * does not implement the {@link RandomAccess} interface and is large,
-     * this method will do an iterator-based binary search that performs
-     * O(n) link traversals and O(log n) element comparisons.
-     *
-     * @param  list the list to be searched.
-     * @param  key the key to be searched for.
-     * @return the index of the search key, if it is contained in the list;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the list: the index of the first
-     *         element greater than the key, or <tt>list.size()</tt> if all
-     *         elements in the list are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws ClassCastException if the list contains elements that are not
-     *         <i>mutually comparable</i> (for example, strings and
-     *         integers), or the search key is not mutually comparable
-     *         with the elements of the list.
-     */
-    public static <T>
-    int binarySearch(List<? extends Comparable<? super T>> list, T key) {
-        if (list instanceof RandomAccess || list.size()<BINARYSEARCH_THRESHOLD)
-            return Collections.indexedBinarySearch(list, key);
-        else
-            return Collections.iteratorBinarySearch(list, key);
-    }
-
-    private static <T>
-    int indexedBinarySearch(List<? extends Comparable<? super T>> list, T key)
-    {
-        int low = 0;
-        int high = list.size()-1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            Comparable<? super T> midVal = list.get(mid);
-            int cmp = midVal.compareTo(key);
-
-            if (cmp < 0)
-                low = mid + 1;
-            else if (cmp > 0)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found
-    }
-
-    private static <T>
-    int iteratorBinarySearch(List<? extends Comparable<? super T>> list, T key)
-    {
-        int low = 0;
-        int high = list.size()-1;
-        ListIterator<? extends Comparable<? super T>> i = list.listIterator();
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            Comparable<? super T> midVal = get(i, mid);
-            int cmp = midVal.compareTo(key);
-
-            if (cmp < 0)
-                low = mid + 1;
-            else if (cmp > 0)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found
-    }
-
-    /**
-     * Gets the ith element from the given list by repositioning the specified
-     * list listIterator.
-     */
-    private static <T> T get(ListIterator<? extends T> i, int index) {
-        T obj = null;
-        int pos = i.nextIndex();
-        if (pos <= index) {
-            do {
-                obj = i.next();
-            } while (pos++ < index);
-        } else {
-            do {
-                obj = i.previous();
-            } while (--pos > index);
-        }
-        return obj;
-    }
-
-    /**
-     * Searches the specified list for the specified object using the binary
-     * search algorithm.  The list must be sorted into ascending order
-     * according to the specified comparator (as by the
-     * {@link #sort(List, Comparator) sort(List, Comparator)}
-     * method), prior to making this call.  If it is
-     * not sorted, the results are undefined.  If the list contains multiple
-     * elements equal to the specified object, there is no guarantee which one
-     * will be found.
-     *
-     * <p>This method runs in log(n) time for a "random access" list (which
-     * provides near-constant-time positional access).  If the specified list
-     * does not implement the {@link RandomAccess} interface and is large,
-     * this method will do an iterator-based binary search that performs
-     * O(n) link traversals and O(log n) element comparisons.
-     *
-     * @param  list the list to be searched.
-     * @param  key the key to be searched for.
-     * @param  c the comparator by which the list is ordered.
-     *         A <tt>null</tt> value indicates that the elements'
-     *         {@linkplain Comparable natural ordering} should be used.
-     * @return the index of the search key, if it is contained in the list;
-     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
-     *         <i>insertion point</i> is defined as the point at which the
-     *         key would be inserted into the list: the index of the first
-     *         element greater than the key, or <tt>list.size()</tt> if all
-     *         elements in the list are less than the specified key.  Note
-     *         that this guarantees that the return value will be &gt;= 0 if
-     *         and only if the key is found.
-     * @throws ClassCastException if the list contains elements that are not
-     *         <i>mutually comparable</i> using the specified comparator,
-     *         or the search key is not mutually comparable with the
-     *         elements of the list using this comparator.
-     */
-    public static <T> int binarySearch(List<? extends T> list, T key, Comparator<? super T> c) {
-        if (c==null)
-            return binarySearch((List) list, key);
-
-        if (list instanceof RandomAccess || list.size()<BINARYSEARCH_THRESHOLD)
-            return Collections.indexedBinarySearch(list, key, c);
-        else
-            return Collections.iteratorBinarySearch(list, key, c);
-    }
-
-    private static <T> int indexedBinarySearch(List<? extends T> l, T key, Comparator<? super T> c) {
-        int low = 0;
-        int high = l.size()-1;
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            T midVal = l.get(mid);
-            int cmp = c.compare(midVal, key);
-
-            if (cmp < 0)
-                low = mid + 1;
-            else if (cmp > 0)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found
-    }
-
-    private static <T> int iteratorBinarySearch(List<? extends T> l, T key, Comparator<? super T> c) {
-        int low = 0;
-        int high = l.size()-1;
-        ListIterator<? extends T> i = l.listIterator();
-
-        while (low <= high) {
-            int mid = (low + high) >>> 1;
-            T midVal = get(i, mid);
-            int cmp = c.compare(midVal, key);
-
-            if (cmp < 0)
-                low = mid + 1;
-            else if (cmp > 0)
-                high = mid - 1;
-            else
-                return mid; // key found
-        }
-        return -(low + 1);  // key not found
-    }
-
-    private interface SelfComparable extends Comparable<SelfComparable> {}
-
-
-    /**
-     * Reverses the order of the elements in the specified list.<p>
-     *
-     * This method runs in linear time.
-     *
-     * @param  list the list whose elements are to be reversed.
-     * @throws UnsupportedOperationException if the specified list or
-     *         its list-iterator does not support the <tt>set</tt> operation.
-     */
-    public static void reverse(List<?> list) {
-        int size = list.size();
-        if (size < REVERSE_THRESHOLD || list instanceof RandomAccess) {
-            for (int i=0, mid=size>>1, j=size-1; i<mid; i++, j--)
-                swap(list, i, j);
-        } else {
-            ListIterator fwd = list.listIterator();
-            ListIterator rev = list.listIterator(size);
-            for (int i=0, mid=list.size()>>1; i<mid; i++) {
-                Object tmp = fwd.next();
-                fwd.set(rev.previous());
-                rev.set(tmp);
-            }
-        }
-    }
-
-    /**
-     * Randomly permutes the specified list using a default source of
-     * randomness.  All permutations occur with approximately equal
-     * likelihood.<p>
-     *
-     * The hedge "approximately" is used in the foregoing description because
-     * default source of randomness is only approximately an unbiased source
-     * of independently chosen bits. If it were a perfect source of randomly
-     * chosen bits, then the algorithm would choose permutations with perfect
-     * uniformity.<p>
-     *
-     * This implementation traverses the list backwards, from the last element
-     * up to the second, repeatedly swapping a randomly selected element into
-     * the "current position".  Elements are randomly selected from the
-     * portion of the list that runs from the first element to the current
-     * position, inclusive.<p>
-     *
-     * This method runs in linear time.  If the specified list does not
-     * implement the {@link RandomAccess} interface and is large, this
-     * implementation dumps the specified list into an array before shuffling
-     * it, and dumps the shuffled array back into the list.  This avoids the
-     * quadratic behavior that would result from shuffling a "sequential
-     * access" list in place.
-     *
-     * @param  list the list to be shuffled.
-     * @throws UnsupportedOperationException if the specified list or
-     *         its list-iterator does not support the <tt>set</tt> operation.
-     */
-    public static void shuffle(List<?> list) {
-        Random rnd = r;
-        if (rnd == null)
-            r = rnd = new Random();
-        shuffle(list, rnd);
-    }
-    private static Random r;
-
-    /**
-     * Randomly permute the specified list using the specified source of
-     * randomness.  All permutations occur with equal likelihood
-     * assuming that the source of randomness is fair.<p>
-     *
-     * This implementation traverses the list backwards, from the last element
-     * up to the second, repeatedly swapping a randomly selected element into
-     * the "current position".  Elements are randomly selected from the
-     * portion of the list that runs from the first element to the current
-     * position, inclusive.<p>
-     *
-     * This method runs in linear time.  If the specified list does not
-     * implement the {@link RandomAccess} interface and is large, this
-     * implementation dumps the specified list into an array before shuffling
-     * it, and dumps the shuffled array back into the list.  This avoids the
-     * quadratic behavior that would result from shuffling a "sequential
-     * access" list in place.
-     *
-     * @param  list the list to be shuffled.
-     * @param  rnd the source of randomness to use to shuffle the list.
-     * @throws UnsupportedOperationException if the specified list or its
-     *         list-iterator does not support the <tt>set</tt> operation.
-     */
-    public static void shuffle(List<?> list, Random rnd) {
-        int size = list.size();
-        if (size < SHUFFLE_THRESHOLD || list instanceof RandomAccess) {
-            for (int i=size; i>1; i--)
-                swap(list, i-1, rnd.nextInt(i));
-        } else {
-            Object arr[] = list.toArray();
-
-            // Shuffle array
-            for (int i=size; i>1; i--)
-                swap(arr, i-1, rnd.nextInt(i));
-
-            // Dump array back into list
-            ListIterator it = list.listIterator();
-            for (int i=0; i<arr.length; i++) {
-                it.next();
-                it.set(arr[i]);
-            }
-        }
-    }
-
-    /**
-     * Swaps the elements at the specified positions in the specified list.
-     * (If the specified positions are equal, invoking this method leaves
-     * the list unchanged.)
-     *
-     * @param list The list in which to swap elements.
-     * @param i the index of one element to be swapped.
-     * @param j the index of the other element to be swapped.
-     * @throws IndexOutOfBoundsException if either <tt>i</tt> or <tt>j</tt>
-     *         is out of range (i &lt; 0 || i &gt;= list.size()
-     *         || j &lt; 0 || j &gt;= list.size()).
-     * @since 1.4
-     */
-    public static void swap(List<?> list, int i, int j) {
-        final List l = list;
-        l.set(i, l.set(j, l.get(i)));
-    }
-
-    /**
-     * Swaps the two specified elements in the specified array.
-     */
-    private static void swap(Object[] arr, int i, int j) {
-        Object tmp = arr[i];
-        arr[i] = arr[j];
-        arr[j] = tmp;
-    }
-
-    /**
-     * Replaces all of the elements of the specified list with the specified
-     * element. <p>
-     *
-     * This method runs in linear time.
-     *
-     * @param  list the list to be filled with the specified element.
-     * @param  obj The element with which to fill the specified list.
-     * @throws UnsupportedOperationException if the specified list or its
-     *         list-iterator does not support the <tt>set</tt> operation.
-     */
-    public static <T> void fill(List<? super T> list, T obj) {
-        int size = list.size();
-
-        if (size < FILL_THRESHOLD || list instanceof RandomAccess) {
-            for (int i=0; i<size; i++)
-                list.set(i, obj);
-        } else {
-            ListIterator<? super T> itr = list.listIterator();
-            for (int i=0; i<size; i++) {
-                itr.next();
-                itr.set(obj);
-            }
-        }
-    }
-
-    /**
-     * Copies all of the elements from one list into another.  After the
-     * operation, the index of each copied element in the destination list
-     * will be identical to its index in the source list.  The destination
-     * list must be at least as long as the source list.  If it is longer, the
-     * remaining elements in the destination list are unaffected. <p>
-     *
-     * This method runs in linear time.
-     *
-     * @param  dest The destination list.
-     * @param  src The source list.
-     * @throws IndexOutOfBoundsException if the destination list is too small
-     *         to contain the entire source List.
-     * @throws UnsupportedOperationException if the destination list's
-     *         list-iterator does not support the <tt>set</tt> operation.
-     */
-    public static <T> void copy(List<? super T> dest, List<? extends T> src) {
-        int srcSize = src.size();
-        if (srcSize > dest.size())
-            throw new IndexOutOfBoundsException("Source does not fit in dest");
-
-        if (srcSize < COPY_THRESHOLD ||
-            (src instanceof RandomAccess && dest instanceof RandomAccess)) {
-            for (int i=0; i<srcSize; i++)
-                dest.set(i, src.get(i));
-        } else {
-            ListIterator<? super T> di=dest.listIterator();
-            ListIterator<? extends T> si=src.listIterator();
-            for (int i=0; i<srcSize; i++) {
-                di.next();
-                di.set(si.next());
-            }
-        }
-    }
-
-    /**
-     * Returns the minimum element of the given collection, according to the
-     * <i>natural ordering</i> of its elements.  All elements in the
-     * collection must implement the <tt>Comparable</tt> interface.
-     * Furthermore, all elements in the collection must be <i>mutually
-     * comparable</i> (that is, <tt>e1.compareTo(e2)</tt> must not throw a
-     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
-     * <tt>e2</tt> in the collection).<p>
-     *
-     * This method iterates over the entire collection, hence it requires
-     * time proportional to the size of the collection.
-     *
-     * @param  coll the collection whose minimum element is to be determined.
-     * @return the minimum element of the given collection, according
-     *         to the <i>natural ordering</i> of its elements.
-     * @throws ClassCastException if the collection contains elements that are
-     *         not <i>mutually comparable</i> (for example, strings and
-     *         integers).
-     * @throws NoSuchElementException if the collection is empty.
-     * @see Comparable
-     */
-    public static <T extends Object & Comparable<? super T>> T min(Collection<? extends T> coll) {
-        Iterator<? extends T> i = coll.iterator();
-        T candidate = i.next();
-
-        while (i.hasNext()) {
-            T next = i.next();
-            if (next.compareTo(candidate) < 0)
-                candidate = next;
-        }
-        return candidate;
-    }
-
-    /**
-     * Returns the minimum element of the given collection, according to the
-     * order induced by the specified comparator.  All elements in the
-     * collection must be <i>mutually comparable</i> by the specified
-     * comparator (that is, <tt>comp.compare(e1, e2)</tt> must not throw a
-     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
-     * <tt>e2</tt> in the collection).<p>
-     *
-     * This method iterates over the entire collection, hence it requires
-     * time proportional to the size of the collection.
-     *
-     * @param  coll the collection whose minimum element is to be determined.
-     * @param  comp the comparator with which to determine the minimum element.
-     *         A <tt>null</tt> value indicates that the elements' <i>natural
-     *         ordering</i> should be used.
-     * @return the minimum element of the given collection, according
-     *         to the specified comparator.
-     * @throws ClassCastException if the collection contains elements that are
-     *         not <i>mutually comparable</i> using the specified comparator.
-     * @throws NoSuchElementException if the collection is empty.
-     * @see Comparable
-     */
-    public static <T> T min(Collection<? extends T> coll, Comparator<? super T> comp) {
-        if (comp==null)
-            return (T)min((Collection<SelfComparable>) (Collection) coll);
-
-        Iterator<? extends T> i = coll.iterator();
-        T candidate = i.next();
-
-        while (i.hasNext()) {
-            T next = i.next();
-            if (comp.compare(next, candidate) < 0)
-                candidate = next;
-        }
-        return candidate;
-    }
-
-    /**
-     * Returns the maximum element of the given collection, according to the
-     * <i>natural ordering</i> of its elements.  All elements in the
-     * collection must implement the <tt>Comparable</tt> interface.
-     * Furthermore, all elements in the collection must be <i>mutually
-     * comparable</i> (that is, <tt>e1.compareTo(e2)</tt> must not throw a
-     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
-     * <tt>e2</tt> in the collection).<p>
-     *
-     * This method iterates over the entire collection, hence it requires
-     * time proportional to the size of the collection.
-     *
-     * @param  coll the collection whose maximum element is to be determined.
-     * @return the maximum element of the given collection, according
-     *         to the <i>natural ordering</i> of its elements.
-     * @throws ClassCastException if the collection contains elements that are
-     *         not <i>mutually comparable</i> (for example, strings and
-     *         integers).
-     * @throws NoSuchElementException if the collection is empty.
-     * @see Comparable
-     */
-    public static <T extends Object & Comparable<? super T>> T max(Collection<? extends T> coll) {
-        Iterator<? extends T> i = coll.iterator();
-        T candidate = i.next();
-
-        while (i.hasNext()) {
-            T next = i.next();
-            if (next.compareTo(candidate) > 0)
-                candidate = next;
-        }
-        return candidate;
-    }
-
-    /**
-     * Returns the maximum element of the given collection, according to the
-     * order induced by the specified comparator.  All elements in the
-     * collection must be <i>mutually comparable</i> by the specified
-     * comparator (that is, <tt>comp.compare(e1, e2)</tt> must not throw a
-     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
-     * <tt>e2</tt> in the collection).<p>
-     *
-     * This method iterates over the entire collection, hence it requires
-     * time proportional to the size of the collection.
-     *
-     * @param  coll the collection whose maximum element is to be determined.
-     * @param  comp the comparator with which to determine the maximum element.
-     *         A <tt>null</tt> value indicates that the elements' <i>natural
-     *        ordering</i> should be used.
-     * @return the maximum element of the given collection, according
-     *         to the specified comparator.
-     * @throws ClassCastException if the collection contains elements that are
-     *         not <i>mutually comparable</i> using the specified comparator.
-     * @throws NoSuchElementException if the collection is empty.
-     * @see Comparable
-     */
-    public static <T> T max(Collection<? extends T> coll, Comparator<? super T> comp) {
-        if (comp==null)
-            return (T)max((Collection<SelfComparable>) (Collection) coll);
-
-        Iterator<? extends T> i = coll.iterator();
-        T candidate = i.next();
-
-        while (i.hasNext()) {
-            T next = i.next();
-            if (comp.compare(next, candidate) > 0)
-                candidate = next;
-        }
-        return candidate;
-    }
-
-    /**
-     * Rotates the elements in the specified list by the specified distance.
-     * After calling this method, the element at index <tt>i</tt> will be
-     * the element previously at index <tt>(i - distance)</tt> mod
-     * <tt>list.size()</tt>, for all values of <tt>i</tt> between <tt>0</tt>
-     * and <tt>list.size()-1</tt>, inclusive.  (This method has no effect on
-     * the size of the list.)
-     *
-     * <p>For example, suppose <tt>list</tt> comprises<tt> [t, a, n, k, s]</tt>.
-     * After invoking <tt>Collections.rotate(list, 1)</tt> (or
-     * <tt>Collections.rotate(list, -4)</tt>), <tt>list</tt> will comprise
-     * <tt>[s, t, a, n, k]</tt>.
-     *
-     * <p>Note that this method can usefully be applied to sublists to
-     * move one or more elements within a list while preserving the
-     * order of the remaining elements.  For example, the following idiom
-     * moves the element at index <tt>j</tt> forward to position
-     * <tt>k</tt> (which must be greater than or equal to <tt>j</tt>):
-     * <pre>
-     *     Collections.rotate(list.subList(j, k+1), -1);
-     * </pre>
-     * To make this concrete, suppose <tt>list</tt> comprises
-     * <tt>[a, b, c, d, e]</tt>.  To move the element at index <tt>1</tt>
-     * (<tt>b</tt>) forward two positions, perform the following invocation:
-     * <pre>
-     *     Collections.rotate(l.subList(1, 4), -1);
-     * </pre>
-     * The resulting list is <tt>[a, c, d, b, e]</tt>.
-     *
-     * <p>To move more than one element forward, increase the absolute value
-     * of the rotation distance.  To move elements backward, use a positive
-     * shift distance.
-     *
-     * <p>If the specified list is small or implements the {@link
-     * RandomAccess} interface, this implementation exchanges the first
-     * element into the location it should go, and then repeatedly exchanges
-     * the displaced element into the location it should go until a displaced
-     * element is swapped into the first element.  If necessary, the process
-     * is repeated on the second and successive elements, until the rotation
-     * is complete.  If the specified list is large and doesn't implement the
-     * <tt>RandomAccess</tt> interface, this implementation breaks the
-     * list into two sublist views around index <tt>-distance mod size</tt>.
-     * Then the {@link #reverse(List)} method is invoked on each sublist view,
-     * and finally it is invoked on the entire list.  For a more complete
-     * description of both algorithms, see Section 2.3 of Jon Bentley's
-     * <i>Programming Pearls</i> (Addison-Wesley, 1986).
-     *
-     * @param list the list to be rotated.
-     * @param distance the distance to rotate the list.  There are no
-     *        constraints on this value; it may be zero, negative, or
-     *        greater than <tt>list.size()</tt>.
-     * @throws UnsupportedOperationException if the specified list or
-     *         its list-iterator does not support the <tt>set</tt> operation.
-     * @since 1.4
-     */
-    public static void rotate(List<?> list, int distance) {
-        if (list instanceof RandomAccess || list.size() < ROTATE_THRESHOLD)
-            rotate1(list, distance);
-        else
-            rotate2(list, distance);
-    }
-
-    private static <T> void rotate1(List<T> list, int distance) {
-        int size = list.size();
-        if (size == 0)
-            return;
-        distance = distance % size;
-        if (distance < 0)
-            distance += size;
-        if (distance == 0)
-            return;
-
-        for (int cycleStart = 0, nMoved = 0; nMoved != size; cycleStart++) {
-            T displaced = list.get(cycleStart);
-            int i = cycleStart;
-            do {
-                i += distance;
-                if (i >= size)
-                    i -= size;
-                displaced = list.set(i, displaced);
-                nMoved ++;
-            } while (i != cycleStart);
-        }
-    }
-
-    private static void rotate2(List<?> list, int distance) {
-        int size = list.size();
-        if (size == 0)
-            return;
-        int mid =  -distance % size;
-        if (mid < 0)
-            mid += size;
-        if (mid == 0)
-            return;
-
-        reverse(list.subList(0, mid));
-        reverse(list.subList(mid, size));
-        reverse(list);
-    }
-
-    /**
-     * Replaces all occurrences of one specified value in a list with another.
-     * More formally, replaces with <tt>newVal</tt> each element <tt>e</tt>
-     * in <tt>list</tt> such that
-     * <tt>(oldVal==null ? e==null : oldVal.equals(e))</tt>.
-     * (This method has no effect on the size of the list.)
-     *
-     * @param list the list in which replacement is to occur.
-     * @param oldVal the old value to be replaced.
-     * @param newVal the new value with which <tt>oldVal</tt> is to be
-     *        replaced.
-     * @return <tt>true</tt> if <tt>list</tt> contained one or more elements
-     *         <tt>e</tt> such that
-     *         <tt>(oldVal==null ?  e==null : oldVal.equals(e))</tt>.
-     * @throws UnsupportedOperationException if the specified list or
-     *         its list-iterator does not support the <tt>set</tt> operation.
-     * @since  1.4
-     */
-    public static <T> boolean replaceAll(List<T> list, T oldVal, T newVal) {
-        boolean result = false;
-        int size = list.size();
-        if (size < REPLACEALL_THRESHOLD || list instanceof RandomAccess) {
-            if (oldVal==null) {
-                for (int i=0; i<size; i++) {
-                    if (list.get(i)==null) {
-                        list.set(i, newVal);
-                        result = true;
-                    }
-                }
-            } else {
-                for (int i=0; i<size; i++) {
-                    if (oldVal.equals(list.get(i))) {
-                        list.set(i, newVal);
-                        result = true;
-                    }
-                }
-            }
-        } else {
-            ListIterator<T> itr=list.listIterator();
-            if (oldVal==null) {
-                for (int i=0; i<size; i++) {
-                    if (itr.next()==null) {
-                        itr.set(newVal);
-                        result = true;
-                    }
-                }
-            } else {
-                for (int i=0; i<size; i++) {
-                    if (oldVal.equals(itr.next())) {
-                        itr.set(newVal);
-                        result = true;
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Returns the starting position of the first occurrence of the specified
-     * target list within the specified source list, or -1 if there is no
-     * such occurrence.  More formally, returns the lowest index <tt>i</tt>
-     * such that <tt>source.subList(i, i+target.size()).equals(target)</tt>,
-     * or -1 if there is no such index.  (Returns -1 if
-     * <tt>target.size() > source.size()</tt>.)
-     *
-     * <p>This implementation uses the "brute force" technique of scanning
-     * over the source list, looking for a match with the target at each
-     * location in turn.
-     *
-     * @param source the list in which to search for the first occurrence
-     *        of <tt>target</tt>.
-     * @param target the list to search for as a subList of <tt>source</tt>.
-     * @return the starting position of the first occurrence of the specified
-     *         target list within the specified source list, or -1 if there
-     *         is no such occurrence.
-     * @since  1.4
-     */
-    public static int indexOfSubList(List<?> source, List<?> target) {
-        int sourceSize = source.size();
-        int targetSize = target.size();
-        int maxCandidate = sourceSize - targetSize;
-
-        if (sourceSize < INDEXOFSUBLIST_THRESHOLD ||
-            (source instanceof RandomAccess&&target instanceof RandomAccess)) {
-        nextCand:
-            for (int candidate = 0; candidate <= maxCandidate; candidate++) {
-                for (int i=0, j=candidate; i<targetSize; i++, j++)
-                    if (!eq(target.get(i), source.get(j)))
-                        continue nextCand;  // Element mismatch, try next cand
-                return candidate;  // All elements of candidate matched target
-            }
-        } else {  // Iterator version of above algorithm
-            ListIterator<?> si = source.listIterator();
-        nextCand:
-            for (int candidate = 0; candidate <= maxCandidate; candidate++) {
-                ListIterator<?> ti = target.listIterator();
-                for (int i=0; i<targetSize; i++) {
-                    if (!eq(ti.next(), si.next())) {
-                        // Back up source iterator to next candidate
-                        for (int j=0; j<i; j++)
-                            si.previous();
-                        continue nextCand;
-                    }
-                }
-                return candidate;
-            }
-        }
-        return -1;  // No candidate matched the target
-    }
-
-    /**
-     * Returns the starting position of the last occurrence of the specified
-     * target list within the specified source list, or -1 if there is no such
-     * occurrence.  More formally, returns the highest index <tt>i</tt>
-     * such that <tt>source.subList(i, i+target.size()).equals(target)</tt>,
-     * or -1 if there is no such index.  (Returns -1 if
-     * <tt>target.size() > source.size()</tt>.)
-     *
-     * <p>This implementation uses the "brute force" technique of iterating
-     * over the source list, looking for a match with the target at each
-     * location in turn.
-     *
-     * @param source the list in which to search for the last occurrence
-     *        of <tt>target</tt>.
-     * @param target the list to search for as a subList of <tt>source</tt>.
-     * @return the starting position of the last occurrence of the specified
-     *         target list within the specified source list, or -1 if there
-     *         is no such occurrence.
-     * @since  1.4
-     */
-    public static int lastIndexOfSubList(List<?> source, List<?> target) {
-        int sourceSize = source.size();
-        int targetSize = target.size();
-        int maxCandidate = sourceSize - targetSize;
-
-        if (sourceSize < INDEXOFSUBLIST_THRESHOLD ||
-            source instanceof RandomAccess) {   // Index access version
-        nextCand:
-            for (int candidate = maxCandidate; candidate >= 0; candidate--) {
-                for (int i=0, j=candidate; i<targetSize; i++, j++)
-                    if (!eq(target.get(i), source.get(j)))
-                        continue nextCand;  // Element mismatch, try next cand
-                return candidate;  // All elements of candidate matched target
-            }
-        } else {  // Iterator version of above algorithm
-            if (maxCandidate < 0)
-                return -1;
-            ListIterator<?> si = source.listIterator(maxCandidate);
-        nextCand:
-            for (int candidate = maxCandidate; candidate >= 0; candidate--) {
-                ListIterator<?> ti = target.listIterator();
-                for (int i=0; i<targetSize; i++) {
-                    if (!eq(ti.next(), si.next())) {
-                        if (candidate != 0) {
-                            // Back up source iterator to next candidate
-                            for (int j=0; j<=i+1; j++)
-                                si.previous();
-                        }
-                        continue nextCand;
-                    }
-                }
-                return candidate;
-            }
-        }
-        return -1;  // No candidate matched the target
-    }
-
-
-    // Unmodifiable Wrappers
-
-    /**
-     * Returns an unmodifiable view of the specified collection.  This method
-     * allows modules to provide users with "read-only" access to internal
-     * collections.  Query operations on the returned collection "read through"
-     * to the specified collection, and attempts to modify the returned
-     * collection, whether direct or via its iterator, result in an
-     * <tt>UnsupportedOperationException</tt>.<p>
-     *
-     * The returned collection does <i>not</i> pass the hashCode and equals
-     * operations through to the backing collection, but relies on
-     * <tt>Object</tt>'s <tt>equals</tt> and <tt>hashCode</tt> methods.  This
-     * is necessary to preserve the contracts of these operations in the case
-     * that the backing collection is a set or a list.<p>
-     *
-     * The returned collection will be serializable if the specified collection
-     * is serializable.
-     *
-     * @param  c the collection for which an unmodifiable view is to be
-     *         returned.
-     * @return an unmodifiable view of the specified collection.
-     */
-    public static <T> Collection<T> unmodifiableCollection(Collection<? extends T> c) {
-        return new UnmodifiableCollection<>(c);
-    }
-
-    /**
-     * @serial include
-     */
-    static class UnmodifiableCollection<E> implements Collection<E>, Serializable {
-        private static final long serialVersionUID = 1820017752578914078L;
-
-        final Collection<? extends E> c;
-
-        UnmodifiableCollection(Collection<? extends E> c) {
-            if (c==null)
-                throw new NullPointerException();
-            this.c = c;
-        }
-
-        public int size()                   {return c.size();}
-        public boolean isEmpty()            {return c.isEmpty();}
-        public boolean contains(Object o)   {return c.contains(o);}
-        public Object[] toArray()           {return c.toArray();}
-        public <T> T[] toArray(T[] a)       {return c.toArray(a);}
-        public String toString()            {return c.toString();}
-
-        public Iterator<E> iterator() {
-            return new Iterator<E>() {
-                private final Iterator<? extends E> i = c.iterator();
-
-                public boolean hasNext() {return i.hasNext();}
-                public E next()          {return i.next();}
-                public void remove() {
-                    throw new UnsupportedOperationException();
-                }
-            };
-        }
-
-        public boolean add(E e) {
-            throw new UnsupportedOperationException();
-        }
-        public boolean remove(Object o) {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean containsAll(Collection<?> coll) {
-            return c.containsAll(coll);
-        }
-        public boolean addAll(Collection<? extends E> coll) {
-            throw new UnsupportedOperationException();
-        }
-        public boolean removeAll(Collection<?> coll) {
-            throw new UnsupportedOperationException();
-        }
-        public boolean retainAll(Collection<?> coll) {
-            throw new UnsupportedOperationException();
-        }
-        public void clear() {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Returns an unmodifiable view of the specified set.  This method allows
-     * modules to provide users with "read-only" access to internal sets.
-     * Query operations on the returned set "read through" to the specified
-     * set, and attempts to modify the returned set, whether direct or via its
-     * iterator, result in an <tt>UnsupportedOperationException</tt>.<p>
-     *
-     * The returned set will be serializable if the specified set
-     * is serializable.
-     *
-     * @param  s the set for which an unmodifiable view is to be returned.
-     * @return an unmodifiable view of the specified set.
-     */
-    public static <T> Set<T> unmodifiableSet(Set<? extends T> s) {
-        return new UnmodifiableSet<>(s);
-    }
-
-    /**
-     * @serial include
-     */
-    static class UnmodifiableSet<E> extends UnmodifiableCollection<E>
-                                 implements Set<E>, Serializable {
-        private static final long serialVersionUID = -9215047833775013803L;
-
-        UnmodifiableSet(Set<? extends E> s)     {super(s);}
-        public boolean equals(Object o) {return o == this || c.equals(o);}
-        public int hashCode()           {return c.hashCode();}
-    }
-
-    /**
-     * Returns an unmodifiable view of the specified sorted set.  This method
-     * allows modules to provide users with "read-only" access to internal
-     * sorted sets.  Query operations on the returned sorted set "read
-     * through" to the specified sorted set.  Attempts to modify the returned
-     * sorted set, whether direct, via its iterator, or via its
-     * <tt>subSet</tt>, <tt>headSet</tt>, or <tt>tailSet</tt> views, result in
-     * an <tt>UnsupportedOperationException</tt>.<p>
-     *
-     * The returned sorted set will be serializable if the specified sorted set
-     * is serializable.
-     *
-     * @param s the sorted set for which an unmodifiable view is to be
-     *        returned.
-     * @return an unmodifiable view of the specified sorted set.
-     */
-    public static <T> SortedSet<T> unmodifiableSortedSet(SortedSet<T> s) {
-        return new UnmodifiableSortedSet<>(s);
-    }
-
-    /**
-     * @serial include
-     */
-    static class UnmodifiableSortedSet<E>
-                             extends UnmodifiableSet<E>
-                             implements SortedSet<E>, Serializable {
-        private static final long serialVersionUID = -4929149591599911165L;
-        private final SortedSet<E> ss;
-
-        UnmodifiableSortedSet(SortedSet<E> s) {super(s); ss = s;}
-
-        public Comparator<? super E> comparator() {return ss.comparator();}
-
-        public SortedSet<E> subSet(E fromElement, E toElement) {
-            return new UnmodifiableSortedSet<>(ss.subSet(fromElement,toElement));
-        }
-        public SortedSet<E> headSet(E toElement) {
-            return new UnmodifiableSortedSet<>(ss.headSet(toElement));
-        }
-        public SortedSet<E> tailSet(E fromElement) {
-            return new UnmodifiableSortedSet<>(ss.tailSet(fromElement));
-        }
-
-        public E first()                   {return ss.first();}
-        public E last()                    {return ss.last();}
-    }
-
-    /**
-     * Returns an unmodifiable view of the specified list.  This method allows
-     * modules to provide users with "read-only" access to internal
-     * lists.  Query operations on the returned list "read through" to the
-     * specified list, and attempts to modify the returned list, whether
-     * direct or via its iterator, result in an
-     * <tt>UnsupportedOperationException</tt>.<p>
-     *
-     * The returned list will be serializable if the specified list
-     * is serializable. Similarly, the returned list will implement
-     * {@link RandomAccess} if the specified list does.
-     *
-     * @param  list the list for which an unmodifiable view is to be returned.
-     * @return an unmodifiable view of the specified list.
-     */
-    public static <T> List<T> unmodifiableList(List<? extends T> list) {
-        return (list instanceof RandomAccess ?
-                new UnmodifiableRandomAccessList<>(list) :
-                new UnmodifiableList<>(list));
-    }
-
-    /**
-     * @serial include
-     */
-    static class UnmodifiableList<E> extends UnmodifiableCollection<E>
-                                  implements List<E> {
-        private static final long serialVersionUID = -283967356065247728L;
-        final List<? extends E> list;
-
-        UnmodifiableList(List<? extends E> list) {
-            super(list);
-            this.list = list;
-        }
-
-        public boolean equals(Object o) {return o == this || list.equals(o);}
-        public int hashCode()           {return list.hashCode();}
-
-        public E get(int index) {return list.get(index);}
-        public E set(int index, E element) {
-            throw new UnsupportedOperationException();
-        }
-        public void add(int index, E element) {
-            throw new UnsupportedOperationException();
-        }
-        public E remove(int index) {
-            throw new UnsupportedOperationException();
-        }
-        public int indexOf(Object o)            {return list.indexOf(o);}
-        public int lastIndexOf(Object o)        {return list.lastIndexOf(o);}
-        public boolean addAll(int index, Collection<? extends E> c) {
-            throw new UnsupportedOperationException();
-        }
-        public ListIterator<E> listIterator()   {return listIterator(0);}
-
-        public ListIterator<E> listIterator(final int index) {
-            return new ListIterator<E>() {
-                private final ListIterator<? extends E> i
-                    = list.listIterator(index);
-
-                public boolean hasNext()     {return i.hasNext();}
-                public E next()              {return i.next();}
-                public boolean hasPrevious() {return i.hasPrevious();}
-                public E previous()          {return i.previous();}
-                public int nextIndex()       {return i.nextIndex();}
-                public int previousIndex()   {return i.previousIndex();}
-
-                public void remove() {
-                    throw new UnsupportedOperationException();
-                }
-                public void set(E e) {
-                    throw new UnsupportedOperationException();
-                }
-                public void add(E e) {
-                    throw new UnsupportedOperationException();
-                }
-            };
-        }
-
-        public List<E> subList(int fromIndex, int toIndex) {
-            return new UnmodifiableList<>(list.subList(fromIndex, toIndex));
-        }
-
-        /**
-         * UnmodifiableRandomAccessList instances are serialized as
-         * UnmodifiableList instances to allow them to be deserialized
-         * in pre-1.4 JREs (which do not have UnmodifiableRandomAccessList).
-         * This method inverts the transformation.  As a beneficial
-         * side-effect, it also grafts the RandomAccess marker onto
-         * UnmodifiableList instances that were serialized in pre-1.4 JREs.
-         *
-         * Note: Unfortunately, UnmodifiableRandomAccessList instances
-         * serialized in 1.4.1 and deserialized in 1.4 will become
-         * UnmodifiableList instances, as this method was missing in 1.4.
-         */
-        private Object readResolve() {
-            return (list instanceof RandomAccess
-                    ? new UnmodifiableRandomAccessList<>(list)
-                    : this);
-        }
-    }
-
-    /**
-     * @serial include
-     */
-    static class UnmodifiableRandomAccessList<E> extends UnmodifiableList<E>
-                                              implements RandomAccess
-    {
-        UnmodifiableRandomAccessList(List<? extends E> list) {
-            super(list);
-        }
-
-        public List<E> subList(int fromIndex, int toIndex) {
-            return new UnmodifiableRandomAccessList<>(
-                list.subList(fromIndex, toIndex));
-        }
-
-        private static final long serialVersionUID = -2542308836966382001L;
-
-        /**
-         * Allows instances to be deserialized in pre-1.4 JREs (which do
-         * not have UnmodifiableRandomAccessList).  UnmodifiableList has
-         * a readResolve method that inverts this transformation upon
-         * deserialization.
-         */
-        private Object writeReplace() {
-            return new UnmodifiableList<>(list);
-        }
-    }
-
-    /**
-     * Returns an unmodifiable view of the specified map.  This method
-     * allows modules to provide users with "read-only" access to internal
-     * maps.  Query operations on the returned map "read through"
-     * to the specified map, and attempts to modify the returned
-     * map, whether direct or via its collection views, result in an
-     * <tt>UnsupportedOperationException</tt>.<p>
-     *
-     * The returned map will be serializable if the specified map
-     * is serializable.
-     *
-     * @param  m the map for which an unmodifiable view is to be returned.
-     * @return an unmodifiable view of the specified map.
-     */
-    public static <K,V> Map<K,V> unmodifiableMap(Map<? extends K, ? extends V> m) {
-        return new UnmodifiableMap<>(m);
-    }
-
-    /**
-     * @serial include
-     */
-    private static class UnmodifiableMap<K,V> implements Map<K,V>, Serializable {
-        private static final long serialVersionUID = -1034234728574286014L;
-
-        private final Map<? extends K, ? extends V> m;
-
-        UnmodifiableMap(Map<? extends K, ? extends V> m) {
-            if (m==null)
-                throw new NullPointerException();
-            this.m = m;
-        }
-
-        public int size()                        {return m.size();}
-        public boolean isEmpty()                 {return m.isEmpty();}
-        public boolean containsKey(Object key)   {return m.containsKey(key);}
-        public boolean containsValue(Object val) {return m.containsValue(val);}
-        public V get(Object key)                 {return m.get(key);}
-
-        public V put(K key, V value) {
-            throw new UnsupportedOperationException();
-        }
-        public V remove(Object key) {
-            throw new UnsupportedOperationException();
-        }
-        public void putAll(Map<? extends K, ? extends V> m) {
-            throw new UnsupportedOperationException();
-        }
-        public void clear() {
-            throw new UnsupportedOperationException();
-        }
-
-        private transient Set<K> keySet = null;
-        private transient Set<Map.Entry<K,V>> entrySet = null;
-        private transient Collection<V> values = null;
-
-        public Set<K> keySet() {
-            if (keySet==null)
-                keySet = unmodifiableSet(m.keySet());
-            return keySet;
-        }
-
-        public Set<Map.Entry<K,V>> entrySet() {
-            if (entrySet==null)
-                entrySet = new UnmodifiableEntrySet<>(m.entrySet());
-            return entrySet;
-        }
-
-        public Collection<V> values() {
-            if (values==null)
-                values = unmodifiableCollection(m.values());
-            return values;
-        }
-
-        public boolean equals(Object o) {return o == this || m.equals(o);}
-        public int hashCode()           {return m.hashCode();}
-        public String toString()        {return m.toString();}
-
-        /**
-         * We need this class in addition to UnmodifiableSet as
-         * Map.Entries themselves permit modification of the backing Map
-         * via their setValue operation.  This class is subtle: there are
-         * many possible attacks that must be thwarted.
-         *
-         * @serial include
-         */
-        static class UnmodifiableEntrySet<K,V>
-            extends UnmodifiableSet<Map.Entry<K,V>> {
-            private static final long serialVersionUID = 7854390611657943733L;
-
-            UnmodifiableEntrySet(Set<? extends Map.Entry<? extends K, ? extends V>> s) {
-                super((Set)s);
-            }
-            public Iterator<Map.Entry<K,V>> iterator() {
-                return new Iterator<Map.Entry<K,V>>() {
-                    private final Iterator<? extends Map.Entry<? extends K, ? extends V>> i = c.iterator();
-
-                    public boolean hasNext() {
-                        return i.hasNext();
-                    }
-                    public Map.Entry<K,V> next() {
-                        return new UnmodifiableEntry<>(i.next());
-                    }
-                    public void remove() {
-                        throw new UnsupportedOperationException();
-                    }
-                };
-            }
-
-            public Object[] toArray() {
-                Object[] a = c.toArray();
-                for (int i=0; i<a.length; i++)
-                    a[i] = new UnmodifiableEntry<>((Map.Entry<K,V>)a[i]);
-                return a;
-            }
-
-            public <T> T[] toArray(T[] a) {
-                // We don't pass a to c.toArray, to avoid window of
-                // vulnerability wherein an unscrupulous multithreaded client
-                // could get his hands on raw (unwrapped) Entries from c.
-                Object[] arr = c.toArray(a.length==0 ? a : Arrays.copyOf(a, 0));
-
-                for (int i=0; i<arr.length; i++)
-                    arr[i] = new UnmodifiableEntry<>((Map.Entry<K,V>)arr[i]);
-
-                if (arr.length > a.length)
-                    return (T[])arr;
-
-                System.arraycopy(arr, 0, a, 0, arr.length);
-                if (a.length > arr.length)
-                    a[arr.length] = null;
-                return a;
-            }
-
-            /**
-             * This method is overridden to protect the backing set against
-             * an object with a nefarious equals function that senses
-             * that the equality-candidate is Map.Entry and calls its
-             * setValue method.
-             */
-            public boolean contains(Object o) {
-                if (!(o instanceof Map.Entry))
-                    return false;
-                return c.contains(
-                    new UnmodifiableEntry<>((Map.Entry<?,?>) o));
-            }
-
-            /**
-             * The next two methods are overridden to protect against
-             * an unscrupulous List whose contains(Object o) method senses
-             * when o is a Map.Entry, and calls o.setValue.
-             */
-            public boolean containsAll(Collection<?> coll) {
-                for (Object e : coll) {
-                    if (!contains(e)) // Invokes safe contains() above
-                        return false;
-                }
-                return true;
-            }
-            public boolean equals(Object o) {
-                if (o == this)
-                    return true;
-
-                if (!(o instanceof Set))
-                    return false;
-                Set s = (Set) o;
-                if (s.size() != c.size())
-                    return false;
-                return containsAll(s); // Invokes safe containsAll() above
-            }
-
-            /**
-             * This "wrapper class" serves two purposes: it prevents
-             * the client from modifying the backing Map, by short-circuiting
-             * the setValue method, and it protects the backing Map against
-             * an ill-behaved Map.Entry that attempts to modify another
-             * Map Entry when asked to perform an equality check.
-             */
-            private static class UnmodifiableEntry<K,V> implements Map.Entry<K,V> {
-                private Map.Entry<? extends K, ? extends V> e;
-
-                UnmodifiableEntry(Map.Entry<? extends K, ? extends V> e) {this.e = e;}
-
-                public K getKey()        {return e.getKey();}
-                public V getValue()      {return e.getValue();}
-                public V setValue(V value) {
-                    throw new UnsupportedOperationException();
-                }
-                public int hashCode()    {return e.hashCode();}
-                public boolean equals(Object o) {
-                    if (!(o instanceof Map.Entry))
-                        return false;
-                    Map.Entry t = (Map.Entry)o;
-                    return eq(e.getKey(),   t.getKey()) &&
-                           eq(e.getValue(), t.getValue());
-                }
-                public String toString() {return e.toString();}
-            }
-        }
-    }
-
-    /**
-     * Returns an unmodifiable view of the specified sorted map.  This method
-     * allows modules to provide users with "read-only" access to internal
-     * sorted maps.  Query operations on the returned sorted map "read through"
-     * to the specified sorted map.  Attempts to modify the returned
-     * sorted map, whether direct, via its collection views, or via its
-     * <tt>subMap</tt>, <tt>headMap</tt>, or <tt>tailMap</tt> views, result in
-     * an <tt>UnsupportedOperationException</tt>.<p>
-     *
-     * The returned sorted map will be serializable if the specified sorted map
-     * is serializable.
-     *
-     * @param m the sorted map for which an unmodifiable view is to be
-     *        returned.
-     * @return an unmodifiable view of the specified sorted map.
-     */
-    public static <K,V> SortedMap<K,V> unmodifiableSortedMap(SortedMap<K, ? extends V> m) {
-        return new UnmodifiableSortedMap<>(m);
-    }
-
-    /**
-     * @serial include
-     */
-    static class UnmodifiableSortedMap<K,V>
-          extends UnmodifiableMap<K,V>
-          implements SortedMap<K,V>, Serializable {
-        private static final long serialVersionUID = -8806743815996713206L;
-
-        private final SortedMap<K, ? extends V> sm;
-
-        UnmodifiableSortedMap(SortedMap<K, ? extends V> m) {super(m); sm = m;}
-
-        public Comparator<? super K> comparator() {return sm.comparator();}
-
-        public SortedMap<K,V> subMap(K fromKey, K toKey) {
-            return new UnmodifiableSortedMap<>(sm.subMap(fromKey, toKey));
-        }
-        public SortedMap<K,V> headMap(K toKey) {
-            return new UnmodifiableSortedMap<>(sm.headMap(toKey));
-        }
-        public SortedMap<K,V> tailMap(K fromKey) {
-            return new UnmodifiableSortedMap<>(sm.tailMap(fromKey));
-        }
-
-        public K firstKey()           {return sm.firstKey();}
-        public K lastKey()            {return sm.lastKey();}
-    }
-
-
-    // Synch Wrappers
-
-    /**
-     * Returns a synchronized (thread-safe) collection backed by the specified
-     * collection.  In order to guarantee serial access, it is critical that
-     * <strong>all</strong> access to the backing collection is accomplished
-     * through the returned collection.<p>
-     *
-     * It is imperative that the user manually synchronize on the returned
-     * collection when iterating over it:
-     * <pre>
-     *  Collection c = Collections.synchronizedCollection(myCollection);
-     *     ...
-     *  synchronized (c) {
-     *      Iterator i = c.iterator(); // Must be in the synchronized block
-     *      while (i.hasNext())
-     *         foo(i.next());
-     *  }
-     * </pre>
-     * Failure to follow this advice may result in non-deterministic behavior.
-     *
-     * <p>The returned collection does <i>not</i> pass the <tt>hashCode</tt>
-     * and <tt>equals</tt> operations through to the backing collection, but
-     * relies on <tt>Object</tt>'s equals and hashCode methods.  This is
-     * necessary to preserve the contracts of these operations in the case
-     * that the backing collection is a set or a list.<p>
-     *
-     * The returned collection will be serializable if the specified collection
-     * is serializable.
-     *
-     * @param  c the collection to be "wrapped" in a synchronized collection.
-     * @return a synchronized view of the specified collection.
-     */
-    public static <T> Collection<T> synchronizedCollection(Collection<T> c) {
-        return new SynchronizedCollection<>(c);
-    }
-
-    static <T> Collection<T> synchronizedCollection(Collection<T> c, Object mutex) {
-        return new SynchronizedCollection<>(c, mutex);
-    }
-
-    /**
-     * @serial include
-     */
-    static class SynchronizedCollection<E> implements Collection<E>, Serializable {
-        private static final long serialVersionUID = 3053995032091335093L;
-
-        final Collection<E> c;  // Backing Collection
-        final Object mutex;     // Object on which to synchronize
-
-        SynchronizedCollection(Collection<E> c) {
-            if (c==null)
-                throw new NullPointerException();
-            this.c = c;
-            mutex = this;
-        }
-        SynchronizedCollection(Collection<E> c, Object mutex) {
-            this.c = c;
-            this.mutex = mutex;
-        }
-
-        public int size() {
-            synchronized (mutex) {return c.size();}
-        }
-        public boolean isEmpty() {
-            synchronized (mutex) {return c.isEmpty();}
-        }
-        public boolean contains(Object o) {
-            synchronized (mutex) {return c.contains(o);}
-        }
-        public Object[] toArray() {
-            synchronized (mutex) {return c.toArray();}
-        }
-        public <T> T[] toArray(T[] a) {
-            synchronized (mutex) {return c.toArray(a);}
-        }
-
-        public Iterator<E> iterator() {
-            return c.iterator(); // Must be manually synched by user!
-        }
-
-        public boolean add(E e) {
-            synchronized (mutex) {return c.add(e);}
-        }
-        public boolean remove(Object o) {
-            synchronized (mutex) {return c.remove(o);}
-        }
-
-        public boolean containsAll(Collection<?> coll) {
-            synchronized (mutex) {return c.containsAll(coll);}
-        }
-        public boolean addAll(Collection<? extends E> coll) {
-            synchronized (mutex) {return c.addAll(coll);}
-        }
-        public boolean removeAll(Collection<?> coll) {
-            synchronized (mutex) {return c.removeAll(coll);}
-        }
-        public boolean retainAll(Collection<?> coll) {
-            synchronized (mutex) {return c.retainAll(coll);}
-        }
-        public void clear() {
-            synchronized (mutex) {c.clear();}
-        }
-        public String toString() {
-            synchronized (mutex) {return c.toString();}
-        }
-    }
-
-    /**
-     * Returns a synchronized (thread-safe) set backed by the specified
-     * set.  In order to guarantee serial access, it is critical that
-     * <strong>all</strong> access to the backing set is accomplished
-     * through the returned set.<p>
-     *
-     * It is imperative that the user manually synchronize on the returned
-     * set when iterating over it:
-     * <pre>
-     *  Set s = Collections.synchronizedSet(new HashSet());
-     *      ...
-     *  synchronized (s) {
-     *      Iterator i = s.iterator(); // Must be in the synchronized block
-     *      while (i.hasNext())
-     *          foo(i.next());
-     *  }
-     * </pre>
-     * Failure to follow this advice may result in non-deterministic behavior.
-     *
-     * <p>The returned set will be serializable if the specified set is
-     * serializable.
-     *
-     * @param  s the set to be "wrapped" in a synchronized set.
-     * @return a synchronized view of the specified set.
-     */
-    public static <T> Set<T> synchronizedSet(Set<T> s) {
-        return new SynchronizedSet<>(s);
-    }
-
-    static <T> Set<T> synchronizedSet(Set<T> s, Object mutex) {
-        return new SynchronizedSet<>(s, mutex);
-    }
-
-    /**
-     * @serial include
-     */
-    static class SynchronizedSet<E>
-          extends SynchronizedCollection<E>
-          implements Set<E> {
-        private static final long serialVersionUID = 487447009682186044L;
-
-        SynchronizedSet(Set<E> s) {
-            super(s);
-        }
-        SynchronizedSet(Set<E> s, Object mutex) {
-            super(s, mutex);
-        }
-
-        public boolean equals(Object o) {
-            synchronized (mutex) {return c.equals(o);}
-        }
-        public int hashCode() {
-            synchronized (mutex) {return c.hashCode();}
-        }
-    }
-
-    /**
-     * Returns a synchronized (thread-safe) sorted set backed by the specified
-     * sorted set.  In order to guarantee serial access, it is critical that
-     * <strong>all</strong> access to the backing sorted set is accomplished
-     * through the returned sorted set (or its views).<p>
-     *
-     * It is imperative that the user manually synchronize on the returned
-     * sorted set when iterating over it or any of its <tt>subSet</tt>,
-     * <tt>headSet</tt>, or <tt>tailSet</tt> views.
-     * <pre>
-     *  SortedSet s = Collections.synchronizedSortedSet(new TreeSet());
-     *      ...
-     *  synchronized (s) {
-     *      Iterator i = s.iterator(); // Must be in the synchronized block
-     *      while (i.hasNext())
-     *          foo(i.next());
-     *  }
-     * </pre>
-     * or:
-     * <pre>
-     *  SortedSet s = Collections.synchronizedSortedSet(new TreeSet());
-     *  SortedSet s2 = s.headSet(foo);
-     *      ...
-     *  synchronized (s) {  // Note: s, not s2!!!
-     *      Iterator i = s2.iterator(); // Must be in the synchronized block
-     *      while (i.hasNext())
-     *          foo(i.next());
-     *  }
-     * </pre>
-     * Failure to follow this advice may result in non-deterministic behavior.
-     *
-     * <p>The returned sorted set will be serializable if the specified
-     * sorted set is serializable.
-     *
-     * @param  s the sorted set to be "wrapped" in a synchronized sorted set.
-     * @return a synchronized view of the specified sorted set.
-     */
-    public static <T> SortedSet<T> synchronizedSortedSet(SortedSet<T> s) {
-        return new SynchronizedSortedSet<>(s);
-    }
-
-    /**
-     * @serial include
-     */
-    static class SynchronizedSortedSet<E>
-        extends SynchronizedSet<E>
-        implements SortedSet<E>
-    {
-        private static final long serialVersionUID = 8695801310862127406L;
-
-        private final SortedSet<E> ss;
-
-        SynchronizedSortedSet(SortedSet<E> s) {
-            super(s);
-            ss = s;
-        }
-        SynchronizedSortedSet(SortedSet<E> s, Object mutex) {
-            super(s, mutex);
-            ss = s;
-        }
-
-        public Comparator<? super E> comparator() {
-            synchronized (mutex) {return ss.comparator();}
-        }
-
-        public SortedSet<E> subSet(E fromElement, E toElement) {
-            synchronized (mutex) {
-                return new SynchronizedSortedSet<>(
-                    ss.subSet(fromElement, toElement), mutex);
-            }
-        }
-        public SortedSet<E> headSet(E toElement) {
-            synchronized (mutex) {
-                return new SynchronizedSortedSet<>(ss.headSet(toElement), mutex);
-            }
-        }
-        public SortedSet<E> tailSet(E fromElement) {
-            synchronized (mutex) {
-               return new SynchronizedSortedSet<>(ss.tailSet(fromElement),mutex);
-            }
-        }
-
-        public E first() {
-            synchronized (mutex) {return ss.first();}
-        }
-        public E last() {
-            synchronized (mutex) {return ss.last();}
-        }
-    }
-
-    /**
-     * Returns a synchronized (thread-safe) list backed by the specified
-     * list.  In order to guarantee serial access, it is critical that
-     * <strong>all</strong> access to the backing list is accomplished
-     * through the returned list.<p>
-     *
-     * It is imperative that the user manually synchronize on the returned
-     * list when iterating over it:
-     * <pre>
-     *  List list = Collections.synchronizedList(new ArrayList());
-     *      ...
-     *  synchronized (list) {
-     *      Iterator i = list.iterator(); // Must be in synchronized block
-     *      while (i.hasNext())
-     *          foo(i.next());
-     *  }
-     * </pre>
-     * Failure to follow this advice may result in non-deterministic behavior.
-     *
-     * <p>The returned list will be serializable if the specified list is
-     * serializable.
-     *
-     * @param  list the list to be "wrapped" in a synchronized list.
-     * @return a synchronized view of the specified list.
-     */
-    public static <T> List<T> synchronizedList(List<T> list) {
-        return (list instanceof RandomAccess ?
-                new SynchronizedRandomAccessList<>(list) :
-                new SynchronizedList<>(list));
-    }
-
-    static <T> List<T> synchronizedList(List<T> list, Object mutex) {
-        return (list instanceof RandomAccess ?
-                new SynchronizedRandomAccessList<>(list, mutex) :
-                new SynchronizedList<>(list, mutex));
-    }
-
-    /**
-     * @serial include
-     */
-    static class SynchronizedList<E>
-        extends SynchronizedCollection<E>
-        implements List<E> {
-        private static final long serialVersionUID = -7754090372962971524L;
-
-        final List<E> list;
-
-        SynchronizedList(List<E> list) {
-            super(list);
-            this.list = list;
-        }
-        SynchronizedList(List<E> list, Object mutex) {
-            super(list, mutex);
-            this.list = list;
-        }
-
-        public boolean equals(Object o) {
-            synchronized (mutex) {return list.equals(o);}
-        }
-        public int hashCode() {
-            synchronized (mutex) {return list.hashCode();}
-        }
-
-        public E get(int index) {
-            synchronized (mutex) {return list.get(index);}
-        }
-        public E set(int index, E element) {
-            synchronized (mutex) {return list.set(index, element);}
-        }
-        public void add(int index, E element) {
-            synchronized (mutex) {list.add(index, element);}
-        }
-        public E remove(int index) {
-            synchronized (mutex) {return list.remove(index);}
-        }
-
-        public int indexOf(Object o) {
-            synchronized (mutex) {return list.indexOf(o);}
-        }
-        public int lastIndexOf(Object o) {
-            synchronized (mutex) {return list.lastIndexOf(o);}
-        }
-
-        public boolean addAll(int index, Collection<? extends E> c) {
-            synchronized (mutex) {return list.addAll(index, c);}
-        }
-
-        public ListIterator<E> listIterator() {
-            return list.listIterator(); // Must be manually synched by user
-        }
-
-        public ListIterator<E> listIterator(int index) {
-            return list.listIterator(index); // Must be manually synched by user
-        }
-
-        public List<E> subList(int fromIndex, int toIndex) {
-            synchronized (mutex) {
-                return new SynchronizedList<>(list.subList(fromIndex, toIndex),
-                                            mutex);
-            }
-        }
-
-        /**
-         * SynchronizedRandomAccessList instances are serialized as
-         * SynchronizedList instances to allow them to be deserialized
-         * in pre-1.4 JREs (which do not have SynchronizedRandomAccessList).
-         * This method inverts the transformation.  As a beneficial
-         * side-effect, it also grafts the RandomAccess marker onto
-         * SynchronizedList instances that were serialized in pre-1.4 JREs.
-         *
-         * Note: Unfortunately, SynchronizedRandomAccessList instances
-         * serialized in 1.4.1 and deserialized in 1.4 will become
-         * SynchronizedList instances, as this method was missing in 1.4.
-         */
-        private Object readResolve() {
-            return (list instanceof RandomAccess
-                    ? new SynchronizedRandomAccessList<>(list)
-                    : this);
-        }
-    }
-
-    /**
-     * @serial include
-     */
-    static class SynchronizedRandomAccessList<E>
-        extends SynchronizedList<E>
-        implements RandomAccess {
-
-        SynchronizedRandomAccessList(List<E> list) {
-            super(list);
-        }
-
-        SynchronizedRandomAccessList(List<E> list, Object mutex) {
-            super(list, mutex);
-        }
-
-        public List<E> subList(int fromIndex, int toIndex) {
-            synchronized (mutex) {
-                return new SynchronizedRandomAccessList<>(
-                    list.subList(fromIndex, toIndex), mutex);
-            }
-        }
-
-        private static final long serialVersionUID = 1530674583602358482L;
-
-        /**
-         * Allows instances to be deserialized in pre-1.4 JREs (which do
-         * not have SynchronizedRandomAccessList).  SynchronizedList has
-         * a readResolve method that inverts this transformation upon
-         * deserialization.
-         */
-        private Object writeReplace() {
-            return new SynchronizedList<>(list);
-        }
-    }
-
-    /**
-     * Returns a synchronized (thread-safe) map backed by the specified
-     * map.  In order to guarantee serial access, it is critical that
-     * <strong>all</strong> access to the backing map is accomplished
-     * through the returned map.<p>
-     *
-     * It is imperative that the user manually synchronize on the returned
-     * map when iterating over any of its collection views:
-     * <pre>
-     *  Map m = Collections.synchronizedMap(new HashMap());
-     *      ...
-     *  Set s = m.keySet();  // Needn't be in synchronized block
-     *      ...
-     *  synchronized (m) {  // Synchronizing on m, not s!
-     *      Iterator i = s.iterator(); // Must be in synchronized block
-     *      while (i.hasNext())
-     *          foo(i.next());
-     *  }
-     * </pre>
-     * Failure to follow this advice may result in non-deterministic behavior.
-     *
-     * <p>The returned map will be serializable if the specified map is
-     * serializable.
-     *
-     * @param  m the map to be "wrapped" in a synchronized map.
-     * @return a synchronized view of the specified map.
-     */
-    public static <K,V> Map<K,V> synchronizedMap(Map<K,V> m) {
-        return new SynchronizedMap<>(m);
-    }
-
-    /**
-     * @serial include
-     */
-    private static class SynchronizedMap<K,V>
-        implements Map<K,V>, Serializable {
-        private static final long serialVersionUID = 1978198479659022715L;
-
-        private final Map<K,V> m;     // Backing Map
-        final Object      mutex;        // Object on which to synchronize
-
-        SynchronizedMap(Map<K,V> m) {
-            if (m==null)
-                throw new NullPointerException();
-            this.m = m;
-            mutex = this;
-        }
-
-        SynchronizedMap(Map<K,V> m, Object mutex) {
-            this.m = m;
-            this.mutex = mutex;
-        }
-
-        public int size() {
-            synchronized (mutex) {return m.size();}
-        }
-        public boolean isEmpty() {
-            synchronized (mutex) {return m.isEmpty();}
-        }
-        public boolean containsKey(Object key) {
-            synchronized (mutex) {return m.containsKey(key);}
-        }
-        public boolean containsValue(Object value) {
-            synchronized (mutex) {return m.containsValue(value);}
-        }
-        public V get(Object key) {
-            synchronized (mutex) {return m.get(key);}
-        }
-
-        public V put(K key, V value) {
-            synchronized (mutex) {return m.put(key, value);}
-        }
-        public V remove(Object key) {
-            synchronized (mutex) {return m.remove(key);}
-        }
-        public void putAll(Map<? extends K, ? extends V> map) {
-            synchronized (mutex) {m.putAll(map);}
-        }
-        public void clear() {
-            synchronized (mutex) {m.clear();}
-        }
-
-        private transient Set<K> keySet = null;
-        private transient Set<Map.Entry<K,V>> entrySet = null;
-        private transient Collection<V> values = null;
-
-        public Set<K> keySet() {
-            synchronized (mutex) {
-                if (keySet==null)
-                    keySet = new SynchronizedSet<>(m.keySet(), mutex);
-                return keySet;
-            }
-        }
-
-        public Set<Map.Entry<K,V>> entrySet() {
-            synchronized (mutex) {
-                if (entrySet==null)
-                    entrySet = new SynchronizedSet<>(m.entrySet(), mutex);
-                return entrySet;
-            }
-        }
-
-        public Collection<V> values() {
-            synchronized (mutex) {
-                if (values==null)
-                    values = new SynchronizedCollection<>(m.values(), mutex);
-                return values;
-            }
-        }
-
-        public boolean equals(Object o) {
-            synchronized (mutex) {return m.equals(o);}
-        }
-        public int hashCode() {
-            synchronized (mutex) {return m.hashCode();}
-        }
-        public String toString() {
-            synchronized (mutex) {return m.toString();}
-        }
-    }
-
-    /**
-     * Returns a synchronized (thread-safe) sorted map backed by the specified
-     * sorted map.  In order to guarantee serial access, it is critical that
-     * <strong>all</strong> access to the backing sorted map is accomplished
-     * through the returned sorted map (or its views).<p>
-     *
-     * It is imperative that the user manually synchronize on the returned
-     * sorted map when iterating over any of its collection views, or the
-     * collections views of any of its <tt>subMap</tt>, <tt>headMap</tt> or
-     * <tt>tailMap</tt> views.
-     * <pre>
-     *  SortedMap m = Collections.synchronizedSortedMap(new TreeMap());
-     *      ...
-     *  Set s = m.keySet();  // Needn't be in synchronized block
-     *      ...
-     *  synchronized (m) {  // Synchronizing on m, not s!
-     *      Iterator i = s.iterator(); // Must be in synchronized block
-     *      while (i.hasNext())
-     *          foo(i.next());
-     *  }
-     * </pre>
-     * or:
-     * <pre>
-     *  SortedMap m = Collections.synchronizedSortedMap(new TreeMap());
-     *  SortedMap m2 = m.subMap(foo, bar);
-     *      ...
-     *  Set s2 = m2.keySet();  // Needn't be in synchronized block
-     *      ...
-     *  synchronized (m) {  // Synchronizing on m, not m2 or s2!
-     *      Iterator i = s.iterator(); // Must be in synchronized block
-     *      while (i.hasNext())
-     *          foo(i.next());
-     *  }
-     * </pre>
-     * Failure to follow this advice may result in non-deterministic behavior.
-     *
-     * <p>The returned sorted map will be serializable if the specified
-     * sorted map is serializable.
-     *
-     * @param  m the sorted map to be "wrapped" in a synchronized sorted map.
-     * @return a synchronized view of the specified sorted map.
-     */
-    public static <K,V> SortedMap<K,V> synchronizedSortedMap(SortedMap<K,V> m) {
-        return new SynchronizedSortedMap<>(m);
-    }
-
-
-    /**
-     * @serial include
-     */
-    static class SynchronizedSortedMap<K,V>
-        extends SynchronizedMap<K,V>
-        implements SortedMap<K,V>
-    {
-        private static final long serialVersionUID = -8798146769416483793L;
-
-        private final SortedMap<K,V> sm;
-
-        SynchronizedSortedMap(SortedMap<K,V> m) {
-            super(m);
-            sm = m;
-        }
-        SynchronizedSortedMap(SortedMap<K,V> m, Object mutex) {
-            super(m, mutex);
-            sm = m;
-        }
-
-        public Comparator<? super K> comparator() {
-            synchronized (mutex) {return sm.comparator();}
-        }
-
-        public SortedMap<K,V> subMap(K fromKey, K toKey) {
-            synchronized (mutex) {
-                return new SynchronizedSortedMap<>(
-                    sm.subMap(fromKey, toKey), mutex);
-            }
-        }
-        public SortedMap<K,V> headMap(K toKey) {
-            synchronized (mutex) {
-                return new SynchronizedSortedMap<>(sm.headMap(toKey), mutex);
-            }
-        }
-        public SortedMap<K,V> tailMap(K fromKey) {
-            synchronized (mutex) {
-               return new SynchronizedSortedMap<>(sm.tailMap(fromKey),mutex);
-            }
-        }
-
-        public K firstKey() {
-            synchronized (mutex) {return sm.firstKey();}
-        }
-        public K lastKey() {
-            synchronized (mutex) {return sm.lastKey();}
-        }
-    }
-
-    // Dynamically typesafe collection wrappers
-
-    /**
-     * Returns a dynamically typesafe view of the specified collection.
-     * Any attempt to insert an element of the wrong type will result in an
-     * immediate {@link ClassCastException}.  Assuming a collection
-     * contains no incorrectly typed elements prior to the time a
-     * dynamically typesafe view is generated, and that all subsequent
-     * access to the collection takes place through the view, it is
-     * <i>guaranteed</i> that the collection cannot contain an incorrectly
-     * typed element.
-     *
-     * <p>The generics mechanism in the language provides compile-time
-     * (static) type checking, but it is possible to defeat this mechanism
-     * with unchecked casts.  Usually this is not a problem, as the compiler
-     * issues warnings on all such unchecked operations.  There are, however,
-     * times when static type checking alone is not sufficient.  For example,
-     * suppose a collection is passed to a third-party library and it is
-     * imperative that the library code not corrupt the collection by
-     * inserting an element of the wrong type.
-     *
-     * <p>Another use of dynamically typesafe views is debugging.  Suppose a
-     * program fails with a {@code ClassCastException}, indicating that an
-     * incorrectly typed element was put into a parameterized collection.
-     * Unfortunately, the exception can occur at any time after the erroneous
-     * element is inserted, so it typically provides little or no information
-     * as to the real source of the problem.  If the problem is reproducible,
-     * one can quickly determine its source by temporarily modifying the
-     * program to wrap the collection with a dynamically typesafe view.
-     * For example, this declaration:
-     *  <pre> {@code
-     *     Collection<String> c = new HashSet<String>();
-     * }</pre>
-     * may be replaced temporarily by this one:
-     *  <pre> {@code
-     *     Collection<String> c = Collections.checkedCollection(
-     *         new HashSet<String>(), String.class);
-     * }</pre>
-     * Running the program again will cause it to fail at the point where
-     * an incorrectly typed element is inserted into the collection, clearly
-     * identifying the source of the problem.  Once the problem is fixed, the
-     * modified declaration may be reverted back to the original.
-     *
-     * <p>The returned collection does <i>not</i> pass the hashCode and equals
-     * operations through to the backing collection, but relies on
-     * {@code Object}'s {@code equals} and {@code hashCode} methods.  This
-     * is necessary to preserve the contracts of these operations in the case
-     * that the backing collection is a set or a list.
-     *
-     * <p>The returned collection will be serializable if the specified
-     * collection is serializable.
-     *
-     * <p>Since {@code null} is considered to be a value of any reference
-     * type, the returned collection permits insertion of null elements
-     * whenever the backing collection does.
-     *
-     * @param c the collection for which a dynamically typesafe view is to be
-     *          returned
-     * @param type the type of element that {@code c} is permitted to hold
-     * @return a dynamically typesafe view of the specified collection
-     * @since 1.5
-     */
-    public static <E> Collection<E> checkedCollection(Collection<E> c,
-                                                      Class<E> type) {
-        return new CheckedCollection<>(c, type);
-    }
-
-    @SuppressWarnings("unchecked")
-    static <T> T[] zeroLengthArray(Class<T> type) {
-        return (T[]) Array.newInstance(type, 0);
-    }
-
-    /**
-     * @serial include
-     */
-    static class CheckedCollection<E> implements Collection<E>, Serializable {
-        private static final long serialVersionUID = 1578914078182001775L;
-
-        final Collection<E> c;
-        final Class<E> type;
-
-        void typeCheck(Object o) {
-            if (o != null && !type.isInstance(o))
-                throw new ClassCastException(badElementMsg(o));
-        }
-
-        private String badElementMsg(Object o) {
-            return "Attempt to insert " + o.getClass() +
-                " element into collection with element type " + type;
-        }
-
-        CheckedCollection(Collection<E> c, Class<E> type) {
-            if (c==null || type == null)
-                throw new NullPointerException();
-            this.c = c;
-            this.type = type;
-        }
-
-        public int size()                 { return c.size(); }
-        public boolean isEmpty()          { return c.isEmpty(); }
-        public boolean contains(Object o) { return c.contains(o); }
-        public Object[] toArray()         { return c.toArray(); }
-        public <T> T[] toArray(T[] a)     { return c.toArray(a); }
-        public String toString()          { return c.toString(); }
-        public boolean remove(Object o)   { return c.remove(o); }
-        public void clear()               {        c.clear(); }
-
-        public boolean containsAll(Collection<?> coll) {
-            return c.containsAll(coll);
-        }
-        public boolean removeAll(Collection<?> coll) {
-            return c.removeAll(coll);
-        }
-        public boolean retainAll(Collection<?> coll) {
-            return c.retainAll(coll);
-        }
-
-        public Iterator<E> iterator() {
-            final Iterator<E> it = c.iterator();
-            return new Iterator<E>() {
-                public boolean hasNext() { return it.hasNext(); }
-                public E next()          { return it.next(); }
-                public void remove()     {        it.remove(); }};
-        }
-
-        public boolean add(E e) {
-            typeCheck(e);
-            return c.add(e);
-        }
-
-        private E[] zeroLengthElementArray = null; // Lazily initialized
-
-        private E[] zeroLengthElementArray() {
-            return zeroLengthElementArray != null ? zeroLengthElementArray :
-                (zeroLengthElementArray = zeroLengthArray(type));
-        }
-
-        @SuppressWarnings("unchecked")
-        Collection<E> checkedCopyOf(Collection<? extends E> coll) {
-            Object[] a = null;
-            try {
-                E[] z = zeroLengthElementArray();
-                a = coll.toArray(z);
-                // Defend against coll violating the toArray contract
-                if (a.getClass() != z.getClass())
-                    a = Arrays.copyOf(a, a.length, z.getClass());
-            } catch (ArrayStoreException ignore) {
-                // To get better and consistent diagnostics,
-                // we call typeCheck explicitly on each element.
-                // We call clone() to defend against coll retaining a
-                // reference to the returned array and storing a bad
-                // element into it after it has been type checked.
-                a = coll.toArray().clone();
-                for (Object o : a)
-                    typeCheck(o);
-            }
-            // A slight abuse of the type system, but safe here.
-            return (Collection<E>) Arrays.asList(a);
-        }
-
-        public boolean addAll(Collection<? extends E> coll) {
-            // Doing things this way insulates us from concurrent changes
-            // in the contents of coll and provides all-or-nothing
-            // semantics (which we wouldn't get if we type-checked each
-            // element as we added it)
-            return c.addAll(checkedCopyOf(coll));
-        }
-    }
-
-    /**
-     * Returns a dynamically typesafe view of the specified set.
-     * Any attempt to insert an element of the wrong type will result in
-     * an immediate {@link ClassCastException}.  Assuming a set contains
-     * no incorrectly typed elements prior to the time a dynamically typesafe
-     * view is generated, and that all subsequent access to the set
-     * takes place through the view, it is <i>guaranteed</i> that the
-     * set cannot contain an incorrectly typed element.
-     *
-     * <p>A discussion of the use of dynamically typesafe views may be
-     * found in the documentation for the {@link #checkedCollection
-     * checkedCollection} method.
-     *
-     * <p>The returned set will be serializable if the specified set is
-     * serializable.
-     *
-     * <p>Since {@code null} is considered to be a value of any reference
-     * type, the returned set permits insertion of null elements whenever
-     * the backing set does.
-     *
-     * @param s the set for which a dynamically typesafe view is to be
-     *          returned
-     * @param type the type of element that {@code s} is permitted to hold
-     * @return a dynamically typesafe view of the specified set
-     * @since 1.5
-     */
-    public static <E> Set<E> checkedSet(Set<E> s, Class<E> type) {
-        return new CheckedSet<>(s, type);
-    }
-
-    /**
-     * @serial include
-     */
-    static class CheckedSet<E> extends CheckedCollection<E>
-                                 implements Set<E>, Serializable
-    {
-        private static final long serialVersionUID = 4694047833775013803L;
-
-        CheckedSet(Set<E> s, Class<E> elementType) { super(s, elementType); }
-
-        public boolean equals(Object o) { return o == this || c.equals(o); }
-        public int hashCode()           { return c.hashCode(); }
-    }
-
-    /**
-     * Returns a dynamically typesafe view of the specified sorted set.
-     * Any attempt to insert an element of the wrong type will result in an
-     * immediate {@link ClassCastException}.  Assuming a sorted set
-     * contains no incorrectly typed elements prior to the time a
-     * dynamically typesafe view is generated, and that all subsequent
-     * access to the sorted set takes place through the view, it is
-     * <i>guaranteed</i> that the sorted set cannot contain an incorrectly
-     * typed element.
-     *
-     * <p>A discussion of the use of dynamically typesafe views may be
-     * found in the documentation for the {@link #checkedCollection
-     * checkedCollection} method.
-     *
-     * <p>The returned sorted set will be serializable if the specified sorted
-     * set is serializable.
-     *
-     * <p>Since {@code null} is considered to be a value of any reference
-     * type, the returned sorted set permits insertion of null elements
-     * whenever the backing sorted set does.
-     *
-     * @param s the sorted set for which a dynamically typesafe view is to be
-     *          returned
-     * @param type the type of element that {@code s} is permitted to hold
-     * @return a dynamically typesafe view of the specified sorted set
-     * @since 1.5
-     */
-    public static <E> SortedSet<E> checkedSortedSet(SortedSet<E> s,
-                                                    Class<E> type) {
-        return new CheckedSortedSet<>(s, type);
-    }
-
-    /**
-     * @serial include
-     */
-    static class CheckedSortedSet<E> extends CheckedSet<E>
-        implements SortedSet<E>, Serializable
-    {
-        private static final long serialVersionUID = 1599911165492914959L;
-        private final SortedSet<E> ss;
-
-        CheckedSortedSet(SortedSet<E> s, Class<E> type) {
-            super(s, type);
-            ss = s;
-        }
-
-        public Comparator<? super E> comparator() { return ss.comparator(); }
-        public E first()                   { return ss.first(); }
-        public E last()                    { return ss.last(); }
-
-        public SortedSet<E> subSet(E fromElement, E toElement) {
-            return checkedSortedSet(ss.subSet(fromElement,toElement), type);
-        }
-        public SortedSet<E> headSet(E toElement) {
-            return checkedSortedSet(ss.headSet(toElement), type);
-        }
-        public SortedSet<E> tailSet(E fromElement) {
-            return checkedSortedSet(ss.tailSet(fromElement), type);
-        }
-    }
-
-    /**
-     * Returns a dynamically typesafe view of the specified list.
-     * Any attempt to insert an element of the wrong type will result in
-     * an immediate {@link ClassCastException}.  Assuming a list contains
-     * no incorrectly typed elements prior to the time a dynamically typesafe
-     * view is generated, and that all subsequent access to the list
-     * takes place through the view, it is <i>guaranteed</i> that the
-     * list cannot contain an incorrectly typed element.
-     *
-     * <p>A discussion of the use of dynamically typesafe views may be
-     * found in the documentation for the {@link #checkedCollection
-     * checkedCollection} method.
-     *
-     * <p>The returned list will be serializable if the specified list
-     * is serializable.
-     *
-     * <p>Since {@code null} is considered to be a value of any reference
-     * type, the returned list permits insertion of null elements whenever
-     * the backing list does.
-     *
-     * @param list the list for which a dynamically typesafe view is to be
-     *             returned
-     * @param type the type of element that {@code list} is permitted to hold
-     * @return a dynamically typesafe view of the specified list
-     * @since 1.5
-     */
-    public static <E> List<E> checkedList(List<E> list, Class<E> type) {
-        return (list instanceof RandomAccess ?
-                new CheckedRandomAccessList<>(list, type) :
-                new CheckedList<>(list, type));
-    }
-
-    /**
-     * @serial include
-     */
-    static class CheckedList<E>
-        extends CheckedCollection<E>
-        implements List<E>
-    {
-        private static final long serialVersionUID = 65247728283967356L;
-        final List<E> list;
-
-        CheckedList(List<E> list, Class<E> type) {
-            super(list, type);
-            this.list = list;
-        }
-
-        public boolean equals(Object o)  { return o == this || list.equals(o); }
-        public int hashCode()            { return list.hashCode(); }
-        public E get(int index)          { return list.get(index); }
-        public E remove(int index)       { return list.remove(index); }
-        public int indexOf(Object o)     { return list.indexOf(o); }
-        public int lastIndexOf(Object o) { return list.lastIndexOf(o); }
-
-        public E set(int index, E element) {
-            typeCheck(element);
-            return list.set(index, element);
-        }
-
-        public void add(int index, E element) {
-            typeCheck(element);
-            list.add(index, element);
-        }
-
-        public boolean addAll(int index, Collection<? extends E> c) {
-            return list.addAll(index, checkedCopyOf(c));
-        }
-        public ListIterator<E> listIterator()   { return listIterator(0); }
-
-        public ListIterator<E> listIterator(final int index) {
-            final ListIterator<E> i = list.listIterator(index);
-
-            return new ListIterator<E>() {
-                public boolean hasNext()     { return i.hasNext(); }
-                public E next()              { return i.next(); }
-                public boolean hasPrevious() { return i.hasPrevious(); }
-                public E previous()          { return i.previous(); }
-                public int nextIndex()       { return i.nextIndex(); }
-                public int previousIndex()   { return i.previousIndex(); }
-                public void remove()         {        i.remove(); }
-
-                public void set(E e) {
-                    typeCheck(e);
-                    i.set(e);
-                }
-
-                public void add(E e) {
-                    typeCheck(e);
-                    i.add(e);
-                }
-            };
-        }
-
-        public List<E> subList(int fromIndex, int toIndex) {
-            return new CheckedList<>(list.subList(fromIndex, toIndex), type);
-        }
-    }
-
-    /**
-     * @serial include
-     */
-    static class CheckedRandomAccessList<E> extends CheckedList<E>
-                                            implements RandomAccess
-    {
-        private static final long serialVersionUID = 1638200125423088369L;
-
-        CheckedRandomAccessList(List<E> list, Class<E> type) {
-            super(list, type);
-        }
-
-        public List<E> subList(int fromIndex, int toIndex) {
-            return new CheckedRandomAccessList<>(
-                list.subList(fromIndex, toIndex), type);
-        }
-    }
-
-    /**
-     * Returns a dynamically typesafe view of the specified map.
-     * Any attempt to insert a mapping whose key or value have the wrong
-     * type will result in an immediate {@link ClassCastException}.
-     * Similarly, any attempt to modify the value currently associated with
-     * a key will result in an immediate {@link ClassCastException},
-     * whether the modification is attempted directly through the map
-     * itself, or through a {@link Map.Entry} instance obtained from the
-     * map's {@link Map#entrySet() entry set} view.
-     *
-     * <p>Assuming a map contains no incorrectly typed keys or values
-     * prior to the time a dynamically typesafe view is generated, and
-     * that all subsequent access to the map takes place through the view
-     * (or one of its collection views), it is <i>guaranteed</i> that the
-     * map cannot contain an incorrectly typed key or value.
-     *
-     * <p>A discussion of the use of dynamically typesafe views may be
-     * found in the documentation for the {@link #checkedCollection
-     * checkedCollection} method.
-     *
-     * <p>The returned map will be serializable if the specified map is
-     * serializable.
-     *
-     * <p>Since {@code null} is considered to be a value of any reference
-     * type, the returned map permits insertion of null keys or values
-     * whenever the backing map does.
-     *
-     * @param m the map for which a dynamically typesafe view is to be
-     *          returned
-     * @param keyType the type of key that {@code m} is permitted to hold
-     * @param valueType the type of value that {@code m} is permitted to hold
-     * @return a dynamically typesafe view of the specified map
-     * @since 1.5
-     */
-    public static <K, V> Map<K, V> checkedMap(Map<K, V> m,
-                                              Class<K> keyType,
-                                              Class<V> valueType) {
-        return new CheckedMap<>(m, keyType, valueType);
-    }
-
-
-    /**
-     * @serial include
-     */
-    private static class CheckedMap<K,V>
-        implements Map<K,V>, Serializable
-    {
-        private static final long serialVersionUID = 5742860141034234728L;
-
-        private final Map<K, V> m;
-        final Class<K> keyType;
-        final Class<V> valueType;
-
-        private void typeCheck(Object key, Object value) {
-            if (key != null && !keyType.isInstance(key))
-                throw new ClassCastException(badKeyMsg(key));
-
-            if (value != null && !valueType.isInstance(value))
-                throw new ClassCastException(badValueMsg(value));
-        }
-
-        private String badKeyMsg(Object key) {
-            return "Attempt to insert " + key.getClass() +
-                " key into map with key type " + keyType;
-        }
-
-        private String badValueMsg(Object value) {
-            return "Attempt to insert " + value.getClass() +
-                " value into map with value type " + valueType;
-        }
-
-        CheckedMap(Map<K, V> m, Class<K> keyType, Class<V> valueType) {
-            if (m == null || keyType == null || valueType == null)
-                throw new NullPointerException();
-            this.m = m;
-            this.keyType = keyType;
-            this.valueType = valueType;
-        }
-
-        public int size()                      { return m.size(); }
-        public boolean isEmpty()               { return m.isEmpty(); }
-        public boolean containsKey(Object key) { return m.containsKey(key); }
-        public boolean containsValue(Object v) { return m.containsValue(v); }
-        public V get(Object key)               { return m.get(key); }
-        public V remove(Object key)            { return m.remove(key); }
-        public void clear()                    { m.clear(); }
-        public Set<K> keySet()                 { return m.keySet(); }
-        public Collection<V> values()          { return m.values(); }
-        public boolean equals(Object o)        { return o == this || m.equals(o); }
-        public int hashCode()                  { return m.hashCode(); }
-        public String toString()               { return m.toString(); }
-
-        public V put(K key, V value) {
-            typeCheck(key, value);
-            return m.put(key, value);
-        }
-
-        @SuppressWarnings("unchecked")
-        public void putAll(Map<? extends K, ? extends V> t) {
-            // Satisfy the following goals:
-            // - good diagnostics in case of type mismatch
-            // - all-or-nothing semantics
-            // - protection from malicious t
-            // - correct behavior if t is a concurrent map
-            Object[] entries = t.entrySet().toArray();
-            List<Map.Entry<K,V>> checked = new ArrayList<>(entries.length);
-            for (Object o : entries) {
-                Map.Entry<?,?> e = (Map.Entry<?,?>) o;
-                Object k = e.getKey();
-                Object v = e.getValue();
-                typeCheck(k, v);
-                checked.add(
-                    new AbstractMap.SimpleImmutableEntry<>((K) k, (V) v));
-            }
-            for (Map.Entry<K,V> e : checked)
-                m.put(e.getKey(), e.getValue());
-        }
-
-        private transient Set<Map.Entry<K,V>> entrySet = null;
-
-        public Set<Map.Entry<K,V>> entrySet() {
-            if (entrySet==null)
-                entrySet = new CheckedEntrySet<>(m.entrySet(), valueType);
-            return entrySet;
-        }
-
-        /**
-         * We need this class in addition to CheckedSet as Map.Entry permits
-         * modification of the backing Map via the setValue operation.  This
-         * class is subtle: there are many possible attacks that must be
-         * thwarted.
-         *
-         * @serial exclude
-         */
-        static class CheckedEntrySet<K,V> implements Set<Map.Entry<K,V>> {
-            private final Set<Map.Entry<K,V>> s;
-            private final Class<V> valueType;
-
-            CheckedEntrySet(Set<Map.Entry<K, V>> s, Class<V> valueType) {
-                this.s = s;
-                this.valueType = valueType;
-            }
-
-            public int size()        { return s.size(); }
-            public boolean isEmpty() { return s.isEmpty(); }
-            public String toString() { return s.toString(); }
-            public int hashCode()    { return s.hashCode(); }
-            public void clear()      {        s.clear(); }
-
-            public boolean add(Map.Entry<K, V> e) {
-                throw new UnsupportedOperationException();
-            }
-            public boolean addAll(Collection<? extends Map.Entry<K, V>> coll) {
-                throw new UnsupportedOperationException();
-            }
-
-            public Iterator<Map.Entry<K,V>> iterator() {
-                final Iterator<Map.Entry<K, V>> i = s.iterator();
-                final Class<V> valueType = this.valueType;
-
-                return new Iterator<Map.Entry<K,V>>() {
-                    public boolean hasNext() { return i.hasNext(); }
-                    public void remove()     { i.remove(); }
-
-                    public Map.Entry<K,V> next() {
-                        return checkedEntry(i.next(), valueType);
-                    }
-                };
-            }
-
-            @SuppressWarnings("unchecked")
-            public Object[] toArray() {
-                Object[] source = s.toArray();
-
-                /*
-                 * Ensure that we don't get an ArrayStoreException even if
-                 * s.toArray returns an array of something other than Object
-                 */
-                Object[] dest = (CheckedEntry.class.isInstance(
-                    source.getClass().getComponentType()) ? source :
-                                 new Object[source.length]);
-
-                for (int i = 0; i < source.length; i++)
-                    dest[i] = checkedEntry((Map.Entry<K,V>)source[i],
-                                           valueType);
-                return dest;
-            }
-
-            @SuppressWarnings("unchecked")
-            public <T> T[] toArray(T[] a) {
-                // We don't pass a to s.toArray, to avoid window of
-                // vulnerability wherein an unscrupulous multithreaded client
-                // could get his hands on raw (unwrapped) Entries from s.
-                T[] arr = s.toArray(a.length==0 ? a : Arrays.copyOf(a, 0));
-
-                for (int i=0; i<arr.length; i++)
-                    arr[i] = (T) checkedEntry((Map.Entry<K,V>)arr[i],
-                                              valueType);
-                if (arr.length > a.length)
-                    return arr;
-
-                System.arraycopy(arr, 0, a, 0, arr.length);
-                if (a.length > arr.length)
-                    a[arr.length] = null;
-                return a;
-            }
-
-            /**
-             * This method is overridden to protect the backing set against
-             * an object with a nefarious equals function that senses
-             * that the equality-candidate is Map.Entry and calls its
-             * setValue method.
-             */
-            public boolean contains(Object o) {
-                if (!(o instanceof Map.Entry))
-                    return false;
-                Map.Entry<?,?> e = (Map.Entry<?,?>) o;
-                return s.contains(
-                    (e instanceof CheckedEntry) ? e : checkedEntry(e, valueType));
-            }
-
-            /**
-             * The bulk collection methods are overridden to protect
-             * against an unscrupulous collection whose contains(Object o)
-             * method senses when o is a Map.Entry, and calls o.setValue.
-             */
-            public boolean containsAll(Collection<?> c) {
-                for (Object o : c)
-                    if (!contains(o)) // Invokes safe contains() above
-                        return false;
-                return true;
-            }
-
-            public boolean remove(Object o) {
-                if (!(o instanceof Map.Entry))
-                    return false;
-                return s.remove(new AbstractMap.SimpleImmutableEntry
-                                <>((Map.Entry<?,?>)o));
-            }
-
-            public boolean removeAll(Collection<?> c) {
-                return batchRemove(c, false);
-            }
-            public boolean retainAll(Collection<?> c) {
-                return batchRemove(c, true);
-            }
-            private boolean batchRemove(Collection<?> c, boolean complement) {
-                boolean modified = false;
-                Iterator<Map.Entry<K,V>> it = iterator();
-                while (it.hasNext()) {
-                    if (c.contains(it.next()) != complement) {
-                        it.remove();
-                        modified = true;
-                    }
-                }
-                return modified;
-            }
-
-            public boolean equals(Object o) {
-                if (o == this)
-                    return true;
-                if (!(o instanceof Set))
-                    return false;
-                Set<?> that = (Set<?>) o;
-                return that.size() == s.size()
-                    && containsAll(that); // Invokes safe containsAll() above
-            }
-
-            static <K,V,T> CheckedEntry<K,V,T> checkedEntry(Map.Entry<K,V> e,
-                                                            Class<T> valueType) {
-                return new CheckedEntry<>(e, valueType);
-            }
-
-            /**
-             * This "wrapper class" serves two purposes: it prevents
-             * the client from modifying the backing Map, by short-circuiting
-             * the setValue method, and it protects the backing Map against
-             * an ill-behaved Map.Entry that attempts to modify another
-             * Map.Entry when asked to perform an equality check.
-             */
-            private static class CheckedEntry<K,V,T> implements Map.Entry<K,V> {
-                private final Map.Entry<K, V> e;
-                private final Class<T> valueType;
-
-                CheckedEntry(Map.Entry<K, V> e, Class<T> valueType) {
-                    this.e = e;
-                    this.valueType = valueType;
-                }
-
-                public K getKey()        { return e.getKey(); }
-                public V getValue()      { return e.getValue(); }
-                public int hashCode()    { return e.hashCode(); }
-                public String toString() { return e.toString(); }
-
-                public V setValue(V value) {
-                    if (value != null && !valueType.isInstance(value))
-                        throw new ClassCastException(badValueMsg(value));
-                    return e.setValue(value);
-                }
-
-                private String badValueMsg(Object value) {
-                    return "Attempt to insert " + value.getClass() +
-                        " value into map with value type " + valueType;
-                }
-
-                public boolean equals(Object o) {
-                    if (o == this)
-                        return true;
-                    if (!(o instanceof Map.Entry))
-                        return false;
-                    return e.equals(new AbstractMap.SimpleImmutableEntry
-                                    <>((Map.Entry<?,?>)o));
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a dynamically typesafe view of the specified sorted map.
-     * Any attempt to insert a mapping whose key or value have the wrong
-     * type will result in an immediate {@link ClassCastException}.
-     * Similarly, any attempt to modify the value currently associated with
-     * a key will result in an immediate {@link ClassCastException},
-     * whether the modification is attempted directly through the map
-     * itself, or through a {@link Map.Entry} instance obtained from the
-     * map's {@link Map#entrySet() entry set} view.
-     *
-     * <p>Assuming a map contains no incorrectly typed keys or values
-     * prior to the time a dynamically typesafe view is generated, and
-     * that all subsequent access to the map takes place through the view
-     * (or one of its collection views), it is <i>guaranteed</i> that the
-     * map cannot contain an incorrectly typed key or value.
-     *
-     * <p>A discussion of the use of dynamically typesafe views may be
-     * found in the documentation for the {@link #checkedCollection
-     * checkedCollection} method.
-     *
-     * <p>The returned map will be serializable if the specified map is
-     * serializable.
-     *
-     * <p>Since {@code null} is considered to be a value of any reference
-     * type, the returned map permits insertion of null keys or values
-     * whenever the backing map does.
-     *
-     * @param m the map for which a dynamically typesafe view is to be
-     *          returned
-     * @param keyType the type of key that {@code m} is permitted to hold
-     * @param valueType the type of value that {@code m} is permitted to hold
-     * @return a dynamically typesafe view of the specified map
-     * @since 1.5
-     */
-    public static <K,V> SortedMap<K,V> checkedSortedMap(SortedMap<K, V> m,
-                                                        Class<K> keyType,
-                                                        Class<V> valueType) {
-        return new CheckedSortedMap<>(m, keyType, valueType);
-    }
-
-    /**
-     * @serial include
-     */
-    static class CheckedSortedMap<K,V> extends CheckedMap<K,V>
-        implements SortedMap<K,V>, Serializable
-    {
-        private static final long serialVersionUID = 1599671320688067438L;
-
-        private final SortedMap<K, V> sm;
-
-        CheckedSortedMap(SortedMap<K, V> m,
-                         Class<K> keyType, Class<V> valueType) {
-            super(m, keyType, valueType);
-            sm = m;
-        }
-
-        public Comparator<? super K> comparator() { return sm.comparator(); }
-        public K firstKey()                       { return sm.firstKey(); }
-        public K lastKey()                        { return sm.lastKey(); }
-
-        public SortedMap<K,V> subMap(K fromKey, K toKey) {
-            return checkedSortedMap(sm.subMap(fromKey, toKey),
-                                    keyType, valueType);
-        }
-        public SortedMap<K,V> headMap(K toKey) {
-            return checkedSortedMap(sm.headMap(toKey), keyType, valueType);
-        }
-        public SortedMap<K,V> tailMap(K fromKey) {
-            return checkedSortedMap(sm.tailMap(fromKey), keyType, valueType);
-        }
-    }
-
-    // Empty collections
-
-    /**
-     * Returns an iterator that has no elements.  More precisely,
-     *
-     * <ul compact>
-     *
-     * <li>{@link Iterator#hasNext hasNext} always returns {@code
-     * false}.
-     *
-     * <li>{@link Iterator#next next} always throws {@link
-     * NoSuchElementException}.
-     *
-     * <li>{@link Iterator#remove remove} always throws {@link
-     * IllegalStateException}.
-     *
-     * </ul>
-     *
-     * <p>Implementations of this method are permitted, but not
-     * required, to return the same object from multiple invocations.
-     *
-     * @return an empty iterator
-     * @since 1.7
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Iterator<T> emptyIterator() {
-        return (Iterator<T>) EmptyIterator.EMPTY_ITERATOR;
-    }
-
-    private static class EmptyIterator<E> implements Iterator<E> {
-        static final EmptyIterator<Object> EMPTY_ITERATOR
-            = new EmptyIterator<>();
-
-        public boolean hasNext() { return false; }
-        public E next() { throw new NoSuchElementException(); }
-        public void remove() { throw new IllegalStateException(); }
-    }
-
-    /**
-     * Returns a list iterator that has no elements.  More precisely,
-     *
-     * <ul compact>
-     *
-     * <li>{@link Iterator#hasNext hasNext} and {@link
-     * ListIterator#hasPrevious hasPrevious} always return {@code
-     * false}.
-     *
-     * <li>{@link Iterator#next next} and {@link ListIterator#previous
-     * previous} always throw {@link NoSuchElementException}.
-     *
-     * <li>{@link Iterator#remove remove} and {@link ListIterator#set
-     * set} always throw {@link IllegalStateException}.
-     *
-     * <li>{@link ListIterator#add add} always throws {@link
-     * UnsupportedOperationException}.
-     *
-     * <li>{@link ListIterator#nextIndex nextIndex} always returns
-     * {@code 0} .
-     *
-     * <li>{@link ListIterator#previousIndex previousIndex} always
-     * returns {@code -1}.
-     *
-     * </ul>
-     *
-     * <p>Implementations of this method are permitted, but not
-     * required, to return the same object from multiple invocations.
-     *
-     * @return an empty list iterator
-     * @since 1.7
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> ListIterator<T> emptyListIterator() {
-        return (ListIterator<T>) EmptyListIterator.EMPTY_ITERATOR;
-    }
-
-    private static class EmptyListIterator<E>
-        extends EmptyIterator<E>
-        implements ListIterator<E>
-    {
-        static final EmptyListIterator<Object> EMPTY_ITERATOR
-            = new EmptyListIterator<>();
-
-        public boolean hasPrevious() { return false; }
-        public E previous() { throw new NoSuchElementException(); }
-        public int nextIndex()     { return 0; }
-        public int previousIndex() { return -1; }
-        public void set(E e) { throw new IllegalStateException(); }
-        public void add(E e) { throw new UnsupportedOperationException(); }
-    }
-
-    /**
-     * Returns an enumeration that has no elements.  More precisely,
-     *
-     * <ul compact>
-     *
-     * <li>{@link Enumeration#hasMoreElements hasMoreElements} always
-     * returns {@code false}.
-     *
-     * <li> {@link Enumeration#nextElement nextElement} always throws
-     * {@link NoSuchElementException}.
-     *
-     * </ul>
-     *
-     * <p>Implementations of this method are permitted, but not
-     * required, to return the same object from multiple invocations.
-     *
-     * @return an empty enumeration
-     * @since 1.7
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Enumeration<T> emptyEnumeration() {
-        return (Enumeration<T>) EmptyEnumeration.EMPTY_ENUMERATION;
-    }
-
-    private static class EmptyEnumeration<E> implements Enumeration<E> {
-        static final EmptyEnumeration<Object> EMPTY_ENUMERATION
-            = new EmptyEnumeration<>();
-
-        public boolean hasMoreElements() { return false; }
-        public E nextElement() { throw new NoSuchElementException(); }
-    }
-
-    /**
-     * The empty set (immutable).  This set is serializable.
-     *
-     * @see #emptySet()
-     */
-    @SuppressWarnings("unchecked")
-    public static final Set EMPTY_SET = new EmptySet<>();
-
-    /**
-     * Returns the empty set (immutable).  This set is serializable.
-     * Unlike the like-named field, this method is parameterized.
-     *
-     * <p>This example illustrates the type-safe way to obtain an empty set:
-     * <pre>
-     *     Set&lt;String&gt; s = Collections.emptySet();
-     * </pre>
-     * Implementation note:  Implementations of this method need not
-     * create a separate <tt>Set</tt> object for each call.   Using this
-     * method is likely to have comparable cost to using the like-named
-     * field.  (Unlike this method, the field does not provide type safety.)
-     *
-     * @see #EMPTY_SET
-     * @since 1.5
-     */
-    @SuppressWarnings("unchecked")
-    public static final <T> Set<T> emptySet() {
-        return (Set<T>) EMPTY_SET;
-    }
-
-    /**
-     * @serial include
-     */
-    private static class EmptySet<E>
-        extends AbstractSet<E>
-        implements Serializable
-    {
-        private static final long serialVersionUID = 1582296315990362920L;
-
-        public Iterator<E> iterator() { return emptyIterator(); }
-
-        public int size() {return 0;}
-        public boolean isEmpty() {return true;}
-
-        public boolean contains(Object obj) {return false;}
-        public boolean containsAll(Collection<?> c) { return c.isEmpty(); }
-
-        public Object[] toArray() { return new Object[0]; }
-
-        public <T> T[] toArray(T[] a) {
-            if (a.length > 0)
-                a[0] = null;
-            return a;
-        }
-
-        // Preserves singleton property
-        private Object readResolve() {
-            return EMPTY_SET;
-        }
-    }
-
-    /**
-     * The empty list (immutable).  This list is serializable.
-     *
-     * @see #emptyList()
-     */
-    @SuppressWarnings("unchecked")
-    public static final List EMPTY_LIST = new EmptyList<>();
-
-    /**
-     * Returns the empty list (immutable).  This list is serializable.
-     *
-     * <p>This example illustrates the type-safe way to obtain an empty list:
-     * <pre>
-     *     List&lt;String&gt; s = Collections.emptyList();
-     * </pre>
-     * Implementation note:  Implementations of this method need not
-     * create a separate <tt>List</tt> object for each call.   Using this
-     * method is likely to have comparable cost to using the like-named
-     * field.  (Unlike this method, the field does not provide type safety.)
-     *
-     * @see #EMPTY_LIST
-     * @since 1.5
-     */
-    @SuppressWarnings("unchecked")
-    public static final <T> List<T> emptyList() {
-        return (List<T>) EMPTY_LIST;
-    }
-
-    /**
-     * @serial include
-     */
-    private static class EmptyList<E>
-        extends AbstractList<E>
-        implements RandomAccess, Serializable {
-        private static final long serialVersionUID = 8842843931221139166L;
-
-        public Iterator<E> iterator() {
-            return emptyIterator();
-        }
-        public ListIterator<E> listIterator() {
-            return emptyListIterator();
-        }
-
-        public int size() {return 0;}
-        public boolean isEmpty() {return true;}
-
-        public boolean contains(Object obj) {return false;}
-        public boolean containsAll(Collection<?> c) { return c.isEmpty(); }
-
-        public Object[] toArray() { return new Object[0]; }
-
-        public <T> T[] toArray(T[] a) {
-            if (a.length > 0)
-                a[0] = null;
-            return a;
-        }
-
-        public E get(int index) {
-            throw new IndexOutOfBoundsException("Index: "+index);
-        }
-
-        public boolean equals(Object o) {
-            return (o instanceof List) && ((List<?>)o).isEmpty();
-        }
-
-        public int hashCode() { return 1; }
-
-        // Preserves singleton property
-        private Object readResolve() {
-            return EMPTY_LIST;
-        }
-    }
-
-    /**
-     * The empty map (immutable).  This map is serializable.
-     *
-     * @see #emptyMap()
-     * @since 1.3
-     */
-    @SuppressWarnings("unchecked")
-    public static final Map EMPTY_MAP = new EmptyMap<>();
-
-    /**
-     * Returns the empty map (immutable).  This map is serializable.
-     *
-     * <p>This example illustrates the type-safe way to obtain an empty set:
-     * <pre>
-     *     Map&lt;String, Date&gt; s = Collections.emptyMap();
-     * </pre>
-     * Implementation note:  Implementations of this method need not
-     * create a separate <tt>Map</tt> object for each call.   Using this
-     * method is likely to have comparable cost to using the like-named
-     * field.  (Unlike this method, the field does not provide type safety.)
-     *
-     * @see #EMPTY_MAP
-     * @since 1.5
-     */
-    @SuppressWarnings("unchecked")
-    public static final <K,V> Map<K,V> emptyMap() {
-        return (Map<K,V>) EMPTY_MAP;
-    }
-
-    /**
-     * @serial include
-     */
-    private static class EmptyMap<K,V>
-        extends AbstractMap<K,V>
-        implements Serializable
-    {
-        private static final long serialVersionUID = 6428348081105594320L;
-
-        public int size()                          {return 0;}
-        public boolean isEmpty()                   {return true;}
-        public boolean containsKey(Object key)     {return false;}
-        public boolean containsValue(Object value) {return false;}
-        public V get(Object key)                   {return null;}
-        public Set<K> keySet()                     {return emptySet();}
-        public Collection<V> values()              {return emptySet();}
-        public Set<Map.Entry<K,V>> entrySet()      {return emptySet();}
-
-        public boolean equals(Object o) {
-            return (o instanceof Map) && ((Map<?,?>)o).isEmpty();
-        }
-
-        public int hashCode()                      {return 0;}
-
-        // Preserves singleton property
-        private Object readResolve() {
-            return EMPTY_MAP;
-        }
-    }
-
-    // Singleton collections
-
-    /**
-     * Returns an immutable set containing only the specified object.
-     * The returned set is serializable.
-     *
-     * @param o the sole object to be stored in the returned set.
-     * @return an immutable set containing only the specified object.
-     */
-    public static <T> Set<T> singleton(T o) {
-        return new SingletonSet<>(o);
-    }
-
-    static <E> Iterator<E> singletonIterator(final E e) {
-        return new Iterator<E>() {
-            private boolean hasNext = true;
-            public boolean hasNext() {
-                return hasNext;
-            }
-            public E next() {
-                if (hasNext) {
-                    hasNext = false;
-                    return e;
-                }
-                throw new NoSuchElementException();
-            }
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-
-    /**
-     * @serial include
-     */
-    private static class SingletonSet<E>
-        extends AbstractSet<E>
-        implements Serializable
-    {
-        private static final long serialVersionUID = 3193687207550431679L;
-
-        private final E element;
-
-        SingletonSet(E e) {element = e;}
-
-        public Iterator<E> iterator() {
-            return singletonIterator(element);
-        }
-
-        public int size() {return 1;}
-
-        public boolean contains(Object o) {return eq(o, element);}
-    }
-
-    /**
-     * Returns an immutable list containing only the specified object.
-     * The returned list is serializable.
-     *
-     * @param o the sole object to be stored in the returned list.
-     * @return an immutable list containing only the specified object.
-     * @since 1.3
-     */
-    public static <T> List<T> singletonList(T o) {
-        return new SingletonList<>(o);
-    }
-
-    /**
-     * @serial include
-     */
-    private static class SingletonList<E>
-        extends AbstractList<E>
-        implements RandomAccess, Serializable {
-
-        private static final long serialVersionUID = 3093736618740652951L;
-
-        private final E element;
-
-        SingletonList(E obj)                {element = obj;}
-
-        public Iterator<E> iterator() {
-            return singletonIterator(element);
-        }
-
-        public int size()                   {return 1;}
-
-        public boolean contains(Object obj) {return eq(obj, element);}
-
-        public E get(int index) {
-            if (index != 0)
-              throw new IndexOutOfBoundsException("Index: "+index+", Size: 1");
-            return element;
-        }
-    }
-
-    /**
-     * Returns an immutable map, mapping only the specified key to the
-     * specified value.  The returned map is serializable.
-     *
-     * @param key the sole key to be stored in the returned map.
-     * @param value the value to which the returned map maps <tt>key</tt>.
-     * @return an immutable map containing only the specified key-value
-     *         mapping.
-     * @since 1.3
-     */
-    public static <K,V> Map<K,V> singletonMap(K key, V value) {
-        return new SingletonMap<>(key, value);
-    }
-
-    /**
-     * @serial include
-     */
-    private static class SingletonMap<K,V>
-          extends AbstractMap<K,V>
-          implements Serializable {
-        private static final long serialVersionUID = -6979724477215052911L;
-
-        private final K k;
-        private final V v;
-
-        SingletonMap(K key, V value) {
-            k = key;
-            v = value;
-        }
-
-        public int size()                          {return 1;}
-
-        public boolean isEmpty()                   {return false;}
-
-        public boolean containsKey(Object key)     {return eq(key, k);}
-
-        public boolean containsValue(Object value) {return eq(value, v);}
-
-        public V get(Object key)                   {return (eq(key, k) ? v : null);}
-
-        private transient Set<K> keySet = null;
-        private transient Set<Map.Entry<K,V>> entrySet = null;
-        private transient Collection<V> values = null;
-
-        public Set<K> keySet() {
-            if (keySet==null)
-                keySet = singleton(k);
-            return keySet;
-        }
-
-        public Set<Map.Entry<K,V>> entrySet() {
-            if (entrySet==null)
-                entrySet = Collections.<Map.Entry<K,V>>singleton(
-                    new SimpleImmutableEntry<>(k, v));
-            return entrySet;
-        }
-
-        public Collection<V> values() {
-            if (values==null)
-                values = singleton(v);
-            return values;
-        }
-
-    }
-
-    // Miscellaneous
-
-    /**
-     * Returns an immutable list consisting of <tt>n</tt> copies of the
-     * specified object.  The newly allocated data object is tiny (it contains
-     * a single reference to the data object).  This method is useful in
-     * combination with the <tt>List.addAll</tt> method to grow lists.
-     * The returned list is serializable.
-     *
-     * @param  n the number of elements in the returned list.
-     * @param  o the element to appear repeatedly in the returned list.
-     * @return an immutable list consisting of <tt>n</tt> copies of the
-     *         specified object.
-     * @throws IllegalArgumentException if {@code n < 0}
-     * @see    List#addAll(Collection)
-     * @see    List#addAll(int, Collection)
-     */
-    public static <T> List<T> nCopies(int n, T o) {
-        if (n < 0)
-            throw new IllegalArgumentException("List length = " + n);
-        return new CopiesList<>(n, o);
-    }
-
-    /**
-     * @serial include
-     */
-    private static class CopiesList<E>
-        extends AbstractList<E>
-        implements RandomAccess, Serializable
-    {
-        private static final long serialVersionUID = 2739099268398711800L;
-
-        final int n;
-        final E element;
-
-        CopiesList(int n, E e) {
-            assert n >= 0;
-            this.n = n;
-            element = e;
-        }
-
-        public int size() {
-            return n;
-        }
-
-        public boolean contains(Object obj) {
-            return n != 0 && eq(obj, element);
-        }
-
-        public int indexOf(Object o) {
-            return contains(o) ? 0 : -1;
-        }
-
-        public int lastIndexOf(Object o) {
-            return contains(o) ? n - 1 : -1;
-        }
-
-        public E get(int index) {
-            if (index < 0 || index >= n)
-                throw new IndexOutOfBoundsException("Index: "+index+
-                                                    ", Size: "+n);
-            return element;
-        }
-
-        public Object[] toArray() {
-            final Object[] a = new Object[n];
-            if (element != null)
-                Arrays.fill(a, 0, n, element);
-            return a;
-        }
-
-        public <T> T[] toArray(T[] a) {
-            final int n = this.n;
-            if (a.length < n) {
-                a = (T[])java.lang.reflect.Array
-                    .newInstance(a.getClass().getComponentType(), n);
-                if (element != null)
-                    Arrays.fill(a, 0, n, element);
-            } else {
-                Arrays.fill(a, 0, n, element);
-                if (a.length > n)
-                    a[n] = null;
-            }
-            return a;
-        }
-
-        public List<E> subList(int fromIndex, int toIndex) {
-            if (fromIndex < 0)
-                throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
-            if (toIndex > n)
-                throw new IndexOutOfBoundsException("toIndex = " + toIndex);
-            if (fromIndex > toIndex)
-                throw new IllegalArgumentException("fromIndex(" + fromIndex +
-                                                   ") > toIndex(" + toIndex + ")");
-            return new CopiesList<>(toIndex - fromIndex, element);
-        }
-    }
-
-    /**
-     * Returns a comparator that imposes the reverse of the <em>natural
-     * ordering</em> on a collection of objects that implement the
-     * {@code Comparable} interface.  (The natural ordering is the ordering
-     * imposed by the objects' own {@code compareTo} method.)  This enables a
-     * simple idiom for sorting (or maintaining) collections (or arrays) of
-     * objects that implement the {@code Comparable} interface in
-     * reverse-natural-order.  For example, suppose {@code a} is an array of
-     * strings. Then: <pre>
-     *          Arrays.sort(a, Collections.reverseOrder());
-     * </pre> sorts the array in reverse-lexicographic (alphabetical) order.<p>
-     *
-     * The returned comparator is serializable.
-     *
-     * @return A comparator that imposes the reverse of the <i>natural
-     *         ordering</i> on a collection of objects that implement
-     *         the <tt>Comparable</tt> interface.
-     * @see Comparable
-     */
-    public static <T> Comparator<T> reverseOrder() {
-        return (Comparator<T>) ReverseComparator.REVERSE_ORDER;
-    }
-
-    /**
-     * @serial include
-     */
-    private static class ReverseComparator
-        implements Comparator<Comparable<Object>>, Serializable {
-
-        private static final long serialVersionUID = 7207038068494060240L;
-
-        static final ReverseComparator REVERSE_ORDER
-            = new ReverseComparator();
-
-        public int compare(Comparable<Object> c1, Comparable<Object> c2) {
-            return c2.compareTo(c1);
-        }
-
-        private Object readResolve() { return reverseOrder(); }
-    }
-
-    /**
-     * Returns a comparator that imposes the reverse ordering of the specified
-     * comparator.  If the specified comparator is {@code null}, this method is
-     * equivalent to {@link #reverseOrder()} (in other words, it returns a
-     * comparator that imposes the reverse of the <em>natural ordering</em> on
-     * a collection of objects that implement the Comparable interface).
-     *
-     * <p>The returned comparator is serializable (assuming the specified
-     * comparator is also serializable or {@code null}).
-     *
-     * @param cmp a comparator who's ordering is to be reversed by the returned
-     * comparator or {@code null}
-     * @return A comparator that imposes the reverse ordering of the
-     *         specified comparator.
-     * @since 1.5
-     */
-    public static <T> Comparator<T> reverseOrder(Comparator<T> cmp) {
-        if (cmp == null)
-            return reverseOrder();
-
-        if (cmp instanceof ReverseComparator2)
-            return ((ReverseComparator2<T>)cmp).cmp;
-
-        return new ReverseComparator2<>(cmp);
-    }
-
-    /**
-     * @serial include
-     */
-    private static class ReverseComparator2<T> implements Comparator<T>,
-        Serializable
-    {
-        private static final long serialVersionUID = 4374092139857L;
-
-        /**
-         * The comparator specified in the static factory.  This will never
-         * be null, as the static factory returns a ReverseComparator
-         * instance if its argument is null.
-         *
-         * @serial
-         */
-        final Comparator<T> cmp;
-
-        ReverseComparator2(Comparator<T> cmp) {
-            assert cmp != null;
-            this.cmp = cmp;
-        }
-
-        public int compare(T t1, T t2) {
-            return cmp.compare(t2, t1);
-        }
-
-        public boolean equals(Object o) {
-            return (o == this) ||
-                (o instanceof ReverseComparator2 &&
-                 cmp.equals(((ReverseComparator2)o).cmp));
-        }
-
-        public int hashCode() {
-            return cmp.hashCode() ^ Integer.MIN_VALUE;
-        }
-    }
-
-    /**
-     * Returns an enumeration over the specified collection.  This provides
-     * interoperability with legacy APIs that require an enumeration
-     * as input.
-     *
-     * @param c the collection for which an enumeration is to be returned.
-     * @return an enumeration over the specified collection.
-     * @see Enumeration
-     */
-    public static <T> Enumeration<T> enumeration(final Collection<T> c) {
-        return new Enumeration<T>() {
-            private final Iterator<T> i = c.iterator();
-
-            public boolean hasMoreElements() {
-                return i.hasNext();
-            }
-
-            public T nextElement() {
-                return i.next();
-            }
-        };
-    }
-
-    /**
-     * Returns an array list containing the elements returned by the
-     * specified enumeration in the order they are returned by the
-     * enumeration.  This method provides interoperability between
-     * legacy APIs that return enumerations and new APIs that require
-     * collections.
-     *
-     * @param e enumeration providing elements for the returned
-     *          array list
-     * @return an array list containing the elements returned
-     *         by the specified enumeration.
-     * @since 1.4
-     * @see Enumeration
-     * @see ArrayList
-     */
-    public static <T> ArrayList<T> list(Enumeration<T> e) {
-        ArrayList<T> l = new ArrayList<>();
-        while (e.hasMoreElements())
-            l.add(e.nextElement());
-        return l;
-    }
-
-    /**
-     * Returns true if the specified arguments are equal, or both null.
-     */
-    static boolean eq(Object o1, Object o2) {
-        return o1==null ? o2==null : o1.equals(o2);
-    }
-
-    /**
-     * Returns the number of elements in the specified collection equal to the
-     * specified object.  More formally, returns the number of elements
-     * <tt>e</tt> in the collection such that
-     * <tt>(o == null ? e == null : o.equals(e))</tt>.
-     *
-     * @param c the collection in which to determine the frequency
-     *     of <tt>o</tt>
-     * @param o the object whose frequency is to be determined
-     * @throws NullPointerException if <tt>c</tt> is null
-     * @since 1.5
-     */
-    public static int frequency(Collection<?> c, Object o) {
-        int result = 0;
-        if (o == null) {
-            for (Object e : c)
-                if (e == null)
-                    result++;
-        } else {
-            for (Object e : c)
-                if (o.equals(e))
-                    result++;
-        }
-        return result;
-    }
-
-    /**
-     * Returns {@code true} if the two specified collections have no
-     * elements in common.
-     *
-     * <p>Care must be exercised if this method is used on collections that
-     * do not comply with the general contract for {@code Collection}.
-     * Implementations may elect to iterate over either collection and test
-     * for containment in the other collection (or to perform any equivalent
-     * computation).  If either collection uses a nonstandard equality test
-     * (as does a {@link SortedSet} whose ordering is not <em>compatible with
-     * equals</em>, or the key set of an {@link IdentityHashMap}), both
-     * collections must use the same nonstandard equality test, or the
-     * result of this method is undefined.
-     *
-     * <p>Care must also be exercised when using collections that have
-     * restrictions on the elements that they may contain. Collection
-     * implementations are allowed to throw exceptions for any operation
-     * involving elements they deem ineligible. For absolute safety the
-     * specified collections should contain only elements which are
-     * eligible elements for both collections.
-     *
-     * <p>Note that it is permissible to pass the same collection in both
-     * parameters, in which case the method will return {@code true} if and
-     * only if the collection is empty.
-     *
-     * @param c1 a collection
-     * @param c2 a collection
-     * @return {@code true} if the two specified collections have no
-     * elements in common.
-     * @throws NullPointerException if either collection is {@code null}.
-     * @throws NullPointerException if one collection contains a {@code null}
-     * element and {@code null} is not an eligible element for the other collection.
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws ClassCastException if one collection contains an element that is
-     * of a type which is ineligible for the other collection.
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @since 1.5
-     */
-    public static boolean disjoint(Collection<?> c1, Collection<?> c2) {
-        // The collection to be used for contains(). Preference is given to
-        // the collection who's contains() has lower O() complexity.
-        Collection<?> contains = c2;
-        // The collection to be iterated. If the collections' contains() impl
-        // are of different O() complexity, the collection with slower
-        // contains() will be used for iteration. For collections who's
-        // contains() are of the same complexity then best performance is
-        // achieved by iterating the smaller collection.
-        Collection<?> iterate = c1;
-
-        // Performance optimization cases. The heuristics:
-        //   1. Generally iterate over c1.
-        //   2. If c1 is a Set then iterate over c2.
-        //   3. If either collection is empty then result is always true.
-        //   4. Iterate over the smaller Collection.
-        if (c1 instanceof Set) {
-            // Use c1 for contains as a Set's contains() is expected to perform
-            // better than O(N/2)
-            iterate = c2;
-            contains = c1;
-        } else if (!(c2 instanceof Set)) {
-            // Both are mere Collections. Iterate over smaller collection.
-            // Example: If c1 contains 3 elements and c2 contains 50 elements and
-            // assuming contains() requires ceiling(N/2) comparisons then
-            // checking for all c1 elements in c2 would require 75 comparisons
-            // (3 * ceiling(50/2)) vs. checking all c2 elements in c1 requiring
-            // 100 comparisons (50 * ceiling(3/2)).
-            int c1size = c1.size();
-            int c2size = c2.size();
-            if (c1size == 0 || c2size == 0) {
-                // At least one collection is empty. Nothing will match.
-                return true;
-            }
-
-            if (c1size > c2size) {
-                iterate = c2;
-                contains = c1;
-            }
-        }
-
-        for (Object e : iterate) {
-            if (contains.contains(e)) {
-               // Found a common element. Collections are not disjoint.
-                return false;
-            }
-        }
-
-        // No common elements were found.
-        return true;
-    }
-
-    /**
-     * Adds all of the specified elements to the specified collection.
-     * Elements to be added may be specified individually or as an array.
-     * The behavior of this convenience method is identical to that of
-     * <tt>c.addAll(Arrays.asList(elements))</tt>, but this method is likely
-     * to run significantly faster under most implementations.
-     *
-     * <p>When elements are specified individually, this method provides a
-     * convenient way to add a few elements to an existing collection:
-     * <pre>
-     *     Collections.addAll(flavors, "Peaches 'n Plutonium", "Rocky Racoon");
-     * </pre>
-     *
-     * @param c the collection into which <tt>elements</tt> are to be inserted
-     * @param elements the elements to insert into <tt>c</tt>
-     * @return <tt>true</tt> if the collection changed as a result of the call
-     * @throws UnsupportedOperationException if <tt>c</tt> does not support
-     *         the <tt>add</tt> operation
-     * @throws NullPointerException if <tt>elements</tt> contains one or more
-     *         null values and <tt>c</tt> does not permit null elements, or
-     *         if <tt>c</tt> or <tt>elements</tt> are <tt>null</tt>
-     * @throws IllegalArgumentException if some property of a value in
-     *         <tt>elements</tt> prevents it from being added to <tt>c</tt>
-     * @see Collection#addAll(Collection)
-     * @since 1.5
-     */
-    @SafeVarargs
-    public static <T> boolean addAll(Collection<? super T> c, T... elements) {
-        boolean result = false;
-        for (T element : elements)
-            result |= c.add(element);
-        return result;
-    }
-
-    /**
-     * Returns a set backed by the specified map.  The resulting set displays
-     * the same ordering, concurrency, and performance characteristics as the
-     * backing map.  In essence, this factory method provides a {@link Set}
-     * implementation corresponding to any {@link Map} implementation.  There
-     * is no need to use this method on a {@link Map} implementation that
-     * already has a corresponding {@link Set} implementation (such as {@link
-     * HashMap} or {@link TreeMap}).
-     *
-     * <p>Each method invocation on the set returned by this method results in
-     * exactly one method invocation on the backing map or its <tt>keySet</tt>
-     * view, with one exception.  The <tt>addAll</tt> method is implemented
-     * as a sequence of <tt>put</tt> invocations on the backing map.
-     *
-     * <p>The specified map must be empty at the time this method is invoked,
-     * and should not be accessed directly after this method returns.  These
-     * conditions are ensured if the map is created empty, passed directly
-     * to this method, and no reference to the map is retained, as illustrated
-     * in the following code fragment:
-     * <pre>
-     *    Set&lt;Object&gt; weakHashSet = Collections.newSetFromMap(
-     *        new WeakHashMap&lt;Object, Boolean&gt;());
-     * </pre>
-     *
-     * @param map the backing map
-     * @return the set backed by the map
-     * @throws IllegalArgumentException if <tt>map</tt> is not empty
-     * @since 1.6
-     */
-    public static <E> Set<E> newSetFromMap(Map<E, Boolean> map) {
-        return new SetFromMap<>(map);
-    }
-
-    /**
-     * @serial include
-     */
-    private static class SetFromMap<E> extends AbstractSet<E>
-        implements Set<E>, Serializable
-    {
-        private final Map<E, Boolean> m;  // The backing map
-        private transient Set<E> s;       // Its keySet
-
-        SetFromMap(Map<E, Boolean> map) {
-            if (!map.isEmpty())
-                throw new IllegalArgumentException("Map is non-empty");
-            m = map;
-            s = map.keySet();
-        }
-
-        public void clear()               {        m.clear(); }
-        public int size()                 { return m.size(); }
-        public boolean isEmpty()          { return m.isEmpty(); }
-        public boolean contains(Object o) { return m.containsKey(o); }
-        public boolean remove(Object o)   { return m.remove(o) != null; }
-        public boolean add(E e) { return m.put(e, Boolean.TRUE) == null; }
-        public Iterator<E> iterator()     { return s.iterator(); }
-        public Object[] toArray()         { return s.toArray(); }
-        public <T> T[] toArray(T[] a)     { return s.toArray(a); }
-        public String toString()          { return s.toString(); }
-        public int hashCode()             { return s.hashCode(); }
-        public boolean equals(Object o)   { return o == this || s.equals(o); }
-        public boolean containsAll(Collection<?> c) {return s.containsAll(c);}
-        public boolean removeAll(Collection<?> c)   {return s.removeAll(c);}
-        public boolean retainAll(Collection<?> c)   {return s.retainAll(c);}
-        // addAll is the only inherited implementation
-
-        private static final long serialVersionUID = 2454657854757543876L;
-
-    }
-
-    /**
-     * Returns a view of a {@link Deque} as a Last-in-first-out (Lifo)
-     * {@link Queue}. Method <tt>add</tt> is mapped to <tt>push</tt>,
-     * <tt>remove</tt> is mapped to <tt>pop</tt> and so on. This
-     * view can be useful when you would like to use a method
-     * requiring a <tt>Queue</tt> but you need Lifo ordering.
-     *
-     * <p>Each method invocation on the queue returned by this method
-     * results in exactly one method invocation on the backing deque, with
-     * one exception.  The {@link Queue#addAll addAll} method is
-     * implemented as a sequence of {@link Deque#addFirst addFirst}
-     * invocations on the backing deque.
-     *
-     * @param deque the deque
-     * @return the queue
-     * @since  1.6
-     */
-    public static <T> Queue<T> asLifoQueue(Deque<T> deque) {
-        return new AsLIFOQueue<>(deque);
-    }
-
-    /**
-     * @serial include
-     */
-    static class AsLIFOQueue<E> extends AbstractQueue<E>
-        implements Queue<E>, Serializable {
-        private static final long serialVersionUID = 1802017725587941708L;
-        private final Deque<E> q;
-        AsLIFOQueue(Deque<E> q)           { this.q = q; }
-        public boolean add(E e)           { q.addFirst(e); return true; }
-        public boolean offer(E e)         { return q.offerFirst(e); }
-        public E poll()                   { return q.pollFirst(); }
-        public E remove()                 { return q.removeFirst(); }
-        public E peek()                   { return q.peekFirst(); }
-        public E element()                { return q.getFirst(); }
-        public void clear()               {        q.clear(); }
-        public int size()                 { return q.size(); }
-        public boolean isEmpty()          { return q.isEmpty(); }
-        public boolean contains(Object o) { return q.contains(o); }
-        public boolean remove(Object o)   { return q.remove(o); }
-        public Iterator<E> iterator()     { return q.iterator(); }
-        public Object[] toArray()         { return q.toArray(); }
-        public <T> T[] toArray(T[] a)     { return q.toArray(a); }
-        public String toString()          { return q.toString(); }
-        public boolean containsAll(Collection<?> c) {return q.containsAll(c);}
-        public boolean removeAll(Collection<?> c)   {return q.removeAll(c);}
-        public boolean retainAll(Collection<?> c)   {return q.retainAll(c);}
-        // We use inherited addAll; forwarding addAll would be wrong
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/ComparableTimSort.java
--- a/emul/compact/src/main/java/java/util/ComparableTimSort.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,896 +0,0 @@
-/*
- * Copyright 2009 Google Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-
-/**
- * This is a near duplicate of {@link TimSort}, modified for use with
- * arrays of objects that implement {@link Comparable}, instead of using
- * explicit comparators.
- *
- * <p>If you are using an optimizing VM, you may find that ComparableTimSort
- * offers no performance benefit over TimSort in conjunction with a
- * comparator that simply returns {@code ((Comparable)first).compareTo(Second)}.
- * If this is the case, you are better off deleting ComparableTimSort to
- * eliminate the code duplication.  (See Arrays.java for details.)
- *
- * @author Josh Bloch
- */
-class ComparableTimSort {
-    /**
-     * This is the minimum sized sequence that will be merged.  Shorter
-     * sequences will be lengthened by calling binarySort.  If the entire
-     * array is less than this length, no merges will be performed.
-     *
-     * This constant should be a power of two.  It was 64 in Tim Peter's C
-     * implementation, but 32 was empirically determined to work better in
-     * this implementation.  In the unlikely event that you set this constant
-     * to be a number that's not a power of two, you'll need to change the
-     * {@link #minRunLength} computation.
-     *
-     * If you decrease this constant, you must change the stackLen
-     * computation in the TimSort constructor, or you risk an
-     * ArrayOutOfBounds exception.  See listsort.txt for a discussion
-     * of the minimum stack length required as a function of the length
-     * of the array being sorted and the minimum merge sequence length.
-     */
-    private static final int MIN_MERGE = 32;
-
-    /**
-     * The array being sorted.
-     */
-    private final Object[] a;
-
-    /**
-     * When we get into galloping mode, we stay there until both runs win less
-     * often than MIN_GALLOP consecutive times.
-     */
-    private static final int  MIN_GALLOP = 7;
-
-    /**
-     * This controls when we get *into* galloping mode.  It is initialized
-     * to MIN_GALLOP.  The mergeLo and mergeHi methods nudge it higher for
-     * random data, and lower for highly structured data.
-     */
-    private int minGallop = MIN_GALLOP;
-
-    /**
-     * Maximum initial size of tmp array, which is used for merging.  The array
-     * can grow to accommodate demand.
-     *
-     * Unlike Tim's original C version, we do not allocate this much storage
-     * when sorting smaller arrays.  This change was required for performance.
-     */
-    private static final int INITIAL_TMP_STORAGE_LENGTH = 256;
-
-    /**
-     * Temp storage for merges.
-     */
-    private Object[] tmp;
-
-    /**
-     * A stack of pending runs yet to be merged.  Run i starts at
-     * address base[i] and extends for len[i] elements.  It's always
-     * true (so long as the indices are in bounds) that:
-     *
-     *     runBase[i] + runLen[i] == runBase[i + 1]
-     *
-     * so we could cut the storage for this, but it's a minor amount,
-     * and keeping all the info explicit simplifies the code.
-     */
-    private int stackSize = 0;  // Number of pending runs on stack
-    private final int[] runBase;
-    private final int[] runLen;
-
-    /**
-     * Creates a TimSort instance to maintain the state of an ongoing sort.
-     *
-     * @param a the array to be sorted
-     */
-    private ComparableTimSort(Object[] a) {
-        this.a = a;
-
-        // Allocate temp storage (which may be increased later if necessary)
-        int len = a.length;
-        @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
-        Object[] newArray = new Object[len < 2 * INITIAL_TMP_STORAGE_LENGTH ?
-                                       len >>> 1 : INITIAL_TMP_STORAGE_LENGTH];
-        tmp = newArray;
-
-        /*
-         * Allocate runs-to-be-merged stack (which cannot be expanded).  The
-         * stack length requirements are described in listsort.txt.  The C
-         * version always uses the same stack length (85), but this was
-         * measured to be too expensive when sorting "mid-sized" arrays (e.g.,
-         * 100 elements) in Java.  Therefore, we use smaller (but sufficiently
-         * large) stack lengths for smaller arrays.  The "magic numbers" in the
-         * computation below must be changed if MIN_MERGE is decreased.  See
-         * the MIN_MERGE declaration above for more information.
-         */
-        int stackLen = (len <    120  ?  5 :
-                        len <   1542  ? 10 :
-                        len < 119151  ? 19 : 40);
-        runBase = new int[stackLen];
-        runLen = new int[stackLen];
-    }
-
-    /*
-     * The next two methods (which are package private and static) constitute
-     * the entire API of this class.  Each of these methods obeys the contract
-     * of the public method with the same signature in java.util.Arrays.
-     */
-
-    static void sort(Object[] a) {
-          sort(a, 0, a.length);
-    }
-
-    static void sort(Object[] a, int lo, int hi) {
-        rangeCheck(a.length, lo, hi);
-        int nRemaining  = hi - lo;
-        if (nRemaining < 2)
-            return;  // Arrays of size 0 and 1 are always sorted
-
-        // If array is small, do a "mini-TimSort" with no merges
-        if (nRemaining < MIN_MERGE) {
-            int initRunLen = countRunAndMakeAscending(a, lo, hi);
-            binarySort(a, lo, hi, lo + initRunLen);
-            return;
-        }
-
-        /**
-         * March over the array once, left to right, finding natural runs,
-         * extending short natural runs to minRun elements, and merging runs
-         * to maintain stack invariant.
-         */
-        ComparableTimSort ts = new ComparableTimSort(a);
-        int minRun = minRunLength(nRemaining);
-        do {
-            // Identify next run
-            int runLen = countRunAndMakeAscending(a, lo, hi);
-
-            // If run is short, extend to min(minRun, nRemaining)
-            if (runLen < minRun) {
-                int force = nRemaining <= minRun ? nRemaining : minRun;
-                binarySort(a, lo, lo + force, lo + runLen);
-                runLen = force;
-            }
-
-            // Push run onto pending-run stack, and maybe merge
-            ts.pushRun(lo, runLen);
-            ts.mergeCollapse();
-
-            // Advance to find next run
-            lo += runLen;
-            nRemaining -= runLen;
-        } while (nRemaining != 0);
-
-        // Merge all remaining runs to complete sort
-        assert lo == hi;
-        ts.mergeForceCollapse();
-        assert ts.stackSize == 1;
-    }
-
-    /**
-     * Sorts the specified portion of the specified array using a binary
-     * insertion sort.  This is the best method for sorting small numbers
-     * of elements.  It requires O(n log n) compares, but O(n^2) data
-     * movement (worst case).
-     *
-     * If the initial part of the specified range is already sorted,
-     * this method can take advantage of it: the method assumes that the
-     * elements from index {@code lo}, inclusive, to {@code start},
-     * exclusive are already sorted.
-     *
-     * @param a the array in which a range is to be sorted
-     * @param lo the index of the first element in the range to be sorted
-     * @param hi the index after the last element in the range to be sorted
-     * @param start the index of the first element in the range that is
-     *        not already known to be sorted ({@code lo <= start <= hi})
-     */
-    @SuppressWarnings("fallthrough")
-    private static void binarySort(Object[] a, int lo, int hi, int start) {
-        assert lo <= start && start <= hi;
-        if (start == lo)
-            start++;
-        for ( ; start < hi; start++) {
-            @SuppressWarnings("unchecked")
-            Comparable<Object> pivot = (Comparable) a[start];
-
-            // Set left (and right) to the index where a[start] (pivot) belongs
-            int left = lo;
-            int right = start;
-            assert left <= right;
-            /*
-             * Invariants:
-             *   pivot >= all in [lo, left).
-             *   pivot <  all in [right, start).
-             */
-            while (left < right) {
-                int mid = (left + right) >>> 1;
-                if (pivot.compareTo(a[mid]) < 0)
-                    right = mid;
-                else
-                    left = mid + 1;
-            }
-            assert left == right;
-
-            /*
-             * The invariants still hold: pivot >= all in [lo, left) and
-             * pivot < all in [left, start), so pivot belongs at left.  Note
-             * that if there are elements equal to pivot, left points to the
-             * first slot after them -- that's why this sort is stable.
-             * Slide elements over to make room for pivot.
-             */
-            int n = start - left;  // The number of elements to move
-            // Switch is just an optimization for arraycopy in default case
-            switch (n) {
-                case 2:  a[left + 2] = a[left + 1];
-                case 1:  a[left + 1] = a[left];
-                         break;
-                default: System.arraycopy(a, left, a, left + 1, n);
-            }
-            a[left] = pivot;
-        }
-    }
-
-    /**
-     * Returns the length of the run beginning at the specified position in
-     * the specified array and reverses the run if it is descending (ensuring
-     * that the run will always be ascending when the method returns).
-     *
-     * A run is the longest ascending sequence with:
-     *
-     *    a[lo] <= a[lo + 1] <= a[lo + 2] <= ...
-     *
-     * or the longest descending sequence with:
-     *
-     *    a[lo] >  a[lo + 1] >  a[lo + 2] >  ...
-     *
-     * For its intended use in a stable mergesort, the strictness of the
-     * definition of "descending" is needed so that the call can safely
-     * reverse a descending sequence without violating stability.
-     *
-     * @param a the array in which a run is to be counted and possibly reversed
-     * @param lo index of the first element in the run
-     * @param hi index after the last element that may be contained in the run.
-              It is required that {@code lo < hi}.
-     * @return  the length of the run beginning at the specified position in
-     *          the specified array
-     */
-    @SuppressWarnings("unchecked")
-    private static int countRunAndMakeAscending(Object[] a, int lo, int hi) {
-        assert lo < hi;
-        int runHi = lo + 1;
-        if (runHi == hi)
-            return 1;
-
-        // Find end of run, and reverse range if descending
-        if (((Comparable) a[runHi++]).compareTo(a[lo]) < 0) { // Descending
-            while (runHi < hi && ((Comparable) a[runHi]).compareTo(a[runHi - 1]) < 0)
-                runHi++;
-            reverseRange(a, lo, runHi);
-        } else {                              // Ascending
-            while (runHi < hi && ((Comparable) a[runHi]).compareTo(a[runHi - 1]) >= 0)
-                runHi++;
-        }
-
-        return runHi - lo;
-    }
-
-    /**
-     * Reverse the specified range of the specified array.
-     *
-     * @param a the array in which a range is to be reversed
-     * @param lo the index of the first element in the range to be reversed
-     * @param hi the index after the last element in the range to be reversed
-     */
-    private static void reverseRange(Object[] a, int lo, int hi) {
-        hi--;
-        while (lo < hi) {
-            Object t = a[lo];
-            a[lo++] = a[hi];
-            a[hi--] = t;
-        }
-    }
-
-    /**
-     * Returns the minimum acceptable run length for an array of the specified
-     * length. Natural runs shorter than this will be extended with
-     * {@link #binarySort}.
-     *
-     * Roughly speaking, the computation is:
-     *
-     *  If n < MIN_MERGE, return n (it's too small to bother with fancy stuff).
-     *  Else if n is an exact power of 2, return MIN_MERGE/2.
-     *  Else return an int k, MIN_MERGE/2 <= k <= MIN_MERGE, such that n/k
-     *   is close to, but strictly less than, an exact power of 2.
-     *
-     * For the rationale, see listsort.txt.
-     *
-     * @param n the length of the array to be sorted
-     * @return the length of the minimum run to be merged
-     */
-    private static int minRunLength(int n) {
-        assert n >= 0;
-        int r = 0;      // Becomes 1 if any 1 bits are shifted off
-        while (n >= MIN_MERGE) {
-            r |= (n & 1);
-            n >>= 1;
-        }
-        return n + r;
-    }
-
-    /**
-     * Pushes the specified run onto the pending-run stack.
-     *
-     * @param runBase index of the first element in the run
-     * @param runLen  the number of elements in the run
-     */
-    private void pushRun(int runBase, int runLen) {
-        this.runBase[stackSize] = runBase;
-        this.runLen[stackSize] = runLen;
-        stackSize++;
-    }
-
-    /**
-     * Examines the stack of runs waiting to be merged and merges adjacent runs
-     * until the stack invariants are reestablished:
-     *
-     *     1. runLen[i - 3] > runLen[i - 2] + runLen[i - 1]
-     *     2. runLen[i - 2] > runLen[i - 1]
-     *
-     * This method is called each time a new run is pushed onto the stack,
-     * so the invariants are guaranteed to hold for i < stackSize upon
-     * entry to the method.
-     */
-    private void mergeCollapse() {
-        while (stackSize > 1) {
-            int n = stackSize - 2;
-            if (n > 0 && runLen[n-1] <= runLen[n] + runLen[n+1]) {
-                if (runLen[n - 1] < runLen[n + 1])
-                    n--;
-                mergeAt(n);
-            } else if (runLen[n] <= runLen[n + 1]) {
-                mergeAt(n);
-            } else {
-                break; // Invariant is established
-            }
-        }
-    }
-
-    /**
-     * Merges all runs on the stack until only one remains.  This method is
-     * called once, to complete the sort.
-     */
-    private void mergeForceCollapse() {
-        while (stackSize > 1) {
-            int n = stackSize - 2;
-            if (n > 0 && runLen[n - 1] < runLen[n + 1])
-                n--;
-            mergeAt(n);
-        }
-    }
-
-    /**
-     * Merges the two runs at stack indices i and i+1.  Run i must be
-     * the penultimate or antepenultimate run on the stack.  In other words,
-     * i must be equal to stackSize-2 or stackSize-3.
-     *
-     * @param i stack index of the first of the two runs to merge
-     */
-    @SuppressWarnings("unchecked")
-    private void mergeAt(int i) {
-        assert stackSize >= 2;
-        assert i >= 0;
-        assert i == stackSize - 2 || i == stackSize - 3;
-
-        int base1 = runBase[i];
-        int len1 = runLen[i];
-        int base2 = runBase[i + 1];
-        int len2 = runLen[i + 1];
-        assert len1 > 0 && len2 > 0;
-        assert base1 + len1 == base2;
-
-        /*
-         * Record the length of the combined runs; if i is the 3rd-last
-         * run now, also slide over the last run (which isn't involved
-         * in this merge).  The current run (i+1) goes away in any case.
-         */
-        runLen[i] = len1 + len2;
-        if (i == stackSize - 3) {
-            runBase[i + 1] = runBase[i + 2];
-            runLen[i + 1] = runLen[i + 2];
-        }
-        stackSize--;
-
-        /*
-         * Find where the first element of run2 goes in run1. Prior elements
-         * in run1 can be ignored (because they're already in place).
-         */
-        int k = gallopRight((Comparable<Object>) a[base2], a, base1, len1, 0);
-        assert k >= 0;
-        base1 += k;
-        len1 -= k;
-        if (len1 == 0)
-            return;
-
-        /*
-         * Find where the last element of run1 goes in run2. Subsequent elements
-         * in run2 can be ignored (because they're already in place).
-         */
-        len2 = gallopLeft((Comparable<Object>) a[base1 + len1 - 1], a,
-                base2, len2, len2 - 1);
-        assert len2 >= 0;
-        if (len2 == 0)
-            return;
-
-        // Merge remaining runs, using tmp array with min(len1, len2) elements
-        if (len1 <= len2)
-            mergeLo(base1, len1, base2, len2);
-        else
-            mergeHi(base1, len1, base2, len2);
-    }
-
-    /**
-     * Locates the position at which to insert the specified key into the
-     * specified sorted range; if the range contains an element equal to key,
-     * returns the index of the leftmost equal element.
-     *
-     * @param key the key whose insertion point to search for
-     * @param a the array in which to search
-     * @param base the index of the first element in the range
-     * @param len the length of the range; must be > 0
-     * @param hint the index at which to begin the search, 0 <= hint < n.
-     *     The closer hint is to the result, the faster this method will run.
-     * @return the int k,  0 <= k <= n such that a[b + k - 1] < key <= a[b + k],
-     *    pretending that a[b - 1] is minus infinity and a[b + n] is infinity.
-     *    In other words, key belongs at index b + k; or in other words,
-     *    the first k elements of a should precede key, and the last n - k
-     *    should follow it.
-     */
-    private static int gallopLeft(Comparable<Object> key, Object[] a,
-            int base, int len, int hint) {
-        assert len > 0 && hint >= 0 && hint < len;
-
-        int lastOfs = 0;
-        int ofs = 1;
-        if (key.compareTo(a[base + hint]) > 0) {
-            // Gallop right until a[base+hint+lastOfs] < key <= a[base+hint+ofs]
-            int maxOfs = len - hint;
-            while (ofs < maxOfs && key.compareTo(a[base + hint + ofs]) > 0) {
-                lastOfs = ofs;
-                ofs = (ofs << 1) + 1;
-                if (ofs <= 0)   // int overflow
-                    ofs = maxOfs;
-            }
-            if (ofs > maxOfs)
-                ofs = maxOfs;
-
-            // Make offsets relative to base
-            lastOfs += hint;
-            ofs += hint;
-        } else { // key <= a[base + hint]
-            // Gallop left until a[base+hint-ofs] < key <= a[base+hint-lastOfs]
-            final int maxOfs = hint + 1;
-            while (ofs < maxOfs && key.compareTo(a[base + hint - ofs]) <= 0) {
-                lastOfs = ofs;
-                ofs = (ofs << 1) + 1;
-                if (ofs <= 0)   // int overflow
-                    ofs = maxOfs;
-            }
-            if (ofs > maxOfs)
-                ofs = maxOfs;
-
-            // Make offsets relative to base
-            int tmp = lastOfs;
-            lastOfs = hint - ofs;
-            ofs = hint - tmp;
-        }
-        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
-
-        /*
-         * Now a[base+lastOfs] < key <= a[base+ofs], so key belongs somewhere
-         * to the right of lastOfs but no farther right than ofs.  Do a binary
-         * search, with invariant a[base + lastOfs - 1] < key <= a[base + ofs].
-         */
-        lastOfs++;
-        while (lastOfs < ofs) {
-            int m = lastOfs + ((ofs - lastOfs) >>> 1);
-
-            if (key.compareTo(a[base + m]) > 0)
-                lastOfs = m + 1;  // a[base + m] < key
-            else
-                ofs = m;          // key <= a[base + m]
-        }
-        assert lastOfs == ofs;    // so a[base + ofs - 1] < key <= a[base + ofs]
-        return ofs;
-    }
-
-    /**
-     * Like gallopLeft, except that if the range contains an element equal to
-     * key, gallopRight returns the index after the rightmost equal element.
-     *
-     * @param key the key whose insertion point to search for
-     * @param a the array in which to search
-     * @param base the index of the first element in the range
-     * @param len the length of the range; must be > 0
-     * @param hint the index at which to begin the search, 0 <= hint < n.
-     *     The closer hint is to the result, the faster this method will run.
-     * @return the int k,  0 <= k <= n such that a[b + k - 1] <= key < a[b + k]
-     */
-    private static int gallopRight(Comparable<Object> key, Object[] a,
-            int base, int len, int hint) {
-        assert len > 0 && hint >= 0 && hint < len;
-
-        int ofs = 1;
-        int lastOfs = 0;
-        if (key.compareTo(a[base + hint]) < 0) {
-            // Gallop left until a[b+hint - ofs] <= key < a[b+hint - lastOfs]
-            int maxOfs = hint + 1;
-            while (ofs < maxOfs && key.compareTo(a[base + hint - ofs]) < 0) {
-                lastOfs = ofs;
-                ofs = (ofs << 1) + 1;
-                if (ofs <= 0)   // int overflow
-                    ofs = maxOfs;
-            }
-            if (ofs > maxOfs)
-                ofs = maxOfs;
-
-            // Make offsets relative to b
-            int tmp = lastOfs;
-            lastOfs = hint - ofs;
-            ofs = hint - tmp;
-        } else { // a[b + hint] <= key
-            // Gallop right until a[b+hint + lastOfs] <= key < a[b+hint + ofs]
-            int maxOfs = len - hint;
-            while (ofs < maxOfs && key.compareTo(a[base + hint + ofs]) >= 0) {
-                lastOfs = ofs;
-                ofs = (ofs << 1) + 1;
-                if (ofs <= 0)   // int overflow
-                    ofs = maxOfs;
-            }
-            if (ofs > maxOfs)
-                ofs = maxOfs;
-
-            // Make offsets relative to b
-            lastOfs += hint;
-            ofs += hint;
-        }
-        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
-
-        /*
-         * Now a[b + lastOfs] <= key < a[b + ofs], so key belongs somewhere to
-         * the right of lastOfs but no farther right than ofs.  Do a binary
-         * search, with invariant a[b + lastOfs - 1] <= key < a[b + ofs].
-         */
-        lastOfs++;
-        while (lastOfs < ofs) {
-            int m = lastOfs + ((ofs - lastOfs) >>> 1);
-
-            if (key.compareTo(a[base + m]) < 0)
-                ofs = m;          // key < a[b + m]
-            else
-                lastOfs = m + 1;  // a[b + m] <= key
-        }
-        assert lastOfs == ofs;    // so a[b + ofs - 1] <= key < a[b + ofs]
-        return ofs;
-    }
-
-    /**
-     * Merges two adjacent runs in place, in a stable fashion.  The first
-     * element of the first run must be greater than the first element of the
-     * second run (a[base1] > a[base2]), and the last element of the first run
-     * (a[base1 + len1-1]) must be greater than all elements of the second run.
-     *
-     * For performance, this method should be called only when len1 <= len2;
-     * its twin, mergeHi should be called if len1 >= len2.  (Either method
-     * may be called if len1 == len2.)
-     *
-     * @param base1 index of first element in first run to be merged
-     * @param len1  length of first run to be merged (must be > 0)
-     * @param base2 index of first element in second run to be merged
-     *        (must be aBase + aLen)
-     * @param len2  length of second run to be merged (must be > 0)
-     */
-    @SuppressWarnings("unchecked")
-    private void mergeLo(int base1, int len1, int base2, int len2) {
-        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
-
-        // Copy first run into temp array
-        Object[] a = this.a; // For performance
-        Object[] tmp = ensureCapacity(len1);
-        System.arraycopy(a, base1, tmp, 0, len1);
-
-        int cursor1 = 0;       // Indexes into tmp array
-        int cursor2 = base2;   // Indexes int a
-        int dest = base1;      // Indexes int a
-
-        // Move first element of second run and deal with degenerate cases
-        a[dest++] = a[cursor2++];
-        if (--len2 == 0) {
-            System.arraycopy(tmp, cursor1, a, dest, len1);
-            return;
-        }
-        if (len1 == 1) {
-            System.arraycopy(a, cursor2, a, dest, len2);
-            a[dest + len2] = tmp[cursor1]; // Last elt of run 1 to end of merge
-            return;
-        }
-
-        int minGallop = this.minGallop;  // Use local variable for performance
-    outer:
-        while (true) {
-            int count1 = 0; // Number of times in a row that first run won
-            int count2 = 0; // Number of times in a row that second run won
-
-            /*
-             * Do the straightforward thing until (if ever) one run starts
-             * winning consistently.
-             */
-            do {
-                assert len1 > 1 && len2 > 0;
-                if (((Comparable) a[cursor2]).compareTo(tmp[cursor1]) < 0) {
-                    a[dest++] = a[cursor2++];
-                    count2++;
-                    count1 = 0;
-                    if (--len2 == 0)
-                        break outer;
-                } else {
-                    a[dest++] = tmp[cursor1++];
-                    count1++;
-                    count2 = 0;
-                    if (--len1 == 1)
-                        break outer;
-                }
-            } while ((count1 | count2) < minGallop);
-
-            /*
-             * One run is winning so consistently that galloping may be a
-             * huge win. So try that, and continue galloping until (if ever)
-             * neither run appears to be winning consistently anymore.
-             */
-            do {
-                assert len1 > 1 && len2 > 0;
-                count1 = gallopRight((Comparable) a[cursor2], tmp, cursor1, len1, 0);
-                if (count1 != 0) {
-                    System.arraycopy(tmp, cursor1, a, dest, count1);
-                    dest += count1;
-                    cursor1 += count1;
-                    len1 -= count1;
-                    if (len1 <= 1)  // len1 == 1 || len1 == 0
-                        break outer;
-                }
-                a[dest++] = a[cursor2++];
-                if (--len2 == 0)
-                    break outer;
-
-                count2 = gallopLeft((Comparable) tmp[cursor1], a, cursor2, len2, 0);
-                if (count2 != 0) {
-                    System.arraycopy(a, cursor2, a, dest, count2);
-                    dest += count2;
-                    cursor2 += count2;
-                    len2 -= count2;
-                    if (len2 == 0)
-                        break outer;
-                }
-                a[dest++] = tmp[cursor1++];
-                if (--len1 == 1)
-                    break outer;
-                minGallop--;
-            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
-            if (minGallop < 0)
-                minGallop = 0;
-            minGallop += 2;  // Penalize for leaving gallop mode
-        }  // End of "outer" loop
-        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
-
-        if (len1 == 1) {
-            assert len2 > 0;
-            System.arraycopy(a, cursor2, a, dest, len2);
-            a[dest + len2] = tmp[cursor1]; //  Last elt of run 1 to end of merge
-        } else if (len1 == 0) {
-            throw new IllegalArgumentException(
-                "Comparison method violates its general contract!");
-        } else {
-            assert len2 == 0;
-            assert len1 > 1;
-            System.arraycopy(tmp, cursor1, a, dest, len1);
-        }
-    }
-
-    /**
-     * Like mergeLo, except that this method should be called only if
-     * len1 >= len2; mergeLo should be called if len1 <= len2.  (Either method
-     * may be called if len1 == len2.)
-     *
-     * @param base1 index of first element in first run to be merged
-     * @param len1  length of first run to be merged (must be > 0)
-     * @param base2 index of first element in second run to be merged
-     *        (must be aBase + aLen)
-     * @param len2  length of second run to be merged (must be > 0)
-     */
-    @SuppressWarnings("unchecked")
-    private void mergeHi(int base1, int len1, int base2, int len2) {
-        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
-
-        // Copy second run into temp array
-        Object[] a = this.a; // For performance
-        Object[] tmp = ensureCapacity(len2);
-        System.arraycopy(a, base2, tmp, 0, len2);
-
-        int cursor1 = base1 + len1 - 1;  // Indexes into a
-        int cursor2 = len2 - 1;          // Indexes into tmp array
-        int dest = base2 + len2 - 1;     // Indexes into a
-
-        // Move last element of first run and deal with degenerate cases
-        a[dest--] = a[cursor1--];
-        if (--len1 == 0) {
-            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
-            return;
-        }
-        if (len2 == 1) {
-            dest -= len1;
-            cursor1 -= len1;
-            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
-            a[dest] = tmp[cursor2];
-            return;
-        }
-
-        int minGallop = this.minGallop;  // Use local variable for performance
-    outer:
-        while (true) {
-            int count1 = 0; // Number of times in a row that first run won
-            int count2 = 0; // Number of times in a row that second run won
-
-            /*
-             * Do the straightforward thing until (if ever) one run
-             * appears to win consistently.
-             */
-            do {
-                assert len1 > 0 && len2 > 1;
-                if (((Comparable) tmp[cursor2]).compareTo(a[cursor1]) < 0) {
-                    a[dest--] = a[cursor1--];
-                    count1++;
-                    count2 = 0;
-                    if (--len1 == 0)
-                        break outer;
-                } else {
-                    a[dest--] = tmp[cursor2--];
-                    count2++;
-                    count1 = 0;
-                    if (--len2 == 1)
-                        break outer;
-                }
-            } while ((count1 | count2) < minGallop);
-
-            /*
-             * One run is winning so consistently that galloping may be a
-             * huge win. So try that, and continue galloping until (if ever)
-             * neither run appears to be winning consistently anymore.
-             */
-            do {
-                assert len1 > 0 && len2 > 1;
-                count1 = len1 - gallopRight((Comparable) tmp[cursor2], a, base1, len1, len1 - 1);
-                if (count1 != 0) {
-                    dest -= count1;
-                    cursor1 -= count1;
-                    len1 -= count1;
-                    System.arraycopy(a, cursor1 + 1, a, dest + 1, count1);
-                    if (len1 == 0)
-                        break outer;
-                }
-                a[dest--] = tmp[cursor2--];
-                if (--len2 == 1)
-                    break outer;
-
-                count2 = len2 - gallopLeft((Comparable) a[cursor1], tmp, 0, len2, len2 - 1);
-                if (count2 != 0) {
-                    dest -= count2;
-                    cursor2 -= count2;
-                    len2 -= count2;
-                    System.arraycopy(tmp, cursor2 + 1, a, dest + 1, count2);
-                    if (len2 <= 1)
-                        break outer; // len2 == 1 || len2 == 0
-                }
-                a[dest--] = a[cursor1--];
-                if (--len1 == 0)
-                    break outer;
-                minGallop--;
-            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
-            if (minGallop < 0)
-                minGallop = 0;
-            minGallop += 2;  // Penalize for leaving gallop mode
-        }  // End of "outer" loop
-        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
-
-        if (len2 == 1) {
-            assert len1 > 0;
-            dest -= len1;
-            cursor1 -= len1;
-            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
-            a[dest] = tmp[cursor2];  // Move first elt of run2 to front of merge
-        } else if (len2 == 0) {
-            throw new IllegalArgumentException(
-                "Comparison method violates its general contract!");
-        } else {
-            assert len1 == 0;
-            assert len2 > 0;
-            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
-        }
-    }
-
-    /**
-     * Ensures that the external array tmp has at least the specified
-     * number of elements, increasing its size if necessary.  The size
-     * increases exponentially to ensure amortized linear time complexity.
-     *
-     * @param minCapacity the minimum required capacity of the tmp array
-     * @return tmp, whether or not it grew
-     */
-    private Object[]  ensureCapacity(int minCapacity) {
-        if (tmp.length < minCapacity) {
-            // Compute smallest power of 2 > minCapacity
-            int newSize = minCapacity;
-            newSize |= newSize >> 1;
-            newSize |= newSize >> 2;
-            newSize |= newSize >> 4;
-            newSize |= newSize >> 8;
-            newSize |= newSize >> 16;
-            newSize++;
-
-            if (newSize < 0) // Not bloody likely!
-                newSize = minCapacity;
-            else
-                newSize = Math.min(newSize, a.length >>> 1);
-
-            @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
-            Object[] newArray = new Object[newSize];
-            tmp = newArray;
-        }
-        return tmp;
-    }
-
-    /**
-     * Checks that fromIndex and toIndex are in range, and throws an
-     * appropriate exception if they aren't.
-     *
-     * @param arrayLen the length of the array
-     * @param fromIndex the index of the first element of the range
-     * @param toIndex the index after the last element of the range
-     * @throws IllegalArgumentException if fromIndex > toIndex
-     * @throws ArrayIndexOutOfBoundsException if fromIndex < 0
-     *         or toIndex > arrayLen
-     */
-    private static void rangeCheck(int arrayLen, int fromIndex, int toIndex) {
-        if (fromIndex > toIndex)
-            throw new IllegalArgumentException("fromIndex(" + fromIndex +
-                       ") > toIndex(" + toIndex+")");
-        if (fromIndex < 0)
-            throw new ArrayIndexOutOfBoundsException(fromIndex);
-        if (toIndex > arrayLen)
-            throw new ArrayIndexOutOfBoundsException(toIndex);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/ConcurrentModificationException.java
--- a/emul/compact/src/main/java/java/util/ConcurrentModificationException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * This exception may be thrown by methods that have detected concurrent
- * modification of an object when such modification is not permissible.
- * <p>
- * For example, it is not generally permissible for one thread to modify a Collection
- * while another thread is iterating over it.  In general, the results of the
- * iteration are undefined under these circumstances.  Some Iterator
- * implementations (including those of all the general purpose collection implementations
- * provided by the JRE) may choose to throw this exception if this behavior is
- * detected.  Iterators that do this are known as <i>fail-fast</i> iterators,
- * as they fail quickly and cleanly, rather that risking arbitrary,
- * non-deterministic behavior at an undetermined time in the future.
- * <p>
- * Note that this exception does not always indicate that an object has
- * been concurrently modified by a <i>different</i> thread.  If a single
- * thread issues a sequence of method invocations that violates the
- * contract of an object, the object may throw this exception.  For
- * example, if a thread modifies a collection directly while it is
- * iterating over the collection with a fail-fast iterator, the iterator
- * will throw this exception.
- *
- * <p>Note that fail-fast behavior cannot be guaranteed as it is, generally
- * speaking, impossible to make any hard guarantees in the presence of
- * unsynchronized concurrent modification.  Fail-fast operations
- * throw {@code ConcurrentModificationException} on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness: <i>{@code ConcurrentModificationException}
- * should be used only to detect bugs.</i>
- *
- * @author  Josh Bloch
- * @see     Collection
- * @see     Iterator
- * @see     ListIterator
- * @see     Vector
- * @see     LinkedList
- * @see     HashSet
- * @see     Hashtable
- * @see     TreeMap
- * @see     AbstractList
- * @since   1.2
- */
-public class ConcurrentModificationException extends RuntimeException {
-    private static final long serialVersionUID = -3666751008965953603L;
-
-    /**
-     * Constructs a ConcurrentModificationException with no
-     * detail message.
-     */
-    public ConcurrentModificationException() {
-    }
-
-    /**
-     * Constructs a {@code ConcurrentModificationException} with the
-     * specified detail message.
-     *
-     * @param message the detail message pertaining to this exception.
-     */
-    public ConcurrentModificationException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail
-     * message of {@code (cause==null ? null : cause.toString())} (which
-     * typically contains the class and detail message of {@code cause}.
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link Throwable#getCause()} method).  (A {@code null} value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.7
-     */
-    public ConcurrentModificationException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and
-     * cause.
-     *
-     * <p>Note that the detail message associated with <code>cause</code> is
-     * <i>not</i> automatically incorporated in this exception's detail
-     * message.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link Throwable#getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link Throwable#getCause()} method).  (A {@code null} value
-     *         is permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since 1.7
-     */
-    public ConcurrentModificationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Deque.java
--- a/emul/compact/src/main/java/java/util/Deque.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,584 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea and Josh Bloch with assistance from members of
- * JCP JSR-166 Expert Group and released to the public domain, as explained
- * at http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-package java.util;
-
-/**
- * A linear collection that supports element insertion and removal at
- * both ends.  The name <i>deque</i> is short for "double ended queue"
- * and is usually pronounced "deck".  Most <tt>Deque</tt>
- * implementations place no fixed limits on the number of elements
- * they may contain, but this interface supports capacity-restricted
- * deques as well as those with no fixed size limit.
- *
- * <p>This interface defines methods to access the elements at both
- * ends of the deque.  Methods are provided to insert, remove, and
- * examine the element.  Each of these methods exists in two forms:
- * one throws an exception if the operation fails, the other returns a
- * special value (either <tt>null</tt> or <tt>false</tt>, depending on
- * the operation).  The latter form of the insert operation is
- * designed specifically for use with capacity-restricted
- * <tt>Deque</tt> implementations; in most implementations, insert
- * operations cannot fail.
- *
- * <p>The twelve methods described above are summarized in the
- * following table:
- *
- * <p>
- * <table BORDER CELLPADDING=3 CELLSPACING=1>
- *  <tr>
- *    <td></td>
- *    <td ALIGN=CENTER COLSPAN = 2> <b>First Element (Head)</b></td>
- *    <td ALIGN=CENTER COLSPAN = 2> <b>Last Element (Tail)</b></td>
- *  </tr>
- *  <tr>
- *    <td></td>
- *    <td ALIGN=CENTER><em>Throws exception</em></td>
- *    <td ALIGN=CENTER><em>Special value</em></td>
- *    <td ALIGN=CENTER><em>Throws exception</em></td>
- *    <td ALIGN=CENTER><em>Special value</em></td>
- *  </tr>
- *  <tr>
- *    <td><b>Insert</b></td>
- *    <td>{@link #addFirst addFirst(e)}</td>
- *    <td>{@link #offerFirst offerFirst(e)}</td>
- *    <td>{@link #addLast addLast(e)}</td>
- *    <td>{@link #offerLast offerLast(e)}</td>
- *  </tr>
- *  <tr>
- *    <td><b>Remove</b></td>
- *    <td>{@link #removeFirst removeFirst()}</td>
- *    <td>{@link #pollFirst pollFirst()}</td>
- *    <td>{@link #removeLast removeLast()}</td>
- *    <td>{@link #pollLast pollLast()}</td>
- *  </tr>
- *  <tr>
- *    <td><b>Examine</b></td>
- *    <td>{@link #getFirst getFirst()}</td>
- *    <td>{@link #peekFirst peekFirst()}</td>
- *    <td>{@link #getLast getLast()}</td>
- *    <td>{@link #peekLast peekLast()}</td>
- *  </tr>
- * </table>
- *
- * <p>This interface extends the {@link Queue} interface.  When a deque is
- * used as a queue, FIFO (First-In-First-Out) behavior results.  Elements are
- * added at the end of the deque and removed from the beginning.  The methods
- * inherited from the <tt>Queue</tt> interface are precisely equivalent to
- * <tt>Deque</tt> methods as indicated in the following table:
- *
- * <p>
- * <table BORDER CELLPADDING=3 CELLSPACING=1>
- *  <tr>
- *    <td ALIGN=CENTER> <b><tt>Queue</tt> Method</b></td>
- *    <td ALIGN=CENTER> <b>Equivalent <tt>Deque</tt> Method</b></td>
- *  </tr>
- *  <tr>
- *    <td>{@link java.util.Queue#add add(e)}</td>
- *    <td>{@link #addLast addLast(e)}</td>
- *  </tr>
- *  <tr>
- *    <td>{@link java.util.Queue#offer offer(e)}</td>
- *    <td>{@link #offerLast offerLast(e)}</td>
- *  </tr>
- *  <tr>
- *    <td>{@link java.util.Queue#remove remove()}</td>
- *    <td>{@link #removeFirst removeFirst()}</td>
- *  </tr>
- *  <tr>
- *    <td>{@link java.util.Queue#poll poll()}</td>
- *    <td>{@link #pollFirst pollFirst()}</td>
- *  </tr>
- *  <tr>
- *    <td>{@link java.util.Queue#element element()}</td>
- *    <td>{@link #getFirst getFirst()}</td>
- *  </tr>
- *  <tr>
- *    <td>{@link java.util.Queue#peek peek()}</td>
- *    <td>{@link #peek peekFirst()}</td>
- *  </tr>
- * </table>
- *
- * <p>Deques can also be used as LIFO (Last-In-First-Out) stacks.  This
- * interface should be used in preference to the legacy {@link Stack} class.
- * When a deque is used as a stack, elements are pushed and popped from the
- * beginning of the deque.  Stack methods are precisely equivalent to
- * <tt>Deque</tt> methods as indicated in the table below:
- *
- * <p>
- * <table BORDER CELLPADDING=3 CELLSPACING=1>
- *  <tr>
- *    <td ALIGN=CENTER> <b>Stack Method</b></td>
- *    <td ALIGN=CENTER> <b>Equivalent <tt>Deque</tt> Method</b></td>
- *  </tr>
- *  <tr>
- *    <td>{@link #push push(e)}</td>
- *    <td>{@link #addFirst addFirst(e)}</td>
- *  </tr>
- *  <tr>
- *    <td>{@link #pop pop()}</td>
- *    <td>{@link #removeFirst removeFirst()}</td>
- *  </tr>
- *  <tr>
- *    <td>{@link #peek peek()}</td>
- *    <td>{@link #peekFirst peekFirst()}</td>
- *  </tr>
- * </table>
- *
- * <p>Note that the {@link #peek peek} method works equally well when
- * a deque is used as a queue or a stack; in either case, elements are
- * drawn from the beginning of the deque.
- *
- * <p>This interface provides two methods to remove interior
- * elements, {@link #removeFirstOccurrence removeFirstOccurrence} and
- * {@link #removeLastOccurrence removeLastOccurrence}.
- *
- * <p>Unlike the {@link List} interface, this interface does not
- * provide support for indexed access to elements.
- *
- * <p>While <tt>Deque</tt> implementations are not strictly required
- * to prohibit the insertion of null elements, they are strongly
- * encouraged to do so.  Users of any <tt>Deque</tt> implementations
- * that do allow null elements are strongly encouraged <i>not</i> to
- * take advantage of the ability to insert nulls.  This is so because
- * <tt>null</tt> is used as a special return value by various methods
- * to indicated that the deque is empty.
- *
- * <p><tt>Deque</tt> implementations generally do not define
- * element-based versions of the <tt>equals</tt> and <tt>hashCode</tt>
- * methods, but instead inherit the identity-based versions from class
- * <tt>Object</tt>.
- *
- * <p>This interface is a member of the <a
- * href="{@docRoot}/../technotes/guides/collections/index.html"> Java Collections
- * Framework</a>.
- *
- * @author Doug Lea
- * @author Josh Bloch
- * @since  1.6
- * @param <E> the type of elements held in this collection
- */
-
-public interface Deque<E> extends Queue<E> {
-    /**
-     * Inserts the specified element at the front of this deque if it is
-     * possible to do so immediately without violating capacity restrictions.
-     * When using a capacity-restricted deque, it is generally preferable to
-     * use method {@link #offerFirst}.
-     *
-     * @param e the element to add
-     * @throws IllegalStateException if the element cannot be added at this
-     *         time due to capacity restrictions
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this deque
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this deque
-     */
-    void addFirst(E e);
-
-    /**
-     * Inserts the specified element at the end of this deque if it is
-     * possible to do so immediately without violating capacity restrictions.
-     * When using a capacity-restricted deque, it is generally preferable to
-     * use method {@link #offerLast}.
-     *
-     * <p>This method is equivalent to {@link #add}.
-     *
-     * @param e the element to add
-     * @throws IllegalStateException if the element cannot be added at this
-     *         time due to capacity restrictions
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this deque
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this deque
-     */
-    void addLast(E e);
-
-    /**
-     * Inserts the specified element at the front of this deque unless it would
-     * violate capacity restrictions.  When using a capacity-restricted deque,
-     * this method is generally preferable to the {@link #addFirst} method,
-     * which can fail to insert an element only by throwing an exception.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> if the element was added to this deque, else
-     *         <tt>false</tt>
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this deque
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this deque
-     */
-    boolean offerFirst(E e);
-
-    /**
-     * Inserts the specified element at the end of this deque unless it would
-     * violate capacity restrictions.  When using a capacity-restricted deque,
-     * this method is generally preferable to the {@link #addLast} method,
-     * which can fail to insert an element only by throwing an exception.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> if the element was added to this deque, else
-     *         <tt>false</tt>
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this deque
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this deque
-     */
-    boolean offerLast(E e);
-
-    /**
-     * Retrieves and removes the first element of this deque.  This method
-     * differs from {@link #pollFirst pollFirst} only in that it throws an
-     * exception if this deque is empty.
-     *
-     * @return the head of this deque
-     * @throws NoSuchElementException if this deque is empty
-     */
-    E removeFirst();
-
-    /**
-     * Retrieves and removes the last element of this deque.  This method
-     * differs from {@link #pollLast pollLast} only in that it throws an
-     * exception if this deque is empty.
-     *
-     * @return the tail of this deque
-     * @throws NoSuchElementException if this deque is empty
-     */
-    E removeLast();
-
-    /**
-     * Retrieves and removes the first element of this deque,
-     * or returns <tt>null</tt> if this deque is empty.
-     *
-     * @return the head of this deque, or <tt>null</tt> if this deque is empty
-     */
-    E pollFirst();
-
-    /**
-     * Retrieves and removes the last element of this deque,
-     * or returns <tt>null</tt> if this deque is empty.
-     *
-     * @return the tail of this deque, or <tt>null</tt> if this deque is empty
-     */
-    E pollLast();
-
-    /**
-     * Retrieves, but does not remove, the first element of this deque.
-     *
-     * This method differs from {@link #peekFirst peekFirst} only in that it
-     * throws an exception if this deque is empty.
-     *
-     * @return the head of this deque
-     * @throws NoSuchElementException if this deque is empty
-     */
-    E getFirst();
-
-    /**
-     * Retrieves, but does not remove, the last element of this deque.
-     * This method differs from {@link #peekLast peekLast} only in that it
-     * throws an exception if this deque is empty.
-     *
-     * @return the tail of this deque
-     * @throws NoSuchElementException if this deque is empty
-     */
-    E getLast();
-
-    /**
-     * Retrieves, but does not remove, the first element of this deque,
-     * or returns <tt>null</tt> if this deque is empty.
-     *
-     * @return the head of this deque, or <tt>null</tt> if this deque is empty
-     */
-    E peekFirst();
-
-    /**
-     * Retrieves, but does not remove, the last element of this deque,
-     * or returns <tt>null</tt> if this deque is empty.
-     *
-     * @return the tail of this deque, or <tt>null</tt> if this deque is empty
-     */
-    E peekLast();
-
-    /**
-     * Removes the first occurrence of the specified element from this deque.
-     * If the deque does not contain the element, it is unchanged.
-     * More formally, removes the first element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
-     * (if such an element exists).
-     * Returns <tt>true</tt> if this deque contained the specified element
-     * (or equivalently, if this deque changed as a result of the call).
-     *
-     * @param o element to be removed from this deque, if present
-     * @return <tt>true</tt> if an element was removed as a result of this call
-     * @throws ClassCastException if the class of the specified element
-     *         is incompatible with this deque
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    boolean removeFirstOccurrence(Object o);
-
-    /**
-     * Removes the last occurrence of the specified element from this deque.
-     * If the deque does not contain the element, it is unchanged.
-     * More formally, removes the last element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
-     * (if such an element exists).
-     * Returns <tt>true</tt> if this deque contained the specified element
-     * (or equivalently, if this deque changed as a result of the call).
-     *
-     * @param o element to be removed from this deque, if present
-     * @return <tt>true</tt> if an element was removed as a result of this call
-     * @throws ClassCastException if the class of the specified element
-     *         is incompatible with this deque
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    boolean removeLastOccurrence(Object o);
-
-    // *** Queue methods ***
-
-    /**
-     * Inserts the specified element into the queue represented by this deque
-     * (in other words, at the tail of this deque) if it is possible to do so
-     * immediately without violating capacity restrictions, returning
-     * <tt>true</tt> upon success and throwing an
-     * <tt>IllegalStateException</tt> if no space is currently available.
-     * When using a capacity-restricted deque, it is generally preferable to
-     * use {@link #offer(Object) offer}.
-     *
-     * <p>This method is equivalent to {@link #addLast}.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> (as specified by {@link Collection#add})
-     * @throws IllegalStateException if the element cannot be added at this
-     *         time due to capacity restrictions
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this deque
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this deque
-     */
-    boolean add(E e);
-
-    /**
-     * Inserts the specified element into the queue represented by this deque
-     * (in other words, at the tail of this deque) if it is possible to do so
-     * immediately without violating capacity restrictions, returning
-     * <tt>true</tt> upon success and <tt>false</tt> if no space is currently
-     * available.  When using a capacity-restricted deque, this method is
-     * generally preferable to the {@link #add} method, which can fail to
-     * insert an element only by throwing an exception.
-     *
-     * <p>This method is equivalent to {@link #offerLast}.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> if the element was added to this deque, else
-     *         <tt>false</tt>
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this deque
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this deque
-     */
-    boolean offer(E e);
-
-    /**
-     * Retrieves and removes the head of the queue represented by this deque
-     * (in other words, the first element of this deque).
-     * This method differs from {@link #poll poll} only in that it throws an
-     * exception if this deque is empty.
-     *
-     * <p>This method is equivalent to {@link #removeFirst()}.
-     *
-     * @return the head of the queue represented by this deque
-     * @throws NoSuchElementException if this deque is empty
-     */
-    E remove();
-
-    /**
-     * Retrieves and removes the head of the queue represented by this deque
-     * (in other words, the first element of this deque), or returns
-     * <tt>null</tt> if this deque is empty.
-     *
-     * <p>This method is equivalent to {@link #pollFirst()}.
-     *
-     * @return the first element of this deque, or <tt>null</tt> if
-     *         this deque is empty
-     */
-    E poll();
-
-    /**
-     * Retrieves, but does not remove, the head of the queue represented by
-     * this deque (in other words, the first element of this deque).
-     * This method differs from {@link #peek peek} only in that it throws an
-     * exception if this deque is empty.
-     *
-     * <p>This method is equivalent to {@link #getFirst()}.
-     *
-     * @return the head of the queue represented by this deque
-     * @throws NoSuchElementException if this deque is empty
-     */
-    E element();
-
-    /**
-     * Retrieves, but does not remove, the head of the queue represented by
-     * this deque (in other words, the first element of this deque), or
-     * returns <tt>null</tt> if this deque is empty.
-     *
-     * <p>This method is equivalent to {@link #peekFirst()}.
-     *
-     * @return the head of the queue represented by this deque, or
-     *         <tt>null</tt> if this deque is empty
-     */
-    E peek();
-
-
-    // *** Stack methods ***
-
-    /**
-     * Pushes an element onto the stack represented by this deque (in other
-     * words, at the head of this deque) if it is possible to do so
-     * immediately without violating capacity restrictions, returning
-     * <tt>true</tt> upon success and throwing an
-     * <tt>IllegalStateException</tt> if no space is currently available.
-     *
-     * <p>This method is equivalent to {@link #addFirst}.
-     *
-     * @param e the element to push
-     * @throws IllegalStateException if the element cannot be added at this
-     *         time due to capacity restrictions
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this deque
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this deque
-     */
-    void push(E e);
-
-    /**
-     * Pops an element from the stack represented by this deque.  In other
-     * words, removes and returns the first element of this deque.
-     *
-     * <p>This method is equivalent to {@link #removeFirst()}.
-     *
-     * @return the element at the front of this deque (which is the top
-     *         of the stack represented by this deque)
-     * @throws NoSuchElementException if this deque is empty
-     */
-    E pop();
-
-
-    // *** Collection methods ***
-
-    /**
-     * Removes the first occurrence of the specified element from this deque.
-     * If the deque does not contain the element, it is unchanged.
-     * More formally, removes the first element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
-     * (if such an element exists).
-     * Returns <tt>true</tt> if this deque contained the specified element
-     * (or equivalently, if this deque changed as a result of the call).
-     *
-     * <p>This method is equivalent to {@link #removeFirstOccurrence}.
-     *
-     * @param o element to be removed from this deque, if present
-     * @return <tt>true</tt> if an element was removed as a result of this call
-     * @throws ClassCastException if the class of the specified element
-     *         is incompatible with this deque
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    boolean remove(Object o);
-
-    /**
-     * Returns <tt>true</tt> if this deque contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this deque contains
-     * at least one element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
-     *
-     * @param o element whose presence in this deque is to be tested
-     * @return <tt>true</tt> if this deque contains the specified element
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this deque
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         deque does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    boolean contains(Object o);
-
-    /**
-     * Returns the number of elements in this deque.
-     *
-     * @return the number of elements in this deque
-     */
-    public int size();
-
-    /**
-     * Returns an iterator over the elements in this deque in proper sequence.
-     * The elements will be returned in order from first (head) to last (tail).
-     *
-     * @return an iterator over the elements in this deque in proper sequence
-     */
-    Iterator<E> iterator();
-
-    /**
-     * Returns an iterator over the elements in this deque in reverse
-     * sequential order.  The elements will be returned in order from
-     * last (tail) to first (head).
-     *
-     * @return an iterator over the elements in this deque in reverse
-     * sequence
-     */
-    Iterator<E> descendingIterator();
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Dictionary.java
--- a/emul/compact/src/main/java/java/util/Dictionary.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * The <code>Dictionary</code> class is the abstract parent of any
- * class, such as <code>Hashtable</code>, which maps keys to values.
- * Every key and every value is an object. In any one <tt>Dictionary</tt>
- * object, every key is associated with at most one value. Given a
- * <tt>Dictionary</tt> and a key, the associated element can be looked up.
- * Any non-<code>null</code> object can be used as a key and as a value.
- * <p>
- * As a rule, the <code>equals</code> method should be used by
- * implementations of this class to decide if two keys are the same.
- * <p>
- * <strong>NOTE: This class is obsolete.  New implementations should
- * implement the Map interface, rather than extending this class.</strong>
- *
- * @author  unascribed
- * @see     java.util.Map
- * @see     java.lang.Object#equals(java.lang.Object)
- * @see     java.lang.Object#hashCode()
- * @see     java.util.Hashtable
- * @since   JDK1.0
- */
-public abstract
-class Dictionary<K,V> {
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    public Dictionary() {
-    }
-
-    /**
-     * Returns the number of entries (distinct keys) in this dictionary.
-     *
-     * @return  the number of keys in this dictionary.
-     */
-    abstract public int size();
-
-    /**
-     * Tests if this dictionary maps no keys to value. The general contract
-     * for the <tt>isEmpty</tt> method is that the result is true if and only
-     * if this dictionary contains no entries.
-     *
-     * @return  <code>true</code> if this dictionary maps no keys to values;
-     *          <code>false</code> otherwise.
-     */
-    abstract public boolean isEmpty();
-
-    /**
-     * Returns an enumeration of the keys in this dictionary. The general
-     * contract for the keys method is that an <tt>Enumeration</tt> object
-     * is returned that will generate all the keys for which this dictionary
-     * contains entries.
-     *
-     * @return  an enumeration of the keys in this dictionary.
-     * @see     java.util.Dictionary#elements()
-     * @see     java.util.Enumeration
-     */
-    abstract public Enumeration<K> keys();
-
-    /**
-     * Returns an enumeration of the values in this dictionary. The general
-     * contract for the <tt>elements</tt> method is that an
-     * <tt>Enumeration</tt> is returned that will generate all the elements
-     * contained in entries in this dictionary.
-     *
-     * @return  an enumeration of the values in this dictionary.
-     * @see     java.util.Dictionary#keys()
-     * @see     java.util.Enumeration
-     */
-    abstract public Enumeration<V> elements();
-
-    /**
-     * Returns the value to which the key is mapped in this dictionary.
-     * The general contract for the <tt>isEmpty</tt> method is that if this
-     * dictionary contains an entry for the specified key, the associated
-     * value is returned; otherwise, <tt>null</tt> is returned.
-     *
-     * @return  the value to which the key is mapped in this dictionary;
-     * @param   key   a key in this dictionary.
-     *          <code>null</code> if the key is not mapped to any value in
-     *          this dictionary.
-     * @exception NullPointerException if the <tt>key</tt> is <tt>null</tt>.
-     * @see     java.util.Dictionary#put(java.lang.Object, java.lang.Object)
-     */
-    abstract public V get(Object key);
-
-    /**
-     * Maps the specified <code>key</code> to the specified
-     * <code>value</code> in this dictionary. Neither the key nor the
-     * value can be <code>null</code>.
-     * <p>
-     * If this dictionary already contains an entry for the specified
-     * <tt>key</tt>, the value already in this dictionary for that
-     * <tt>key</tt> is returned, after modifying the entry to contain the
-     *  new element. <p>If this dictionary does not already have an entry
-     *  for the specified <tt>key</tt>, an entry is created for the
-     *  specified <tt>key</tt> and <tt>value</tt>, and <tt>null</tt> is
-     *  returned.
-     * <p>
-     * The <code>value</code> can be retrieved by calling the
-     * <code>get</code> method with a <code>key</code> that is equal to
-     * the original <code>key</code>.
-     *
-     * @param      key     the hashtable key.
-     * @param      value   the value.
-     * @return     the previous value to which the <code>key</code> was mapped
-     *             in this dictionary, or <code>null</code> if the key did not
-     *             have a previous mapping.
-     * @exception  NullPointerException  if the <code>key</code> or
-     *               <code>value</code> is <code>null</code>.
-     * @see        java.lang.Object#equals(java.lang.Object)
-     * @see        java.util.Dictionary#get(java.lang.Object)
-     */
-    abstract public V put(K key, V value);
-
-    /**
-     * Removes the <code>key</code> (and its corresponding
-     * <code>value</code>) from this dictionary. This method does nothing
-     * if the <code>key</code> is not in this dictionary.
-     *
-     * @param   key   the key that needs to be removed.
-     * @return  the value to which the <code>key</code> had been mapped in this
-     *          dictionary, or <code>null</code> if the key did not have a
-     *          mapping.
-     * @exception NullPointerException if <tt>key</tt> is <tt>null</tt>.
-     */
-    abstract public V remove(Object key);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/DualPivotQuicksort.java
--- a/emul/compact/src/main/java/java/util/DualPivotQuicksort.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3018 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * This class implements the Dual-Pivot Quicksort algorithm by
- * Vladimir Yaroslavskiy, Jon Bentley, and Josh Bloch. The algorithm
- * offers O(n log(n)) performance on many data sets that cause other
- * quicksorts to degrade to quadratic performance, and is typically
- * faster than traditional (one-pivot) Quicksort implementations.
- *
- * @author Vladimir Yaroslavskiy
- * @author Jon Bentley
- * @author Josh Bloch
- *
- * @version 2011.02.11 m765.827.12i:5\7pm
- * @since 1.7
- */
-final class DualPivotQuicksort {
-
-    /**
-     * Prevents instantiation.
-     */
-    private DualPivotQuicksort() {}
-
-    /*
-     * Tuning parameters.
-     */
-
-    /**
-     * The maximum number of runs in merge sort.
-     */
-    private static final int MAX_RUN_COUNT = 67;
-
-    /**
-     * The maximum length of run in merge sort.
-     */
-    private static final int MAX_RUN_LENGTH = 33;
-
-    /**
-     * If the length of an array to be sorted is less than this
-     * constant, Quicksort is used in preference to merge sort.
-     */
-    private static final int QUICKSORT_THRESHOLD = 286;
-
-    /**
-     * If the length of an array to be sorted is less than this
-     * constant, insertion sort is used in preference to Quicksort.
-     */
-    private static final int INSERTION_SORT_THRESHOLD = 47;
-
-    /**
-     * If the length of a byte array to be sorted is greater than this
-     * constant, counting sort is used in preference to insertion sort.
-     */
-    private static final int COUNTING_SORT_THRESHOLD_FOR_BYTE = 29;
-
-    /**
-     * If the length of a short or char array to be sorted is greater
-     * than this constant, counting sort is used in preference to Quicksort.
-     */
-    private static final int COUNTING_SORT_THRESHOLD_FOR_SHORT_OR_CHAR = 3200;
-
-    /*
-     * Sorting methods for seven primitive types.
-     */
-
-    /**
-     * Sorts the specified array.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(int[] a) {
-        sort(a, 0, a.length - 1);
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    public static void sort(int[] a, int left, int right) {
-        // Use Quicksort on small arrays
-        if (right - left < QUICKSORT_THRESHOLD) {
-            sort(a, left, right, true);
-            return;
-        }
-
-        /*
-         * Index run[i] is the start of i-th run
-         * (ascending or descending sequence).
-         */
-        int[] run = new int[MAX_RUN_COUNT + 1];
-        int count = 0; run[0] = left;
-
-        // Check if the array is nearly sorted
-        for (int k = left; k < right; run[count] = k) {
-            if (a[k] < a[k + 1]) { // ascending
-                while (++k <= right && a[k - 1] <= a[k]);
-            } else if (a[k] > a[k + 1]) { // descending
-                while (++k <= right && a[k - 1] >= a[k]);
-                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
-                    int t = a[lo]; a[lo] = a[hi]; a[hi] = t;
-                }
-            } else { // equal
-                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
-                    if (--m == 0) {
-                        sort(a, left, right, true);
-                        return;
-                    }
-                }
-            }
-
-            /*
-             * The array is not highly structured,
-             * use Quicksort instead of merge sort.
-             */
-            if (++count == MAX_RUN_COUNT) {
-                sort(a, left, right, true);
-                return;
-            }
-        }
-
-        // Check special cases
-        if (run[count] == right++) { // The last run contains one element
-            run[++count] = right;
-        } else if (count == 1) { // The array is already sorted
-            return;
-        }
-
-        /*
-         * Create temporary array, which is used for merging.
-         * Implementation note: variable "right" is increased by 1.
-         */
-        int[] b; byte odd = 0;
-        for (int n = 1; (n <<= 1) < count; odd ^= 1);
-
-        if (odd == 0) {
-            b = a; a = new int[b.length];
-            for (int i = left - 1; ++i < right; a[i] = b[i]);
-        } else {
-            b = new int[a.length];
-        }
-
-        // Merging
-        for (int last; count > 1; count = last) {
-            for (int k = (last = 0) + 2; k <= count; k += 2) {
-                int hi = run[k], mi = run[k - 1];
-                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
-                    if (q >= hi || p < mi && a[p] <= a[q]) {
-                        b[i] = a[p++];
-                    } else {
-                        b[i] = a[q++];
-                    }
-                }
-                run[++last] = hi;
-            }
-            if ((count & 1) != 0) {
-                for (int i = right, lo = run[count - 1]; --i >= lo;
-                    b[i] = a[i]
-                );
-                run[++last] = right;
-            }
-            int[] t = a; a = b; b = t;
-        }
-    }
-
-    /**
-     * Sorts the specified range of the array by Dual-Pivot Quicksort.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     * @param leftmost indicates if this part is the leftmost in the range
-     */
-    private static void sort(int[] a, int left, int right, boolean leftmost) {
-        int length = right - left + 1;
-
-        // Use insertion sort on tiny arrays
-        if (length < INSERTION_SORT_THRESHOLD) {
-            if (leftmost) {
-                /*
-                 * Traditional (without sentinel) insertion sort,
-                 * optimized for server VM, is used in case of
-                 * the leftmost part.
-                 */
-                for (int i = left, j = i; i < right; j = ++i) {
-                    int ai = a[i + 1];
-                    while (ai < a[j]) {
-                        a[j + 1] = a[j];
-                        if (j-- == left) {
-                            break;
-                        }
-                    }
-                    a[j + 1] = ai;
-                }
-            } else {
-                /*
-                 * Skip the longest ascending sequence.
-                 */
-                do {
-                    if (left >= right) {
-                        return;
-                    }
-                } while (a[++left] >= a[left - 1]);
-
-                /*
-                 * Every element from adjoining part plays the role
-                 * of sentinel, therefore this allows us to avoid the
-                 * left range check on each iteration. Moreover, we use
-                 * the more optimized algorithm, so called pair insertion
-                 * sort, which is faster (in the context of Quicksort)
-                 * than traditional implementation of insertion sort.
-                 */
-                for (int k = left; ++left <= right; k = ++left) {
-                    int a1 = a[k], a2 = a[left];
-
-                    if (a1 < a2) {
-                        a2 = a1; a1 = a[left];
-                    }
-                    while (a1 < a[--k]) {
-                        a[k + 2] = a[k];
-                    }
-                    a[++k + 1] = a1;
-
-                    while (a2 < a[--k]) {
-                        a[k + 1] = a[k];
-                    }
-                    a[k + 1] = a2;
-                }
-                int last = a[right];
-
-                while (last < a[--right]) {
-                    a[right + 1] = a[right];
-                }
-                a[right + 1] = last;
-            }
-            return;
-        }
-
-        // Inexpensive approximation of length / 7
-        int seventh = (length >> 3) + (length >> 6) + 1;
-
-        /*
-         * Sort five evenly spaced elements around (and including) the
-         * center element in the range. These elements will be used for
-         * pivot selection as described below. The choice for spacing
-         * these elements was empirically determined to work well on
-         * a wide variety of inputs.
-         */
-        int e3 = (left + right) >>> 1; // The midpoint
-        int e2 = e3 - seventh;
-        int e1 = e2 - seventh;
-        int e4 = e3 + seventh;
-        int e5 = e4 + seventh;
-
-        // Sort these elements using insertion sort
-        if (a[e2] < a[e1]) { int t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
-
-        if (a[e3] < a[e2]) { int t = a[e3]; a[e3] = a[e2]; a[e2] = t;
-            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-        }
-        if (a[e4] < a[e3]) { int t = a[e4]; a[e4] = a[e3]; a[e3] = t;
-            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-            }
-        }
-        if (a[e5] < a[e4]) { int t = a[e5]; a[e5] = a[e4]; a[e4] = t;
-            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
-                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-                }
-            }
-        }
-
-        // Pointers
-        int less  = left;  // The index of the first element of center part
-        int great = right; // The index before the first element of right part
-
-        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
-            /*
-             * Use the second and fourth of the five sorted elements as pivots.
-             * These values are inexpensive approximations of the first and
-             * second terciles of the array. Note that pivot1 <= pivot2.
-             */
-            int pivot1 = a[e2];
-            int pivot2 = a[e4];
-
-            /*
-             * The first and the last elements to be sorted are moved to the
-             * locations formerly occupied by the pivots. When partitioning
-             * is complete, the pivots are swapped back into their final
-             * positions, and excluded from subsequent sorting.
-             */
-            a[e2] = a[left];
-            a[e4] = a[right];
-
-            /*
-             * Skip elements, which are less or greater than pivot values.
-             */
-            while (a[++less] < pivot1);
-            while (a[--great] > pivot2);
-
-            /*
-             * Partitioning:
-             *
-             *   left part           center part                   right part
-             * +--------------------------------------------------------------+
-             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
-             * +--------------------------------------------------------------+
-             *               ^                          ^       ^
-             *               |                          |       |
-             *              less                        k     great
-             *
-             * Invariants:
-             *
-             *              all in (left, less)   < pivot1
-             *    pivot1 <= all in [less, k)     <= pivot2
-             *              all in (great, right) > pivot2
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            outer:
-            for (int k = less - 1; ++k <= great; ) {
-                int ak = a[k];
-                if (ak < pivot1) { // Move a[k] to left part
-                    a[k] = a[less];
-                    /*
-                     * Here and below we use "a[i] = b; i++;" instead
-                     * of "a[i++] = b;" due to performance issue.
-                     */
-                    a[less] = ak;
-                    ++less;
-                } else if (ak > pivot2) { // Move a[k] to right part
-                    while (a[great] > pivot2) {
-                        if (great-- == k) {
-                            break outer;
-                        }
-                    }
-                    if (a[great] < pivot1) { // a[great] <= pivot2
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // pivot1 <= a[great] <= pivot2
-                        a[k] = a[great];
-                    }
-                    /*
-                     * Here and below we use "a[i] = b; i--;" instead
-                     * of "a[i--] = b;" due to performance issue.
-                     */
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            // Swap pivots into their final positions
-            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
-            a[right] = a[great + 1]; a[great + 1] = pivot2;
-
-            // Sort left and right parts recursively, excluding known pivots
-            sort(a, left, less - 2, leftmost);
-            sort(a, great + 2, right, false);
-
-            /*
-             * If center part is too large (comprises > 4/7 of the array),
-             * swap internal pivot values to ends.
-             */
-            if (less < e1 && e5 < great) {
-                /*
-                 * Skip elements, which are equal to pivot values.
-                 */
-                while (a[less] == pivot1) {
-                    ++less;
-                }
-
-                while (a[great] == pivot2) {
-                    --great;
-                }
-
-                /*
-                 * Partitioning:
-                 *
-                 *   left part         center part                  right part
-                 * +----------------------------------------------------------+
-                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
-                 * +----------------------------------------------------------+
-                 *              ^                        ^       ^
-                 *              |                        |       |
-                 *             less                      k     great
-                 *
-                 * Invariants:
-                 *
-                 *              all in (*,  less) == pivot1
-                 *     pivot1 < all in [less,  k)  < pivot2
-                 *              all in (great, *) == pivot2
-                 *
-                 * Pointer k is the first index of ?-part.
-                 */
-                outer:
-                for (int k = less - 1; ++k <= great; ) {
-                    int ak = a[k];
-                    if (ak == pivot1) { // Move a[k] to left part
-                        a[k] = a[less];
-                        a[less] = ak;
-                        ++less;
-                    } else if (ak == pivot2) { // Move a[k] to right part
-                        while (a[great] == pivot2) {
-                            if (great-- == k) {
-                                break outer;
-                            }
-                        }
-                        if (a[great] == pivot1) { // a[great] < pivot2
-                            a[k] = a[less];
-                            /*
-                             * Even though a[great] equals to pivot1, the
-                             * assignment a[less] = pivot1 may be incorrect,
-                             * if a[great] and pivot1 are floating-point zeros
-                             * of different signs. Therefore in float and
-                             * double sorting methods we have to use more
-                             * accurate assignment a[less] = a[great].
-                             */
-                            a[less] = pivot1;
-                            ++less;
-                        } else { // pivot1 < a[great] < pivot2
-                            a[k] = a[great];
-                        }
-                        a[great] = ak;
-                        --great;
-                    }
-                }
-            }
-
-            // Sort center part recursively
-            sort(a, less, great, false);
-
-        } else { // Partitioning with one pivot
-            /*
-             * Use the third of the five sorted elements as pivot.
-             * This value is inexpensive approximation of the median.
-             */
-            int pivot = a[e3];
-
-            /*
-             * Partitioning degenerates to the traditional 3-way
-             * (or "Dutch National Flag") schema:
-             *
-             *   left part    center part              right part
-             * +-------------------------------------------------+
-             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
-             * +-------------------------------------------------+
-             *              ^              ^        ^
-             *              |              |        |
-             *             less            k      great
-             *
-             * Invariants:
-             *
-             *   all in (left, less)   < pivot
-             *   all in [less, k)     == pivot
-             *   all in (great, right) > pivot
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            for (int k = less; k <= great; ++k) {
-                if (a[k] == pivot) {
-                    continue;
-                }
-                int ak = a[k];
-                if (ak < pivot) { // Move a[k] to left part
-                    a[k] = a[less];
-                    a[less] = ak;
-                    ++less;
-                } else { // a[k] > pivot - Move a[k] to right part
-                    while (a[great] > pivot) {
-                        --great;
-                    }
-                    if (a[great] < pivot) { // a[great] <= pivot
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // a[great] == pivot
-                        /*
-                         * Even though a[great] equals to pivot, the
-                         * assignment a[k] = pivot may be incorrect,
-                         * if a[great] and pivot are floating-point
-                         * zeros of different signs. Therefore in float
-                         * and double sorting methods we have to use
-                         * more accurate assignment a[k] = a[great].
-                         */
-                        a[k] = pivot;
-                    }
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            /*
-             * Sort left and right parts recursively.
-             * All elements from center part are equal
-             * and, therefore, already sorted.
-             */
-            sort(a, left, less - 1, leftmost);
-            sort(a, great + 1, right, false);
-        }
-    }
-
-    /**
-     * Sorts the specified array.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(long[] a) {
-        sort(a, 0, a.length - 1);
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    public static void sort(long[] a, int left, int right) {
-        // Use Quicksort on small arrays
-        if (right - left < QUICKSORT_THRESHOLD) {
-            sort(a, left, right, true);
-            return;
-        }
-
-        /*
-         * Index run[i] is the start of i-th run
-         * (ascending or descending sequence).
-         */
-        int[] run = new int[MAX_RUN_COUNT + 1];
-        int count = 0; run[0] = left;
-
-        // Check if the array is nearly sorted
-        for (int k = left; k < right; run[count] = k) {
-            if (a[k] < a[k + 1]) { // ascending
-                while (++k <= right && a[k - 1] <= a[k]);
-            } else if (a[k] > a[k + 1]) { // descending
-                while (++k <= right && a[k - 1] >= a[k]);
-                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
-                    long t = a[lo]; a[lo] = a[hi]; a[hi] = t;
-                }
-            } else { // equal
-                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
-                    if (--m == 0) {
-                        sort(a, left, right, true);
-                        return;
-                    }
-                }
-            }
-
-            /*
-             * The array is not highly structured,
-             * use Quicksort instead of merge sort.
-             */
-            if (++count == MAX_RUN_COUNT) {
-                sort(a, left, right, true);
-                return;
-            }
-        }
-
-        // Check special cases
-        if (run[count] == right++) { // The last run contains one element
-            run[++count] = right;
-        } else if (count == 1) { // The array is already sorted
-            return;
-        }
-
-        /*
-         * Create temporary array, which is used for merging.
-         * Implementation note: variable "right" is increased by 1.
-         */
-        long[] b; byte odd = 0;
-        for (int n = 1; (n <<= 1) < count; odd ^= 1);
-
-        if (odd == 0) {
-            b = a; a = new long[b.length];
-            for (int i = left - 1; ++i < right; a[i] = b[i]);
-        } else {
-            b = new long[a.length];
-        }
-
-        // Merging
-        for (int last; count > 1; count = last) {
-            for (int k = (last = 0) + 2; k <= count; k += 2) {
-                int hi = run[k], mi = run[k - 1];
-                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
-                    if (q >= hi || p < mi && a[p] <= a[q]) {
-                        b[i] = a[p++];
-                    } else {
-                        b[i] = a[q++];
-                    }
-                }
-                run[++last] = hi;
-            }
-            if ((count & 1) != 0) {
-                for (int i = right, lo = run[count - 1]; --i >= lo;
-                    b[i] = a[i]
-                );
-                run[++last] = right;
-            }
-            long[] t = a; a = b; b = t;
-        }
-    }
-
-    /**
-     * Sorts the specified range of the array by Dual-Pivot Quicksort.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     * @param leftmost indicates if this part is the leftmost in the range
-     */
-    private static void sort(long[] a, int left, int right, boolean leftmost) {
-        int length = right - left + 1;
-
-        // Use insertion sort on tiny arrays
-        if (length < INSERTION_SORT_THRESHOLD) {
-            if (leftmost) {
-                /*
-                 * Traditional (without sentinel) insertion sort,
-                 * optimized for server VM, is used in case of
-                 * the leftmost part.
-                 */
-                for (int i = left, j = i; i < right; j = ++i) {
-                    long ai = a[i + 1];
-                    while (ai < a[j]) {
-                        a[j + 1] = a[j];
-                        if (j-- == left) {
-                            break;
-                        }
-                    }
-                    a[j + 1] = ai;
-                }
-            } else {
-                /*
-                 * Skip the longest ascending sequence.
-                 */
-                do {
-                    if (left >= right) {
-                        return;
-                    }
-                } while (a[++left] >= a[left - 1]);
-
-                /*
-                 * Every element from adjoining part plays the role
-                 * of sentinel, therefore this allows us to avoid the
-                 * left range check on each iteration. Moreover, we use
-                 * the more optimized algorithm, so called pair insertion
-                 * sort, which is faster (in the context of Quicksort)
-                 * than traditional implementation of insertion sort.
-                 */
-                for (int k = left; ++left <= right; k = ++left) {
-                    long a1 = a[k], a2 = a[left];
-
-                    if (a1 < a2) {
-                        a2 = a1; a1 = a[left];
-                    }
-                    while (a1 < a[--k]) {
-                        a[k + 2] = a[k];
-                    }
-                    a[++k + 1] = a1;
-
-                    while (a2 < a[--k]) {
-                        a[k + 1] = a[k];
-                    }
-                    a[k + 1] = a2;
-                }
-                long last = a[right];
-
-                while (last < a[--right]) {
-                    a[right + 1] = a[right];
-                }
-                a[right + 1] = last;
-            }
-            return;
-        }
-
-        // Inexpensive approximation of length / 7
-        int seventh = (length >> 3) + (length >> 6) + 1;
-
-        /*
-         * Sort five evenly spaced elements around (and including) the
-         * center element in the range. These elements will be used for
-         * pivot selection as described below. The choice for spacing
-         * these elements was empirically determined to work well on
-         * a wide variety of inputs.
-         */
-        int e3 = (left + right) >>> 1; // The midpoint
-        int e2 = e3 - seventh;
-        int e1 = e2 - seventh;
-        int e4 = e3 + seventh;
-        int e5 = e4 + seventh;
-
-        // Sort these elements using insertion sort
-        if (a[e2] < a[e1]) { long t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
-
-        if (a[e3] < a[e2]) { long t = a[e3]; a[e3] = a[e2]; a[e2] = t;
-            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-        }
-        if (a[e4] < a[e3]) { long t = a[e4]; a[e4] = a[e3]; a[e3] = t;
-            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-            }
-        }
-        if (a[e5] < a[e4]) { long t = a[e5]; a[e5] = a[e4]; a[e4] = t;
-            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
-                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-                }
-            }
-        }
-
-        // Pointers
-        int less  = left;  // The index of the first element of center part
-        int great = right; // The index before the first element of right part
-
-        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
-            /*
-             * Use the second and fourth of the five sorted elements as pivots.
-             * These values are inexpensive approximations of the first and
-             * second terciles of the array. Note that pivot1 <= pivot2.
-             */
-            long pivot1 = a[e2];
-            long pivot2 = a[e4];
-
-            /*
-             * The first and the last elements to be sorted are moved to the
-             * locations formerly occupied by the pivots. When partitioning
-             * is complete, the pivots are swapped back into their final
-             * positions, and excluded from subsequent sorting.
-             */
-            a[e2] = a[left];
-            a[e4] = a[right];
-
-            /*
-             * Skip elements, which are less or greater than pivot values.
-             */
-            while (a[++less] < pivot1);
-            while (a[--great] > pivot2);
-
-            /*
-             * Partitioning:
-             *
-             *   left part           center part                   right part
-             * +--------------------------------------------------------------+
-             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
-             * +--------------------------------------------------------------+
-             *               ^                          ^       ^
-             *               |                          |       |
-             *              less                        k     great
-             *
-             * Invariants:
-             *
-             *              all in (left, less)   < pivot1
-             *    pivot1 <= all in [less, k)     <= pivot2
-             *              all in (great, right) > pivot2
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            outer:
-            for (int k = less - 1; ++k <= great; ) {
-                long ak = a[k];
-                if (ak < pivot1) { // Move a[k] to left part
-                    a[k] = a[less];
-                    /*
-                     * Here and below we use "a[i] = b; i++;" instead
-                     * of "a[i++] = b;" due to performance issue.
-                     */
-                    a[less] = ak;
-                    ++less;
-                } else if (ak > pivot2) { // Move a[k] to right part
-                    while (a[great] > pivot2) {
-                        if (great-- == k) {
-                            break outer;
-                        }
-                    }
-                    if (a[great] < pivot1) { // a[great] <= pivot2
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // pivot1 <= a[great] <= pivot2
-                        a[k] = a[great];
-                    }
-                    /*
-                     * Here and below we use "a[i] = b; i--;" instead
-                     * of "a[i--] = b;" due to performance issue.
-                     */
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            // Swap pivots into their final positions
-            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
-            a[right] = a[great + 1]; a[great + 1] = pivot2;
-
-            // Sort left and right parts recursively, excluding known pivots
-            sort(a, left, less - 2, leftmost);
-            sort(a, great + 2, right, false);
-
-            /*
-             * If center part is too large (comprises > 4/7 of the array),
-             * swap internal pivot values to ends.
-             */
-            if (less < e1 && e5 < great) {
-                /*
-                 * Skip elements, which are equal to pivot values.
-                 */
-                while (a[less] == pivot1) {
-                    ++less;
-                }
-
-                while (a[great] == pivot2) {
-                    --great;
-                }
-
-                /*
-                 * Partitioning:
-                 *
-                 *   left part         center part                  right part
-                 * +----------------------------------------------------------+
-                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
-                 * +----------------------------------------------------------+
-                 *              ^                        ^       ^
-                 *              |                        |       |
-                 *             less                      k     great
-                 *
-                 * Invariants:
-                 *
-                 *              all in (*,  less) == pivot1
-                 *     pivot1 < all in [less,  k)  < pivot2
-                 *              all in (great, *) == pivot2
-                 *
-                 * Pointer k is the first index of ?-part.
-                 */
-                outer:
-                for (int k = less - 1; ++k <= great; ) {
-                    long ak = a[k];
-                    if (ak == pivot1) { // Move a[k] to left part
-                        a[k] = a[less];
-                        a[less] = ak;
-                        ++less;
-                    } else if (ak == pivot2) { // Move a[k] to right part
-                        while (a[great] == pivot2) {
-                            if (great-- == k) {
-                                break outer;
-                            }
-                        }
-                        if (a[great] == pivot1) { // a[great] < pivot2
-                            a[k] = a[less];
-                            /*
-                             * Even though a[great] equals to pivot1, the
-                             * assignment a[less] = pivot1 may be incorrect,
-                             * if a[great] and pivot1 are floating-point zeros
-                             * of different signs. Therefore in float and
-                             * double sorting methods we have to use more
-                             * accurate assignment a[less] = a[great].
-                             */
-                            a[less] = pivot1;
-                            ++less;
-                        } else { // pivot1 < a[great] < pivot2
-                            a[k] = a[great];
-                        }
-                        a[great] = ak;
-                        --great;
-                    }
-                }
-            }
-
-            // Sort center part recursively
-            sort(a, less, great, false);
-
-        } else { // Partitioning with one pivot
-            /*
-             * Use the third of the five sorted elements as pivot.
-             * This value is inexpensive approximation of the median.
-             */
-            long pivot = a[e3];
-
-            /*
-             * Partitioning degenerates to the traditional 3-way
-             * (or "Dutch National Flag") schema:
-             *
-             *   left part    center part              right part
-             * +-------------------------------------------------+
-             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
-             * +-------------------------------------------------+
-             *              ^              ^        ^
-             *              |              |        |
-             *             less            k      great
-             *
-             * Invariants:
-             *
-             *   all in (left, less)   < pivot
-             *   all in [less, k)     == pivot
-             *   all in (great, right) > pivot
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            for (int k = less; k <= great; ++k) {
-                if (a[k] == pivot) {
-                    continue;
-                }
-                long ak = a[k];
-                if (ak < pivot) { // Move a[k] to left part
-                    a[k] = a[less];
-                    a[less] = ak;
-                    ++less;
-                } else { // a[k] > pivot - Move a[k] to right part
-                    while (a[great] > pivot) {
-                        --great;
-                    }
-                    if (a[great] < pivot) { // a[great] <= pivot
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // a[great] == pivot
-                        /*
-                         * Even though a[great] equals to pivot, the
-                         * assignment a[k] = pivot may be incorrect,
-                         * if a[great] and pivot are floating-point
-                         * zeros of different signs. Therefore in float
-                         * and double sorting methods we have to use
-                         * more accurate assignment a[k] = a[great].
-                         */
-                        a[k] = pivot;
-                    }
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            /*
-             * Sort left and right parts recursively.
-             * All elements from center part are equal
-             * and, therefore, already sorted.
-             */
-            sort(a, left, less - 1, leftmost);
-            sort(a, great + 1, right, false);
-        }
-    }
-
-    /**
-     * Sorts the specified array.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(short[] a) {
-        sort(a, 0, a.length - 1);
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    public static void sort(short[] a, int left, int right) {
-        // Use counting sort on large arrays
-        if (right - left > COUNTING_SORT_THRESHOLD_FOR_SHORT_OR_CHAR) {
-            int[] count = new int[NUM_SHORT_VALUES];
-
-            for (int i = left - 1; ++i <= right;
-                count[a[i] - Short.MIN_VALUE]++
-            );
-            for (int i = NUM_SHORT_VALUES, k = right + 1; k > left; ) {
-                while (count[--i] == 0);
-                short value = (short) (i + Short.MIN_VALUE);
-                int s = count[i];
-
-                do {
-                    a[--k] = value;
-                } while (--s > 0);
-            }
-        } else { // Use Dual-Pivot Quicksort on small arrays
-            doSort(a, left, right);
-        }
-    }
-
-    /** The number of distinct short values. */
-    private static final int NUM_SHORT_VALUES = 1 << 16;
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    private static void doSort(short[] a, int left, int right) {
-        // Use Quicksort on small arrays
-        if (right - left < QUICKSORT_THRESHOLD) {
-            sort(a, left, right, true);
-            return;
-        }
-
-        /*
-         * Index run[i] is the start of i-th run
-         * (ascending or descending sequence).
-         */
-        int[] run = new int[MAX_RUN_COUNT + 1];
-        int count = 0; run[0] = left;
-
-        // Check if the array is nearly sorted
-        for (int k = left; k < right; run[count] = k) {
-            if (a[k] < a[k + 1]) { // ascending
-                while (++k <= right && a[k - 1] <= a[k]);
-            } else if (a[k] > a[k + 1]) { // descending
-                while (++k <= right && a[k - 1] >= a[k]);
-                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
-                    short t = a[lo]; a[lo] = a[hi]; a[hi] = t;
-                }
-            } else { // equal
-                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
-                    if (--m == 0) {
-                        sort(a, left, right, true);
-                        return;
-                    }
-                }
-            }
-
-            /*
-             * The array is not highly structured,
-             * use Quicksort instead of merge sort.
-             */
-            if (++count == MAX_RUN_COUNT) {
-                sort(a, left, right, true);
-                return;
-            }
-        }
-
-        // Check special cases
-        if (run[count] == right++) { // The last run contains one element
-            run[++count] = right;
-        } else if (count == 1) { // The array is already sorted
-            return;
-        }
-
-        /*
-         * Create temporary array, which is used for merging.
-         * Implementation note: variable "right" is increased by 1.
-         */
-        short[] b; byte odd = 0;
-        for (int n = 1; (n <<= 1) < count; odd ^= 1);
-
-        if (odd == 0) {
-            b = a; a = new short[b.length];
-            for (int i = left - 1; ++i < right; a[i] = b[i]);
-        } else {
-            b = new short[a.length];
-        }
-
-        // Merging
-        for (int last; count > 1; count = last) {
-            for (int k = (last = 0) + 2; k <= count; k += 2) {
-                int hi = run[k], mi = run[k - 1];
-                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
-                    if (q >= hi || p < mi && a[p] <= a[q]) {
-                        b[i] = a[p++];
-                    } else {
-                        b[i] = a[q++];
-                    }
-                }
-                run[++last] = hi;
-            }
-            if ((count & 1) != 0) {
-                for (int i = right, lo = run[count - 1]; --i >= lo;
-                    b[i] = a[i]
-                );
-                run[++last] = right;
-            }
-            short[] t = a; a = b; b = t;
-        }
-    }
-
-    /**
-     * Sorts the specified range of the array by Dual-Pivot Quicksort.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     * @param leftmost indicates if this part is the leftmost in the range
-     */
-    private static void sort(short[] a, int left, int right, boolean leftmost) {
-        int length = right - left + 1;
-
-        // Use insertion sort on tiny arrays
-        if (length < INSERTION_SORT_THRESHOLD) {
-            if (leftmost) {
-                /*
-                 * Traditional (without sentinel) insertion sort,
-                 * optimized for server VM, is used in case of
-                 * the leftmost part.
-                 */
-                for (int i = left, j = i; i < right; j = ++i) {
-                    short ai = a[i + 1];
-                    while (ai < a[j]) {
-                        a[j + 1] = a[j];
-                        if (j-- == left) {
-                            break;
-                        }
-                    }
-                    a[j + 1] = ai;
-                }
-            } else {
-                /*
-                 * Skip the longest ascending sequence.
-                 */
-                do {
-                    if (left >= right) {
-                        return;
-                    }
-                } while (a[++left] >= a[left - 1]);
-
-                /*
-                 * Every element from adjoining part plays the role
-                 * of sentinel, therefore this allows us to avoid the
-                 * left range check on each iteration. Moreover, we use
-                 * the more optimized algorithm, so called pair insertion
-                 * sort, which is faster (in the context of Quicksort)
-                 * than traditional implementation of insertion sort.
-                 */
-                for (int k = left; ++left <= right; k = ++left) {
-                    short a1 = a[k], a2 = a[left];
-
-                    if (a1 < a2) {
-                        a2 = a1; a1 = a[left];
-                    }
-                    while (a1 < a[--k]) {
-                        a[k + 2] = a[k];
-                    }
-                    a[++k + 1] = a1;
-
-                    while (a2 < a[--k]) {
-                        a[k + 1] = a[k];
-                    }
-                    a[k + 1] = a2;
-                }
-                short last = a[right];
-
-                while (last < a[--right]) {
-                    a[right + 1] = a[right];
-                }
-                a[right + 1] = last;
-            }
-            return;
-        }
-
-        // Inexpensive approximation of length / 7
-        int seventh = (length >> 3) + (length >> 6) + 1;
-
-        /*
-         * Sort five evenly spaced elements around (and including) the
-         * center element in the range. These elements will be used for
-         * pivot selection as described below. The choice for spacing
-         * these elements was empirically determined to work well on
-         * a wide variety of inputs.
-         */
-        int e3 = (left + right) >>> 1; // The midpoint
-        int e2 = e3 - seventh;
-        int e1 = e2 - seventh;
-        int e4 = e3 + seventh;
-        int e5 = e4 + seventh;
-
-        // Sort these elements using insertion sort
-        if (a[e2] < a[e1]) { short t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
-
-        if (a[e3] < a[e2]) { short t = a[e3]; a[e3] = a[e2]; a[e2] = t;
-            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-        }
-        if (a[e4] < a[e3]) { short t = a[e4]; a[e4] = a[e3]; a[e3] = t;
-            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-            }
-        }
-        if (a[e5] < a[e4]) { short t = a[e5]; a[e5] = a[e4]; a[e4] = t;
-            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
-                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-                }
-            }
-        }
-
-        // Pointers
-        int less  = left;  // The index of the first element of center part
-        int great = right; // The index before the first element of right part
-
-        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
-            /*
-             * Use the second and fourth of the five sorted elements as pivots.
-             * These values are inexpensive approximations of the first and
-             * second terciles of the array. Note that pivot1 <= pivot2.
-             */
-            short pivot1 = a[e2];
-            short pivot2 = a[e4];
-
-            /*
-             * The first and the last elements to be sorted are moved to the
-             * locations formerly occupied by the pivots. When partitioning
-             * is complete, the pivots are swapped back into their final
-             * positions, and excluded from subsequent sorting.
-             */
-            a[e2] = a[left];
-            a[e4] = a[right];
-
-            /*
-             * Skip elements, which are less or greater than pivot values.
-             */
-            while (a[++less] < pivot1);
-            while (a[--great] > pivot2);
-
-            /*
-             * Partitioning:
-             *
-             *   left part           center part                   right part
-             * +--------------------------------------------------------------+
-             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
-             * +--------------------------------------------------------------+
-             *               ^                          ^       ^
-             *               |                          |       |
-             *              less                        k     great
-             *
-             * Invariants:
-             *
-             *              all in (left, less)   < pivot1
-             *    pivot1 <= all in [less, k)     <= pivot2
-             *              all in (great, right) > pivot2
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            outer:
-            for (int k = less - 1; ++k <= great; ) {
-                short ak = a[k];
-                if (ak < pivot1) { // Move a[k] to left part
-                    a[k] = a[less];
-                    /*
-                     * Here and below we use "a[i] = b; i++;" instead
-                     * of "a[i++] = b;" due to performance issue.
-                     */
-                    a[less] = ak;
-                    ++less;
-                } else if (ak > pivot2) { // Move a[k] to right part
-                    while (a[great] > pivot2) {
-                        if (great-- == k) {
-                            break outer;
-                        }
-                    }
-                    if (a[great] < pivot1) { // a[great] <= pivot2
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // pivot1 <= a[great] <= pivot2
-                        a[k] = a[great];
-                    }
-                    /*
-                     * Here and below we use "a[i] = b; i--;" instead
-                     * of "a[i--] = b;" due to performance issue.
-                     */
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            // Swap pivots into their final positions
-            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
-            a[right] = a[great + 1]; a[great + 1] = pivot2;
-
-            // Sort left and right parts recursively, excluding known pivots
-            sort(a, left, less - 2, leftmost);
-            sort(a, great + 2, right, false);
-
-            /*
-             * If center part is too large (comprises > 4/7 of the array),
-             * swap internal pivot values to ends.
-             */
-            if (less < e1 && e5 < great) {
-                /*
-                 * Skip elements, which are equal to pivot values.
-                 */
-                while (a[less] == pivot1) {
-                    ++less;
-                }
-
-                while (a[great] == pivot2) {
-                    --great;
-                }
-
-                /*
-                 * Partitioning:
-                 *
-                 *   left part         center part                  right part
-                 * +----------------------------------------------------------+
-                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
-                 * +----------------------------------------------------------+
-                 *              ^                        ^       ^
-                 *              |                        |       |
-                 *             less                      k     great
-                 *
-                 * Invariants:
-                 *
-                 *              all in (*,  less) == pivot1
-                 *     pivot1 < all in [less,  k)  < pivot2
-                 *              all in (great, *) == pivot2
-                 *
-                 * Pointer k is the first index of ?-part.
-                 */
-                outer:
-                for (int k = less - 1; ++k <= great; ) {
-                    short ak = a[k];
-                    if (ak == pivot1) { // Move a[k] to left part
-                        a[k] = a[less];
-                        a[less] = ak;
-                        ++less;
-                    } else if (ak == pivot2) { // Move a[k] to right part
-                        while (a[great] == pivot2) {
-                            if (great-- == k) {
-                                break outer;
-                            }
-                        }
-                        if (a[great] == pivot1) { // a[great] < pivot2
-                            a[k] = a[less];
-                            /*
-                             * Even though a[great] equals to pivot1, the
-                             * assignment a[less] = pivot1 may be incorrect,
-                             * if a[great] and pivot1 are floating-point zeros
-                             * of different signs. Therefore in float and
-                             * double sorting methods we have to use more
-                             * accurate assignment a[less] = a[great].
-                             */
-                            a[less] = pivot1;
-                            ++less;
-                        } else { // pivot1 < a[great] < pivot2
-                            a[k] = a[great];
-                        }
-                        a[great] = ak;
-                        --great;
-                    }
-                }
-            }
-
-            // Sort center part recursively
-            sort(a, less, great, false);
-
-        } else { // Partitioning with one pivot
-            /*
-             * Use the third of the five sorted elements as pivot.
-             * This value is inexpensive approximation of the median.
-             */
-            short pivot = a[e3];
-
-            /*
-             * Partitioning degenerates to the traditional 3-way
-             * (or "Dutch National Flag") schema:
-             *
-             *   left part    center part              right part
-             * +-------------------------------------------------+
-             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
-             * +-------------------------------------------------+
-             *              ^              ^        ^
-             *              |              |        |
-             *             less            k      great
-             *
-             * Invariants:
-             *
-             *   all in (left, less)   < pivot
-             *   all in [less, k)     == pivot
-             *   all in (great, right) > pivot
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            for (int k = less; k <= great; ++k) {
-                if (a[k] == pivot) {
-                    continue;
-                }
-                short ak = a[k];
-                if (ak < pivot) { // Move a[k] to left part
-                    a[k] = a[less];
-                    a[less] = ak;
-                    ++less;
-                } else { // a[k] > pivot - Move a[k] to right part
-                    while (a[great] > pivot) {
-                        --great;
-                    }
-                    if (a[great] < pivot) { // a[great] <= pivot
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // a[great] == pivot
-                        /*
-                         * Even though a[great] equals to pivot, the
-                         * assignment a[k] = pivot may be incorrect,
-                         * if a[great] and pivot are floating-point
-                         * zeros of different signs. Therefore in float
-                         * and double sorting methods we have to use
-                         * more accurate assignment a[k] = a[great].
-                         */
-                        a[k] = pivot;
-                    }
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            /*
-             * Sort left and right parts recursively.
-             * All elements from center part are equal
-             * and, therefore, already sorted.
-             */
-            sort(a, left, less - 1, leftmost);
-            sort(a, great + 1, right, false);
-        }
-    }
-
-    /**
-     * Sorts the specified array.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(char[] a) {
-        sort(a, 0, a.length - 1);
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    public static void sort(char[] a, int left, int right) {
-        // Use counting sort on large arrays
-        if (right - left > COUNTING_SORT_THRESHOLD_FOR_SHORT_OR_CHAR) {
-            int[] count = new int[NUM_CHAR_VALUES];
-
-            for (int i = left - 1; ++i <= right;
-                count[a[i]]++
-            );
-            for (int i = NUM_CHAR_VALUES, k = right + 1; k > left; ) {
-                while (count[--i] == 0);
-                char value = (char) i;
-                int s = count[i];
-
-                do {
-                    a[--k] = value;
-                } while (--s > 0);
-            }
-        } else { // Use Dual-Pivot Quicksort on small arrays
-            doSort(a, left, right);
-        }
-    }
-
-    /** The number of distinct char values. */
-    private static final int NUM_CHAR_VALUES = 1 << 16;
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    private static void doSort(char[] a, int left, int right) {
-        // Use Quicksort on small arrays
-        if (right - left < QUICKSORT_THRESHOLD) {
-            sort(a, left, right, true);
-            return;
-        }
-
-        /*
-         * Index run[i] is the start of i-th run
-         * (ascending or descending sequence).
-         */
-        int[] run = new int[MAX_RUN_COUNT + 1];
-        int count = 0; run[0] = left;
-
-        // Check if the array is nearly sorted
-        for (int k = left; k < right; run[count] = k) {
-            if (a[k] < a[k + 1]) { // ascending
-                while (++k <= right && a[k - 1] <= a[k]);
-            } else if (a[k] > a[k + 1]) { // descending
-                while (++k <= right && a[k - 1] >= a[k]);
-                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
-                    char t = a[lo]; a[lo] = a[hi]; a[hi] = t;
-                }
-            } else { // equal
-                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
-                    if (--m == 0) {
-                        sort(a, left, right, true);
-                        return;
-                    }
-                }
-            }
-
-            /*
-             * The array is not highly structured,
-             * use Quicksort instead of merge sort.
-             */
-            if (++count == MAX_RUN_COUNT) {
-                sort(a, left, right, true);
-                return;
-            }
-        }
-
-        // Check special cases
-        if (run[count] == right++) { // The last run contains one element
-            run[++count] = right;
-        } else if (count == 1) { // The array is already sorted
-            return;
-        }
-
-        /*
-         * Create temporary array, which is used for merging.
-         * Implementation note: variable "right" is increased by 1.
-         */
-        char[] b; byte odd = 0;
-        for (int n = 1; (n <<= 1) < count; odd ^= 1);
-
-        if (odd == 0) {
-            b = a; a = new char[b.length];
-            for (int i = left - 1; ++i < right; a[i] = b[i]);
-        } else {
-            b = new char[a.length];
-        }
-
-        // Merging
-        for (int last; count > 1; count = last) {
-            for (int k = (last = 0) + 2; k <= count; k += 2) {
-                int hi = run[k], mi = run[k - 1];
-                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
-                    if (q >= hi || p < mi && a[p] <= a[q]) {
-                        b[i] = a[p++];
-                    } else {
-                        b[i] = a[q++];
-                    }
-                }
-                run[++last] = hi;
-            }
-            if ((count & 1) != 0) {
-                for (int i = right, lo = run[count - 1]; --i >= lo;
-                    b[i] = a[i]
-                );
-                run[++last] = right;
-            }
-            char[] t = a; a = b; b = t;
-        }
-    }
-
-    /**
-     * Sorts the specified range of the array by Dual-Pivot Quicksort.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     * @param leftmost indicates if this part is the leftmost in the range
-     */
-    private static void sort(char[] a, int left, int right, boolean leftmost) {
-        int length = right - left + 1;
-
-        // Use insertion sort on tiny arrays
-        if (length < INSERTION_SORT_THRESHOLD) {
-            if (leftmost) {
-                /*
-                 * Traditional (without sentinel) insertion sort,
-                 * optimized for server VM, is used in case of
-                 * the leftmost part.
-                 */
-                for (int i = left, j = i; i < right; j = ++i) {
-                    char ai = a[i + 1];
-                    while (ai < a[j]) {
-                        a[j + 1] = a[j];
-                        if (j-- == left) {
-                            break;
-                        }
-                    }
-                    a[j + 1] = ai;
-                }
-            } else {
-                /*
-                 * Skip the longest ascending sequence.
-                 */
-                do {
-                    if (left >= right) {
-                        return;
-                    }
-                } while (a[++left] >= a[left - 1]);
-
-                /*
-                 * Every element from adjoining part plays the role
-                 * of sentinel, therefore this allows us to avoid the
-                 * left range check on each iteration. Moreover, we use
-                 * the more optimized algorithm, so called pair insertion
-                 * sort, which is faster (in the context of Quicksort)
-                 * than traditional implementation of insertion sort.
-                 */
-                for (int k = left; ++left <= right; k = ++left) {
-                    char a1 = a[k], a2 = a[left];
-
-                    if (a1 < a2) {
-                        a2 = a1; a1 = a[left];
-                    }
-                    while (a1 < a[--k]) {
-                        a[k + 2] = a[k];
-                    }
-                    a[++k + 1] = a1;
-
-                    while (a2 < a[--k]) {
-                        a[k + 1] = a[k];
-                    }
-                    a[k + 1] = a2;
-                }
-                char last = a[right];
-
-                while (last < a[--right]) {
-                    a[right + 1] = a[right];
-                }
-                a[right + 1] = last;
-            }
-            return;
-        }
-
-        // Inexpensive approximation of length / 7
-        int seventh = (length >> 3) + (length >> 6) + 1;
-
-        /*
-         * Sort five evenly spaced elements around (and including) the
-         * center element in the range. These elements will be used for
-         * pivot selection as described below. The choice for spacing
-         * these elements was empirically determined to work well on
-         * a wide variety of inputs.
-         */
-        int e3 = (left + right) >>> 1; // The midpoint
-        int e2 = e3 - seventh;
-        int e1 = e2 - seventh;
-        int e4 = e3 + seventh;
-        int e5 = e4 + seventh;
-
-        // Sort these elements using insertion sort
-        if (a[e2] < a[e1]) { char t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
-
-        if (a[e3] < a[e2]) { char t = a[e3]; a[e3] = a[e2]; a[e2] = t;
-            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-        }
-        if (a[e4] < a[e3]) { char t = a[e4]; a[e4] = a[e3]; a[e3] = t;
-            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-            }
-        }
-        if (a[e5] < a[e4]) { char t = a[e5]; a[e5] = a[e4]; a[e4] = t;
-            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
-                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-                }
-            }
-        }
-
-        // Pointers
-        int less  = left;  // The index of the first element of center part
-        int great = right; // The index before the first element of right part
-
-        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
-            /*
-             * Use the second and fourth of the five sorted elements as pivots.
-             * These values are inexpensive approximations of the first and
-             * second terciles of the array. Note that pivot1 <= pivot2.
-             */
-            char pivot1 = a[e2];
-            char pivot2 = a[e4];
-
-            /*
-             * The first and the last elements to be sorted are moved to the
-             * locations formerly occupied by the pivots. When partitioning
-             * is complete, the pivots are swapped back into their final
-             * positions, and excluded from subsequent sorting.
-             */
-            a[e2] = a[left];
-            a[e4] = a[right];
-
-            /*
-             * Skip elements, which are less or greater than pivot values.
-             */
-            while (a[++less] < pivot1);
-            while (a[--great] > pivot2);
-
-            /*
-             * Partitioning:
-             *
-             *   left part           center part                   right part
-             * +--------------------------------------------------------------+
-             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
-             * +--------------------------------------------------------------+
-             *               ^                          ^       ^
-             *               |                          |       |
-             *              less                        k     great
-             *
-             * Invariants:
-             *
-             *              all in (left, less)   < pivot1
-             *    pivot1 <= all in [less, k)     <= pivot2
-             *              all in (great, right) > pivot2
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            outer:
-            for (int k = less - 1; ++k <= great; ) {
-                char ak = a[k];
-                if (ak < pivot1) { // Move a[k] to left part
-                    a[k] = a[less];
-                    /*
-                     * Here and below we use "a[i] = b; i++;" instead
-                     * of "a[i++] = b;" due to performance issue.
-                     */
-                    a[less] = ak;
-                    ++less;
-                } else if (ak > pivot2) { // Move a[k] to right part
-                    while (a[great] > pivot2) {
-                        if (great-- == k) {
-                            break outer;
-                        }
-                    }
-                    if (a[great] < pivot1) { // a[great] <= pivot2
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // pivot1 <= a[great] <= pivot2
-                        a[k] = a[great];
-                    }
-                    /*
-                     * Here and below we use "a[i] = b; i--;" instead
-                     * of "a[i--] = b;" due to performance issue.
-                     */
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            // Swap pivots into their final positions
-            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
-            a[right] = a[great + 1]; a[great + 1] = pivot2;
-
-            // Sort left and right parts recursively, excluding known pivots
-            sort(a, left, less - 2, leftmost);
-            sort(a, great + 2, right, false);
-
-            /*
-             * If center part is too large (comprises > 4/7 of the array),
-             * swap internal pivot values to ends.
-             */
-            if (less < e1 && e5 < great) {
-                /*
-                 * Skip elements, which are equal to pivot values.
-                 */
-                while (a[less] == pivot1) {
-                    ++less;
-                }
-
-                while (a[great] == pivot2) {
-                    --great;
-                }
-
-                /*
-                 * Partitioning:
-                 *
-                 *   left part         center part                  right part
-                 * +----------------------------------------------------------+
-                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
-                 * +----------------------------------------------------------+
-                 *              ^                        ^       ^
-                 *              |                        |       |
-                 *             less                      k     great
-                 *
-                 * Invariants:
-                 *
-                 *              all in (*,  less) == pivot1
-                 *     pivot1 < all in [less,  k)  < pivot2
-                 *              all in (great, *) == pivot2
-                 *
-                 * Pointer k is the first index of ?-part.
-                 */
-                outer:
-                for (int k = less - 1; ++k <= great; ) {
-                    char ak = a[k];
-                    if (ak == pivot1) { // Move a[k] to left part
-                        a[k] = a[less];
-                        a[less] = ak;
-                        ++less;
-                    } else if (ak == pivot2) { // Move a[k] to right part
-                        while (a[great] == pivot2) {
-                            if (great-- == k) {
-                                break outer;
-                            }
-                        }
-                        if (a[great] == pivot1) { // a[great] < pivot2
-                            a[k] = a[less];
-                            /*
-                             * Even though a[great] equals to pivot1, the
-                             * assignment a[less] = pivot1 may be incorrect,
-                             * if a[great] and pivot1 are floating-point zeros
-                             * of different signs. Therefore in float and
-                             * double sorting methods we have to use more
-                             * accurate assignment a[less] = a[great].
-                             */
-                            a[less] = pivot1;
-                            ++less;
-                        } else { // pivot1 < a[great] < pivot2
-                            a[k] = a[great];
-                        }
-                        a[great] = ak;
-                        --great;
-                    }
-                }
-            }
-
-            // Sort center part recursively
-            sort(a, less, great, false);
-
-        } else { // Partitioning with one pivot
-            /*
-             * Use the third of the five sorted elements as pivot.
-             * This value is inexpensive approximation of the median.
-             */
-            char pivot = a[e3];
-
-            /*
-             * Partitioning degenerates to the traditional 3-way
-             * (or "Dutch National Flag") schema:
-             *
-             *   left part    center part              right part
-             * +-------------------------------------------------+
-             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
-             * +-------------------------------------------------+
-             *              ^              ^        ^
-             *              |              |        |
-             *             less            k      great
-             *
-             * Invariants:
-             *
-             *   all in (left, less)   < pivot
-             *   all in [less, k)     == pivot
-             *   all in (great, right) > pivot
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            for (int k = less; k <= great; ++k) {
-                if (a[k] == pivot) {
-                    continue;
-                }
-                char ak = a[k];
-                if (ak < pivot) { // Move a[k] to left part
-                    a[k] = a[less];
-                    a[less] = ak;
-                    ++less;
-                } else { // a[k] > pivot - Move a[k] to right part
-                    while (a[great] > pivot) {
-                        --great;
-                    }
-                    if (a[great] < pivot) { // a[great] <= pivot
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // a[great] == pivot
-                        /*
-                         * Even though a[great] equals to pivot, the
-                         * assignment a[k] = pivot may be incorrect,
-                         * if a[great] and pivot are floating-point
-                         * zeros of different signs. Therefore in float
-                         * and double sorting methods we have to use
-                         * more accurate assignment a[k] = a[great].
-                         */
-                        a[k] = pivot;
-                    }
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            /*
-             * Sort left and right parts recursively.
-             * All elements from center part are equal
-             * and, therefore, already sorted.
-             */
-            sort(a, left, less - 1, leftmost);
-            sort(a, great + 1, right, false);
-        }
-    }
-
-    /** The number of distinct byte values. */
-    private static final int NUM_BYTE_VALUES = 1 << 8;
-
-    /**
-     * Sorts the specified array.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(byte[] a) {
-        sort(a, 0, a.length - 1);
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    public static void sort(byte[] a, int left, int right) {
-        // Use counting sort on large arrays
-        if (right - left > COUNTING_SORT_THRESHOLD_FOR_BYTE) {
-            int[] count = new int[NUM_BYTE_VALUES];
-
-            for (int i = left - 1; ++i <= right;
-                count[a[i] - Byte.MIN_VALUE]++
-            );
-            for (int i = NUM_BYTE_VALUES, k = right + 1; k > left; ) {
-                while (count[--i] == 0);
-                byte value = (byte) (i + Byte.MIN_VALUE);
-                int s = count[i];
-
-                do {
-                    a[--k] = value;
-                } while (--s > 0);
-            }
-        } else { // Use insertion sort on small arrays
-            for (int i = left, j = i; i < right; j = ++i) {
-                byte ai = a[i + 1];
-                while (ai < a[j]) {
-                    a[j + 1] = a[j];
-                    if (j-- == left) {
-                        break;
-                    }
-                }
-                a[j + 1] = ai;
-            }
-        }
-    }
-
-    /**
-     * Sorts the specified array.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(float[] a) {
-        sort(a, 0, a.length - 1);
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    public static void sort(float[] a, int left, int right) {
-        /*
-         * Phase 1: Move NaNs to the end of the array.
-         */
-        while (left <= right && Float.isNaN(a[right])) {
-            --right;
-        }
-        for (int k = right; --k >= left; ) {
-            float ak = a[k];
-            if (ak != ak) { // a[k] is NaN
-                a[k] = a[right];
-                a[right] = ak;
-                --right;
-            }
-        }
-
-        /*
-         * Phase 2: Sort everything except NaNs (which are already in place).
-         */
-        doSort(a, left, right);
-
-        /*
-         * Phase 3: Place negative zeros before positive zeros.
-         */
-        int hi = right;
-
-        /*
-         * Find the first zero, or first positive, or last negative element.
-         */
-        while (left < hi) {
-            int middle = (left + hi) >>> 1;
-            float middleValue = a[middle];
-
-            if (middleValue < 0.0f) {
-                left = middle + 1;
-            } else {
-                hi = middle;
-            }
-        }
-
-        /*
-         * Skip the last negative value (if any) or all leading negative zeros.
-         */
-        while (left <= right && Float.floatToRawIntBits(a[left]) < 0) {
-            ++left;
-        }
-
-        /*
-         * Move negative zeros to the beginning of the sub-range.
-         *
-         * Partitioning:
-         *
-         * +----------------------------------------------------+
-         * |   < 0.0   |   -0.0   |   0.0   |   ?  ( >= 0.0 )   |
-         * +----------------------------------------------------+
-         *              ^          ^         ^
-         *              |          |         |
-         *             left        p         k
-         *
-         * Invariants:
-         *
-         *   all in (*,  left)  <  0.0
-         *   all in [left,  p) == -0.0
-         *   all in [p,     k) ==  0.0
-         *   all in [k, right] >=  0.0
-         *
-         * Pointer k is the first index of ?-part.
-         */
-        for (int k = left, p = left - 1; ++k <= right; ) {
-            float ak = a[k];
-            if (ak != 0.0f) {
-                break;
-            }
-            if (Float.floatToRawIntBits(ak) < 0) { // ak is -0.0f
-                a[k] = 0.0f;
-                a[++p] = -0.0f;
-            }
-        }
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    private static void doSort(float[] a, int left, int right) {
-        // Use Quicksort on small arrays
-        if (right - left < QUICKSORT_THRESHOLD) {
-            sort(a, left, right, true);
-            return;
-        }
-
-        /*
-         * Index run[i] is the start of i-th run
-         * (ascending or descending sequence).
-         */
-        int[] run = new int[MAX_RUN_COUNT + 1];
-        int count = 0; run[0] = left;
-
-        // Check if the array is nearly sorted
-        for (int k = left; k < right; run[count] = k) {
-            if (a[k] < a[k + 1]) { // ascending
-                while (++k <= right && a[k - 1] <= a[k]);
-            } else if (a[k] > a[k + 1]) { // descending
-                while (++k <= right && a[k - 1] >= a[k]);
-                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
-                    float t = a[lo]; a[lo] = a[hi]; a[hi] = t;
-                }
-            } else { // equal
-                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
-                    if (--m == 0) {
-                        sort(a, left, right, true);
-                        return;
-                    }
-                }
-            }
-
-            /*
-             * The array is not highly structured,
-             * use Quicksort instead of merge sort.
-             */
-            if (++count == MAX_RUN_COUNT) {
-                sort(a, left, right, true);
-                return;
-            }
-        }
-
-        // Check special cases
-        if (run[count] == right++) { // The last run contains one element
-            run[++count] = right;
-        } else if (count == 1) { // The array is already sorted
-            return;
-        }
-
-        /*
-         * Create temporary array, which is used for merging.
-         * Implementation note: variable "right" is increased by 1.
-         */
-        float[] b; byte odd = 0;
-        for (int n = 1; (n <<= 1) < count; odd ^= 1);
-
-        if (odd == 0) {
-            b = a; a = new float[b.length];
-            for (int i = left - 1; ++i < right; a[i] = b[i]);
-        } else {
-            b = new float[a.length];
-        }
-
-        // Merging
-        for (int last; count > 1; count = last) {
-            for (int k = (last = 0) + 2; k <= count; k += 2) {
-                int hi = run[k], mi = run[k - 1];
-                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
-                    if (q >= hi || p < mi && a[p] <= a[q]) {
-                        b[i] = a[p++];
-                    } else {
-                        b[i] = a[q++];
-                    }
-                }
-                run[++last] = hi;
-            }
-            if ((count & 1) != 0) {
-                for (int i = right, lo = run[count - 1]; --i >= lo;
-                    b[i] = a[i]
-                );
-                run[++last] = right;
-            }
-            float[] t = a; a = b; b = t;
-        }
-    }
-
-    /**
-     * Sorts the specified range of the array by Dual-Pivot Quicksort.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     * @param leftmost indicates if this part is the leftmost in the range
-     */
-    private static void sort(float[] a, int left, int right, boolean leftmost) {
-        int length = right - left + 1;
-
-        // Use insertion sort on tiny arrays
-        if (length < INSERTION_SORT_THRESHOLD) {
-            if (leftmost) {
-                /*
-                 * Traditional (without sentinel) insertion sort,
-                 * optimized for server VM, is used in case of
-                 * the leftmost part.
-                 */
-                for (int i = left, j = i; i < right; j = ++i) {
-                    float ai = a[i + 1];
-                    while (ai < a[j]) {
-                        a[j + 1] = a[j];
-                        if (j-- == left) {
-                            break;
-                        }
-                    }
-                    a[j + 1] = ai;
-                }
-            } else {
-                /*
-                 * Skip the longest ascending sequence.
-                 */
-                do {
-                    if (left >= right) {
-                        return;
-                    }
-                } while (a[++left] >= a[left - 1]);
-
-                /*
-                 * Every element from adjoining part plays the role
-                 * of sentinel, therefore this allows us to avoid the
-                 * left range check on each iteration. Moreover, we use
-                 * the more optimized algorithm, so called pair insertion
-                 * sort, which is faster (in the context of Quicksort)
-                 * than traditional implementation of insertion sort.
-                 */
-                for (int k = left; ++left <= right; k = ++left) {
-                    float a1 = a[k], a2 = a[left];
-
-                    if (a1 < a2) {
-                        a2 = a1; a1 = a[left];
-                    }
-                    while (a1 < a[--k]) {
-                        a[k + 2] = a[k];
-                    }
-                    a[++k + 1] = a1;
-
-                    while (a2 < a[--k]) {
-                        a[k + 1] = a[k];
-                    }
-                    a[k + 1] = a2;
-                }
-                float last = a[right];
-
-                while (last < a[--right]) {
-                    a[right + 1] = a[right];
-                }
-                a[right + 1] = last;
-            }
-            return;
-        }
-
-        // Inexpensive approximation of length / 7
-        int seventh = (length >> 3) + (length >> 6) + 1;
-
-        /*
-         * Sort five evenly spaced elements around (and including) the
-         * center element in the range. These elements will be used for
-         * pivot selection as described below. The choice for spacing
-         * these elements was empirically determined to work well on
-         * a wide variety of inputs.
-         */
-        int e3 = (left + right) >>> 1; // The midpoint
-        int e2 = e3 - seventh;
-        int e1 = e2 - seventh;
-        int e4 = e3 + seventh;
-        int e5 = e4 + seventh;
-
-        // Sort these elements using insertion sort
-        if (a[e2] < a[e1]) { float t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
-
-        if (a[e3] < a[e2]) { float t = a[e3]; a[e3] = a[e2]; a[e2] = t;
-            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-        }
-        if (a[e4] < a[e3]) { float t = a[e4]; a[e4] = a[e3]; a[e3] = t;
-            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-            }
-        }
-        if (a[e5] < a[e4]) { float t = a[e5]; a[e5] = a[e4]; a[e4] = t;
-            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
-                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-                }
-            }
-        }
-
-        // Pointers
-        int less  = left;  // The index of the first element of center part
-        int great = right; // The index before the first element of right part
-
-        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
-            /*
-             * Use the second and fourth of the five sorted elements as pivots.
-             * These values are inexpensive approximations of the first and
-             * second terciles of the array. Note that pivot1 <= pivot2.
-             */
-            float pivot1 = a[e2];
-            float pivot2 = a[e4];
-
-            /*
-             * The first and the last elements to be sorted are moved to the
-             * locations formerly occupied by the pivots. When partitioning
-             * is complete, the pivots are swapped back into their final
-             * positions, and excluded from subsequent sorting.
-             */
-            a[e2] = a[left];
-            a[e4] = a[right];
-
-            /*
-             * Skip elements, which are less or greater than pivot values.
-             */
-            while (a[++less] < pivot1);
-            while (a[--great] > pivot2);
-
-            /*
-             * Partitioning:
-             *
-             *   left part           center part                   right part
-             * +--------------------------------------------------------------+
-             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
-             * +--------------------------------------------------------------+
-             *               ^                          ^       ^
-             *               |                          |       |
-             *              less                        k     great
-             *
-             * Invariants:
-             *
-             *              all in (left, less)   < pivot1
-             *    pivot1 <= all in [less, k)     <= pivot2
-             *              all in (great, right) > pivot2
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            outer:
-            for (int k = less - 1; ++k <= great; ) {
-                float ak = a[k];
-                if (ak < pivot1) { // Move a[k] to left part
-                    a[k] = a[less];
-                    /*
-                     * Here and below we use "a[i] = b; i++;" instead
-                     * of "a[i++] = b;" due to performance issue.
-                     */
-                    a[less] = ak;
-                    ++less;
-                } else if (ak > pivot2) { // Move a[k] to right part
-                    while (a[great] > pivot2) {
-                        if (great-- == k) {
-                            break outer;
-                        }
-                    }
-                    if (a[great] < pivot1) { // a[great] <= pivot2
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // pivot1 <= a[great] <= pivot2
-                        a[k] = a[great];
-                    }
-                    /*
-                     * Here and below we use "a[i] = b; i--;" instead
-                     * of "a[i--] = b;" due to performance issue.
-                     */
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            // Swap pivots into their final positions
-            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
-            a[right] = a[great + 1]; a[great + 1] = pivot2;
-
-            // Sort left and right parts recursively, excluding known pivots
-            sort(a, left, less - 2, leftmost);
-            sort(a, great + 2, right, false);
-
-            /*
-             * If center part is too large (comprises > 4/7 of the array),
-             * swap internal pivot values to ends.
-             */
-            if (less < e1 && e5 < great) {
-                /*
-                 * Skip elements, which are equal to pivot values.
-                 */
-                while (a[less] == pivot1) {
-                    ++less;
-                }
-
-                while (a[great] == pivot2) {
-                    --great;
-                }
-
-                /*
-                 * Partitioning:
-                 *
-                 *   left part         center part                  right part
-                 * +----------------------------------------------------------+
-                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
-                 * +----------------------------------------------------------+
-                 *              ^                        ^       ^
-                 *              |                        |       |
-                 *             less                      k     great
-                 *
-                 * Invariants:
-                 *
-                 *              all in (*,  less) == pivot1
-                 *     pivot1 < all in [less,  k)  < pivot2
-                 *              all in (great, *) == pivot2
-                 *
-                 * Pointer k is the first index of ?-part.
-                 */
-                outer:
-                for (int k = less - 1; ++k <= great; ) {
-                    float ak = a[k];
-                    if (ak == pivot1) { // Move a[k] to left part
-                        a[k] = a[less];
-                        a[less] = ak;
-                        ++less;
-                    } else if (ak == pivot2) { // Move a[k] to right part
-                        while (a[great] == pivot2) {
-                            if (great-- == k) {
-                                break outer;
-                            }
-                        }
-                        if (a[great] == pivot1) { // a[great] < pivot2
-                            a[k] = a[less];
-                            /*
-                             * Even though a[great] equals to pivot1, the
-                             * assignment a[less] = pivot1 may be incorrect,
-                             * if a[great] and pivot1 are floating-point zeros
-                             * of different signs. Therefore in float and
-                             * double sorting methods we have to use more
-                             * accurate assignment a[less] = a[great].
-                             */
-                            a[less] = a[great];
-                            ++less;
-                        } else { // pivot1 < a[great] < pivot2
-                            a[k] = a[great];
-                        }
-                        a[great] = ak;
-                        --great;
-                    }
-                }
-            }
-
-            // Sort center part recursively
-            sort(a, less, great, false);
-
-        } else { // Partitioning with one pivot
-            /*
-             * Use the third of the five sorted elements as pivot.
-             * This value is inexpensive approximation of the median.
-             */
-            float pivot = a[e3];
-
-            /*
-             * Partitioning degenerates to the traditional 3-way
-             * (or "Dutch National Flag") schema:
-             *
-             *   left part    center part              right part
-             * +-------------------------------------------------+
-             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
-             * +-------------------------------------------------+
-             *              ^              ^        ^
-             *              |              |        |
-             *             less            k      great
-             *
-             * Invariants:
-             *
-             *   all in (left, less)   < pivot
-             *   all in [less, k)     == pivot
-             *   all in (great, right) > pivot
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            for (int k = less; k <= great; ++k) {
-                if (a[k] == pivot) {
-                    continue;
-                }
-                float ak = a[k];
-                if (ak < pivot) { // Move a[k] to left part
-                    a[k] = a[less];
-                    a[less] = ak;
-                    ++less;
-                } else { // a[k] > pivot - Move a[k] to right part
-                    while (a[great] > pivot) {
-                        --great;
-                    }
-                    if (a[great] < pivot) { // a[great] <= pivot
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // a[great] == pivot
-                        /*
-                         * Even though a[great] equals to pivot, the
-                         * assignment a[k] = pivot may be incorrect,
-                         * if a[great] and pivot are floating-point
-                         * zeros of different signs. Therefore in float
-                         * and double sorting methods we have to use
-                         * more accurate assignment a[k] = a[great].
-                         */
-                        a[k] = a[great];
-                    }
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            /*
-             * Sort left and right parts recursively.
-             * All elements from center part are equal
-             * and, therefore, already sorted.
-             */
-            sort(a, left, less - 1, leftmost);
-            sort(a, great + 1, right, false);
-        }
-    }
-
-    /**
-     * Sorts the specified array.
-     *
-     * @param a the array to be sorted
-     */
-    public static void sort(double[] a) {
-        sort(a, 0, a.length - 1);
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    public static void sort(double[] a, int left, int right) {
-        /*
-         * Phase 1: Move NaNs to the end of the array.
-         */
-        while (left <= right && Double.isNaN(a[right])) {
-            --right;
-        }
-        for (int k = right; --k >= left; ) {
-            double ak = a[k];
-            if (ak != ak) { // a[k] is NaN
-                a[k] = a[right];
-                a[right] = ak;
-                --right;
-            }
-        }
-
-        /*
-         * Phase 2: Sort everything except NaNs (which are already in place).
-         */
-        doSort(a, left, right);
-
-        /*
-         * Phase 3: Place negative zeros before positive zeros.
-         */
-        int hi = right;
-
-        /*
-         * Find the first zero, or first positive, or last negative element.
-         */
-        while (left < hi) {
-            int middle = (left + hi) >>> 1;
-            double middleValue = a[middle];
-
-            if (middleValue < 0.0d) {
-                left = middle + 1;
-            } else {
-                hi = middle;
-            }
-        }
-
-        /*
-         * Skip the last negative value (if any) or all leading negative zeros.
-         */
-        while (left <= right && Double.doubleToRawLongBits(a[left]) < 0) {
-            ++left;
-        }
-
-        /*
-         * Move negative zeros to the beginning of the sub-range.
-         *
-         * Partitioning:
-         *
-         * +----------------------------------------------------+
-         * |   < 0.0   |   -0.0   |   0.0   |   ?  ( >= 0.0 )   |
-         * +----------------------------------------------------+
-         *              ^          ^         ^
-         *              |          |         |
-         *             left        p         k
-         *
-         * Invariants:
-         *
-         *   all in (*,  left)  <  0.0
-         *   all in [left,  p) == -0.0
-         *   all in [p,     k) ==  0.0
-         *   all in [k, right] >=  0.0
-         *
-         * Pointer k is the first index of ?-part.
-         */
-        for (int k = left, p = left - 1; ++k <= right; ) {
-            double ak = a[k];
-            if (ak != 0.0d) {
-                break;
-            }
-            if (Double.doubleToRawLongBits(ak) < 0) { // ak is -0.0d
-                a[k] = 0.0d;
-                a[++p] = -0.0d;
-            }
-        }
-    }
-
-    /**
-     * Sorts the specified range of the array.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     */
-    private static void doSort(double[] a, int left, int right) {
-        // Use Quicksort on small arrays
-        if (right - left < QUICKSORT_THRESHOLD) {
-            sort(a, left, right, true);
-            return;
-        }
-
-        /*
-         * Index run[i] is the start of i-th run
-         * (ascending or descending sequence).
-         */
-        int[] run = new int[MAX_RUN_COUNT + 1];
-        int count = 0; run[0] = left;
-
-        // Check if the array is nearly sorted
-        for (int k = left; k < right; run[count] = k) {
-            if (a[k] < a[k + 1]) { // ascending
-                while (++k <= right && a[k - 1] <= a[k]);
-            } else if (a[k] > a[k + 1]) { // descending
-                while (++k <= right && a[k - 1] >= a[k]);
-                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
-                    double t = a[lo]; a[lo] = a[hi]; a[hi] = t;
-                }
-            } else { // equal
-                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
-                    if (--m == 0) {
-                        sort(a, left, right, true);
-                        return;
-                    }
-                }
-            }
-
-            /*
-             * The array is not highly structured,
-             * use Quicksort instead of merge sort.
-             */
-            if (++count == MAX_RUN_COUNT) {
-                sort(a, left, right, true);
-                return;
-            }
-        }
-
-        // Check special cases
-        if (run[count] == right++) { // The last run contains one element
-            run[++count] = right;
-        } else if (count == 1) { // The array is already sorted
-            return;
-        }
-
-        /*
-         * Create temporary array, which is used for merging.
-         * Implementation note: variable "right" is increased by 1.
-         */
-        double[] b; byte odd = 0;
-        for (int n = 1; (n <<= 1) < count; odd ^= 1);
-
-        if (odd == 0) {
-            b = a; a = new double[b.length];
-            for (int i = left - 1; ++i < right; a[i] = b[i]);
-        } else {
-            b = new double[a.length];
-        }
-
-        // Merging
-        for (int last; count > 1; count = last) {
-            for (int k = (last = 0) + 2; k <= count; k += 2) {
-                int hi = run[k], mi = run[k - 1];
-                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
-                    if (q >= hi || p < mi && a[p] <= a[q]) {
-                        b[i] = a[p++];
-                    } else {
-                        b[i] = a[q++];
-                    }
-                }
-                run[++last] = hi;
-            }
-            if ((count & 1) != 0) {
-                for (int i = right, lo = run[count - 1]; --i >= lo;
-                    b[i] = a[i]
-                );
-                run[++last] = right;
-            }
-            double[] t = a; a = b; b = t;
-        }
-    }
-
-    /**
-     * Sorts the specified range of the array by Dual-Pivot Quicksort.
-     *
-     * @param a the array to be sorted
-     * @param left the index of the first element, inclusive, to be sorted
-     * @param right the index of the last element, inclusive, to be sorted
-     * @param leftmost indicates if this part is the leftmost in the range
-     */
-    private static void sort(double[] a, int left, int right, boolean leftmost) {
-        int length = right - left + 1;
-
-        // Use insertion sort on tiny arrays
-        if (length < INSERTION_SORT_THRESHOLD) {
-            if (leftmost) {
-                /*
-                 * Traditional (without sentinel) insertion sort,
-                 * optimized for server VM, is used in case of
-                 * the leftmost part.
-                 */
-                for (int i = left, j = i; i < right; j = ++i) {
-                    double ai = a[i + 1];
-                    while (ai < a[j]) {
-                        a[j + 1] = a[j];
-                        if (j-- == left) {
-                            break;
-                        }
-                    }
-                    a[j + 1] = ai;
-                }
-            } else {
-                /*
-                 * Skip the longest ascending sequence.
-                 */
-                do {
-                    if (left >= right) {
-                        return;
-                    }
-                } while (a[++left] >= a[left - 1]);
-
-                /*
-                 * Every element from adjoining part plays the role
-                 * of sentinel, therefore this allows us to avoid the
-                 * left range check on each iteration. Moreover, we use
-                 * the more optimized algorithm, so called pair insertion
-                 * sort, which is faster (in the context of Quicksort)
-                 * than traditional implementation of insertion sort.
-                 */
-                for (int k = left; ++left <= right; k = ++left) {
-                    double a1 = a[k], a2 = a[left];
-
-                    if (a1 < a2) {
-                        a2 = a1; a1 = a[left];
-                    }
-                    while (a1 < a[--k]) {
-                        a[k + 2] = a[k];
-                    }
-                    a[++k + 1] = a1;
-
-                    while (a2 < a[--k]) {
-                        a[k + 1] = a[k];
-                    }
-                    a[k + 1] = a2;
-                }
-                double last = a[right];
-
-                while (last < a[--right]) {
-                    a[right + 1] = a[right];
-                }
-                a[right + 1] = last;
-            }
-            return;
-        }
-
-        // Inexpensive approximation of length / 7
-        int seventh = (length >> 3) + (length >> 6) + 1;
-
-        /*
-         * Sort five evenly spaced elements around (and including) the
-         * center element in the range. These elements will be used for
-         * pivot selection as described below. The choice for spacing
-         * these elements was empirically determined to work well on
-         * a wide variety of inputs.
-         */
-        int e3 = (left + right) >>> 1; // The midpoint
-        int e2 = e3 - seventh;
-        int e1 = e2 - seventh;
-        int e4 = e3 + seventh;
-        int e5 = e4 + seventh;
-
-        // Sort these elements using insertion sort
-        if (a[e2] < a[e1]) { double t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
-
-        if (a[e3] < a[e2]) { double t = a[e3]; a[e3] = a[e2]; a[e2] = t;
-            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-        }
-        if (a[e4] < a[e3]) { double t = a[e4]; a[e4] = a[e3]; a[e3] = t;
-            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-            }
-        }
-        if (a[e5] < a[e4]) { double t = a[e5]; a[e5] = a[e4]; a[e4] = t;
-            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
-                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
-                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
-                }
-            }
-        }
-
-        // Pointers
-        int less  = left;  // The index of the first element of center part
-        int great = right; // The index before the first element of right part
-
-        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
-            /*
-             * Use the second and fourth of the five sorted elements as pivots.
-             * These values are inexpensive approximations of the first and
-             * second terciles of the array. Note that pivot1 <= pivot2.
-             */
-            double pivot1 = a[e2];
-            double pivot2 = a[e4];
-
-            /*
-             * The first and the last elements to be sorted are moved to the
-             * locations formerly occupied by the pivots. When partitioning
-             * is complete, the pivots are swapped back into their final
-             * positions, and excluded from subsequent sorting.
-             */
-            a[e2] = a[left];
-            a[e4] = a[right];
-
-            /*
-             * Skip elements, which are less or greater than pivot values.
-             */
-            while (a[++less] < pivot1);
-            while (a[--great] > pivot2);
-
-            /*
-             * Partitioning:
-             *
-             *   left part           center part                   right part
-             * +--------------------------------------------------------------+
-             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
-             * +--------------------------------------------------------------+
-             *               ^                          ^       ^
-             *               |                          |       |
-             *              less                        k     great
-             *
-             * Invariants:
-             *
-             *              all in (left, less)   < pivot1
-             *    pivot1 <= all in [less, k)     <= pivot2
-             *              all in (great, right) > pivot2
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            outer:
-            for (int k = less - 1; ++k <= great; ) {
-                double ak = a[k];
-                if (ak < pivot1) { // Move a[k] to left part
-                    a[k] = a[less];
-                    /*
-                     * Here and below we use "a[i] = b; i++;" instead
-                     * of "a[i++] = b;" due to performance issue.
-                     */
-                    a[less] = ak;
-                    ++less;
-                } else if (ak > pivot2) { // Move a[k] to right part
-                    while (a[great] > pivot2) {
-                        if (great-- == k) {
-                            break outer;
-                        }
-                    }
-                    if (a[great] < pivot1) { // a[great] <= pivot2
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // pivot1 <= a[great] <= pivot2
-                        a[k] = a[great];
-                    }
-                    /*
-                     * Here and below we use "a[i] = b; i--;" instead
-                     * of "a[i--] = b;" due to performance issue.
-                     */
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            // Swap pivots into their final positions
-            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
-            a[right] = a[great + 1]; a[great + 1] = pivot2;
-
-            // Sort left and right parts recursively, excluding known pivots
-            sort(a, left, less - 2, leftmost);
-            sort(a, great + 2, right, false);
-
-            /*
-             * If center part is too large (comprises > 4/7 of the array),
-             * swap internal pivot values to ends.
-             */
-            if (less < e1 && e5 < great) {
-                /*
-                 * Skip elements, which are equal to pivot values.
-                 */
-                while (a[less] == pivot1) {
-                    ++less;
-                }
-
-                while (a[great] == pivot2) {
-                    --great;
-                }
-
-                /*
-                 * Partitioning:
-                 *
-                 *   left part         center part                  right part
-                 * +----------------------------------------------------------+
-                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
-                 * +----------------------------------------------------------+
-                 *              ^                        ^       ^
-                 *              |                        |       |
-                 *             less                      k     great
-                 *
-                 * Invariants:
-                 *
-                 *              all in (*,  less) == pivot1
-                 *     pivot1 < all in [less,  k)  < pivot2
-                 *              all in (great, *) == pivot2
-                 *
-                 * Pointer k is the first index of ?-part.
-                 */
-                outer:
-                for (int k = less - 1; ++k <= great; ) {
-                    double ak = a[k];
-                    if (ak == pivot1) { // Move a[k] to left part
-                        a[k] = a[less];
-                        a[less] = ak;
-                        ++less;
-                    } else if (ak == pivot2) { // Move a[k] to right part
-                        while (a[great] == pivot2) {
-                            if (great-- == k) {
-                                break outer;
-                            }
-                        }
-                        if (a[great] == pivot1) { // a[great] < pivot2
-                            a[k] = a[less];
-                            /*
-                             * Even though a[great] equals to pivot1, the
-                             * assignment a[less] = pivot1 may be incorrect,
-                             * if a[great] and pivot1 are floating-point zeros
-                             * of different signs. Therefore in float and
-                             * double sorting methods we have to use more
-                             * accurate assignment a[less] = a[great].
-                             */
-                            a[less] = a[great];
-                            ++less;
-                        } else { // pivot1 < a[great] < pivot2
-                            a[k] = a[great];
-                        }
-                        a[great] = ak;
-                        --great;
-                    }
-                }
-            }
-
-            // Sort center part recursively
-            sort(a, less, great, false);
-
-        } else { // Partitioning with one pivot
-            /*
-             * Use the third of the five sorted elements as pivot.
-             * This value is inexpensive approximation of the median.
-             */
-            double pivot = a[e3];
-
-            /*
-             * Partitioning degenerates to the traditional 3-way
-             * (or "Dutch National Flag") schema:
-             *
-             *   left part    center part              right part
-             * +-------------------------------------------------+
-             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
-             * +-------------------------------------------------+
-             *              ^              ^        ^
-             *              |              |        |
-             *             less            k      great
-             *
-             * Invariants:
-             *
-             *   all in (left, less)   < pivot
-             *   all in [less, k)     == pivot
-             *   all in (great, right) > pivot
-             *
-             * Pointer k is the first index of ?-part.
-             */
-            for (int k = less; k <= great; ++k) {
-                if (a[k] == pivot) {
-                    continue;
-                }
-                double ak = a[k];
-                if (ak < pivot) { // Move a[k] to left part
-                    a[k] = a[less];
-                    a[less] = ak;
-                    ++less;
-                } else { // a[k] > pivot - Move a[k] to right part
-                    while (a[great] > pivot) {
-                        --great;
-                    }
-                    if (a[great] < pivot) { // a[great] <= pivot
-                        a[k] = a[less];
-                        a[less] = a[great];
-                        ++less;
-                    } else { // a[great] == pivot
-                        /*
-                         * Even though a[great] equals to pivot, the
-                         * assignment a[k] = pivot may be incorrect,
-                         * if a[great] and pivot are floating-point
-                         * zeros of different signs. Therefore in float
-                         * and double sorting methods we have to use
-                         * more accurate assignment a[k] = a[great].
-                         */
-                        a[k] = a[great];
-                    }
-                    a[great] = ak;
-                    --great;
-                }
-            }
-
-            /*
-             * Sort left and right parts recursively.
-             * All elements from center part are equal
-             * and, therefore, already sorted.
-             */
-            sort(a, left, less - 1, leftmost);
-            sort(a, great + 1, right, false);
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/EmptyStackException.java
--- a/emul/compact/src/main/java/java/util/EmptyStackException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * Thrown by methods in the <code>Stack</code> class to indicate
- * that the stack is empty.
- *
- * @author  Jonathan Payne
- * @see     java.util.Stack
- * @since   JDK1.0
- */
-public
-class EmptyStackException extends RuntimeException {
-    private static final long serialVersionUID = 5084686378493302095L;
-
-    /**
-     * Constructs a new <code>EmptyStackException</code> with <tt>null</tt>
-     * as its error message string.
-     */
-    public EmptyStackException() {
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/EventListener.java
--- a/emul/compact/src/main/java/java/util/EventListener.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * A tagging interface that all event listener interfaces must extend.
- * @since JDK1.1
- */
-public interface EventListener {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/EventListenerProxy.java
--- a/emul/compact/src/main/java/java/util/EventListenerProxy.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * An abstract wrapper class for an {@code EventListener} class
- * which associates a set of additional parameters with the listener.
- * Subclasses must provide the storage and accessor methods
- * for the additional arguments or parameters.
- * <p>
- * For example, a bean which supports named properties
- * would have a two argument method signature for adding
- * a {@code PropertyChangeListener} for a property:
- * <pre>
- * public void addPropertyChangeListener(String propertyName,
- *                                       PropertyChangeListener listener)
- * </pre>
- * If the bean also implemented the zero argument get listener method:
- * <pre>
- * public PropertyChangeListener[] getPropertyChangeListeners()
- * </pre>
- * then the array may contain inner {@code PropertyChangeListeners}
- * which are also {@code PropertyChangeListenerProxy} objects.
- * <p>
- * If the calling method is interested in retrieving the named property
- * then it would have to test the element to see if it is a proxy class.
- *
- * @since 1.4
- */
-public abstract class EventListenerProxy<T extends EventListener>
-        implements EventListener {
-
-    private final T listener;
-
-    /**
-     * Creates a proxy for the specified listener.
-     *
-     * @param listener  the listener object
-     */
-    public EventListenerProxy(T listener) {
-        this.listener = listener;
-    }
-
-    /**
-     * Returns the listener associated with the proxy.
-     *
-     * @return  the listener associated with the proxy
-     */
-    public T getListener() {
-        return this.listener;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/EventObject.java
--- a/emul/compact/src/main/java/java/util/EventObject.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * <p>
- * The root class from which all event state objects shall be derived.
- * <p>
- * All Events are constructed with a reference to the object, the "source",
- * that is logically deemed to be the object upon which the Event in question
- * initially occurred upon.
- *
- * @since JDK1.1
- */
-
-public class EventObject implements java.io.Serializable {
-
-    private static final long serialVersionUID = 5516075349620653480L;
-
-    /**
-     * The object on which the Event initially occurred.
-     */
-    protected transient Object  source;
-
-    /**
-     * Constructs a prototypical Event.
-     *
-     * @param    source    The object on which the Event initially occurred.
-     * @exception  IllegalArgumentException  if source is null.
-     */
-    public EventObject(Object source) {
-        if (source == null)
-            throw new IllegalArgumentException("null source");
-
-        this.source = source;
-    }
-
-    /**
-     * The object on which the Event initially occurred.
-     *
-     * @return   The object on which the Event initially occurred.
-     */
-    public Object getSource() {
-        return source;
-    }
-
-    /**
-     * Returns a String representation of this EventObject.
-     *
-     * @return  A a String representation of this EventObject.
-     */
-    public String toString() {
-        return getClass().getName() + "[source=" + source + "]";
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/HashMap.java
--- a/emul/compact/src/main/java/java/util/HashMap.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,990 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-import java.io.*;
-
-/**
- * Hash table based implementation of the <tt>Map</tt> interface.  This
- * implementation provides all of the optional map operations, and permits
- * <tt>null</tt> values and the <tt>null</tt> key.  (The <tt>HashMap</tt>
- * class is roughly equivalent to <tt>Hashtable</tt>, except that it is
- * unsynchronized and permits nulls.)  This class makes no guarantees as to
- * the order of the map; in particular, it does not guarantee that the order
- * will remain constant over time.
- *
- * <p>This implementation provides constant-time performance for the basic
- * operations (<tt>get</tt> and <tt>put</tt>), assuming the hash function
- * disperses the elements properly among the buckets.  Iteration over
- * collection views requires time proportional to the "capacity" of the
- * <tt>HashMap</tt> instance (the number of buckets) plus its size (the number
- * of key-value mappings).  Thus, it's very important not to set the initial
- * capacity too high (or the load factor too low) if iteration performance is
- * important.
- *
- * <p>An instance of <tt>HashMap</tt> has two parameters that affect its
- * performance: <i>initial capacity</i> and <i>load factor</i>.  The
- * <i>capacity</i> is the number of buckets in the hash table, and the initial
- * capacity is simply the capacity at the time the hash table is created.  The
- * <i>load factor</i> is a measure of how full the hash table is allowed to
- * get before its capacity is automatically increased.  When the number of
- * entries in the hash table exceeds the product of the load factor and the
- * current capacity, the hash table is <i>rehashed</i> (that is, internal data
- * structures are rebuilt) so that the hash table has approximately twice the
- * number of buckets.
- *
- * <p>As a general rule, the default load factor (.75) offers a good tradeoff
- * between time and space costs.  Higher values decrease the space overhead
- * but increase the lookup cost (reflected in most of the operations of the
- * <tt>HashMap</tt> class, including <tt>get</tt> and <tt>put</tt>).  The
- * expected number of entries in the map and its load factor should be taken
- * into account when setting its initial capacity, so as to minimize the
- * number of rehash operations.  If the initial capacity is greater
- * than the maximum number of entries divided by the load factor, no
- * rehash operations will ever occur.
- *
- * <p>If many mappings are to be stored in a <tt>HashMap</tt> instance,
- * creating it with a sufficiently large capacity will allow the mappings to
- * be stored more efficiently than letting it perform automatic rehashing as
- * needed to grow the table.
- *
- * <p><strong>Note that this implementation is not synchronized.</strong>
- * If multiple threads access a hash map concurrently, and at least one of
- * the threads modifies the map structurally, it <i>must</i> be
- * synchronized externally.  (A structural modification is any operation
- * that adds or deletes one or more mappings; merely changing the value
- * associated with a key that an instance already contains is not a
- * structural modification.)  This is typically accomplished by
- * synchronizing on some object that naturally encapsulates the map.
- *
- * If no such object exists, the map should be "wrapped" using the
- * {@link Collections#synchronizedMap Collections.synchronizedMap}
- * method.  This is best done at creation time, to prevent accidental
- * unsynchronized access to the map:<pre>
- *   Map m = Collections.synchronizedMap(new HashMap(...));</pre>
- *
- * <p>The iterators returned by all of this class's "collection view methods"
- * are <i>fail-fast</i>: if the map is structurally modified at any time after
- * the iterator is created, in any way except through the iterator's own
- * <tt>remove</tt> method, the iterator will throw a
- * {@link ConcurrentModificationException}.  Thus, in the face of concurrent
- * modification, the iterator fails quickly and cleanly, rather than risking
- * arbitrary, non-deterministic behavior at an undetermined time in the
- * future.
- *
- * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
- * as it is, generally speaking, impossible to make any hard guarantees in the
- * presence of unsynchronized concurrent modification.  Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness: <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i>
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- *
- * @author  Doug Lea
- * @author  Josh Bloch
- * @author  Arthur van Hoff
- * @author  Neal Gafter
- * @see     Object#hashCode()
- * @see     Collection
- * @see     Map
- * @see     TreeMap
- * @see     Hashtable
- * @since   1.2
- */
-
-public class HashMap<K,V>
-    extends AbstractMap<K,V>
-    implements Map<K,V>, Cloneable, Serializable
-{
-
-    /**
-     * The default initial capacity - MUST be a power of two.
-     */
-    static final int DEFAULT_INITIAL_CAPACITY = 16;
-
-    /**
-     * The maximum capacity, used if a higher value is implicitly specified
-     * by either of the constructors with arguments.
-     * MUST be a power of two <= 1<<30.
-     */
-    static final int MAXIMUM_CAPACITY = 1 << 30;
-
-    /**
-     * The load factor used when none specified in constructor.
-     */
-    static final float DEFAULT_LOAD_FACTOR = 0.75f;
-
-    /**
-     * The table, resized as necessary. Length MUST Always be a power of two.
-     */
-    transient Entry[] table;
-
-    /**
-     * The number of key-value mappings contained in this map.
-     */
-    transient int size;
-
-    /**
-     * The next size value at which to resize (capacity * load factor).
-     * @serial
-     */
-    int threshold;
-
-    /**
-     * The load factor for the hash table.
-     *
-     * @serial
-     */
-    final float loadFactor;
-
-    /**
-     * The number of times this HashMap has been structurally modified
-     * Structural modifications are those that change the number of mappings in
-     * the HashMap or otherwise modify its internal structure (e.g.,
-     * rehash).  This field is used to make iterators on Collection-views of
-     * the HashMap fail-fast.  (See ConcurrentModificationException).
-     */
-    transient int modCount;
-
-    /**
-     * Constructs an empty <tt>HashMap</tt> with the specified initial
-     * capacity and load factor.
-     *
-     * @param  initialCapacity the initial capacity
-     * @param  loadFactor      the load factor
-     * @throws IllegalArgumentException if the initial capacity is negative
-     *         or the load factor is nonpositive
-     */
-    public HashMap(int initialCapacity, float loadFactor) {
-        if (initialCapacity < 0)
-            throw new IllegalArgumentException("Illegal initial capacity: " +
-                                               initialCapacity);
-        if (initialCapacity > MAXIMUM_CAPACITY)
-            initialCapacity = MAXIMUM_CAPACITY;
-        if (loadFactor <= 0 || Float.isNaN(loadFactor))
-            throw new IllegalArgumentException("Illegal load factor: " +
-                                               loadFactor);
-
-        // Find a power of 2 >= initialCapacity
-        int capacity = 1;
-        while (capacity < initialCapacity)
-            capacity <<= 1;
-
-        this.loadFactor = loadFactor;
-        threshold = (int)(capacity * loadFactor);
-        table = new Entry[capacity];
-        init();
-    }
-
-    /**
-     * Constructs an empty <tt>HashMap</tt> with the specified initial
-     * capacity and the default load factor (0.75).
-     *
-     * @param  initialCapacity the initial capacity.
-     * @throws IllegalArgumentException if the initial capacity is negative.
-     */
-    public HashMap(int initialCapacity) {
-        this(initialCapacity, DEFAULT_LOAD_FACTOR);
-    }
-
-    /**
-     * Constructs an empty <tt>HashMap</tt> with the default initial capacity
-     * (16) and the default load factor (0.75).
-     */
-    public HashMap() {
-        this.loadFactor = DEFAULT_LOAD_FACTOR;
-        threshold = (int)(DEFAULT_INITIAL_CAPACITY * DEFAULT_LOAD_FACTOR);
-        table = new Entry[DEFAULT_INITIAL_CAPACITY];
-        init();
-    }
-
-    /**
-     * Constructs a new <tt>HashMap</tt> with the same mappings as the
-     * specified <tt>Map</tt>.  The <tt>HashMap</tt> is created with
-     * default load factor (0.75) and an initial capacity sufficient to
-     * hold the mappings in the specified <tt>Map</tt>.
-     *
-     * @param   m the map whose mappings are to be placed in this map
-     * @throws  NullPointerException if the specified map is null
-     */
-    public HashMap(Map<? extends K, ? extends V> m) {
-        this(Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1,
-                      DEFAULT_INITIAL_CAPACITY), DEFAULT_LOAD_FACTOR);
-        putAllForCreate(m);
-    }
-
-    // internal utilities
-
-    /**
-     * Initialization hook for subclasses. This method is called
-     * in all constructors and pseudo-constructors (clone, readObject)
-     * after HashMap has been initialized but before any entries have
-     * been inserted.  (In the absence of this method, readObject would
-     * require explicit knowledge of subclasses.)
-     */
-    void init() {
-    }
-
-    /**
-     * Applies a supplemental hash function to a given hashCode, which
-     * defends against poor quality hash functions.  This is critical
-     * because HashMap uses power-of-two length hash tables, that
-     * otherwise encounter collisions for hashCodes that do not differ
-     * in lower bits. Note: Null keys always map to hash 0, thus index 0.
-     */
-    static int hash(int h) {
-        // This function ensures that hashCodes that differ only by
-        // constant multiples at each bit position have a bounded
-        // number of collisions (approximately 8 at default load factor).
-        h ^= (h >>> 20) ^ (h >>> 12);
-        return h ^ (h >>> 7) ^ (h >>> 4);
-    }
-
-    /**
-     * Returns index for hash code h.
-     */
-    static int indexFor(int h, int length) {
-        return h & (length-1);
-    }
-
-    /**
-     * Returns the number of key-value mappings in this map.
-     *
-     * @return the number of key-value mappings in this map
-     */
-    public int size() {
-        return size;
-    }
-
-    /**
-     * Returns <tt>true</tt> if this map contains no key-value mappings.
-     *
-     * @return <tt>true</tt> if this map contains no key-value mappings
-     */
-    public boolean isEmpty() {
-        return size == 0;
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped,
-     * or {@code null} if this map contains no mapping for the key.
-     *
-     * <p>More formally, if this map contains a mapping from a key
-     * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
-     * key.equals(k))}, then this method returns {@code v}; otherwise
-     * it returns {@code null}.  (There can be at most one such mapping.)
-     *
-     * <p>A return value of {@code null} does not <i>necessarily</i>
-     * indicate that the map contains no mapping for the key; it's also
-     * possible that the map explicitly maps the key to {@code null}.
-     * The {@link #containsKey containsKey} operation may be used to
-     * distinguish these two cases.
-     *
-     * @see #put(Object, Object)
-     */
-    public V get(Object key) {
-        if (key == null)
-            return getForNullKey();
-        int hash = hash(key.hashCode());
-        for (Entry<K,V> e = table[indexFor(hash, table.length)];
-             e != null;
-             e = e.next) {
-            Object k;
-            if (e.hash == hash && ((k = e.key) == key || key.equals(k)))
-                return e.value;
-        }
-        return null;
-    }
-
-    /**
-     * Offloaded version of get() to look up null keys.  Null keys map
-     * to index 0.  This null case is split out into separate methods
-     * for the sake of performance in the two most commonly used
-     * operations (get and put), but incorporated with conditionals in
-     * others.
-     */
-    private V getForNullKey() {
-        for (Entry<K,V> e = table[0]; e != null; e = e.next) {
-            if (e.key == null)
-                return e.value;
-        }
-        return null;
-    }
-
-    /**
-     * Returns <tt>true</tt> if this map contains a mapping for the
-     * specified key.
-     *
-     * @param   key   The key whose presence in this map is to be tested
-     * @return <tt>true</tt> if this map contains a mapping for the specified
-     * key.
-     */
-    public boolean containsKey(Object key) {
-        return getEntry(key) != null;
-    }
-
-    /**
-     * Returns the entry associated with the specified key in the
-     * HashMap.  Returns null if the HashMap contains no mapping
-     * for the key.
-     */
-    final Entry<K,V> getEntry(Object key) {
-        int hash = (key == null) ? 0 : hash(key.hashCode());
-        for (Entry<K,V> e = table[indexFor(hash, table.length)];
-             e != null;
-             e = e.next) {
-            Object k;
-            if (e.hash == hash &&
-                ((k = e.key) == key || (key != null && key.equals(k))))
-                return e;
-        }
-        return null;
-    }
-
-
-    /**
-     * Associates the specified value with the specified key in this map.
-     * If the map previously contained a mapping for the key, the old
-     * value is replaced.
-     *
-     * @param key key with which the specified value is to be associated
-     * @param value value to be associated with the specified key
-     * @return the previous value associated with <tt>key</tt>, or
-     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
-     *         (A <tt>null</tt> return can also indicate that the map
-     *         previously associated <tt>null</tt> with <tt>key</tt>.)
-     */
-    public V put(K key, V value) {
-        if (key == null)
-            return putForNullKey(value);
-        int hash = hash(key.hashCode());
-        int i = indexFor(hash, table.length);
-        for (Entry<K,V> e = table[i]; e != null; e = e.next) {
-            Object k;
-            if (e.hash == hash && ((k = e.key) == key || key.equals(k))) {
-                V oldValue = e.value;
-                e.value = value;
-                e.recordAccess(this);
-                return oldValue;
-            }
-        }
-
-        modCount++;
-        addEntry(hash, key, value, i);
-        return null;
-    }
-
-    /**
-     * Offloaded version of put for null keys
-     */
-    private V putForNullKey(V value) {
-        for (Entry<K,V> e = table[0]; e != null; e = e.next) {
-            if (e.key == null) {
-                V oldValue = e.value;
-                e.value = value;
-                e.recordAccess(this);
-                return oldValue;
-            }
-        }
-        modCount++;
-        addEntry(0, null, value, 0);
-        return null;
-    }
-
-    /**
-     * This method is used instead of put by constructors and
-     * pseudoconstructors (clone, readObject).  It does not resize the table,
-     * check for comodification, etc.  It calls createEntry rather than
-     * addEntry.
-     */
-    private void putForCreate(K key, V value) {
-        int hash = (key == null) ? 0 : hash(key.hashCode());
-        int i = indexFor(hash, table.length);
-
-        /**
-         * Look for preexisting entry for key.  This will never happen for
-         * clone or deserialize.  It will only happen for construction if the
-         * input Map is a sorted map whose ordering is inconsistent w/ equals.
-         */
-        for (Entry<K,V> e = table[i]; e != null; e = e.next) {
-            Object k;
-            if (e.hash == hash &&
-                ((k = e.key) == key || (key != null && key.equals(k)))) {
-                e.value = value;
-                return;
-            }
-        }
-
-        createEntry(hash, key, value, i);
-    }
-
-    private void putAllForCreate(Map<? extends K, ? extends V> m) {
-        for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
-            putForCreate(e.getKey(), e.getValue());
-    }
-
-    /**
-     * Rehashes the contents of this map into a new array with a
-     * larger capacity.  This method is called automatically when the
-     * number of keys in this map reaches its threshold.
-     *
-     * If current capacity is MAXIMUM_CAPACITY, this method does not
-     * resize the map, but sets threshold to Integer.MAX_VALUE.
-     * This has the effect of preventing future calls.
-     *
-     * @param newCapacity the new capacity, MUST be a power of two;
-     *        must be greater than current capacity unless current
-     *        capacity is MAXIMUM_CAPACITY (in which case value
-     *        is irrelevant).
-     */
-    void resize(int newCapacity) {
-        Entry[] oldTable = table;
-        int oldCapacity = oldTable.length;
-        if (oldCapacity == MAXIMUM_CAPACITY) {
-            threshold = Integer.MAX_VALUE;
-            return;
-        }
-
-        Entry[] newTable = new Entry[newCapacity];
-        transfer(newTable);
-        table = newTable;
-        threshold = (int)(newCapacity * loadFactor);
-    }
-
-    /**
-     * Transfers all entries from current table to newTable.
-     */
-    void transfer(Entry[] newTable) {
-        Entry[] src = table;
-        int newCapacity = newTable.length;
-        for (int j = 0; j < src.length; j++) {
-            Entry<K,V> e = src[j];
-            if (e != null) {
-                src[j] = null;
-                do {
-                    Entry<K,V> next = e.next;
-                    int i = indexFor(e.hash, newCapacity);
-                    e.next = newTable[i];
-                    newTable[i] = e;
-                    e = next;
-                } while (e != null);
-            }
-        }
-    }
-
-    /**
-     * Copies all of the mappings from the specified map to this map.
-     * These mappings will replace any mappings that this map had for
-     * any of the keys currently in the specified map.
-     *
-     * @param m mappings to be stored in this map
-     * @throws NullPointerException if the specified map is null
-     */
-    public void putAll(Map<? extends K, ? extends V> m) {
-        int numKeysToBeAdded = m.size();
-        if (numKeysToBeAdded == 0)
-            return;
-
-        /*
-         * Expand the map if the map if the number of mappings to be added
-         * is greater than or equal to threshold.  This is conservative; the
-         * obvious condition is (m.size() + size) >= threshold, but this
-         * condition could result in a map with twice the appropriate capacity,
-         * if the keys to be added overlap with the keys already in this map.
-         * By using the conservative calculation, we subject ourself
-         * to at most one extra resize.
-         */
-        if (numKeysToBeAdded > threshold) {
-            int targetCapacity = (int)(numKeysToBeAdded / loadFactor + 1);
-            if (targetCapacity > MAXIMUM_CAPACITY)
-                targetCapacity = MAXIMUM_CAPACITY;
-            int newCapacity = table.length;
-            while (newCapacity < targetCapacity)
-                newCapacity <<= 1;
-            if (newCapacity > table.length)
-                resize(newCapacity);
-        }
-
-        for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
-            put(e.getKey(), e.getValue());
-    }
-
-    /**
-     * Removes the mapping for the specified key from this map if present.
-     *
-     * @param  key key whose mapping is to be removed from the map
-     * @return the previous value associated with <tt>key</tt>, or
-     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
-     *         (A <tt>null</tt> return can also indicate that the map
-     *         previously associated <tt>null</tt> with <tt>key</tt>.)
-     */
-    public V remove(Object key) {
-        Entry<K,V> e = removeEntryForKey(key);
-        return (e == null ? null : e.value);
-    }
-
-    /**
-     * Removes and returns the entry associated with the specified key
-     * in the HashMap.  Returns null if the HashMap contains no mapping
-     * for this key.
-     */
-    final Entry<K,V> removeEntryForKey(Object key) {
-        int hash = (key == null) ? 0 : hash(key.hashCode());
-        int i = indexFor(hash, table.length);
-        Entry<K,V> prev = table[i];
-        Entry<K,V> e = prev;
-
-        while (e != null) {
-            Entry<K,V> next = e.next;
-            Object k;
-            if (e.hash == hash &&
-                ((k = e.key) == key || (key != null && key.equals(k)))) {
-                modCount++;
-                size--;
-                if (prev == e)
-                    table[i] = next;
-                else
-                    prev.next = next;
-                e.recordRemoval(this);
-                return e;
-            }
-            prev = e;
-            e = next;
-        }
-
-        return e;
-    }
-
-    /**
-     * Special version of remove for EntrySet.
-     */
-    final Entry<K,V> removeMapping(Object o) {
-        if (!(o instanceof Map.Entry))
-            return null;
-
-        Map.Entry<K,V> entry = (Map.Entry<K,V>) o;
-        Object key = entry.getKey();
-        int hash = (key == null) ? 0 : hash(key.hashCode());
-        int i = indexFor(hash, table.length);
-        Entry<K,V> prev = table[i];
-        Entry<K,V> e = prev;
-
-        while (e != null) {
-            Entry<K,V> next = e.next;
-            if (e.hash == hash && e.equals(entry)) {
-                modCount++;
-                size--;
-                if (prev == e)
-                    table[i] = next;
-                else
-                    prev.next = next;
-                e.recordRemoval(this);
-                return e;
-            }
-            prev = e;
-            e = next;
-        }
-
-        return e;
-    }
-
-    /**
-     * Removes all of the mappings from this map.
-     * The map will be empty after this call returns.
-     */
-    public void clear() {
-        modCount++;
-        Entry[] tab = table;
-        for (int i = 0; i < tab.length; i++)
-            tab[i] = null;
-        size = 0;
-    }
-
-    /**
-     * Returns <tt>true</tt> if this map maps one or more keys to the
-     * specified value.
-     *
-     * @param value value whose presence in this map is to be tested
-     * @return <tt>true</tt> if this map maps one or more keys to the
-     *         specified value
-     */
-    public boolean containsValue(Object value) {
-        if (value == null)
-            return containsNullValue();
-
-        Entry[] tab = table;
-        for (int i = 0; i < tab.length ; i++)
-            for (Entry e = tab[i] ; e != null ; e = e.next)
-                if (value.equals(e.value))
-                    return true;
-        return false;
-    }
-
-    /**
-     * Special-case code for containsValue with null argument
-     */
-    private boolean containsNullValue() {
-        Entry[] tab = table;
-        for (int i = 0; i < tab.length ; i++)
-            for (Entry e = tab[i] ; e != null ; e = e.next)
-                if (e.value == null)
-                    return true;
-        return false;
-    }
-
-    /**
-     * Returns a shallow copy of this <tt>HashMap</tt> instance: the keys and
-     * values themselves are not cloned.
-     *
-     * @return a shallow copy of this map
-     */
-    public Object clone() {
-        HashMap<K,V> result = null;
-        try {
-            result = (HashMap<K,V>)super.clone();
-        } catch (CloneNotSupportedException e) {
-            // assert false;
-        }
-        result.table = new Entry[table.length];
-        result.entrySet = null;
-        result.modCount = 0;
-        result.size = 0;
-        result.init();
-        result.putAllForCreate(this);
-
-        return result;
-    }
-
-    static class Entry<K,V> implements Map.Entry<K,V> {
-        final K key;
-        V value;
-        Entry<K,V> next;
-        final int hash;
-
-        /**
-         * Creates new entry.
-         */
-        Entry(int h, K k, V v, Entry<K,V> n) {
-            value = v;
-            next = n;
-            key = k;
-            hash = h;
-        }
-
-        public final K getKey() {
-            return key;
-        }
-
-        public final V getValue() {
-            return value;
-        }
-
-        public final V setValue(V newValue) {
-            V oldValue = value;
-            value = newValue;
-            return oldValue;
-        }
-
-        public final boolean equals(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry e = (Map.Entry)o;
-            Object k1 = getKey();
-            Object k2 = e.getKey();
-            if (k1 == k2 || (k1 != null && k1.equals(k2))) {
-                Object v1 = getValue();
-                Object v2 = e.getValue();
-                if (v1 == v2 || (v1 != null && v1.equals(v2)))
-                    return true;
-            }
-            return false;
-        }
-
-        public final int hashCode() {
-            return (key==null   ? 0 : key.hashCode()) ^
-                   (value==null ? 0 : value.hashCode());
-        }
-
-        public final String toString() {
-            return getKey() + "=" + getValue();
-        }
-
-        /**
-         * This method is invoked whenever the value in an entry is
-         * overwritten by an invocation of put(k,v) for a key k that's already
-         * in the HashMap.
-         */
-        void recordAccess(HashMap<K,V> m) {
-        }
-
-        /**
-         * This method is invoked whenever the entry is
-         * removed from the table.
-         */
-        void recordRemoval(HashMap<K,V> m) {
-        }
-    }
-
-    /**
-     * Adds a new entry with the specified key, value and hash code to
-     * the specified bucket.  It is the responsibility of this
-     * method to resize the table if appropriate.
-     *
-     * Subclass overrides this to alter the behavior of put method.
-     */
-    void addEntry(int hash, K key, V value, int bucketIndex) {
-        Entry<K,V> e = table[bucketIndex];
-        table[bucketIndex] = new Entry<>(hash, key, value, e);
-        if (size++ >= threshold)
-            resize(2 * table.length);
-    }
-
-    /**
-     * Like addEntry except that this version is used when creating entries
-     * as part of Map construction or "pseudo-construction" (cloning,
-     * deserialization).  This version needn't worry about resizing the table.
-     *
-     * Subclass overrides this to alter the behavior of HashMap(Map),
-     * clone, and readObject.
-     */
-    void createEntry(int hash, K key, V value, int bucketIndex) {
-        Entry<K,V> e = table[bucketIndex];
-        table[bucketIndex] = new Entry<>(hash, key, value, e);
-        size++;
-    }
-
-    private abstract class HashIterator<E> implements Iterator<E> {
-        Entry<K,V> next;        // next entry to return
-        int expectedModCount;   // For fast-fail
-        int index;              // current slot
-        Entry<K,V> current;     // current entry
-
-        HashIterator() {
-            expectedModCount = modCount;
-            if (size > 0) { // advance to first entry
-                Entry[] t = table;
-                while (index < t.length && (next = t[index++]) == null)
-                    ;
-            }
-        }
-
-        public final boolean hasNext() {
-            return next != null;
-        }
-
-        final Entry<K,V> nextEntry() {
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-            Entry<K,V> e = next;
-            if (e == null)
-                throw new NoSuchElementException();
-
-            if ((next = e.next) == null) {
-                Entry[] t = table;
-                while (index < t.length && (next = t[index++]) == null)
-                    ;
-            }
-            current = e;
-            return e;
-        }
-
-        public void remove() {
-            if (current == null)
-                throw new IllegalStateException();
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-            Object k = current.key;
-            current = null;
-            HashMap.this.removeEntryForKey(k);
-            expectedModCount = modCount;
-        }
-
-    }
-
-    private final class ValueIterator extends HashIterator<V> {
-        public V next() {
-            return nextEntry().value;
-        }
-    }
-
-    private final class KeyIterator extends HashIterator<K> {
-        public K next() {
-            return nextEntry().getKey();
-        }
-    }
-
-    private final class EntryIterator extends HashIterator<Map.Entry<K,V>> {
-        public Map.Entry<K,V> next() {
-            return nextEntry();
-        }
-    }
-
-    // Subclass overrides these to alter behavior of views' iterator() method
-    Iterator<K> newKeyIterator()   {
-        return new KeyIterator();
-    }
-    Iterator<V> newValueIterator()   {
-        return new ValueIterator();
-    }
-    Iterator<Map.Entry<K,V>> newEntryIterator()   {
-        return new EntryIterator();
-    }
-
-
-    // Views
-
-    private transient Set<Map.Entry<K,V>> entrySet = null;
-
-    /**
-     * Returns a {@link Set} view of the keys contained in this map.
-     * The set is backed by the map, so changes to the map are
-     * reflected in the set, and vice-versa.  If the map is modified
-     * while an iteration over the set is in progress (except through
-     * the iterator's own <tt>remove</tt> operation), the results of
-     * the iteration are undefined.  The set supports element removal,
-     * which removes the corresponding mapping from the map, via the
-     * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
-     * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
-     * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
-     * operations.
-     */
-    public Set<K> keySet() {
-        Set<K> ks = keySet;
-        return (ks != null ? ks : (keySet = new KeySet()));
-    }
-
-    private final class KeySet extends AbstractSet<K> {
-        public Iterator<K> iterator() {
-            return newKeyIterator();
-        }
-        public int size() {
-            return size;
-        }
-        public boolean contains(Object o) {
-            return containsKey(o);
-        }
-        public boolean remove(Object o) {
-            return HashMap.this.removeEntryForKey(o) != null;
-        }
-        public void clear() {
-            HashMap.this.clear();
-        }
-    }
-
-    /**
-     * Returns a {@link Collection} view of the values contained in this map.
-     * The collection is backed by the map, so changes to the map are
-     * reflected in the collection, and vice-versa.  If the map is
-     * modified while an iteration over the collection is in progress
-     * (except through the iterator's own <tt>remove</tt> operation),
-     * the results of the iteration are undefined.  The collection
-     * supports element removal, which removes the corresponding
-     * mapping from the map, via the <tt>Iterator.remove</tt>,
-     * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
-     * <tt>retainAll</tt> and <tt>clear</tt> operations.  It does not
-     * support the <tt>add</tt> or <tt>addAll</tt> operations.
-     */
-    public Collection<V> values() {
-        Collection<V> vs = values;
-        return (vs != null ? vs : (values = new Values()));
-    }
-
-    private final class Values extends AbstractCollection<V> {
-        public Iterator<V> iterator() {
-            return newValueIterator();
-        }
-        public int size() {
-            return size;
-        }
-        public boolean contains(Object o) {
-            return containsValue(o);
-        }
-        public void clear() {
-            HashMap.this.clear();
-        }
-    }
-
-    /**
-     * Returns a {@link Set} view of the mappings contained in this map.
-     * The set is backed by the map, so changes to the map are
-     * reflected in the set, and vice-versa.  If the map is modified
-     * while an iteration over the set is in progress (except through
-     * the iterator's own <tt>remove</tt> operation, or through the
-     * <tt>setValue</tt> operation on a map entry returned by the
-     * iterator) the results of the iteration are undefined.  The set
-     * supports element removal, which removes the corresponding
-     * mapping from the map, via the <tt>Iterator.remove</tt>,
-     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
-     * <tt>clear</tt> operations.  It does not support the
-     * <tt>add</tt> or <tt>addAll</tt> operations.
-     *
-     * @return a set view of the mappings contained in this map
-     */
-    public Set<Map.Entry<K,V>> entrySet() {
-        return entrySet0();
-    }
-
-    private Set<Map.Entry<K,V>> entrySet0() {
-        Set<Map.Entry<K,V>> es = entrySet;
-        return es != null ? es : (entrySet = new EntrySet());
-    }
-
-    private final class EntrySet extends AbstractSet<Map.Entry<K,V>> {
-        public Iterator<Map.Entry<K,V>> iterator() {
-            return newEntryIterator();
-        }
-        public boolean contains(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry<K,V> e = (Map.Entry<K,V>) o;
-            Entry<K,V> candidate = getEntry(e.getKey());
-            return candidate != null && candidate.equals(e);
-        }
-        public boolean remove(Object o) {
-            return removeMapping(o) != null;
-        }
-        public int size() {
-            return size;
-        }
-        public void clear() {
-            HashMap.this.clear();
-        }
-    }
-
-
-    private static final long serialVersionUID = 362498820763181265L;
-
-
-    // These methods are used when serializing HashSets
-    int   capacity()     { return table.length; }
-    float loadFactor()   { return loadFactor;   }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/HashSet.java
--- a/emul/compact/src/main/java/java/util/HashSet.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * This class implements the <tt>Set</tt> interface, backed by a hash table
- * (actually a <tt>HashMap</tt> instance).  It makes no guarantees as to the
- * iteration order of the set; in particular, it does not guarantee that the
- * order will remain constant over time.  This class permits the <tt>null</tt>
- * element.
- *
- * <p>This class offers constant time performance for the basic operations
- * (<tt>add</tt>, <tt>remove</tt>, <tt>contains</tt> and <tt>size</tt>),
- * assuming the hash function disperses the elements properly among the
- * buckets.  Iterating over this set requires time proportional to the sum of
- * the <tt>HashSet</tt> instance's size (the number of elements) plus the
- * "capacity" of the backing <tt>HashMap</tt> instance (the number of
- * buckets).  Thus, it's very important not to set the initial capacity too
- * high (or the load factor too low) if iteration performance is important.
- *
- * <p><strong>Note that this implementation is not synchronized.</strong>
- * If multiple threads access a hash set concurrently, and at least one of
- * the threads modifies the set, it <i>must</i> be synchronized externally.
- * This is typically accomplished by synchronizing on some object that
- * naturally encapsulates the set.
- *
- * If no such object exists, the set should be "wrapped" using the
- * {@link Collections#synchronizedSet Collections.synchronizedSet}
- * method.  This is best done at creation time, to prevent accidental
- * unsynchronized access to the set:<pre>
- *   Set s = Collections.synchronizedSet(new HashSet(...));</pre>
- *
- * <p>The iterators returned by this class's <tt>iterator</tt> method are
- * <i>fail-fast</i>: if the set is modified at any time after the iterator is
- * created, in any way except through the iterator's own <tt>remove</tt>
- * method, the Iterator throws a {@link ConcurrentModificationException}.
- * Thus, in the face of concurrent modification, the iterator fails quickly
- * and cleanly, rather than risking arbitrary, non-deterministic behavior at
- * an undetermined time in the future.
- *
- * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
- * as it is, generally speaking, impossible to make any hard guarantees in the
- * presence of unsynchronized concurrent modification.  Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness: <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i>
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <E> the type of elements maintained by this set
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see     Collection
- * @see     Set
- * @see     TreeSet
- * @see     HashMap
- * @since   1.2
- */
-
-public class HashSet<E>
-    extends AbstractSet<E>
-    implements Set<E>, Cloneable, java.io.Serializable
-{
-    static final long serialVersionUID = -5024744406713321676L;
-
-    private transient HashMap<E,Object> map;
-
-    // Dummy value to associate with an Object in the backing Map
-    private static final Object PRESENT = new Object();
-
-    /**
-     * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
-     * default initial capacity (16) and load factor (0.75).
-     */
-    public HashSet() {
-        map = new HashMap<>();
-    }
-
-    /**
-     * Constructs a new set containing the elements in the specified
-     * collection.  The <tt>HashMap</tt> is created with default load factor
-     * (0.75) and an initial capacity sufficient to contain the elements in
-     * the specified collection.
-     *
-     * @param c the collection whose elements are to be placed into this set
-     * @throws NullPointerException if the specified collection is null
-     */
-    public HashSet(Collection<? extends E> c) {
-        map = new HashMap<>(Math.max((int) (c.size()/.75f) + 1, 16));
-        addAll(c);
-    }
-
-    /**
-     * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
-     * the specified initial capacity and the specified load factor.
-     *
-     * @param      initialCapacity   the initial capacity of the hash map
-     * @param      loadFactor        the load factor of the hash map
-     * @throws     IllegalArgumentException if the initial capacity is less
-     *             than zero, or if the load factor is nonpositive
-     */
-    public HashSet(int initialCapacity, float loadFactor) {
-        map = new HashMap<>(initialCapacity, loadFactor);
-    }
-
-    /**
-     * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
-     * the specified initial capacity and default load factor (0.75).
-     *
-     * @param      initialCapacity   the initial capacity of the hash table
-     * @throws     IllegalArgumentException if the initial capacity is less
-     *             than zero
-     */
-    public HashSet(int initialCapacity) {
-        map = new HashMap<>(initialCapacity);
-    }
-
-    /**
-     * Constructs a new, empty linked hash set.  (This package private
-     * constructor is only used by LinkedHashSet.) The backing
-     * HashMap instance is a LinkedHashMap with the specified initial
-     * capacity and the specified load factor.
-     *
-     * @param      initialCapacity   the initial capacity of the hash map
-     * @param      loadFactor        the load factor of the hash map
-     * @param      dummy             ignored (distinguishes this
-     *             constructor from other int, float constructor.)
-     * @throws     IllegalArgumentException if the initial capacity is less
-     *             than zero, or if the load factor is nonpositive
-     */
-    HashSet(int initialCapacity, float loadFactor, boolean dummy) {
-        map = new LinkedHashMap<>(initialCapacity, loadFactor);
-    }
-
-    /**
-     * Returns an iterator over the elements in this set.  The elements
-     * are returned in no particular order.
-     *
-     * @return an Iterator over the elements in this set
-     * @see ConcurrentModificationException
-     */
-    public Iterator<E> iterator() {
-        return map.keySet().iterator();
-    }
-
-    /**
-     * Returns the number of elements in this set (its cardinality).
-     *
-     * @return the number of elements in this set (its cardinality)
-     */
-    public int size() {
-        return map.size();
-    }
-
-    /**
-     * Returns <tt>true</tt> if this set contains no elements.
-     *
-     * @return <tt>true</tt> if this set contains no elements
-     */
-    public boolean isEmpty() {
-        return map.isEmpty();
-    }
-
-    /**
-     * Returns <tt>true</tt> if this set contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this set
-     * contains an element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
-     *
-     * @param o element whose presence in this set is to be tested
-     * @return <tt>true</tt> if this set contains the specified element
-     */
-    public boolean contains(Object o) {
-        return map.containsKey(o);
-    }
-
-    /**
-     * Adds the specified element to this set if it is not already present.
-     * More formally, adds the specified element <tt>e</tt> to this set if
-     * this set contains no element <tt>e2</tt> such that
-     * <tt>(e==null&nbsp;?&nbsp;e2==null&nbsp;:&nbsp;e.equals(e2))</tt>.
-     * If this set already contains the element, the call leaves the set
-     * unchanged and returns <tt>false</tt>.
-     *
-     * @param e element to be added to this set
-     * @return <tt>true</tt> if this set did not already contain the specified
-     * element
-     */
-    public boolean add(E e) {
-        return map.put(e, PRESENT)==null;
-    }
-
-    /**
-     * Removes the specified element from this set if it is present.
-     * More formally, removes an element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>,
-     * if this set contains such an element.  Returns <tt>true</tt> if
-     * this set contained the element (or equivalently, if this set
-     * changed as a result of the call).  (This set will not contain the
-     * element once the call returns.)
-     *
-     * @param o object to be removed from this set, if present
-     * @return <tt>true</tt> if the set contained the specified element
-     */
-    public boolean remove(Object o) {
-        return map.remove(o)==PRESENT;
-    }
-
-    /**
-     * Removes all of the elements from this set.
-     * The set will be empty after this call returns.
-     */
-    public void clear() {
-        map.clear();
-    }
-
-    /**
-     * Returns a shallow copy of this <tt>HashSet</tt> instance: the elements
-     * themselves are not cloned.
-     *
-     * @return a shallow copy of this set
-     */
-    public Object clone() {
-        try {
-            HashSet<E> newSet = (HashSet<E>) super.clone();
-            newSet.map = (HashMap<E, Object>) map.clone();
-            return newSet;
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError();
-        }
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Hashtable.java
--- a/emul/compact/src/main/java/java/util/Hashtable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1005 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-import java.io.*;
-
-/**
- * This class implements a hash table, which maps keys to values. Any
- * non-<code>null</code> object can be used as a key or as a value. <p>
- *
- * To successfully store and retrieve objects from a hashtable, the
- * objects used as keys must implement the <code>hashCode</code>
- * method and the <code>equals</code> method. <p>
- *
- * An instance of <code>Hashtable</code> has two parameters that affect its
- * performance: <i>initial capacity</i> and <i>load factor</i>.  The
- * <i>capacity</i> is the number of <i>buckets</i> in the hash table, and the
- * <i>initial capacity</i> is simply the capacity at the time the hash table
- * is created.  Note that the hash table is <i>open</i>: in the case of a "hash
- * collision", a single bucket stores multiple entries, which must be searched
- * sequentially.  The <i>load factor</i> is a measure of how full the hash
- * table is allowed to get before its capacity is automatically increased.
- * The initial capacity and load factor parameters are merely hints to
- * the implementation.  The exact details as to when and whether the rehash
- * method is invoked are implementation-dependent.<p>
- *
- * Generally, the default load factor (.75) offers a good tradeoff between
- * time and space costs.  Higher values decrease the space overhead but
- * increase the time cost to look up an entry (which is reflected in most
- * <tt>Hashtable</tt> operations, including <tt>get</tt> and <tt>put</tt>).<p>
- *
- * The initial capacity controls a tradeoff between wasted space and the
- * need for <code>rehash</code> operations, which are time-consuming.
- * No <code>rehash</code> operations will <i>ever</i> occur if the initial
- * capacity is greater than the maximum number of entries the
- * <tt>Hashtable</tt> will contain divided by its load factor.  However,
- * setting the initial capacity too high can waste space.<p>
- *
- * If many entries are to be made into a <code>Hashtable</code>,
- * creating it with a sufficiently large capacity may allow the
- * entries to be inserted more efficiently than letting it perform
- * automatic rehashing as needed to grow the table. <p>
- *
- * This example creates a hashtable of numbers. It uses the names of
- * the numbers as keys:
- * <pre>   {@code
- *   Hashtable<String, Integer> numbers
- *     = new Hashtable<String, Integer>();
- *   numbers.put("one", 1);
- *   numbers.put("two", 2);
- *   numbers.put("three", 3);}</pre>
- *
- * <p>To retrieve a number, use the following code:
- * <pre>   {@code
- *   Integer n = numbers.get("two");
- *   if (n != null) {
- *     System.out.println("two = " + n);
- *   }}</pre>
- *
- * <p>The iterators returned by the <tt>iterator</tt> method of the collections
- * returned by all of this class's "collection view methods" are
- * <em>fail-fast</em>: if the Hashtable is structurally modified at any time
- * after the iterator is created, in any way except through the iterator's own
- * <tt>remove</tt> method, the iterator will throw a {@link
- * ConcurrentModificationException}.  Thus, in the face of concurrent
- * modification, the iterator fails quickly and cleanly, rather than risking
- * arbitrary, non-deterministic behavior at an undetermined time in the future.
- * The Enumerations returned by Hashtable's keys and elements methods are
- * <em>not</em> fail-fast.
- *
- * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
- * as it is, generally speaking, impossible to make any hard guarantees in the
- * presence of unsynchronized concurrent modification.  Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness: <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i>
- *
- * <p>As of the Java 2 platform v1.2, this class was retrofitted to
- * implement the {@link Map} interface, making it a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- *
- * Java Collections Framework</a>.  Unlike the new collection
- * implementations, {@code Hashtable} is synchronized.  If a
- * thread-safe implementation is not needed, it is recommended to use
- * {@link HashMap} in place of {@code Hashtable}.  If a thread-safe
- * highly-concurrent implementation is desired, then it is recommended
- * to use {@link java.util.concurrent.ConcurrentHashMap} in place of
- * {@code Hashtable}.
- *
- * @author  Arthur van Hoff
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see     Object#equals(java.lang.Object)
- * @see     Object#hashCode()
- * @see     Hashtable#rehash()
- * @see     Collection
- * @see     Map
- * @see     HashMap
- * @see     TreeMap
- * @since JDK1.0
- */
-public class Hashtable<K,V>
-    extends Dictionary<K,V>
-    implements Map<K,V>, Cloneable, java.io.Serializable {
-
-    /**
-     * The hash table data.
-     */
-    private transient Entry[] table;
-
-    /**
-     * The total number of entries in the hash table.
-     */
-    private transient int count;
-
-    /**
-     * The table is rehashed when its size exceeds this threshold.  (The
-     * value of this field is (int)(capacity * loadFactor).)
-     *
-     * @serial
-     */
-    private int threshold;
-
-    /**
-     * The load factor for the hashtable.
-     *
-     * @serial
-     */
-    private float loadFactor;
-
-    /**
-     * The number of times this Hashtable has been structurally modified
-     * Structural modifications are those that change the number of entries in
-     * the Hashtable or otherwise modify its internal structure (e.g.,
-     * rehash).  This field is used to make iterators on Collection-views of
-     * the Hashtable fail-fast.  (See ConcurrentModificationException).
-     */
-    private transient int modCount = 0;
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = 1421746759512286392L;
-
-    /**
-     * Constructs a new, empty hashtable with the specified initial
-     * capacity and the specified load factor.
-     *
-     * @param      initialCapacity   the initial capacity of the hashtable.
-     * @param      loadFactor        the load factor of the hashtable.
-     * @exception  IllegalArgumentException  if the initial capacity is less
-     *             than zero, or if the load factor is nonpositive.
-     */
-    public Hashtable(int initialCapacity, float loadFactor) {
-        if (initialCapacity < 0)
-            throw new IllegalArgumentException("Illegal Capacity: "+
-                                               initialCapacity);
-        if (loadFactor <= 0 || Float.isNaN(loadFactor))
-            throw new IllegalArgumentException("Illegal Load: "+loadFactor);
-
-        if (initialCapacity==0)
-            initialCapacity = 1;
-        this.loadFactor = loadFactor;
-        table = new Entry[initialCapacity];
-        threshold = (int)(initialCapacity * loadFactor);
-    }
-
-    /**
-     * Constructs a new, empty hashtable with the specified initial capacity
-     * and default load factor (0.75).
-     *
-     * @param     initialCapacity   the initial capacity of the hashtable.
-     * @exception IllegalArgumentException if the initial capacity is less
-     *              than zero.
-     */
-    public Hashtable(int initialCapacity) {
-        this(initialCapacity, 0.75f);
-    }
-
-    /**
-     * Constructs a new, empty hashtable with a default initial capacity (11)
-     * and load factor (0.75).
-     */
-    public Hashtable() {
-        this(11, 0.75f);
-    }
-
-    /**
-     * Constructs a new hashtable with the same mappings as the given
-     * Map.  The hashtable is created with an initial capacity sufficient to
-     * hold the mappings in the given Map and a default load factor (0.75).
-     *
-     * @param t the map whose mappings are to be placed in this map.
-     * @throws NullPointerException if the specified map is null.
-     * @since   1.2
-     */
-    public Hashtable(Map<? extends K, ? extends V> t) {
-        this(Math.max(2*t.size(), 11), 0.75f);
-        putAll(t);
-    }
-
-    /**
-     * Returns the number of keys in this hashtable.
-     *
-     * @return  the number of keys in this hashtable.
-     */
-    public synchronized int size() {
-        return count;
-    }
-
-    /**
-     * Tests if this hashtable maps no keys to values.
-     *
-     * @return  <code>true</code> if this hashtable maps no keys to values;
-     *          <code>false</code> otherwise.
-     */
-    public synchronized boolean isEmpty() {
-        return count == 0;
-    }
-
-    /**
-     * Returns an enumeration of the keys in this hashtable.
-     *
-     * @return  an enumeration of the keys in this hashtable.
-     * @see     Enumeration
-     * @see     #elements()
-     * @see     #keySet()
-     * @see     Map
-     */
-    public synchronized Enumeration<K> keys() {
-        return this.<K>getEnumeration(KEYS);
-    }
-
-    /**
-     * Returns an enumeration of the values in this hashtable.
-     * Use the Enumeration methods on the returned object to fetch the elements
-     * sequentially.
-     *
-     * @return  an enumeration of the values in this hashtable.
-     * @see     java.util.Enumeration
-     * @see     #keys()
-     * @see     #values()
-     * @see     Map
-     */
-    public synchronized Enumeration<V> elements() {
-        return this.<V>getEnumeration(VALUES);
-    }
-
-    /**
-     * Tests if some key maps into the specified value in this hashtable.
-     * This operation is more expensive than the {@link #containsKey
-     * containsKey} method.
-     *
-     * <p>Note that this method is identical in functionality to
-     * {@link #containsValue containsValue}, (which is part of the
-     * {@link Map} interface in the collections framework).
-     *
-     * @param      value   a value to search for
-     * @return     <code>true</code> if and only if some key maps to the
-     *             <code>value</code> argument in this hashtable as
-     *             determined by the <tt>equals</tt> method;
-     *             <code>false</code> otherwise.
-     * @exception  NullPointerException  if the value is <code>null</code>
-     */
-    public synchronized boolean contains(Object value) {
-        if (value == null) {
-            throw new NullPointerException();
-        }
-
-        Entry tab[] = table;
-        for (int i = tab.length ; i-- > 0 ;) {
-            for (Entry<K,V> e = tab[i] ; e != null ; e = e.next) {
-                if (e.value.equals(value)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns true if this hashtable maps one or more keys to this value.
-     *
-     * <p>Note that this method is identical in functionality to {@link
-     * #contains contains} (which predates the {@link Map} interface).
-     *
-     * @param value value whose presence in this hashtable is to be tested
-     * @return <tt>true</tt> if this map maps one or more keys to the
-     *         specified value
-     * @throws NullPointerException  if the value is <code>null</code>
-     * @since 1.2
-     */
-    public boolean containsValue(Object value) {
-        return contains(value);
-    }
-
-    /**
-     * Tests if the specified object is a key in this hashtable.
-     *
-     * @param   key   possible key
-     * @return  <code>true</code> if and only if the specified object
-     *          is a key in this hashtable, as determined by the
-     *          <tt>equals</tt> method; <code>false</code> otherwise.
-     * @throws  NullPointerException  if the key is <code>null</code>
-     * @see     #contains(Object)
-     */
-    public synchronized boolean containsKey(Object key) {
-        Entry tab[] = table;
-        int hash = key.hashCode();
-        int index = (hash & 0x7FFFFFFF) % tab.length;
-        for (Entry<K,V> e = tab[index] ; e != null ; e = e.next) {
-            if ((e.hash == hash) && e.key.equals(key)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped,
-     * or {@code null} if this map contains no mapping for the key.
-     *
-     * <p>More formally, if this map contains a mapping from a key
-     * {@code k} to a value {@code v} such that {@code (key.equals(k))},
-     * then this method returns {@code v}; otherwise it returns
-     * {@code null}.  (There can be at most one such mapping.)
-     *
-     * @param key the key whose associated value is to be returned
-     * @return the value to which the specified key is mapped, or
-     *         {@code null} if this map contains no mapping for the key
-     * @throws NullPointerException if the specified key is null
-     * @see     #put(Object, Object)
-     */
-    public synchronized V get(Object key) {
-        Entry tab[] = table;
-        int hash = key.hashCode();
-        int index = (hash & 0x7FFFFFFF) % tab.length;
-        for (Entry<K,V> e = tab[index] ; e != null ; e = e.next) {
-            if ((e.hash == hash) && e.key.equals(key)) {
-                return e.value;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * The maximum size of array to allocate.
-     * Some VMs reserve some header words in an array.
-     * Attempts to allocate larger arrays may result in
-     * OutOfMemoryError: Requested array size exceeds VM limit
-     */
-    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
-    /**
-     * Increases the capacity of and internally reorganizes this
-     * hashtable, in order to accommodate and access its entries more
-     * efficiently.  This method is called automatically when the
-     * number of keys in the hashtable exceeds this hashtable's capacity
-     * and load factor.
-     */
-    protected void rehash() {
-        int oldCapacity = table.length;
-        Entry[] oldMap = table;
-
-        // overflow-conscious code
-        int newCapacity = (oldCapacity << 1) + 1;
-        if (newCapacity - MAX_ARRAY_SIZE > 0) {
-            if (oldCapacity == MAX_ARRAY_SIZE)
-                // Keep running with MAX_ARRAY_SIZE buckets
-                return;
-            newCapacity = MAX_ARRAY_SIZE;
-        }
-        Entry[] newMap = new Entry[newCapacity];
-
-        modCount++;
-        threshold = (int)(newCapacity * loadFactor);
-        table = newMap;
-
-        for (int i = oldCapacity ; i-- > 0 ;) {
-            for (Entry<K,V> old = oldMap[i] ; old != null ; ) {
-                Entry<K,V> e = old;
-                old = old.next;
-
-                int index = (e.hash & 0x7FFFFFFF) % newCapacity;
-                e.next = newMap[index];
-                newMap[index] = e;
-            }
-        }
-    }
-
-    /**
-     * Maps the specified <code>key</code> to the specified
-     * <code>value</code> in this hashtable. Neither the key nor the
-     * value can be <code>null</code>. <p>
-     *
-     * The value can be retrieved by calling the <code>get</code> method
-     * with a key that is equal to the original key.
-     *
-     * @param      key     the hashtable key
-     * @param      value   the value
-     * @return     the previous value of the specified key in this hashtable,
-     *             or <code>null</code> if it did not have one
-     * @exception  NullPointerException  if the key or value is
-     *               <code>null</code>
-     * @see     Object#equals(Object)
-     * @see     #get(Object)
-     */
-    public synchronized V put(K key, V value) {
-        // Make sure the value is not null
-        if (value == null) {
-            throw new NullPointerException();
-        }
-
-        // Makes sure the key is not already in the hashtable.
-        Entry tab[] = table;
-        int hash = key.hashCode();
-        int index = (hash & 0x7FFFFFFF) % tab.length;
-        for (Entry<K,V> e = tab[index] ; e != null ; e = e.next) {
-            if ((e.hash == hash) && e.key.equals(key)) {
-                V old = e.value;
-                e.value = value;
-                return old;
-            }
-        }
-
-        modCount++;
-        if (count >= threshold) {
-            // Rehash the table if the threshold is exceeded
-            rehash();
-
-            tab = table;
-            index = (hash & 0x7FFFFFFF) % tab.length;
-        }
-
-        // Creates the new entry.
-        Entry<K,V> e = tab[index];
-        tab[index] = new Entry<>(hash, key, value, e);
-        count++;
-        return null;
-    }
-
-    /**
-     * Removes the key (and its corresponding value) from this
-     * hashtable. This method does nothing if the key is not in the hashtable.
-     *
-     * @param   key   the key that needs to be removed
-     * @return  the value to which the key had been mapped in this hashtable,
-     *          or <code>null</code> if the key did not have a mapping
-     * @throws  NullPointerException  if the key is <code>null</code>
-     */
-    public synchronized V remove(Object key) {
-        Entry tab[] = table;
-        int hash = key.hashCode();
-        int index = (hash & 0x7FFFFFFF) % tab.length;
-        for (Entry<K,V> e = tab[index], prev = null ; e != null ; prev = e, e = e.next) {
-            if ((e.hash == hash) && e.key.equals(key)) {
-                modCount++;
-                if (prev != null) {
-                    prev.next = e.next;
-                } else {
-                    tab[index] = e.next;
-                }
-                count--;
-                V oldValue = e.value;
-                e.value = null;
-                return oldValue;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Copies all of the mappings from the specified map to this hashtable.
-     * These mappings will replace any mappings that this hashtable had for any
-     * of the keys currently in the specified map.
-     *
-     * @param t mappings to be stored in this map
-     * @throws NullPointerException if the specified map is null
-     * @since 1.2
-     */
-    public synchronized void putAll(Map<? extends K, ? extends V> t) {
-        for (Map.Entry<? extends K, ? extends V> e : t.entrySet())
-            put(e.getKey(), e.getValue());
-    }
-
-    /**
-     * Clears this hashtable so that it contains no keys.
-     */
-    public synchronized void clear() {
-        Entry tab[] = table;
-        modCount++;
-        for (int index = tab.length; --index >= 0; )
-            tab[index] = null;
-        count = 0;
-    }
-
-    /**
-     * Creates a shallow copy of this hashtable. All the structure of the
-     * hashtable itself is copied, but the keys and values are not cloned.
-     * This is a relatively expensive operation.
-     *
-     * @return  a clone of the hashtable
-     */
-    public synchronized Object clone() {
-        try {
-            Hashtable<K,V> t = (Hashtable<K,V>) super.clone();
-            t.table = new Entry[table.length];
-            for (int i = table.length ; i-- > 0 ; ) {
-                t.table[i] = (table[i] != null)
-                    ? (Entry<K,V>) table[i].clone() : null;
-            }
-            t.keySet = null;
-            t.entrySet = null;
-            t.values = null;
-            t.modCount = 0;
-            return t;
-        } catch (CloneNotSupportedException e) {
-            // this shouldn't happen, since we are Cloneable
-            throw new InternalError();
-        }
-    }
-
-    /**
-     * Returns a string representation of this <tt>Hashtable</tt> object
-     * in the form of a set of entries, enclosed in braces and separated
-     * by the ASCII characters "<tt>,&nbsp;</tt>" (comma and space). Each
-     * entry is rendered as the key, an equals sign <tt>=</tt>, and the
-     * associated element, where the <tt>toString</tt> method is used to
-     * convert the key and element to strings.
-     *
-     * @return  a string representation of this hashtable
-     */
-    public synchronized String toString() {
-        int max = size() - 1;
-        if (max == -1)
-            return "{}";
-
-        StringBuilder sb = new StringBuilder();
-        Iterator<Map.Entry<K,V>> it = entrySet().iterator();
-
-        sb.append('{');
-        for (int i = 0; ; i++) {
-            Map.Entry<K,V> e = it.next();
-            K key = e.getKey();
-            V value = e.getValue();
-            sb.append(key   == this ? "(this Map)" : key.toString());
-            sb.append('=');
-            sb.append(value == this ? "(this Map)" : value.toString());
-
-            if (i == max)
-                return sb.append('}').toString();
-            sb.append(", ");
-        }
-    }
-
-
-    private <T> Enumeration<T> getEnumeration(int type) {
-        if (count == 0) {
-            return Collections.emptyEnumeration();
-        } else {
-            return new Enumerator<>(type, false);
-        }
-    }
-
-    private <T> Iterator<T> getIterator(int type) {
-        if (count == 0) {
-            return Collections.emptyIterator();
-        } else {
-            return new Enumerator<>(type, true);
-        }
-    }
-
-    // Views
-
-    /**
-     * Each of these fields are initialized to contain an instance of the
-     * appropriate view the first time this view is requested.  The views are
-     * stateless, so there's no reason to create more than one of each.
-     */
-    private transient volatile Set<K> keySet = null;
-    private transient volatile Set<Map.Entry<K,V>> entrySet = null;
-    private transient volatile Collection<V> values = null;
-
-    /**
-     * Returns a {@link Set} view of the keys contained in this map.
-     * The set is backed by the map, so changes to the map are
-     * reflected in the set, and vice-versa.  If the map is modified
-     * while an iteration over the set is in progress (except through
-     * the iterator's own <tt>remove</tt> operation), the results of
-     * the iteration are undefined.  The set supports element removal,
-     * which removes the corresponding mapping from the map, via the
-     * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
-     * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
-     * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
-     * operations.
-     *
-     * @since 1.2
-     */
-    public Set<K> keySet() {
-        if (keySet == null)
-            keySet = Collections.synchronizedSet(new KeySet(), this);
-        return keySet;
-    }
-
-    private class KeySet extends AbstractSet<K> {
-        public Iterator<K> iterator() {
-            return getIterator(KEYS);
-        }
-        public int size() {
-            return count;
-        }
-        public boolean contains(Object o) {
-            return containsKey(o);
-        }
-        public boolean remove(Object o) {
-            return Hashtable.this.remove(o) != null;
-        }
-        public void clear() {
-            Hashtable.this.clear();
-        }
-    }
-
-    /**
-     * Returns a {@link Set} view of the mappings contained in this map.
-     * The set is backed by the map, so changes to the map are
-     * reflected in the set, and vice-versa.  If the map is modified
-     * while an iteration over the set is in progress (except through
-     * the iterator's own <tt>remove</tt> operation, or through the
-     * <tt>setValue</tt> operation on a map entry returned by the
-     * iterator) the results of the iteration are undefined.  The set
-     * supports element removal, which removes the corresponding
-     * mapping from the map, via the <tt>Iterator.remove</tt>,
-     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
-     * <tt>clear</tt> operations.  It does not support the
-     * <tt>add</tt> or <tt>addAll</tt> operations.
-     *
-     * @since 1.2
-     */
-    public Set<Map.Entry<K,V>> entrySet() {
-        if (entrySet==null)
-            entrySet = Collections.synchronizedSet(new EntrySet(), this);
-        return entrySet;
-    }
-
-    private class EntrySet extends AbstractSet<Map.Entry<K,V>> {
-        public Iterator<Map.Entry<K,V>> iterator() {
-            return getIterator(ENTRIES);
-        }
-
-        public boolean add(Map.Entry<K,V> o) {
-            return super.add(o);
-        }
-
-        public boolean contains(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry entry = (Map.Entry)o;
-            Object key = entry.getKey();
-            Entry[] tab = table;
-            int hash = key.hashCode();
-            int index = (hash & 0x7FFFFFFF) % tab.length;
-
-            for (Entry e = tab[index]; e != null; e = e.next)
-                if (e.hash==hash && e.equals(entry))
-                    return true;
-            return false;
-        }
-
-        public boolean remove(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry<K,V> entry = (Map.Entry<K,V>) o;
-            K key = entry.getKey();
-            Entry[] tab = table;
-            int hash = key.hashCode();
-            int index = (hash & 0x7FFFFFFF) % tab.length;
-
-            for (Entry<K,V> e = tab[index], prev = null; e != null;
-                 prev = e, e = e.next) {
-                if (e.hash==hash && e.equals(entry)) {
-                    modCount++;
-                    if (prev != null)
-                        prev.next = e.next;
-                    else
-                        tab[index] = e.next;
-
-                    count--;
-                    e.value = null;
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public int size() {
-            return count;
-        }
-
-        public void clear() {
-            Hashtable.this.clear();
-        }
-    }
-
-    /**
-     * Returns a {@link Collection} view of the values contained in this map.
-     * The collection is backed by the map, so changes to the map are
-     * reflected in the collection, and vice-versa.  If the map is
-     * modified while an iteration over the collection is in progress
-     * (except through the iterator's own <tt>remove</tt> operation),
-     * the results of the iteration are undefined.  The collection
-     * supports element removal, which removes the corresponding
-     * mapping from the map, via the <tt>Iterator.remove</tt>,
-     * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
-     * <tt>retainAll</tt> and <tt>clear</tt> operations.  It does not
-     * support the <tt>add</tt> or <tt>addAll</tt> operations.
-     *
-     * @since 1.2
-     */
-    public Collection<V> values() {
-        if (values==null)
-            values = Collections.synchronizedCollection(new ValueCollection(),
-                                                        this);
-        return values;
-    }
-
-    private class ValueCollection extends AbstractCollection<V> {
-        public Iterator<V> iterator() {
-            return getIterator(VALUES);
-        }
-        public int size() {
-            return count;
-        }
-        public boolean contains(Object o) {
-            return containsValue(o);
-        }
-        public void clear() {
-            Hashtable.this.clear();
-        }
-    }
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified Object with this Map for equality,
-     * as per the definition in the Map interface.
-     *
-     * @param  o object to be compared for equality with this hashtable
-     * @return true if the specified Object is equal to this Map
-     * @see Map#equals(Object)
-     * @since 1.2
-     */
-    public synchronized boolean equals(Object o) {
-        if (o == this)
-            return true;
-
-        if (!(o instanceof Map))
-            return false;
-        Map<K,V> t = (Map<K,V>) o;
-        if (t.size() != size())
-            return false;
-
-        try {
-            Iterator<Map.Entry<K,V>> i = entrySet().iterator();
-            while (i.hasNext()) {
-                Map.Entry<K,V> e = i.next();
-                K key = e.getKey();
-                V value = e.getValue();
-                if (value == null) {
-                    if (!(t.get(key)==null && t.containsKey(key)))
-                        return false;
-                } else {
-                    if (!value.equals(t.get(key)))
-                        return false;
-                }
-            }
-        } catch (ClassCastException unused)   {
-            return false;
-        } catch (NullPointerException unused) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the hash code value for this Map as per the definition in the
-     * Map interface.
-     *
-     * @see Map#hashCode()
-     * @since 1.2
-     */
-    public synchronized int hashCode() {
-        /*
-         * This code detects the recursion caused by computing the hash code
-         * of a self-referential hash table and prevents the stack overflow
-         * that would otherwise result.  This allows certain 1.1-era
-         * applets with self-referential hash tables to work.  This code
-         * abuses the loadFactor field to do double-duty as a hashCode
-         * in progress flag, so as not to worsen the space performance.
-         * A negative load factor indicates that hash code computation is
-         * in progress.
-         */
-        int h = 0;
-        if (count == 0 || loadFactor < 0)
-            return h;  // Returns zero
-
-        loadFactor = -loadFactor;  // Mark hashCode computation in progress
-        Entry[] tab = table;
-        for (int i = 0; i < tab.length; i++)
-            for (Entry e = tab[i]; e != null; e = e.next)
-                h += e.key.hashCode() ^ e.value.hashCode();
-        loadFactor = -loadFactor;  // Mark hashCode computation complete
-
-        return h;
-    }
-
-    /**
-     * Hashtable collision list.
-     */
-    private static class Entry<K,V> implements Map.Entry<K,V> {
-        int hash;
-        K key;
-        V value;
-        Entry<K,V> next;
-
-        protected Entry(int hash, K key, V value, Entry<K,V> next) {
-            this.hash = hash;
-            this.key = key;
-            this.value = value;
-            this.next = next;
-        }
-
-        protected Object clone() {
-            return new Entry<>(hash, key, value,
-                                  (next==null ? null : (Entry<K,V>) next.clone()));
-        }
-
-        // Map.Entry Ops
-
-        public K getKey() {
-            return key;
-        }
-
-        public V getValue() {
-            return value;
-        }
-
-        public V setValue(V value) {
-            if (value == null)
-                throw new NullPointerException();
-
-            V oldValue = this.value;
-            this.value = value;
-            return oldValue;
-        }
-
-        public boolean equals(Object o) {
-            if (!(o instanceof Map.Entry))
-                return false;
-            Map.Entry e = (Map.Entry)o;
-
-            return (key==null ? e.getKey()==null : key.equals(e.getKey())) &&
-               (value==null ? e.getValue()==null : value.equals(e.getValue()));
-        }
-
-        public int hashCode() {
-            return hash ^ (value==null ? 0 : value.hashCode());
-        }
-
-        public String toString() {
-            return key.toString()+"="+value.toString();
-        }
-    }
-
-    // Types of Enumerations/Iterations
-    private static final int KEYS = 0;
-    private static final int VALUES = 1;
-    private static final int ENTRIES = 2;
-
-    /**
-     * A hashtable enumerator class.  This class implements both the
-     * Enumeration and Iterator interfaces, but individual instances
-     * can be created with the Iterator methods disabled.  This is necessary
-     * to avoid unintentionally increasing the capabilities granted a user
-     * by passing an Enumeration.
-     */
-    private class Enumerator<T> implements Enumeration<T>, Iterator<T> {
-        Entry[] table = Hashtable.this.table;
-        int index = table.length;
-        Entry<K,V> entry = null;
-        Entry<K,V> lastReturned = null;
-        int type;
-
-        /**
-         * Indicates whether this Enumerator is serving as an Iterator
-         * or an Enumeration.  (true -> Iterator).
-         */
-        boolean iterator;
-
-        /**
-         * The modCount value that the iterator believes that the backing
-         * Hashtable should have.  If this expectation is violated, the iterator
-         * has detected concurrent modification.
-         */
-        protected int expectedModCount = modCount;
-
-        Enumerator(int type, boolean iterator) {
-            this.type = type;
-            this.iterator = iterator;
-        }
-
-        public boolean hasMoreElements() {
-            Entry<K,V> e = entry;
-            int i = index;
-            Entry[] t = table;
-            /* Use locals for faster loop iteration */
-            while (e == null && i > 0) {
-                e = t[--i];
-            }
-            entry = e;
-            index = i;
-            return e != null;
-        }
-
-        public T nextElement() {
-            Entry<K,V> et = entry;
-            int i = index;
-            Entry[] t = table;
-            /* Use locals for faster loop iteration */
-            while (et == null && i > 0) {
-                et = t[--i];
-            }
-            entry = et;
-            index = i;
-            if (et != null) {
-                Entry<K,V> e = lastReturned = entry;
-                entry = e.next;
-                return type == KEYS ? (T)e.key : (type == VALUES ? (T)e.value : (T)e);
-            }
-            throw new NoSuchElementException("Hashtable Enumerator");
-        }
-
-        // Iterator methods
-        public boolean hasNext() {
-            return hasMoreElements();
-        }
-
-        public T next() {
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-            return nextElement();
-        }
-
-        public void remove() {
-            if (!iterator)
-                throw new UnsupportedOperationException();
-            if (lastReturned == null)
-                throw new IllegalStateException("Hashtable Enumerator");
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-
-            synchronized(Hashtable.this) {
-                Entry[] tab = Hashtable.this.table;
-                int index = (lastReturned.hash & 0x7FFFFFFF) % tab.length;
-
-                for (Entry<K,V> e = tab[index], prev = null; e != null;
-                     prev = e, e = e.next) {
-                    if (e == lastReturned) {
-                        modCount++;
-                        expectedModCount++;
-                        if (prev == null)
-                            tab[index] = e.next;
-                        else
-                            prev.next = e.next;
-                        count--;
-                        lastReturned = null;
-                        return;
-                    }
-                }
-                throw new ConcurrentModificationException();
-            }
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Iterator.java
--- a/emul/compact/src/main/java/java/util/Iterator.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * An iterator over a collection.  {@code Iterator} takes the place of
- * {@link Enumeration} in the Java Collections Framework.  Iterators
- * differ from enumerations in two ways:
- *
- * <ul>
- *      <li> Iterators allow the caller to remove elements from the
- *           underlying collection during the iteration with well-defined
- *           semantics.
- *      <li> Method names have been improved.
- * </ul>
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <E> the type of elements returned by this iterator
- *
- * @author  Josh Bloch
- * @see Collection
- * @see ListIterator
- * @see Iterable
- * @since 1.2
- */
-public interface Iterator<E> {
-    /**
-     * Returns {@code true} if the iteration has more elements.
-     * (In other words, returns {@code true} if {@link #next} would
-     * return an element rather than throwing an exception.)
-     *
-     * @return {@code true} if the iteration has more elements
-     */
-    boolean hasNext();
-
-    /**
-     * Returns the next element in the iteration.
-     *
-     * @return the next element in the iteration
-     * @throws NoSuchElementException if the iteration has no more elements
-     */
-    E next();
-
-    /**
-     * Removes from the underlying collection the last element returned
-     * by this iterator (optional operation).  This method can be called
-     * only once per call to {@link #next}.  The behavior of an iterator
-     * is unspecified if the underlying collection is modified while the
-     * iteration is in progress in any way other than by calling this
-     * method.
-     *
-     * @throws UnsupportedOperationException if the {@code remove}
-     *         operation is not supported by this iterator
-     *
-     * @throws IllegalStateException if the {@code next} method has not
-     *         yet been called, or the {@code remove} method has already
-     *         been called after the last call to the {@code next}
-     *         method
-     */
-    void remove();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/LinkedHashMap.java
--- a/emul/compact/src/main/java/java/util/LinkedHashMap.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,491 +0,0 @@
-/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-import java.io.*;
-
-/**
- * <p>Hash table and linked list implementation of the <tt>Map</tt> interface,
- * with predictable iteration order.  This implementation differs from
- * <tt>HashMap</tt> in that it maintains a doubly-linked list running through
- * all of its entries.  This linked list defines the iteration ordering,
- * which is normally the order in which keys were inserted into the map
- * (<i>insertion-order</i>).  Note that insertion order is not affected
- * if a key is <i>re-inserted</i> into the map.  (A key <tt>k</tt> is
- * reinserted into a map <tt>m</tt> if <tt>m.put(k, v)</tt> is invoked when
- * <tt>m.containsKey(k)</tt> would return <tt>true</tt> immediately prior to
- * the invocation.)
- *
- * <p>This implementation spares its clients from the unspecified, generally
- * chaotic ordering provided by {@link HashMap} (and {@link Hashtable}),
- * without incurring the increased cost associated with {@link TreeMap}.  It
- * can be used to produce a copy of a map that has the same order as the
- * original, regardless of the original map's implementation:
- * <pre>
- *     void foo(Map m) {
- *         Map copy = new LinkedHashMap(m);
- *         ...
- *     }
- * </pre>
- * This technique is particularly useful if a module takes a map on input,
- * copies it, and later returns results whose order is determined by that of
- * the copy.  (Clients generally appreciate having things returned in the same
- * order they were presented.)
- *
- * <p>A special {@link #LinkedHashMap(int,float,boolean) constructor} is
- * provided to create a linked hash map whose order of iteration is the order
- * in which its entries were last accessed, from least-recently accessed to
- * most-recently (<i>access-order</i>).  This kind of map is well-suited to
- * building LRU caches.  Invoking the <tt>put</tt> or <tt>get</tt> method
- * results in an access to the corresponding entry (assuming it exists after
- * the invocation completes).  The <tt>putAll</tt> method generates one entry
- * access for each mapping in the specified map, in the order that key-value
- * mappings are provided by the specified map's entry set iterator.  <i>No
- * other methods generate entry accesses.</i> In particular, operations on
- * collection-views do <i>not</i> affect the order of iteration of the backing
- * map.
- *
- * <p>The {@link #removeEldestEntry(Map.Entry)} method may be overridden to
- * impose a policy for removing stale mappings automatically when new mappings
- * are added to the map.
- *
- * <p>This class provides all of the optional <tt>Map</tt> operations, and
- * permits null elements.  Like <tt>HashMap</tt>, it provides constant-time
- * performance for the basic operations (<tt>add</tt>, <tt>contains</tt> and
- * <tt>remove</tt>), assuming the hash function disperses elements
- * properly among the buckets.  Performance is likely to be just slightly
- * below that of <tt>HashMap</tt>, due to the added expense of maintaining the
- * linked list, with one exception: Iteration over the collection-views
- * of a <tt>LinkedHashMap</tt> requires time proportional to the <i>size</i>
- * of the map, regardless of its capacity.  Iteration over a <tt>HashMap</tt>
- * is likely to be more expensive, requiring time proportional to its
- * <i>capacity</i>.
- *
- * <p>A linked hash map has two parameters that affect its performance:
- * <i>initial capacity</i> and <i>load factor</i>.  They are defined precisely
- * as for <tt>HashMap</tt>.  Note, however, that the penalty for choosing an
- * excessively high value for initial capacity is less severe for this class
- * than for <tt>HashMap</tt>, as iteration times for this class are unaffected
- * by capacity.
- *
- * <p><strong>Note that this implementation is not synchronized.</strong>
- * If multiple threads access a linked hash map concurrently, and at least
- * one of the threads modifies the map structurally, it <em>must</em> be
- * synchronized externally.  This is typically accomplished by
- * synchronizing on some object that naturally encapsulates the map.
- *
- * If no such object exists, the map should be "wrapped" using the
- * {@link Collections#synchronizedMap Collections.synchronizedMap}
- * method.  This is best done at creation time, to prevent accidental
- * unsynchronized access to the map:<pre>
- *   Map m = Collections.synchronizedMap(new LinkedHashMap(...));</pre>
- *
- * A structural modification is any operation that adds or deletes one or more
- * mappings or, in the case of access-ordered linked hash maps, affects
- * iteration order.  In insertion-ordered linked hash maps, merely changing
- * the value associated with a key that is already contained in the map is not
- * a structural modification.  <strong>In access-ordered linked hash maps,
- * merely querying the map with <tt>get</tt> is a structural
- * modification.</strong>)
- *
- * <p>The iterators returned by the <tt>iterator</tt> method of the collections
- * returned by all of this class's collection view methods are
- * <em>fail-fast</em>: if the map is structurally modified at any time after
- * the iterator is created, in any way except through the iterator's own
- * <tt>remove</tt> method, the iterator will throw a {@link
- * ConcurrentModificationException}.  Thus, in the face of concurrent
- * modification, the iterator fails quickly and cleanly, rather than risking
- * arbitrary, non-deterministic behavior at an undetermined time in the future.
- *
- * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
- * as it is, generally speaking, impossible to make any hard guarantees in the
- * presence of unsynchronized concurrent modification.  Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness:   <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i>
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- *
- * @author  Josh Bloch
- * @see     Object#hashCode()
- * @see     Collection
- * @see     Map
- * @see     HashMap
- * @see     TreeMap
- * @see     Hashtable
- * @since   1.4
- */
-
-public class LinkedHashMap<K,V>
-    extends HashMap<K,V>
-    implements Map<K,V>
-{
-
-    private static final long serialVersionUID = 3801124242820219131L;
-
-    /**
-     * The head of the doubly linked list.
-     */
-    private transient Entry<K,V> header;
-
-    /**
-     * The iteration ordering method for this linked hash map: <tt>true</tt>
-     * for access-order, <tt>false</tt> for insertion-order.
-     *
-     * @serial
-     */
-    private final boolean accessOrder;
-
-    /**
-     * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
-     * with the specified initial capacity and load factor.
-     *
-     * @param  initialCapacity the initial capacity
-     * @param  loadFactor      the load factor
-     * @throws IllegalArgumentException if the initial capacity is negative
-     *         or the load factor is nonpositive
-     */
-    public LinkedHashMap(int initialCapacity, float loadFactor) {
-        super(initialCapacity, loadFactor);
-        accessOrder = false;
-    }
-
-    /**
-     * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
-     * with the specified initial capacity and a default load factor (0.75).
-     *
-     * @param  initialCapacity the initial capacity
-     * @throws IllegalArgumentException if the initial capacity is negative
-     */
-    public LinkedHashMap(int initialCapacity) {
-        super(initialCapacity);
-        accessOrder = false;
-    }
-
-    /**
-     * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
-     * with the default initial capacity (16) and load factor (0.75).
-     */
-    public LinkedHashMap() {
-        super();
-        accessOrder = false;
-    }
-
-    /**
-     * Constructs an insertion-ordered <tt>LinkedHashMap</tt> instance with
-     * the same mappings as the specified map.  The <tt>LinkedHashMap</tt>
-     * instance is created with a default load factor (0.75) and an initial
-     * capacity sufficient to hold the mappings in the specified map.
-     *
-     * @param  m the map whose mappings are to be placed in this map
-     * @throws NullPointerException if the specified map is null
-     */
-    public LinkedHashMap(Map<? extends K, ? extends V> m) {
-        super(m);
-        accessOrder = false;
-    }
-
-    /**
-     * Constructs an empty <tt>LinkedHashMap</tt> instance with the
-     * specified initial capacity, load factor and ordering mode.
-     *
-     * @param  initialCapacity the initial capacity
-     * @param  loadFactor      the load factor
-     * @param  accessOrder     the ordering mode - <tt>true</tt> for
-     *         access-order, <tt>false</tt> for insertion-order
-     * @throws IllegalArgumentException if the initial capacity is negative
-     *         or the load factor is nonpositive
-     */
-    public LinkedHashMap(int initialCapacity,
-                         float loadFactor,
-                         boolean accessOrder) {
-        super(initialCapacity, loadFactor);
-        this.accessOrder = accessOrder;
-    }
-
-    /**
-     * Called by superclass constructors and pseudoconstructors (clone,
-     * readObject) before any entries are inserted into the map.  Initializes
-     * the chain.
-     */
-    void init() {
-        header = new Entry<>(-1, null, null, null);
-        header.before = header.after = header;
-    }
-
-    /**
-     * Transfers all entries to new table array.  This method is called
-     * by superclass resize.  It is overridden for performance, as it is
-     * faster to iterate using our linked list.
-     */
-    void transfer(HashMap.Entry[] newTable) {
-        int newCapacity = newTable.length;
-        for (Entry<K,V> e = header.after; e != header; e = e.after) {
-            int index = indexFor(e.hash, newCapacity);
-            e.next = newTable[index];
-            newTable[index] = e;
-        }
-    }
-
-
-    /**
-     * Returns <tt>true</tt> if this map maps one or more keys to the
-     * specified value.
-     *
-     * @param value value whose presence in this map is to be tested
-     * @return <tt>true</tt> if this map maps one or more keys to the
-     *         specified value
-     */
-    public boolean containsValue(Object value) {
-        // Overridden to take advantage of faster iterator
-        if (value==null) {
-            for (Entry e = header.after; e != header; e = e.after)
-                if (e.value==null)
-                    return true;
-        } else {
-            for (Entry e = header.after; e != header; e = e.after)
-                if (value.equals(e.value))
-                    return true;
-        }
-        return false;
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped,
-     * or {@code null} if this map contains no mapping for the key.
-     *
-     * <p>More formally, if this map contains a mapping from a key
-     * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
-     * key.equals(k))}, then this method returns {@code v}; otherwise
-     * it returns {@code null}.  (There can be at most one such mapping.)
-     *
-     * <p>A return value of {@code null} does not <i>necessarily</i>
-     * indicate that the map contains no mapping for the key; it's also
-     * possible that the map explicitly maps the key to {@code null}.
-     * The {@link #containsKey containsKey} operation may be used to
-     * distinguish these two cases.
-     */
-    public V get(Object key) {
-        Entry<K,V> e = (Entry<K,V>)getEntry(key);
-        if (e == null)
-            return null;
-        e.recordAccess(this);
-        return e.value;
-    }
-
-    /**
-     * Removes all of the mappings from this map.
-     * The map will be empty after this call returns.
-     */
-    public void clear() {
-        super.clear();
-        header.before = header.after = header;
-    }
-
-    /**
-     * LinkedHashMap entry.
-     */
-    private static class Entry<K,V> extends HashMap.Entry<K,V> {
-        // These fields comprise the doubly linked list used for iteration.
-        Entry<K,V> before, after;
-
-        Entry(int hash, K key, V value, HashMap.Entry<K,V> next) {
-            super(hash, key, value, next);
-        }
-
-        /**
-         * Removes this entry from the linked list.
-         */
-        private void remove() {
-            before.after = after;
-            after.before = before;
-        }
-
-        /**
-         * Inserts this entry before the specified existing entry in the list.
-         */
-        private void addBefore(Entry<K,V> existingEntry) {
-            after  = existingEntry;
-            before = existingEntry.before;
-            before.after = this;
-            after.before = this;
-        }
-
-        /**
-         * This method is invoked by the superclass whenever the value
-         * of a pre-existing entry is read by Map.get or modified by Map.set.
-         * If the enclosing Map is access-ordered, it moves the entry
-         * to the end of the list; otherwise, it does nothing.
-         */
-        void recordAccess(HashMap<K,V> m) {
-            LinkedHashMap<K,V> lm = (LinkedHashMap<K,V>)m;
-            if (lm.accessOrder) {
-                lm.modCount++;
-                remove();
-                addBefore(lm.header);
-            }
-        }
-
-        void recordRemoval(HashMap<K,V> m) {
-            remove();
-        }
-    }
-
-    private abstract class LinkedHashIterator<T> implements Iterator<T> {
-        Entry<K,V> nextEntry    = header.after;
-        Entry<K,V> lastReturned = null;
-
-        /**
-         * The modCount value that the iterator believes that the backing
-         * List should have.  If this expectation is violated, the iterator
-         * has detected concurrent modification.
-         */
-        int expectedModCount = modCount;
-
-        public boolean hasNext() {
-            return nextEntry != header;
-        }
-
-        public void remove() {
-            if (lastReturned == null)
-                throw new IllegalStateException();
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-
-            LinkedHashMap.this.remove(lastReturned.key);
-            lastReturned = null;
-            expectedModCount = modCount;
-        }
-
-        Entry<K,V> nextEntry() {
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-            if (nextEntry == header)
-                throw new NoSuchElementException();
-
-            Entry<K,V> e = lastReturned = nextEntry;
-            nextEntry = e.after;
-            return e;
-        }
-    }
-
-    private class KeyIterator extends LinkedHashIterator<K> {
-        public K next() { return nextEntry().getKey(); }
-    }
-
-    private class ValueIterator extends LinkedHashIterator<V> {
-        public V next() { return nextEntry().value; }
-    }
-
-    private class EntryIterator extends LinkedHashIterator<Map.Entry<K,V>> {
-        public Map.Entry<K,V> next() { return nextEntry(); }
-    }
-
-    // These Overrides alter the behavior of superclass view iterator() methods
-    Iterator<K> newKeyIterator()   { return new KeyIterator();   }
-    Iterator<V> newValueIterator() { return new ValueIterator(); }
-    Iterator<Map.Entry<K,V>> newEntryIterator() { return new EntryIterator(); }
-
-    /**
-     * This override alters behavior of superclass put method. It causes newly
-     * allocated entry to get inserted at the end of the linked list and
-     * removes the eldest entry if appropriate.
-     */
-    void addEntry(int hash, K key, V value, int bucketIndex) {
-        createEntry(hash, key, value, bucketIndex);
-
-        // Remove eldest entry if instructed, else grow capacity if appropriate
-        Entry<K,V> eldest = header.after;
-        if (removeEldestEntry(eldest)) {
-            removeEntryForKey(eldest.key);
-        } else {
-            if (size >= threshold)
-                resize(2 * table.length);
-        }
-    }
-
-    /**
-     * This override differs from addEntry in that it doesn't resize the
-     * table or remove the eldest entry.
-     */
-    void createEntry(int hash, K key, V value, int bucketIndex) {
-        HashMap.Entry<K,V> old = table[bucketIndex];
-        Entry<K,V> e = new Entry<>(hash, key, value, old);
-        table[bucketIndex] = e;
-        e.addBefore(header);
-        size++;
-    }
-
-    /**
-     * Returns <tt>true</tt> if this map should remove its eldest entry.
-     * This method is invoked by <tt>put</tt> and <tt>putAll</tt> after
-     * inserting a new entry into the map.  It provides the implementor
-     * with the opportunity to remove the eldest entry each time a new one
-     * is added.  This is useful if the map represents a cache: it allows
-     * the map to reduce memory consumption by deleting stale entries.
-     *
-     * <p>Sample use: this override will allow the map to grow up to 100
-     * entries and then delete the eldest entry each time a new entry is
-     * added, maintaining a steady state of 100 entries.
-     * <pre>
-     *     private static final int MAX_ENTRIES = 100;
-     *
-     *     protected boolean removeEldestEntry(Map.Entry eldest) {
-     *        return size() > MAX_ENTRIES;
-     *     }
-     * </pre>
-     *
-     * <p>This method typically does not modify the map in any way,
-     * instead allowing the map to modify itself as directed by its
-     * return value.  It <i>is</i> permitted for this method to modify
-     * the map directly, but if it does so, it <i>must</i> return
-     * <tt>false</tt> (indicating that the map should not attempt any
-     * further modification).  The effects of returning <tt>true</tt>
-     * after modifying the map from within this method are unspecified.
-     *
-     * <p>This implementation merely returns <tt>false</tt> (so that this
-     * map acts like a normal map - the eldest element is never removed).
-     *
-     * @param    eldest The least recently inserted entry in the map, or if
-     *           this is an access-ordered map, the least recently accessed
-     *           entry.  This is the entry that will be removed it this
-     *           method returns <tt>true</tt>.  If the map was empty prior
-     *           to the <tt>put</tt> or <tt>putAll</tt> invocation resulting
-     *           in this invocation, this will be the entry that was just
-     *           inserted; in other words, if the map contains a single
-     *           entry, the eldest entry is also the newest.
-     * @return   <tt>true</tt> if the eldest entry should be removed
-     *           from the map; <tt>false</tt> if it should be retained.
-     */
-    protected boolean removeEldestEntry(Map.Entry<K,V> eldest) {
-        return false;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/LinkedList.java
--- a/emul/compact/src/main/java/java/util/LinkedList.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1100 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * Doubly-linked list implementation of the {@code List} and {@code Deque}
- * interfaces.  Implements all optional list operations, and permits all
- * elements (including {@code null}).
- *
- * <p>All of the operations perform as could be expected for a doubly-linked
- * list.  Operations that index into the list will traverse the list from
- * the beginning or the end, whichever is closer to the specified index.
- *
- * <p><strong>Note that this implementation is not synchronized.</strong>
- * If multiple threads access a linked list concurrently, and at least
- * one of the threads modifies the list structurally, it <i>must</i> be
- * synchronized externally.  (A structural modification is any operation
- * that adds or deletes one or more elements; merely setting the value of
- * an element is not a structural modification.)  This is typically
- * accomplished by synchronizing on some object that naturally
- * encapsulates the list.
- *
- * If no such object exists, the list should be "wrapped" using the
- * {@link Collections#synchronizedList Collections.synchronizedList}
- * method.  This is best done at creation time, to prevent accidental
- * unsynchronized access to the list:<pre>
- *   List list = Collections.synchronizedList(new LinkedList(...));</pre>
- *
- * <p>The iterators returned by this class's {@code iterator} and
- * {@code listIterator} methods are <i>fail-fast</i>: if the list is
- * structurally modified at any time after the iterator is created, in
- * any way except through the Iterator's own {@code remove} or
- * {@code add} methods, the iterator will throw a {@link
- * ConcurrentModificationException}.  Thus, in the face of concurrent
- * modification, the iterator fails quickly and cleanly, rather than
- * risking arbitrary, non-deterministic behavior at an undetermined
- * time in the future.
- *
- * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
- * as it is, generally speaking, impossible to make any hard guarantees in the
- * presence of unsynchronized concurrent modification.  Fail-fast iterators
- * throw {@code ConcurrentModificationException} on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness:   <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i>
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch
- * @see     List
- * @see     ArrayList
- * @since 1.2
- * @param <E> the type of elements held in this collection
- */
-
-public class LinkedList<E>
-    extends AbstractSequentialList<E>
-    implements List<E>, Deque<E>, Cloneable, java.io.Serializable
-{
-    transient int size = 0;
-
-    /**
-     * Pointer to first node.
-     * Invariant: (first == null && last == null) ||
-     *            (first.prev == null && first.item != null)
-     */
-    transient Node<E> first;
-
-    /**
-     * Pointer to last node.
-     * Invariant: (first == null && last == null) ||
-     *            (last.next == null && last.item != null)
-     */
-    transient Node<E> last;
-
-    /**
-     * Constructs an empty list.
-     */
-    public LinkedList() {
-    }
-
-    /**
-     * Constructs a list containing the elements of the specified
-     * collection, in the order they are returned by the collection's
-     * iterator.
-     *
-     * @param  c the collection whose elements are to be placed into this list
-     * @throws NullPointerException if the specified collection is null
-     */
-    public LinkedList(Collection<? extends E> c) {
-        this();
-        addAll(c);
-    }
-
-    /**
-     * Links e as first element.
-     */
-    private void linkFirst(E e) {
-        final Node<E> f = first;
-        final Node<E> newNode = new Node<>(null, e, f);
-        first = newNode;
-        if (f == null)
-            last = newNode;
-        else
-            f.prev = newNode;
-        size++;
-        modCount++;
-    }
-
-    /**
-     * Links e as last element.
-     */
-    void linkLast(E e) {
-        final Node<E> l = last;
-        final Node<E> newNode = new Node<>(l, e, null);
-        last = newNode;
-        if (l == null)
-            first = newNode;
-        else
-            l.next = newNode;
-        size++;
-        modCount++;
-    }
-
-    /**
-     * Inserts element e before non-null Node succ.
-     */
-    void linkBefore(E e, Node<E> succ) {
-        // assert succ != null;
-        final Node<E> pred = succ.prev;
-        final Node<E> newNode = new Node<>(pred, e, succ);
-        succ.prev = newNode;
-        if (pred == null)
-            first = newNode;
-        else
-            pred.next = newNode;
-        size++;
-        modCount++;
-    }
-
-    /**
-     * Unlinks non-null first node f.
-     */
-    private E unlinkFirst(Node<E> f) {
-        // assert f == first && f != null;
-        final E element = f.item;
-        final Node<E> next = f.next;
-        f.item = null;
-        f.next = null; // help GC
-        first = next;
-        if (next == null)
-            last = null;
-        else
-            next.prev = null;
-        size--;
-        modCount++;
-        return element;
-    }
-
-    /**
-     * Unlinks non-null last node l.
-     */
-    private E unlinkLast(Node<E> l) {
-        // assert l == last && l != null;
-        final E element = l.item;
-        final Node<E> prev = l.prev;
-        l.item = null;
-        l.prev = null; // help GC
-        last = prev;
-        if (prev == null)
-            first = null;
-        else
-            prev.next = null;
-        size--;
-        modCount++;
-        return element;
-    }
-
-    /**
-     * Unlinks non-null node x.
-     */
-    E unlink(Node<E> x) {
-        // assert x != null;
-        final E element = x.item;
-        final Node<E> next = x.next;
-        final Node<E> prev = x.prev;
-
-        if (prev == null) {
-            first = next;
-        } else {
-            prev.next = next;
-            x.prev = null;
-        }
-
-        if (next == null) {
-            last = prev;
-        } else {
-            next.prev = prev;
-            x.next = null;
-        }
-
-        x.item = null;
-        size--;
-        modCount++;
-        return element;
-    }
-
-    /**
-     * Returns the first element in this list.
-     *
-     * @return the first element in this list
-     * @throws NoSuchElementException if this list is empty
-     */
-    public E getFirst() {
-        final Node<E> f = first;
-        if (f == null)
-            throw new NoSuchElementException();
-        return f.item;
-    }
-
-    /**
-     * Returns the last element in this list.
-     *
-     * @return the last element in this list
-     * @throws NoSuchElementException if this list is empty
-     */
-    public E getLast() {
-        final Node<E> l = last;
-        if (l == null)
-            throw new NoSuchElementException();
-        return l.item;
-    }
-
-    /**
-     * Removes and returns the first element from this list.
-     *
-     * @return the first element from this list
-     * @throws NoSuchElementException if this list is empty
-     */
-    public E removeFirst() {
-        final Node<E> f = first;
-        if (f == null)
-            throw new NoSuchElementException();
-        return unlinkFirst(f);
-    }
-
-    /**
-     * Removes and returns the last element from this list.
-     *
-     * @return the last element from this list
-     * @throws NoSuchElementException if this list is empty
-     */
-    public E removeLast() {
-        final Node<E> l = last;
-        if (l == null)
-            throw new NoSuchElementException();
-        return unlinkLast(l);
-    }
-
-    /**
-     * Inserts the specified element at the beginning of this list.
-     *
-     * @param e the element to add
-     */
-    public void addFirst(E e) {
-        linkFirst(e);
-    }
-
-    /**
-     * Appends the specified element to the end of this list.
-     *
-     * <p>This method is equivalent to {@link #add}.
-     *
-     * @param e the element to add
-     */
-    public void addLast(E e) {
-        linkLast(e);
-    }
-
-    /**
-     * Returns {@code true} if this list contains the specified element.
-     * More formally, returns {@code true} if and only if this list contains
-     * at least one element {@code e} such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
-     *
-     * @param o element whose presence in this list is to be tested
-     * @return {@code true} if this list contains the specified element
-     */
-    public boolean contains(Object o) {
-        return indexOf(o) != -1;
-    }
-
-    /**
-     * Returns the number of elements in this list.
-     *
-     * @return the number of elements in this list
-     */
-    public int size() {
-        return size;
-    }
-
-    /**
-     * Appends the specified element to the end of this list.
-     *
-     * <p>This method is equivalent to {@link #addLast}.
-     *
-     * @param e element to be appended to this list
-     * @return {@code true} (as specified by {@link Collection#add})
-     */
-    public boolean add(E e) {
-        linkLast(e);
-        return true;
-    }
-
-    /**
-     * Removes the first occurrence of the specified element from this list,
-     * if it is present.  If this list does not contain the element, it is
-     * unchanged.  More formally, removes the element with the lowest index
-     * {@code i} such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>
-     * (if such an element exists).  Returns {@code true} if this list
-     * contained the specified element (or equivalently, if this list
-     * changed as a result of the call).
-     *
-     * @param o element to be removed from this list, if present
-     * @return {@code true} if this list contained the specified element
-     */
-    public boolean remove(Object o) {
-        if (o == null) {
-            for (Node<E> x = first; x != null; x = x.next) {
-                if (x.item == null) {
-                    unlink(x);
-                    return true;
-                }
-            }
-        } else {
-            for (Node<E> x = first; x != null; x = x.next) {
-                if (o.equals(x.item)) {
-                    unlink(x);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Appends all of the elements in the specified collection to the end of
-     * this list, in the order that they are returned by the specified
-     * collection's iterator.  The behavior of this operation is undefined if
-     * the specified collection is modified while the operation is in
-     * progress.  (Note that this will occur if the specified collection is
-     * this list, and it's nonempty.)
-     *
-     * @param c collection containing elements to be added to this list
-     * @return {@code true} if this list changed as a result of the call
-     * @throws NullPointerException if the specified collection is null
-     */
-    public boolean addAll(Collection<? extends E> c) {
-        return addAll(size, c);
-    }
-
-    /**
-     * Inserts all of the elements in the specified collection into this
-     * list, starting at the specified position.  Shifts the element
-     * currently at that position (if any) and any subsequent elements to
-     * the right (increases their indices).  The new elements will appear
-     * in the list in the order that they are returned by the
-     * specified collection's iterator.
-     *
-     * @param index index at which to insert the first element
-     *              from the specified collection
-     * @param c collection containing elements to be added to this list
-     * @return {@code true} if this list changed as a result of the call
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @throws NullPointerException if the specified collection is null
-     */
-    public boolean addAll(int index, Collection<? extends E> c) {
-        checkPositionIndex(index);
-
-        Object[] a = c.toArray();
-        int numNew = a.length;
-        if (numNew == 0)
-            return false;
-
-        Node<E> pred, succ;
-        if (index == size) {
-            succ = null;
-            pred = last;
-        } else {
-            succ = node(index);
-            pred = succ.prev;
-        }
-
-        for (Object o : a) {
-            @SuppressWarnings("unchecked") E e = (E) o;
-            Node<E> newNode = new Node<>(pred, e, null);
-            if (pred == null)
-                first = newNode;
-            else
-                pred.next = newNode;
-            pred = newNode;
-        }
-
-        if (succ == null) {
-            last = pred;
-        } else {
-            pred.next = succ;
-            succ.prev = pred;
-        }
-
-        size += numNew;
-        modCount++;
-        return true;
-    }
-
-    /**
-     * Removes all of the elements from this list.
-     * The list will be empty after this call returns.
-     */
-    public void clear() {
-        // Clearing all of the links between nodes is "unnecessary", but:
-        // - helps a generational GC if the discarded nodes inhabit
-        //   more than one generation
-        // - is sure to free memory even if there is a reachable Iterator
-        for (Node<E> x = first; x != null; ) {
-            Node<E> next = x.next;
-            x.item = null;
-            x.next = null;
-            x.prev = null;
-            x = next;
-        }
-        first = last = null;
-        size = 0;
-        modCount++;
-    }
-
-
-    // Positional Access Operations
-
-    /**
-     * Returns the element at the specified position in this list.
-     *
-     * @param index index of the element to return
-     * @return the element at the specified position in this list
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public E get(int index) {
-        checkElementIndex(index);
-        return node(index).item;
-    }
-
-    /**
-     * Replaces the element at the specified position in this list with the
-     * specified element.
-     *
-     * @param index index of the element to replace
-     * @param element element to be stored at the specified position
-     * @return the element previously at the specified position
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public E set(int index, E element) {
-        checkElementIndex(index);
-        Node<E> x = node(index);
-        E oldVal = x.item;
-        x.item = element;
-        return oldVal;
-    }
-
-    /**
-     * Inserts the specified element at the specified position in this list.
-     * Shifts the element currently at that position (if any) and any
-     * subsequent elements to the right (adds one to their indices).
-     *
-     * @param index index at which the specified element is to be inserted
-     * @param element element to be inserted
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public void add(int index, E element) {
-        checkPositionIndex(index);
-
-        if (index == size)
-            linkLast(element);
-        else
-            linkBefore(element, node(index));
-    }
-
-    /**
-     * Removes the element at the specified position in this list.  Shifts any
-     * subsequent elements to the left (subtracts one from their indices).
-     * Returns the element that was removed from the list.
-     *
-     * @param index the index of the element to be removed
-     * @return the element previously at the specified position
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public E remove(int index) {
-        checkElementIndex(index);
-        return unlink(node(index));
-    }
-
-    /**
-     * Tells if the argument is the index of an existing element.
-     */
-    private boolean isElementIndex(int index) {
-        return index >= 0 && index < size;
-    }
-
-    /**
-     * Tells if the argument is the index of a valid position for an
-     * iterator or an add operation.
-     */
-    private boolean isPositionIndex(int index) {
-        return index >= 0 && index <= size;
-    }
-
-    /**
-     * Constructs an IndexOutOfBoundsException detail message.
-     * Of the many possible refactorings of the error handling code,
-     * this "outlining" performs best with both server and client VMs.
-     */
-    private String outOfBoundsMsg(int index) {
-        return "Index: "+index+", Size: "+size;
-    }
-
-    private void checkElementIndex(int index) {
-        if (!isElementIndex(index))
-            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-    }
-
-    private void checkPositionIndex(int index) {
-        if (!isPositionIndex(index))
-            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
-    }
-
-    /**
-     * Returns the (non-null) Node at the specified element index.
-     */
-    Node<E> node(int index) {
-        // assert isElementIndex(index);
-
-        if (index < (size >> 1)) {
-            Node<E> x = first;
-            for (int i = 0; i < index; i++)
-                x = x.next;
-            return x;
-        } else {
-            Node<E> x = last;
-            for (int i = size - 1; i > index; i--)
-                x = x.prev;
-            return x;
-        }
-    }
-
-    // Search Operations
-
-    /**
-     * Returns the index of the first occurrence of the specified element
-     * in this list, or -1 if this list does not contain the element.
-     * More formally, returns the lowest index {@code i} such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-     * or -1 if there is no such index.
-     *
-     * @param o element to search for
-     * @return the index of the first occurrence of the specified element in
-     *         this list, or -1 if this list does not contain the element
-     */
-    public int indexOf(Object o) {
-        int index = 0;
-        if (o == null) {
-            for (Node<E> x = first; x != null; x = x.next) {
-                if (x.item == null)
-                    return index;
-                index++;
-            }
-        } else {
-            for (Node<E> x = first; x != null; x = x.next) {
-                if (o.equals(x.item))
-                    return index;
-                index++;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index of the last occurrence of the specified element
-     * in this list, or -1 if this list does not contain the element.
-     * More formally, returns the highest index {@code i} such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-     * or -1 if there is no such index.
-     *
-     * @param o element to search for
-     * @return the index of the last occurrence of the specified element in
-     *         this list, or -1 if this list does not contain the element
-     */
-    public int lastIndexOf(Object o) {
-        int index = size;
-        if (o == null) {
-            for (Node<E> x = last; x != null; x = x.prev) {
-                index--;
-                if (x.item == null)
-                    return index;
-            }
-        } else {
-            for (Node<E> x = last; x != null; x = x.prev) {
-                index--;
-                if (o.equals(x.item))
-                    return index;
-            }
-        }
-        return -1;
-    }
-
-    // Queue operations.
-
-    /**
-     * Retrieves, but does not remove, the head (first element) of this list.
-     *
-     * @return the head of this list, or {@code null} if this list is empty
-     * @since 1.5
-     */
-    public E peek() {
-        final Node<E> f = first;
-        return (f == null) ? null : f.item;
-    }
-
-    /**
-     * Retrieves, but does not remove, the head (first element) of this list.
-     *
-     * @return the head of this list
-     * @throws NoSuchElementException if this list is empty
-     * @since 1.5
-     */
-    public E element() {
-        return getFirst();
-    }
-
-    /**
-     * Retrieves and removes the head (first element) of this list.
-     *
-     * @return the head of this list, or {@code null} if this list is empty
-     * @since 1.5
-     */
-    public E poll() {
-        final Node<E> f = first;
-        return (f == null) ? null : unlinkFirst(f);
-    }
-
-    /**
-     * Retrieves and removes the head (first element) of this list.
-     *
-     * @return the head of this list
-     * @throws NoSuchElementException if this list is empty
-     * @since 1.5
-     */
-    public E remove() {
-        return removeFirst();
-    }
-
-    /**
-     * Adds the specified element as the tail (last element) of this list.
-     *
-     * @param e the element to add
-     * @return {@code true} (as specified by {@link Queue#offer})
-     * @since 1.5
-     */
-    public boolean offer(E e) {
-        return add(e);
-    }
-
-    // Deque operations
-    /**
-     * Inserts the specified element at the front of this list.
-     *
-     * @param e the element to insert
-     * @return {@code true} (as specified by {@link Deque#offerFirst})
-     * @since 1.6
-     */
-    public boolean offerFirst(E e) {
-        addFirst(e);
-        return true;
-    }
-
-    /**
-     * Inserts the specified element at the end of this list.
-     *
-     * @param e the element to insert
-     * @return {@code true} (as specified by {@link Deque#offerLast})
-     * @since 1.6
-     */
-    public boolean offerLast(E e) {
-        addLast(e);
-        return true;
-    }
-
-    /**
-     * Retrieves, but does not remove, the first element of this list,
-     * or returns {@code null} if this list is empty.
-     *
-     * @return the first element of this list, or {@code null}
-     *         if this list is empty
-     * @since 1.6
-     */
-    public E peekFirst() {
-        final Node<E> f = first;
-        return (f == null) ? null : f.item;
-     }
-
-    /**
-     * Retrieves, but does not remove, the last element of this list,
-     * or returns {@code null} if this list is empty.
-     *
-     * @return the last element of this list, or {@code null}
-     *         if this list is empty
-     * @since 1.6
-     */
-    public E peekLast() {
-        final Node<E> l = last;
-        return (l == null) ? null : l.item;
-    }
-
-    /**
-     * Retrieves and removes the first element of this list,
-     * or returns {@code null} if this list is empty.
-     *
-     * @return the first element of this list, or {@code null} if
-     *     this list is empty
-     * @since 1.6
-     */
-    public E pollFirst() {
-        final Node<E> f = first;
-        return (f == null) ? null : unlinkFirst(f);
-    }
-
-    /**
-     * Retrieves and removes the last element of this list,
-     * or returns {@code null} if this list is empty.
-     *
-     * @return the last element of this list, or {@code null} if
-     *     this list is empty
-     * @since 1.6
-     */
-    public E pollLast() {
-        final Node<E> l = last;
-        return (l == null) ? null : unlinkLast(l);
-    }
-
-    /**
-     * Pushes an element onto the stack represented by this list.  In other
-     * words, inserts the element at the front of this list.
-     *
-     * <p>This method is equivalent to {@link #addFirst}.
-     *
-     * @param e the element to push
-     * @since 1.6
-     */
-    public void push(E e) {
-        addFirst(e);
-    }
-
-    /**
-     * Pops an element from the stack represented by this list.  In other
-     * words, removes and returns the first element of this list.
-     *
-     * <p>This method is equivalent to {@link #removeFirst()}.
-     *
-     * @return the element at the front of this list (which is the top
-     *         of the stack represented by this list)
-     * @throws NoSuchElementException if this list is empty
-     * @since 1.6
-     */
-    public E pop() {
-        return removeFirst();
-    }
-
-    /**
-     * Removes the first occurrence of the specified element in this
-     * list (when traversing the list from head to tail).  If the list
-     * does not contain the element, it is unchanged.
-     *
-     * @param o element to be removed from this list, if present
-     * @return {@code true} if the list contained the specified element
-     * @since 1.6
-     */
-    public boolean removeFirstOccurrence(Object o) {
-        return remove(o);
-    }
-
-    /**
-     * Removes the last occurrence of the specified element in this
-     * list (when traversing the list from head to tail).  If the list
-     * does not contain the element, it is unchanged.
-     *
-     * @param o element to be removed from this list, if present
-     * @return {@code true} if the list contained the specified element
-     * @since 1.6
-     */
-    public boolean removeLastOccurrence(Object o) {
-        if (o == null) {
-            for (Node<E> x = last; x != null; x = x.prev) {
-                if (x.item == null) {
-                    unlink(x);
-                    return true;
-                }
-            }
-        } else {
-            for (Node<E> x = last; x != null; x = x.prev) {
-                if (o.equals(x.item)) {
-                    unlink(x);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a list-iterator of the elements in this list (in proper
-     * sequence), starting at the specified position in the list.
-     * Obeys the general contract of {@code List.listIterator(int)}.<p>
-     *
-     * The list-iterator is <i>fail-fast</i>: if the list is structurally
-     * modified at any time after the Iterator is created, in any way except
-     * through the list-iterator's own {@code remove} or {@code add}
-     * methods, the list-iterator will throw a
-     * {@code ConcurrentModificationException}.  Thus, in the face of
-     * concurrent modification, the iterator fails quickly and cleanly, rather
-     * than risking arbitrary, non-deterministic behavior at an undetermined
-     * time in the future.
-     *
-     * @param index index of the first element to be returned from the
-     *              list-iterator (by a call to {@code next})
-     * @return a ListIterator of the elements in this list (in proper
-     *         sequence), starting at the specified position in the list
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @see List#listIterator(int)
-     */
-    public ListIterator<E> listIterator(int index) {
-        checkPositionIndex(index);
-        return new ListItr(index);
-    }
-
-    private class ListItr implements ListIterator<E> {
-        private Node<E> lastReturned = null;
-        private Node<E> next;
-        private int nextIndex;
-        private int expectedModCount = modCount;
-
-        ListItr(int index) {
-            // assert isPositionIndex(index);
-            next = (index == size) ? null : node(index);
-            nextIndex = index;
-        }
-
-        public boolean hasNext() {
-            return nextIndex < size;
-        }
-
-        public E next() {
-            checkForComodification();
-            if (!hasNext())
-                throw new NoSuchElementException();
-
-            lastReturned = next;
-            next = next.next;
-            nextIndex++;
-            return lastReturned.item;
-        }
-
-        public boolean hasPrevious() {
-            return nextIndex > 0;
-        }
-
-        public E previous() {
-            checkForComodification();
-            if (!hasPrevious())
-                throw new NoSuchElementException();
-
-            lastReturned = next = (next == null) ? last : next.prev;
-            nextIndex--;
-            return lastReturned.item;
-        }
-
-        public int nextIndex() {
-            return nextIndex;
-        }
-
-        public int previousIndex() {
-            return nextIndex - 1;
-        }
-
-        public void remove() {
-            checkForComodification();
-            if (lastReturned == null)
-                throw new IllegalStateException();
-
-            Node<E> lastNext = lastReturned.next;
-            unlink(lastReturned);
-            if (next == lastReturned)
-                next = lastNext;
-            else
-                nextIndex--;
-            lastReturned = null;
-            expectedModCount++;
-        }
-
-        public void set(E e) {
-            if (lastReturned == null)
-                throw new IllegalStateException();
-            checkForComodification();
-            lastReturned.item = e;
-        }
-
-        public void add(E e) {
-            checkForComodification();
-            lastReturned = null;
-            if (next == null)
-                linkLast(e);
-            else
-                linkBefore(e, next);
-            nextIndex++;
-            expectedModCount++;
-        }
-
-        final void checkForComodification() {
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-        }
-    }
-
-    private static class Node<E> {
-        E item;
-        Node<E> next;
-        Node<E> prev;
-
-        Node(Node<E> prev, E element, Node<E> next) {
-            this.item = element;
-            this.next = next;
-            this.prev = prev;
-        }
-    }
-
-    /**
-     * @since 1.6
-     */
-    public Iterator<E> descendingIterator() {
-        return new DescendingIterator();
-    }
-
-    /**
-     * Adapter to provide descending iterators via ListItr.previous
-     */
-    private class DescendingIterator implements Iterator<E> {
-        private final ListItr itr = new ListItr(size());
-        public boolean hasNext() {
-            return itr.hasPrevious();
-        }
-        public E next() {
-            return itr.previous();
-        }
-        public void remove() {
-            itr.remove();
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private LinkedList<E> superClone() {
-        try {
-            return (LinkedList<E>) super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError();
-        }
-    }
-
-    /**
-     * Returns a shallow copy of this {@code LinkedList}. (The elements
-     * themselves are not cloned.)
-     *
-     * @return a shallow copy of this {@code LinkedList} instance
-     */
-    public Object clone() {
-        LinkedList<E> clone = superClone();
-
-        // Put clone into "virgin" state
-        clone.first = clone.last = null;
-        clone.size = 0;
-        clone.modCount = 0;
-
-        // Initialize clone with our elements
-        for (Node<E> x = first; x != null; x = x.next)
-            clone.add(x.item);
-
-        return clone;
-    }
-
-    /**
-     * Returns an array containing all of the elements in this list
-     * in proper sequence (from first to last element).
-     *
-     * <p>The returned array will be "safe" in that no references to it are
-     * maintained by this list.  (In other words, this method must allocate
-     * a new array).  The caller is thus free to modify the returned array.
-     *
-     * <p>This method acts as bridge between array-based and collection-based
-     * APIs.
-     *
-     * @return an array containing all of the elements in this list
-     *         in proper sequence
-     */
-    public Object[] toArray() {
-        Object[] result = new Object[size];
-        int i = 0;
-        for (Node<E> x = first; x != null; x = x.next)
-            result[i++] = x.item;
-        return result;
-    }
-
-    /**
-     * Returns an array containing all of the elements in this list in
-     * proper sequence (from first to last element); the runtime type of
-     * the returned array is that of the specified array.  If the list fits
-     * in the specified array, it is returned therein.  Otherwise, a new
-     * array is allocated with the runtime type of the specified array and
-     * the size of this list.
-     *
-     * <p>If the list fits in the specified array with room to spare (i.e.,
-     * the array has more elements than the list), the element in the array
-     * immediately following the end of the list is set to {@code null}.
-     * (This is useful in determining the length of the list <i>only</i> if
-     * the caller knows that the list does not contain any null elements.)
-     *
-     * <p>Like the {@link #toArray()} method, this method acts as bridge between
-     * array-based and collection-based APIs.  Further, this method allows
-     * precise control over the runtime type of the output array, and may,
-     * under certain circumstances, be used to save allocation costs.
-     *
-     * <p>Suppose {@code x} is a list known to contain only strings.
-     * The following code can be used to dump the list into a newly
-     * allocated array of {@code String}:
-     *
-     * <pre>
-     *     String[] y = x.toArray(new String[0]);</pre>
-     *
-     * Note that {@code toArray(new Object[0])} is identical in function to
-     * {@code toArray()}.
-     *
-     * @param a the array into which the elements of the list are to
-     *          be stored, if it is big enough; otherwise, a new array of the
-     *          same runtime type is allocated for this purpose.
-     * @return an array containing the elements of the list
-     * @throws ArrayStoreException if the runtime type of the specified array
-     *         is not a supertype of the runtime type of every element in
-     *         this list
-     * @throws NullPointerException if the specified array is null
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T[] toArray(T[] a) {
-        if (a.length < size)
-            a = (T[])java.lang.reflect.Array.newInstance(
-                                a.getClass().getComponentType(), size);
-        int i = 0;
-        Object[] result = a;
-        for (Node<E> x = first; x != null; x = x.next)
-            result[i++] = x.item;
-
-        if (a.length > size)
-            a[size] = null;
-
-        return a;
-    }
-
-    private static final long serialVersionUID = 876323262645176354L;
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/List.java
--- a/emul/compact/src/main/java/java/util/List.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,600 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * An ordered collection (also known as a <i>sequence</i>).  The user of this
- * interface has precise control over where in the list each element is
- * inserted.  The user can access elements by their integer index (position in
- * the list), and search for elements in the list.<p>
- *
- * Unlike sets, lists typically allow duplicate elements.  More formally,
- * lists typically allow pairs of elements <tt>e1</tt> and <tt>e2</tt>
- * such that <tt>e1.equals(e2)</tt>, and they typically allow multiple
- * null elements if they allow null elements at all.  It is not inconceivable
- * that someone might wish to implement a list that prohibits duplicates, by
- * throwing runtime exceptions when the user attempts to insert them, but we
- * expect this usage to be rare.<p>
- *
- * The <tt>List</tt> interface places additional stipulations, beyond those
- * specified in the <tt>Collection</tt> interface, on the contracts of the
- * <tt>iterator</tt>, <tt>add</tt>, <tt>remove</tt>, <tt>equals</tt>, and
- * <tt>hashCode</tt> methods.  Declarations for other inherited methods are
- * also included here for convenience.<p>
- *
- * The <tt>List</tt> interface provides four methods for positional (indexed)
- * access to list elements.  Lists (like Java arrays) are zero based.  Note
- * that these operations may execute in time proportional to the index value
- * for some implementations (the <tt>LinkedList</tt> class, for
- * example). Thus, iterating over the elements in a list is typically
- * preferable to indexing through it if the caller does not know the
- * implementation.<p>
- *
- * The <tt>List</tt> interface provides a special iterator, called a
- * <tt>ListIterator</tt>, that allows element insertion and replacement, and
- * bidirectional access in addition to the normal operations that the
- * <tt>Iterator</tt> interface provides.  A method is provided to obtain a
- * list iterator that starts at a specified position in the list.<p>
- *
- * The <tt>List</tt> interface provides two methods to search for a specified
- * object.  From a performance standpoint, these methods should be used with
- * caution.  In many implementations they will perform costly linear
- * searches.<p>
- *
- * The <tt>List</tt> interface provides two methods to efficiently insert and
- * remove multiple elements at an arbitrary point in the list.<p>
- *
- * Note: While it is permissible for lists to contain themselves as elements,
- * extreme caution is advised: the <tt>equals</tt> and <tt>hashCode</tt>
- * methods are no longer well defined on such a list.
- *
- * <p>Some list implementations have restrictions on the elements that
- * they may contain.  For example, some implementations prohibit null elements,
- * and some have restrictions on the types of their elements.  Attempting to
- * add an ineligible element throws an unchecked exception, typically
- * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.  Attempting
- * to query the presence of an ineligible element may throw an exception,
- * or it may simply return false; some implementations will exhibit the former
- * behavior and some will exhibit the latter.  More generally, attempting an
- * operation on an ineligible element whose completion would not result in
- * the insertion of an ineligible element into the list may throw an
- * exception or it may succeed, at the option of the implementation.
- * Such exceptions are marked as "optional" in the specification for this
- * interface.
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <E> the type of elements in this list
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see Collection
- * @see Set
- * @see ArrayList
- * @see LinkedList
- * @see Vector
- * @see Arrays#asList(Object[])
- * @see Collections#nCopies(int, Object)
- * @see Collections#EMPTY_LIST
- * @see AbstractList
- * @see AbstractSequentialList
- * @since 1.2
- */
-
-public interface List<E> extends Collection<E> {
-    // Query Operations
-
-    /**
-     * Returns the number of elements in this list.  If this list contains
-     * more than <tt>Integer.MAX_VALUE</tt> elements, returns
-     * <tt>Integer.MAX_VALUE</tt>.
-     *
-     * @return the number of elements in this list
-     */
-    int size();
-
-    /**
-     * Returns <tt>true</tt> if this list contains no elements.
-     *
-     * @return <tt>true</tt> if this list contains no elements
-     */
-    boolean isEmpty();
-
-    /**
-     * Returns <tt>true</tt> if this list contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this list contains
-     * at least one element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
-     *
-     * @param o element whose presence in this list is to be tested
-     * @return <tt>true</tt> if this list contains the specified element
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this list
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         list does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    boolean contains(Object o);
-
-    /**
-     * Returns an iterator over the elements in this list in proper sequence.
-     *
-     * @return an iterator over the elements in this list in proper sequence
-     */
-    Iterator<E> iterator();
-
-    /**
-     * Returns an array containing all of the elements in this list in proper
-     * sequence (from first to last element).
-     *
-     * <p>The returned array will be "safe" in that no references to it are
-     * maintained by this list.  (In other words, this method must
-     * allocate a new array even if this list is backed by an array).
-     * The caller is thus free to modify the returned array.
-     *
-     * <p>This method acts as bridge between array-based and collection-based
-     * APIs.
-     *
-     * @return an array containing all of the elements in this list in proper
-     *         sequence
-     * @see Arrays#asList(Object[])
-     */
-    Object[] toArray();
-
-    /**
-     * Returns an array containing all of the elements in this list in
-     * proper sequence (from first to last element); the runtime type of
-     * the returned array is that of the specified array.  If the list fits
-     * in the specified array, it is returned therein.  Otherwise, a new
-     * array is allocated with the runtime type of the specified array and
-     * the size of this list.
-     *
-     * <p>If the list fits in the specified array with room to spare (i.e.,
-     * the array has more elements than the list), the element in the array
-     * immediately following the end of the list is set to <tt>null</tt>.
-     * (This is useful in determining the length of the list <i>only</i> if
-     * the caller knows that the list does not contain any null elements.)
-     *
-     * <p>Like the {@link #toArray()} method, this method acts as bridge between
-     * array-based and collection-based APIs.  Further, this method allows
-     * precise control over the runtime type of the output array, and may,
-     * under certain circumstances, be used to save allocation costs.
-     *
-     * <p>Suppose <tt>x</tt> is a list known to contain only strings.
-     * The following code can be used to dump the list into a newly
-     * allocated array of <tt>String</tt>:
-     *
-     * <pre>
-     *     String[] y = x.toArray(new String[0]);</pre>
-     *
-     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
-     * <tt>toArray()</tt>.
-     *
-     * @param a the array into which the elements of this list are to
-     *          be stored, if it is big enough; otherwise, a new array of the
-     *          same runtime type is allocated for this purpose.
-     * @return an array containing the elements of this list
-     * @throws ArrayStoreException if the runtime type of the specified array
-     *         is not a supertype of the runtime type of every element in
-     *         this list
-     * @throws NullPointerException if the specified array is null
-     */
-    <T> T[] toArray(T[] a);
-
-
-    // Modification Operations
-
-    /**
-     * Appends the specified element to the end of this list (optional
-     * operation).
-     *
-     * <p>Lists that support this operation may place limitations on what
-     * elements may be added to this list.  In particular, some
-     * lists will refuse to add null elements, and others will impose
-     * restrictions on the type of elements that may be added.  List
-     * classes should clearly specify in their documentation any restrictions
-     * on what elements may be added.
-     *
-     * @param e element to be appended to this list
-     * @return <tt>true</tt> (as specified by {@link Collection#add})
-     * @throws UnsupportedOperationException if the <tt>add</tt> operation
-     *         is not supported by this list
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this list
-     * @throws NullPointerException if the specified element is null and this
-     *         list does not permit null elements
-     * @throws IllegalArgumentException if some property of this element
-     *         prevents it from being added to this list
-     */
-    boolean add(E e);
-
-    /**
-     * Removes the first occurrence of the specified element from this list,
-     * if it is present (optional operation).  If this list does not contain
-     * the element, it is unchanged.  More formally, removes the element with
-     * the lowest index <tt>i</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>
-     * (if such an element exists).  Returns <tt>true</tt> if this list
-     * contained the specified element (or equivalently, if this list changed
-     * as a result of the call).
-     *
-     * @param o element to be removed from this list, if present
-     * @return <tt>true</tt> if this list contained the specified element
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this list
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         list does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
-     *         is not supported by this list
-     */
-    boolean remove(Object o);
-
-
-    // Bulk Modification Operations
-
-    /**
-     * Returns <tt>true</tt> if this list contains all of the elements of the
-     * specified collection.
-     *
-     * @param  c collection to be checked for containment in this list
-     * @return <tt>true</tt> if this list contains all of the elements of the
-     *         specified collection
-     * @throws ClassCastException if the types of one or more elements
-     *         in the specified collection are incompatible with this
-     *         list
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified collection contains one
-     *         or more null elements and this list does not permit null
-     *         elements
-     *         (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see #contains(Object)
-     */
-    boolean containsAll(Collection<?> c);
-
-    /**
-     * Appends all of the elements in the specified collection to the end of
-     * this list, in the order that they are returned by the specified
-     * collection's iterator (optional operation).  The behavior of this
-     * operation is undefined if the specified collection is modified while
-     * the operation is in progress.  (Note that this will occur if the
-     * specified collection is this list, and it's nonempty.)
-     *
-     * @param c collection containing elements to be added to this list
-     * @return <tt>true</tt> if this list changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
-     *         is not supported by this list
-     * @throws ClassCastException if the class of an element of the specified
-     *         collection prevents it from being added to this list
-     * @throws NullPointerException if the specified collection contains one
-     *         or more null elements and this list does not permit null
-     *         elements, or if the specified collection is null
-     * @throws IllegalArgumentException if some property of an element of the
-     *         specified collection prevents it from being added to this list
-     * @see #add(Object)
-     */
-    boolean addAll(Collection<? extends E> c);
-
-    /**
-     * Inserts all of the elements in the specified collection into this
-     * list at the specified position (optional operation).  Shifts the
-     * element currently at that position (if any) and any subsequent
-     * elements to the right (increases their indices).  The new elements
-     * will appear in this list in the order that they are returned by the
-     * specified collection's iterator.  The behavior of this operation is
-     * undefined if the specified collection is modified while the
-     * operation is in progress.  (Note that this will occur if the specified
-     * collection is this list, and it's nonempty.)
-     *
-     * @param index index at which to insert the first element from the
-     *              specified collection
-     * @param c collection containing elements to be added to this list
-     * @return <tt>true</tt> if this list changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
-     *         is not supported by this list
-     * @throws ClassCastException if the class of an element of the specified
-     *         collection prevents it from being added to this list
-     * @throws NullPointerException if the specified collection contains one
-     *         or more null elements and this list does not permit null
-     *         elements, or if the specified collection is null
-     * @throws IllegalArgumentException if some property of an element of the
-     *         specified collection prevents it from being added to this list
-     * @throws IndexOutOfBoundsException if the index is out of range
-     *         (<tt>index &lt; 0 || index &gt; size()</tt>)
-     */
-    boolean addAll(int index, Collection<? extends E> c);
-
-    /**
-     * Removes from this list all of its elements that are contained in the
-     * specified collection (optional operation).
-     *
-     * @param c collection containing elements to be removed from this list
-     * @return <tt>true</tt> if this list changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
-     *         is not supported by this list
-     * @throws ClassCastException if the class of an element of this list
-     *         is incompatible with the specified collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this list contains a null element and the
-     *         specified collection does not permit null elements
-     *         (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see #remove(Object)
-     * @see #contains(Object)
-     */
-    boolean removeAll(Collection<?> c);
-
-    /**
-     * Retains only the elements in this list that are contained in the
-     * specified collection (optional operation).  In other words, removes
-     * from this list all of its elements that are not contained in the
-     * specified collection.
-     *
-     * @param c collection containing elements to be retained in this list
-     * @return <tt>true</tt> if this list changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
-     *         is not supported by this list
-     * @throws ClassCastException if the class of an element of this list
-     *         is incompatible with the specified collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this list contains a null element and the
-     *         specified collection does not permit null elements
-     *         (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see #remove(Object)
-     * @see #contains(Object)
-     */
-    boolean retainAll(Collection<?> c);
-
-    /**
-     * Removes all of the elements from this list (optional operation).
-     * The list will be empty after this call returns.
-     *
-     * @throws UnsupportedOperationException if the <tt>clear</tt> operation
-     *         is not supported by this list
-     */
-    void clear();
-
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified object with this list for equality.  Returns
-     * <tt>true</tt> if and only if the specified object is also a list, both
-     * lists have the same size, and all corresponding pairs of elements in
-     * the two lists are <i>equal</i>.  (Two elements <tt>e1</tt> and
-     * <tt>e2</tt> are <i>equal</i> if <tt>(e1==null ? e2==null :
-     * e1.equals(e2))</tt>.)  In other words, two lists are defined to be
-     * equal if they contain the same elements in the same order.  This
-     * definition ensures that the equals method works properly across
-     * different implementations of the <tt>List</tt> interface.
-     *
-     * @param o the object to be compared for equality with this list
-     * @return <tt>true</tt> if the specified object is equal to this list
-     */
-    boolean equals(Object o);
-
-    /**
-     * Returns the hash code value for this list.  The hash code of a list
-     * is defined to be the result of the following calculation:
-     * <pre>
-     *  int hashCode = 1;
-     *  for (E e : list)
-     *      hashCode = 31*hashCode + (e==null ? 0 : e.hashCode());
-     * </pre>
-     * This ensures that <tt>list1.equals(list2)</tt> implies that
-     * <tt>list1.hashCode()==list2.hashCode()</tt> for any two lists,
-     * <tt>list1</tt> and <tt>list2</tt>, as required by the general
-     * contract of {@link Object#hashCode}.
-     *
-     * @return the hash code value for this list
-     * @see Object#equals(Object)
-     * @see #equals(Object)
-     */
-    int hashCode();
-
-
-    // Positional Access Operations
-
-    /**
-     * Returns the element at the specified position in this list.
-     *
-     * @param index index of the element to return
-     * @return the element at the specified position in this list
-     * @throws IndexOutOfBoundsException if the index is out of range
-     *         (<tt>index &lt; 0 || index &gt;= size()</tt>)
-     */
-    E get(int index);
-
-    /**
-     * Replaces the element at the specified position in this list with the
-     * specified element (optional operation).
-     *
-     * @param index index of the element to replace
-     * @param element element to be stored at the specified position
-     * @return the element previously at the specified position
-     * @throws UnsupportedOperationException if the <tt>set</tt> operation
-     *         is not supported by this list
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this list
-     * @throws NullPointerException if the specified element is null and
-     *         this list does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this list
-     * @throws IndexOutOfBoundsException if the index is out of range
-     *         (<tt>index &lt; 0 || index &gt;= size()</tt>)
-     */
-    E set(int index, E element);
-
-    /**
-     * Inserts the specified element at the specified position in this list
-     * (optional operation).  Shifts the element currently at that position
-     * (if any) and any subsequent elements to the right (adds one to their
-     * indices).
-     *
-     * @param index index at which the specified element is to be inserted
-     * @param element element to be inserted
-     * @throws UnsupportedOperationException if the <tt>add</tt> operation
-     *         is not supported by this list
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this list
-     * @throws NullPointerException if the specified element is null and
-     *         this list does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified
-     *         element prevents it from being added to this list
-     * @throws IndexOutOfBoundsException if the index is out of range
-     *         (<tt>index &lt; 0 || index &gt; size()</tt>)
-     */
-    void add(int index, E element);
-
-    /**
-     * Removes the element at the specified position in this list (optional
-     * operation).  Shifts any subsequent elements to the left (subtracts one
-     * from their indices).  Returns the element that was removed from the
-     * list.
-     *
-     * @param index the index of the element to be removed
-     * @return the element previously at the specified position
-     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
-     *         is not supported by this list
-     * @throws IndexOutOfBoundsException if the index is out of range
-     *         (<tt>index &lt; 0 || index &gt;= size()</tt>)
-     */
-    E remove(int index);
-
-
-    // Search Operations
-
-    /**
-     * Returns the index of the first occurrence of the specified element
-     * in this list, or -1 if this list does not contain the element.
-     * More formally, returns the lowest index <tt>i</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-     * or -1 if there is no such index.
-     *
-     * @param o element to search for
-     * @return the index of the first occurrence of the specified element in
-     *         this list, or -1 if this list does not contain the element
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this list
-     *         (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         list does not permit null elements
-     *         (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    int indexOf(Object o);
-
-    /**
-     * Returns the index of the last occurrence of the specified element
-     * in this list, or -1 if this list does not contain the element.
-     * More formally, returns the highest index <tt>i</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-     * or -1 if there is no such index.
-     *
-     * @param o element to search for
-     * @return the index of the last occurrence of the specified element in
-     *         this list, or -1 if this list does not contain the element
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this list
-     *         (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         list does not permit null elements
-     *         (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    int lastIndexOf(Object o);
-
-
-    // List Iterators
-
-    /**
-     * Returns a list iterator over the elements in this list (in proper
-     * sequence).
-     *
-     * @return a list iterator over the elements in this list (in proper
-     *         sequence)
-     */
-    ListIterator<E> listIterator();
-
-    /**
-     * Returns a list iterator over the elements in this list (in proper
-     * sequence), starting at the specified position in the list.
-     * The specified index indicates the first element that would be
-     * returned by an initial call to {@link ListIterator#next next}.
-     * An initial call to {@link ListIterator#previous previous} would
-     * return the element with the specified index minus one.
-     *
-     * @param index index of the first element to be returned from the
-     *        list iterator (by a call to {@link ListIterator#next next})
-     * @return a list iterator over the elements in this list (in proper
-     *         sequence), starting at the specified position in the list
-     * @throws IndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index > size()})
-     */
-    ListIterator<E> listIterator(int index);
-
-    // View
-
-    /**
-     * Returns a view of the portion of this list between the specified
-     * <tt>fromIndex</tt>, inclusive, and <tt>toIndex</tt>, exclusive.  (If
-     * <tt>fromIndex</tt> and <tt>toIndex</tt> are equal, the returned list is
-     * empty.)  The returned list is backed by this list, so non-structural
-     * changes in the returned list are reflected in this list, and vice-versa.
-     * The returned list supports all of the optional list operations supported
-     * by this list.<p>
-     *
-     * This method eliminates the need for explicit range operations (of
-     * the sort that commonly exist for arrays).  Any operation that expects
-     * a list can be used as a range operation by passing a subList view
-     * instead of a whole list.  For example, the following idiom
-     * removes a range of elements from a list:
-     * <pre>
-     *      list.subList(from, to).clear();
-     * </pre>
-     * Similar idioms may be constructed for <tt>indexOf</tt> and
-     * <tt>lastIndexOf</tt>, and all of the algorithms in the
-     * <tt>Collections</tt> class can be applied to a subList.<p>
-     *
-     * The semantics of the list returned by this method become undefined if
-     * the backing list (i.e., this list) is <i>structurally modified</i> in
-     * any way other than via the returned list.  (Structural modifications are
-     * those that change the size of this list, or otherwise perturb it in such
-     * a fashion that iterations in progress may yield incorrect results.)
-     *
-     * @param fromIndex low endpoint (inclusive) of the subList
-     * @param toIndex high endpoint (exclusive) of the subList
-     * @return a view of the specified range within this list
-     * @throws IndexOutOfBoundsException for an illegal endpoint index value
-     *         (<tt>fromIndex &lt; 0 || toIndex &gt; size ||
-     *         fromIndex &gt; toIndex</tt>)
-     */
-    List<E> subList(int fromIndex, int toIndex);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/ListIterator.java
--- a/emul/compact/src/main/java/java/util/ListIterator.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * An iterator for lists that allows the programmer
- * to traverse the list in either direction, modify
- * the list during iteration, and obtain the iterator's
- * current position in the list. A {@code ListIterator}
- * has no current element; its <I>cursor position</I> always
- * lies between the element that would be returned by a call
- * to {@code previous()} and the element that would be
- * returned by a call to {@code next()}.
- * An iterator for a list of length {@code n} has {@code n+1} possible
- * cursor positions, as illustrated by the carets ({@code ^}) below:
- * <PRE>
- *                      Element(0)   Element(1)   Element(2)   ... Element(n-1)
- * cursor positions:  ^            ^            ^            ^                  ^
- * </PRE>
- * Note that the {@link #remove} and {@link #set(Object)} methods are
- * <i>not</i> defined in terms of the cursor position;  they are defined to
- * operate on the last element returned by a call to {@link #next} or
- * {@link #previous()}.
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch
- * @see Collection
- * @see List
- * @see Iterator
- * @see Enumeration
- * @see List#listIterator()
- * @since   1.2
- */
-public interface ListIterator<E> extends Iterator<E> {
-    // Query Operations
-
-    /**
-     * Returns {@code true} if this list iterator has more elements when
-     * traversing the list in the forward direction. (In other words,
-     * returns {@code true} if {@link #next} would return an element rather
-     * than throwing an exception.)
-     *
-     * @return {@code true} if the list iterator has more elements when
-     *         traversing the list in the forward direction
-     */
-    boolean hasNext();
-
-    /**
-     * Returns the next element in the list and advances the cursor position.
-     * This method may be called repeatedly to iterate through the list,
-     * or intermixed with calls to {@link #previous} to go back and forth.
-     * (Note that alternating calls to {@code next} and {@code previous}
-     * will return the same element repeatedly.)
-     *
-     * @return the next element in the list
-     * @throws NoSuchElementException if the iteration has no next element
-     */
-    E next();
-
-    /**
-     * Returns {@code true} if this list iterator has more elements when
-     * traversing the list in the reverse direction.  (In other words,
-     * returns {@code true} if {@link #previous} would return an element
-     * rather than throwing an exception.)
-     *
-     * @return {@code true} if the list iterator has more elements when
-     *         traversing the list in the reverse direction
-     */
-    boolean hasPrevious();
-
-    /**
-     * Returns the previous element in the list and moves the cursor
-     * position backwards.  This method may be called repeatedly to
-     * iterate through the list backwards, or intermixed with calls to
-     * {@link #next} to go back and forth.  (Note that alternating calls
-     * to {@code next} and {@code previous} will return the same
-     * element repeatedly.)
-     *
-     * @return the previous element in the list
-     * @throws NoSuchElementException if the iteration has no previous
-     *         element
-     */
-    E previous();
-
-    /**
-     * Returns the index of the element that would be returned by a
-     * subsequent call to {@link #next}. (Returns list size if the list
-     * iterator is at the end of the list.)
-     *
-     * @return the index of the element that would be returned by a
-     *         subsequent call to {@code next}, or list size if the list
-     *         iterator is at the end of the list
-     */
-    int nextIndex();
-
-    /**
-     * Returns the index of the element that would be returned by a
-     * subsequent call to {@link #previous}. (Returns -1 if the list
-     * iterator is at the beginning of the list.)
-     *
-     * @return the index of the element that would be returned by a
-     *         subsequent call to {@code previous}, or -1 if the list
-     *         iterator is at the beginning of the list
-     */
-    int previousIndex();
-
-
-    // Modification Operations
-
-    /**
-     * Removes from the list the last element that was returned by {@link
-     * #next} or {@link #previous} (optional operation).  This call can
-     * only be made once per call to {@code next} or {@code previous}.
-     * It can be made only if {@link #add} has not been
-     * called after the last call to {@code next} or {@code previous}.
-     *
-     * @throws UnsupportedOperationException if the {@code remove}
-     *         operation is not supported by this list iterator
-     * @throws IllegalStateException if neither {@code next} nor
-     *         {@code previous} have been called, or {@code remove} or
-     *         {@code add} have been called after the last call to
-     *         {@code next} or {@code previous}
-     */
-    void remove();
-
-    /**
-     * Replaces the last element returned by {@link #next} or
-     * {@link #previous} with the specified element (optional operation).
-     * This call can be made only if neither {@link #remove} nor {@link
-     * #add} have been called after the last call to {@code next} or
-     * {@code previous}.
-     *
-     * @param e the element with which to replace the last element returned by
-     *          {@code next} or {@code previous}
-     * @throws UnsupportedOperationException if the {@code set} operation
-     *         is not supported by this list iterator
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this list
-     * @throws IllegalArgumentException if some aspect of the specified
-     *         element prevents it from being added to this list
-     * @throws IllegalStateException if neither {@code next} nor
-     *         {@code previous} have been called, or {@code remove} or
-     *         {@code add} have been called after the last call to
-     *         {@code next} or {@code previous}
-     */
-    void set(E e);
-
-    /**
-     * Inserts the specified element into the list (optional operation).
-     * The element is inserted immediately before the element that
-     * would be returned by {@link #next}, if any, and after the element
-     * that would be returned by {@link #previous}, if any.  (If the
-     * list contains no elements, the new element becomes the sole element
-     * on the list.)  The new element is inserted before the implicit
-     * cursor: a subsequent call to {@code next} would be unaffected, and a
-     * subsequent call to {@code previous} would return the new element.
-     * (This call increases by one the value that would be returned by a
-     * call to {@code nextIndex} or {@code previousIndex}.)
-     *
-     * @param e the element to insert
-     * @throws UnsupportedOperationException if the {@code add} method is
-     *         not supported by this list iterator
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this list
-     * @throws IllegalArgumentException if some aspect of this element
-     *         prevents it from being added to this list
-     */
-    void add(E e);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Map.java
--- a/emul/compact/src/main/java/java/util/Map.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,478 +0,0 @@
-/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * An object that maps keys to values.  A map cannot contain duplicate keys;
- * each key can map to at most one value.
- *
- * <p>This interface takes the place of the <tt>Dictionary</tt> class, which
- * was a totally abstract class rather than an interface.
- *
- * <p>The <tt>Map</tt> interface provides three <i>collection views</i>, which
- * allow a map's contents to be viewed as a set of keys, collection of values,
- * or set of key-value mappings.  The <i>order</i> of a map is defined as
- * the order in which the iterators on the map's collection views return their
- * elements.  Some map implementations, like the <tt>TreeMap</tt> class, make
- * specific guarantees as to their order; others, like the <tt>HashMap</tt>
- * class, do not.
- *
- * <p>Note: great care must be exercised if mutable objects are used as map
- * keys.  The behavior of a map is not specified if the value of an object is
- * changed in a manner that affects <tt>equals</tt> comparisons while the
- * object is a key in the map.  A special case of this prohibition is that it
- * is not permissible for a map to contain itself as a key.  While it is
- * permissible for a map to contain itself as a value, extreme caution is
- * advised: the <tt>equals</tt> and <tt>hashCode</tt> methods are no longer
- * well defined on such a map.
- *
- * <p>All general-purpose map implementation classes should provide two
- * "standard" constructors: a void (no arguments) constructor which creates an
- * empty map, and a constructor with a single argument of type <tt>Map</tt>,
- * which creates a new map with the same key-value mappings as its argument.
- * In effect, the latter constructor allows the user to copy any map,
- * producing an equivalent map of the desired class.  There is no way to
- * enforce this recommendation (as interfaces cannot contain constructors) but
- * all of the general-purpose map implementations in the JDK comply.
- *
- * <p>The "destructive" methods contained in this interface, that is, the
- * methods that modify the map on which they operate, are specified to throw
- * <tt>UnsupportedOperationException</tt> if this map does not support the
- * operation.  If this is the case, these methods may, but are not required
- * to, throw an <tt>UnsupportedOperationException</tt> if the invocation would
- * have no effect on the map.  For example, invoking the {@link #putAll(Map)}
- * method on an unmodifiable map may, but is not required to, throw the
- * exception if the map whose mappings are to be "superimposed" is empty.
- *
- * <p>Some map implementations have restrictions on the keys and values they
- * may contain.  For example, some implementations prohibit null keys and
- * values, and some have restrictions on the types of their keys.  Attempting
- * to insert an ineligible key or value throws an unchecked exception,
- * typically <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.
- * Attempting to query the presence of an ineligible key or value may throw an
- * exception, or it may simply return false; some implementations will exhibit
- * the former behavior and some will exhibit the latter.  More generally,
- * attempting an operation on an ineligible key or value whose completion
- * would not result in the insertion of an ineligible element into the map may
- * throw an exception or it may succeed, at the option of the implementation.
- * Such exceptions are marked as "optional" in the specification for this
- * interface.
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * <p>Many methods in Collections Framework interfaces are defined
- * in terms of the {@link Object#equals(Object) equals} method.  For
- * example, the specification for the {@link #containsKey(Object)
- * containsKey(Object key)} method says: "returns <tt>true</tt> if and
- * only if this map contains a mapping for a key <tt>k</tt> such that
- * <tt>(key==null ? k==null : key.equals(k))</tt>." This specification should
- * <i>not</i> be construed to imply that invoking <tt>Map.containsKey</tt>
- * with a non-null argument <tt>key</tt> will cause <tt>key.equals(k)</tt> to
- * be invoked for any key <tt>k</tt>.  Implementations are free to
- * implement optimizations whereby the <tt>equals</tt> invocation is avoided,
- * for example, by first comparing the hash codes of the two keys.  (The
- * {@link Object#hashCode()} specification guarantees that two objects with
- * unequal hash codes cannot be equal.)  More generally, implementations of
- * the various Collections Framework interfaces are free to take advantage of
- * the specified behavior of underlying {@link Object} methods wherever the
- * implementor deems it appropriate.
- *
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- *
- * @author  Josh Bloch
- * @see HashMap
- * @see TreeMap
- * @see Hashtable
- * @see SortedMap
- * @see Collection
- * @see Set
- * @since 1.2
- */
-public interface Map<K,V> {
-    // Query Operations
-
-    /**
-     * Returns the number of key-value mappings in this map.  If the
-     * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
-     * <tt>Integer.MAX_VALUE</tt>.
-     *
-     * @return the number of key-value mappings in this map
-     */
-    int size();
-
-    /**
-     * Returns <tt>true</tt> if this map contains no key-value mappings.
-     *
-     * @return <tt>true</tt> if this map contains no key-value mappings
-     */
-    boolean isEmpty();
-
-    /**
-     * Returns <tt>true</tt> if this map contains a mapping for the specified
-     * key.  More formally, returns <tt>true</tt> if and only if
-     * this map contains a mapping for a key <tt>k</tt> such that
-     * <tt>(key==null ? k==null : key.equals(k))</tt>.  (There can be
-     * at most one such mapping.)
-     *
-     * @param key key whose presence in this map is to be tested
-     * @return <tt>true</tt> if this map contains a mapping for the specified
-     *         key
-     * @throws ClassCastException if the key is of an inappropriate type for
-     *         this map
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified key is null and this map
-     *         does not permit null keys
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    boolean containsKey(Object key);
-
-    /**
-     * Returns <tt>true</tt> if this map maps one or more keys to the
-     * specified value.  More formally, returns <tt>true</tt> if and only if
-     * this map contains at least one mapping to a value <tt>v</tt> such that
-     * <tt>(value==null ? v==null : value.equals(v))</tt>.  This operation
-     * will probably require time linear in the map size for most
-     * implementations of the <tt>Map</tt> interface.
-     *
-     * @param value value whose presence in this map is to be tested
-     * @return <tt>true</tt> if this map maps one or more keys to the
-     *         specified value
-     * @throws ClassCastException if the value is of an inappropriate type for
-     *         this map
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified value is null and this
-     *         map does not permit null values
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    boolean containsValue(Object value);
-
-    /**
-     * Returns the value to which the specified key is mapped,
-     * or {@code null} if this map contains no mapping for the key.
-     *
-     * <p>More formally, if this map contains a mapping from a key
-     * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
-     * key.equals(k))}, then this method returns {@code v}; otherwise
-     * it returns {@code null}.  (There can be at most one such mapping.)
-     *
-     * <p>If this map permits null values, then a return value of
-     * {@code null} does not <i>necessarily</i> indicate that the map
-     * contains no mapping for the key; it's also possible that the map
-     * explicitly maps the key to {@code null}.  The {@link #containsKey
-     * containsKey} operation may be used to distinguish these two cases.
-     *
-     * @param key the key whose associated value is to be returned
-     * @return the value to which the specified key is mapped, or
-     *         {@code null} if this map contains no mapping for the key
-     * @throws ClassCastException if the key is of an inappropriate type for
-     *         this map
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified key is null and this map
-     *         does not permit null keys
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    V get(Object key);
-
-    // Modification Operations
-
-    /**
-     * Associates the specified value with the specified key in this map
-     * (optional operation).  If the map previously contained a mapping for
-     * the key, the old value is replaced by the specified value.  (A map
-     * <tt>m</tt> is said to contain a mapping for a key <tt>k</tt> if and only
-     * if {@link #containsKey(Object) m.containsKey(k)} would return
-     * <tt>true</tt>.)
-     *
-     * @param key key with which the specified value is to be associated
-     * @param value value to be associated with the specified key
-     * @return the previous value associated with <tt>key</tt>, or
-     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
-     *         (A <tt>null</tt> return can also indicate that the map
-     *         previously associated <tt>null</tt> with <tt>key</tt>,
-     *         if the implementation supports <tt>null</tt> values.)
-     * @throws UnsupportedOperationException if the <tt>put</tt> operation
-     *         is not supported by this map
-     * @throws ClassCastException if the class of the specified key or value
-     *         prevents it from being stored in this map
-     * @throws NullPointerException if the specified key or value is null
-     *         and this map does not permit null keys or values
-     * @throws IllegalArgumentException if some property of the specified key
-     *         or value prevents it from being stored in this map
-     */
-    V put(K key, V value);
-
-    /**
-     * Removes the mapping for a key from this map if it is present
-     * (optional operation).   More formally, if this map contains a mapping
-     * from key <tt>k</tt> to value <tt>v</tt> such that
-     * <code>(key==null ?  k==null : key.equals(k))</code>, that mapping
-     * is removed.  (The map can contain at most one such mapping.)
-     *
-     * <p>Returns the value to which this map previously associated the key,
-     * or <tt>null</tt> if the map contained no mapping for the key.
-     *
-     * <p>If this map permits null values, then a return value of
-     * <tt>null</tt> does not <i>necessarily</i> indicate that the map
-     * contained no mapping for the key; it's also possible that the map
-     * explicitly mapped the key to <tt>null</tt>.
-     *
-     * <p>The map will not contain a mapping for the specified key once the
-     * call returns.
-     *
-     * @param key key whose mapping is to be removed from the map
-     * @return the previous value associated with <tt>key</tt>, or
-     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
-     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
-     *         is not supported by this map
-     * @throws ClassCastException if the key is of an inappropriate type for
-     *         this map
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified key is null and this
-     *         map does not permit null keys
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    V remove(Object key);
-
-
-    // Bulk Operations
-
-    /**
-     * Copies all of the mappings from the specified map to this map
-     * (optional operation).  The effect of this call is equivalent to that
-     * of calling {@link #put(Object,Object) put(k, v)} on this map once
-     * for each mapping from key <tt>k</tt> to value <tt>v</tt> in the
-     * specified map.  The behavior of this operation is undefined if the
-     * specified map is modified while the operation is in progress.
-     *
-     * @param m mappings to be stored in this map
-     * @throws UnsupportedOperationException if the <tt>putAll</tt> operation
-     *         is not supported by this map
-     * @throws ClassCastException if the class of a key or value in the
-     *         specified map prevents it from being stored in this map
-     * @throws NullPointerException if the specified map is null, or if
-     *         this map does not permit null keys or values, and the
-     *         specified map contains null keys or values
-     * @throws IllegalArgumentException if some property of a key or value in
-     *         the specified map prevents it from being stored in this map
-     */
-    void putAll(Map<? extends K, ? extends V> m);
-
-    /**
-     * Removes all of the mappings from this map (optional operation).
-     * The map will be empty after this call returns.
-     *
-     * @throws UnsupportedOperationException if the <tt>clear</tt> operation
-     *         is not supported by this map
-     */
-    void clear();
-
-
-    // Views
-
-    /**
-     * Returns a {@link Set} view of the keys contained in this map.
-     * The set is backed by the map, so changes to the map are
-     * reflected in the set, and vice-versa.  If the map is modified
-     * while an iteration over the set is in progress (except through
-     * the iterator's own <tt>remove</tt> operation), the results of
-     * the iteration are undefined.  The set supports element removal,
-     * which removes the corresponding mapping from the map, via the
-     * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
-     * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
-     * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
-     * operations.
-     *
-     * @return a set view of the keys contained in this map
-     */
-    Set<K> keySet();
-
-    /**
-     * Returns a {@link Collection} view of the values contained in this map.
-     * The collection is backed by the map, so changes to the map are
-     * reflected in the collection, and vice-versa.  If the map is
-     * modified while an iteration over the collection is in progress
-     * (except through the iterator's own <tt>remove</tt> operation),
-     * the results of the iteration are undefined.  The collection
-     * supports element removal, which removes the corresponding
-     * mapping from the map, via the <tt>Iterator.remove</tt>,
-     * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
-     * <tt>retainAll</tt> and <tt>clear</tt> operations.  It does not
-     * support the <tt>add</tt> or <tt>addAll</tt> operations.
-     *
-     * @return a collection view of the values contained in this map
-     */
-    Collection<V> values();
-
-    /**
-     * Returns a {@link Set} view of the mappings contained in this map.
-     * The set is backed by the map, so changes to the map are
-     * reflected in the set, and vice-versa.  If the map is modified
-     * while an iteration over the set is in progress (except through
-     * the iterator's own <tt>remove</tt> operation, or through the
-     * <tt>setValue</tt> operation on a map entry returned by the
-     * iterator) the results of the iteration are undefined.  The set
-     * supports element removal, which removes the corresponding
-     * mapping from the map, via the <tt>Iterator.remove</tt>,
-     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
-     * <tt>clear</tt> operations.  It does not support the
-     * <tt>add</tt> or <tt>addAll</tt> operations.
-     *
-     * @return a set view of the mappings contained in this map
-     */
-    Set<Map.Entry<K, V>> entrySet();
-
-    /**
-     * A map entry (key-value pair).  The <tt>Map.entrySet</tt> method returns
-     * a collection-view of the map, whose elements are of this class.  The
-     * <i>only</i> way to obtain a reference to a map entry is from the
-     * iterator of this collection-view.  These <tt>Map.Entry</tt> objects are
-     * valid <i>only</i> for the duration of the iteration; more formally,
-     * the behavior of a map entry is undefined if the backing map has been
-     * modified after the entry was returned by the iterator, except through
-     * the <tt>setValue</tt> operation on the map entry.
-     *
-     * @see Map#entrySet()
-     * @since 1.2
-     */
-    interface Entry<K,V> {
-        /**
-         * Returns the key corresponding to this entry.
-         *
-         * @return the key corresponding to this entry
-         * @throws IllegalStateException implementations may, but are not
-         *         required to, throw this exception if the entry has been
-         *         removed from the backing map.
-         */
-        K getKey();
-
-        /**
-         * Returns the value corresponding to this entry.  If the mapping
-         * has been removed from the backing map (by the iterator's
-         * <tt>remove</tt> operation), the results of this call are undefined.
-         *
-         * @return the value corresponding to this entry
-         * @throws IllegalStateException implementations may, but are not
-         *         required to, throw this exception if the entry has been
-         *         removed from the backing map.
-         */
-        V getValue();
-
-        /**
-         * Replaces the value corresponding to this entry with the specified
-         * value (optional operation).  (Writes through to the map.)  The
-         * behavior of this call is undefined if the mapping has already been
-         * removed from the map (by the iterator's <tt>remove</tt> operation).
-         *
-         * @param value new value to be stored in this entry
-         * @return old value corresponding to the entry
-         * @throws UnsupportedOperationException if the <tt>put</tt> operation
-         *         is not supported by the backing map
-         * @throws ClassCastException if the class of the specified value
-         *         prevents it from being stored in the backing map
-         * @throws NullPointerException if the backing map does not permit
-         *         null values, and the specified value is null
-         * @throws IllegalArgumentException if some property of this value
-         *         prevents it from being stored in the backing map
-         * @throws IllegalStateException implementations may, but are not
-         *         required to, throw this exception if the entry has been
-         *         removed from the backing map.
-         */
-        V setValue(V value);
-
-        /**
-         * Compares the specified object with this entry for equality.
-         * Returns <tt>true</tt> if the given object is also a map entry and
-         * the two entries represent the same mapping.  More formally, two
-         * entries <tt>e1</tt> and <tt>e2</tt> represent the same mapping
-         * if<pre>
-         *     (e1.getKey()==null ?
-         *      e2.getKey()==null : e1.getKey().equals(e2.getKey()))  &amp;&amp;
-         *     (e1.getValue()==null ?
-         *      e2.getValue()==null : e1.getValue().equals(e2.getValue()))
-         * </pre>
-         * This ensures that the <tt>equals</tt> method works properly across
-         * different implementations of the <tt>Map.Entry</tt> interface.
-         *
-         * @param o object to be compared for equality with this map entry
-         * @return <tt>true</tt> if the specified object is equal to this map
-         *         entry
-         */
-        boolean equals(Object o);
-
-        /**
-         * Returns the hash code value for this map entry.  The hash code
-         * of a map entry <tt>e</tt> is defined to be: <pre>
-         *     (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
-         *     (e.getValue()==null ? 0 : e.getValue().hashCode())
-         * </pre>
-         * This ensures that <tt>e1.equals(e2)</tt> implies that
-         * <tt>e1.hashCode()==e2.hashCode()</tt> for any two Entries
-         * <tt>e1</tt> and <tt>e2</tt>, as required by the general
-         * contract of <tt>Object.hashCode</tt>.
-         *
-         * @return the hash code value for this map entry
-         * @see Object#hashCode()
-         * @see Object#equals(Object)
-         * @see #equals(Object)
-         */
-        int hashCode();
-    }
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified object with this map for equality.  Returns
-     * <tt>true</tt> if the given object is also a map and the two maps
-     * represent the same mappings.  More formally, two maps <tt>m1</tt> and
-     * <tt>m2</tt> represent the same mappings if
-     * <tt>m1.entrySet().equals(m2.entrySet())</tt>.  This ensures that the
-     * <tt>equals</tt> method works properly across different implementations
-     * of the <tt>Map</tt> interface.
-     *
-     * @param o object to be compared for equality with this map
-     * @return <tt>true</tt> if the specified object is equal to this map
-     */
-    boolean equals(Object o);
-
-    /**
-     * Returns the hash code value for this map.  The hash code of a map is
-     * defined to be the sum of the hash codes of each entry in the map's
-     * <tt>entrySet()</tt> view.  This ensures that <tt>m1.equals(m2)</tt>
-     * implies that <tt>m1.hashCode()==m2.hashCode()</tt> for any two maps
-     * <tt>m1</tt> and <tt>m2</tt>, as required by the general contract of
-     * {@link Object#hashCode}.
-     *
-     * @return the hash code value for this map
-     * @see Map.Entry#hashCode()
-     * @see Object#equals(Object)
-     * @see #equals(Object)
-     */
-    int hashCode();
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Objects.java
--- a/emul/compact/src/main/java/java/util/Objects.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * This class consists of {@code static} utility methods for operating
- * on objects.  These utilities include {@code null}-safe or {@code
- * null}-tolerant methods for computing the hash code of an object,
- * returning a string for an object, and comparing two objects.
- *
- * @since 1.7
- */
-public final class Objects {
-    private Objects() {
-        throw new AssertionError("No java.util.Objects instances for you!");
-    }
-
-    /**
-     * Returns {@code true} if the arguments are equal to each other
-     * and {@code false} otherwise.
-     * Consequently, if both arguments are {@code null}, {@code true}
-     * is returned and if exactly one argument is {@code null}, {@code
-     * false} is returned.  Otherwise, equality is determined by using
-     * the {@link Object#equals equals} method of the first
-     * argument.
-     *
-     * @param a an object
-     * @param b an object to be compared with {@code a} for equality
-     * @return {@code true} if the arguments are equal to each other
-     * and {@code false} otherwise
-     * @see Object#equals(Object)
-     */
-    public static boolean equals(Object a, Object b) {
-        return (a == b) || (a != null && a.equals(b));
-    }
-
-   /**
-    * Returns {@code true} if the arguments are deeply equal to each other
-    * and {@code false} otherwise.
-    *
-    * Two {@code null} values are deeply equal.  If both arguments are
-    * arrays, the algorithm in {@link Arrays#deepEquals(Object[],
-    * Object[]) Arrays.deepEquals} is used to determine equality.
-    * Otherwise, equality is determined by using the {@link
-    * Object#equals equals} method of the first argument.
-    *
-    * @param a an object
-    * @param b an object to be compared with {@code a} for deep equality
-    * @return {@code true} if the arguments are deeply equal to each other
-    * and {@code false} otherwise
-    * @see Arrays#deepEquals(Object[], Object[])
-    * @see Objects#equals(Object, Object)
-    */
-    public static boolean deepEquals(Object a, Object b) {
-        if (a == b)
-            return true;
-        else if (a == null || b == null)
-            return false;
-        else
-            return Arrays.deepEquals0(a, b);
-    }
-
-    /**
-     * Returns the hash code of a non-{@code null} argument and 0 for
-     * a {@code null} argument.
-     *
-     * @param o an object
-     * @return the hash code of a non-{@code null} argument and 0 for
-     * a {@code null} argument
-     * @see Object#hashCode
-     */
-    public static int hashCode(Object o) {
-        return o != null ? o.hashCode() : 0;
-    }
-
-   /**
-    * Generates a hash code for a sequence of input values. The hash
-    * code is generated as if all the input values were placed into an
-    * array, and that array were hashed by calling {@link
-    * Arrays#hashCode(Object[])}.
-    *
-    * <p>This method is useful for implementing {@link
-    * Object#hashCode()} on objects containing multiple fields. For
-    * example, if an object that has three fields, {@code x}, {@code
-    * y}, and {@code z}, one could write:
-    *
-    * <blockquote><pre>
-    * &#064;Override public int hashCode() {
-    *     return Objects.hash(x, y, z);
-    * }
-    * </pre></blockquote>
-    *
-    * <b>Warning: When a single object reference is supplied, the returned
-    * value does not equal the hash code of that object reference.</b> This
-    * value can be computed by calling {@link #hashCode(Object)}.
-    *
-    * @param values the values to be hashed
-    * @return a hash value of the sequence of input values
-    * @see Arrays#hashCode(Object[])
-    * @see List#hashCode
-    */
-    public static int hash(Object... values) {
-        return Arrays.hashCode(values);
-    }
-
-    /**
-     * Returns the result of calling {@code toString} for a non-{@code
-     * null} argument and {@code "null"} for a {@code null} argument.
-     *
-     * @param o an object
-     * @return the result of calling {@code toString} for a non-{@code
-     * null} argument and {@code "null"} for a {@code null} argument
-     * @see Object#toString
-     * @see String#valueOf(Object)
-     */
-    public static String toString(Object o) {
-        return String.valueOf(o);
-    }
-
-    /**
-     * Returns the result of calling {@code toString} on the first
-     * argument if the first argument is not {@code null} and returns
-     * the second argument otherwise.
-     *
-     * @param o an object
-     * @param nullDefault string to return if the first argument is
-     *        {@code null}
-     * @return the result of calling {@code toString} on the first
-     * argument if it is not {@code null} and the second argument
-     * otherwise.
-     * @see Objects#toString(Object)
-     */
-    public static String toString(Object o, String nullDefault) {
-        return (o != null) ? o.toString() : nullDefault;
-    }
-
-    /**
-     * Returns 0 if the arguments are identical and {@code
-     * c.compare(a, b)} otherwise.
-     * Consequently, if both arguments are {@code null} 0
-     * is returned.
-     *
-     * <p>Note that if one of the arguments is {@code null}, a {@code
-     * NullPointerException} may or may not be thrown depending on
-     * what ordering policy, if any, the {@link Comparator Comparator}
-     * chooses to have for {@code null} values.
-     *
-     * @param <T> the type of the objects being compared
-     * @param a an object
-     * @param b an object to be compared with {@code a}
-     * @param c the {@code Comparator} to compare the first two arguments
-     * @return 0 if the arguments are identical and {@code
-     * c.compare(a, b)} otherwise.
-     * @see Comparable
-     * @see Comparator
-     */
-    public static <T> int compare(T a, T b, Comparator<? super T> c) {
-        return (a == b) ? 0 :  c.compare(a, b);
-    }
-
-    /**
-     * Checks that the specified object reference is not {@code null}. This
-     * method is designed primarily for doing parameter validation in methods
-     * and constructors, as demonstrated below:
-     * <blockquote><pre>
-     * public Foo(Bar bar) {
-     *     this.bar = Objects.requireNonNull(bar);
-     * }
-     * </pre></blockquote>
-     *
-     * @param obj the object reference to check for nullity
-     * @param <T> the type of the reference
-     * @return {@code obj} if not {@code null}
-     * @throws NullPointerException if {@code obj} is {@code null}
-     */
-    public static <T> T requireNonNull(T obj) {
-        if (obj == null)
-            throw new NullPointerException();
-        return obj;
-    }
-
-    /**
-     * Checks that the specified object reference is not {@code null} and
-     * throws a customized {@link NullPointerException} if it is. This method
-     * is designed primarily for doing parameter validation in methods and
-     * constructors with multiple parameters, as demonstrated below:
-     * <blockquote><pre>
-     * public Foo(Bar bar, Baz baz) {
-     *     this.bar = Objects.requireNonNull(bar, "bar must not be null");
-     *     this.baz = Objects.requireNonNull(baz, "baz must not be null");
-     * }
-     * </pre></blockquote>
-     *
-     * @param obj     the object reference to check for nullity
-     * @param message detail message to be used in the event that a {@code
-     *                NullPointerException} is thrown
-     * @param <T> the type of the reference
-     * @return {@code obj} if not {@code null}
-     * @throws NullPointerException if {@code obj} is {@code null}
-     */
-    public static <T> T requireNonNull(T obj, String message) {
-        if (obj == null)
-            throw new NullPointerException(message);
-        return obj;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/PriorityQueue.java
--- a/emul/compact/src/main/java/java/util/PriorityQueue.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,731 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-
-/**
- * An unbounded priority {@linkplain Queue queue} based on a priority heap.
- * The elements of the priority queue are ordered according to their
- * {@linkplain Comparable natural ordering}, or by a {@link Comparator}
- * provided at queue construction time, depending on which constructor is
- * used.  A priority queue does not permit {@code null} elements.
- * A priority queue relying on natural ordering also does not permit
- * insertion of non-comparable objects (doing so may result in
- * {@code ClassCastException}).
- *
- * <p>The <em>head</em> of this queue is the <em>least</em> element
- * with respect to the specified ordering.  If multiple elements are
- * tied for least value, the head is one of those elements -- ties are
- * broken arbitrarily.  The queue retrieval operations {@code poll},
- * {@code remove}, {@code peek}, and {@code element} access the
- * element at the head of the queue.
- *
- * <p>A priority queue is unbounded, but has an internal
- * <i>capacity</i> governing the size of an array used to store the
- * elements on the queue.  It is always at least as large as the queue
- * size.  As elements are added to a priority queue, its capacity
- * grows automatically.  The details of the growth policy are not
- * specified.
- *
- * <p>This class and its iterator implement all of the
- * <em>optional</em> methods of the {@link Collection} and {@link
- * Iterator} interfaces.  The Iterator provided in method {@link
- * #iterator()} is <em>not</em> guaranteed to traverse the elements of
- * the priority queue in any particular order. If you need ordered
- * traversal, consider using {@code Arrays.sort(pq.toArray())}.
- *
- * <p> <strong>Note that this implementation is not synchronized.</strong>
- * Multiple threads should not access a {@code PriorityQueue}
- * instance concurrently if any of the threads modifies the queue.
- * Instead, use the thread-safe {@link
- * java.util.concurrent.PriorityBlockingQueue} class.
- *
- * <p>Implementation note: this implementation provides
- * O(log(n)) time for the enqueing and dequeing methods
- * ({@code offer}, {@code poll}, {@code remove()} and {@code add});
- * linear time for the {@code remove(Object)} and {@code contains(Object)}
- * methods; and constant time for the retrieval methods
- * ({@code peek}, {@code element}, and {@code size}).
- *
- * <p>This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @since 1.5
- * @author Josh Bloch, Doug Lea
- * @param <E> the type of elements held in this collection
- */
-public class PriorityQueue<E> extends AbstractQueue<E>
-    implements java.io.Serializable {
-
-    private static final long serialVersionUID = -7720805057305804111L;
-
-    private static final int DEFAULT_INITIAL_CAPACITY = 11;
-
-    /**
-     * Priority queue represented as a balanced binary heap: the two
-     * children of queue[n] are queue[2*n+1] and queue[2*(n+1)].  The
-     * priority queue is ordered by comparator, or by the elements'
-     * natural ordering, if comparator is null: For each node n in the
-     * heap and each descendant d of n, n <= d.  The element with the
-     * lowest value is in queue[0], assuming the queue is nonempty.
-     */
-    private transient Object[] queue;
-
-    /**
-     * The number of elements in the priority queue.
-     */
-    private int size = 0;
-
-    /**
-     * The comparator, or null if priority queue uses elements'
-     * natural ordering.
-     */
-    private final Comparator<? super E> comparator;
-
-    /**
-     * The number of times this priority queue has been
-     * <i>structurally modified</i>.  See AbstractList for gory details.
-     */
-    private transient int modCount = 0;
-
-    /**
-     * Creates a {@code PriorityQueue} with the default initial
-     * capacity (11) that orders its elements according to their
-     * {@linkplain Comparable natural ordering}.
-     */
-    public PriorityQueue() {
-        this(DEFAULT_INITIAL_CAPACITY, null);
-    }
-
-    /**
-     * Creates a {@code PriorityQueue} with the specified initial
-     * capacity that orders its elements according to their
-     * {@linkplain Comparable natural ordering}.
-     *
-     * @param initialCapacity the initial capacity for this priority queue
-     * @throws IllegalArgumentException if {@code initialCapacity} is less
-     *         than 1
-     */
-    public PriorityQueue(int initialCapacity) {
-        this(initialCapacity, null);
-    }
-
-    /**
-     * Creates a {@code PriorityQueue} with the specified initial capacity
-     * that orders its elements according to the specified comparator.
-     *
-     * @param  initialCapacity the initial capacity for this priority queue
-     * @param  comparator the comparator that will be used to order this
-     *         priority queue.  If {@code null}, the {@linkplain Comparable
-     *         natural ordering} of the elements will be used.
-     * @throws IllegalArgumentException if {@code initialCapacity} is
-     *         less than 1
-     */
-    public PriorityQueue(int initialCapacity,
-                         Comparator<? super E> comparator) {
-        // Note: This restriction of at least one is not actually needed,
-        // but continues for 1.5 compatibility
-        if (initialCapacity < 1)
-            throw new IllegalArgumentException();
-        this.queue = new Object[initialCapacity];
-        this.comparator = comparator;
-    }
-
-    /**
-     * Creates a {@code PriorityQueue} containing the elements in the
-     * specified collection.  If the specified collection is an instance of
-     * a {@link SortedSet} or is another {@code PriorityQueue}, this
-     * priority queue will be ordered according to the same ordering.
-     * Otherwise, this priority queue will be ordered according to the
-     * {@linkplain Comparable natural ordering} of its elements.
-     *
-     * @param  c the collection whose elements are to be placed
-     *         into this priority queue
-     * @throws ClassCastException if elements of the specified collection
-     *         cannot be compared to one another according to the priority
-     *         queue's ordering
-     * @throws NullPointerException if the specified collection or any
-     *         of its elements are null
-     */
-    @SuppressWarnings("unchecked")
-    public PriorityQueue(Collection<? extends E> c) {
-        if (c instanceof SortedSet<?>) {
-            SortedSet<? extends E> ss = (SortedSet<? extends E>) c;
-            this.comparator = (Comparator<? super E>) ss.comparator();
-            initElementsFromCollection(ss);
-        }
-        else if (c instanceof PriorityQueue<?>) {
-            PriorityQueue<? extends E> pq = (PriorityQueue<? extends E>) c;
-            this.comparator = (Comparator<? super E>) pq.comparator();
-            initFromPriorityQueue(pq);
-        }
-        else {
-            this.comparator = null;
-            initFromCollection(c);
-        }
-    }
-
-    /**
-     * Creates a {@code PriorityQueue} containing the elements in the
-     * specified priority queue.  This priority queue will be
-     * ordered according to the same ordering as the given priority
-     * queue.
-     *
-     * @param  c the priority queue whose elements are to be placed
-     *         into this priority queue
-     * @throws ClassCastException if elements of {@code c} cannot be
-     *         compared to one another according to {@code c}'s
-     *         ordering
-     * @throws NullPointerException if the specified priority queue or any
-     *         of its elements are null
-     */
-    @SuppressWarnings("unchecked")
-    public PriorityQueue(PriorityQueue<? extends E> c) {
-        this.comparator = (Comparator<? super E>) c.comparator();
-        initFromPriorityQueue(c);
-    }
-
-    /**
-     * Creates a {@code PriorityQueue} containing the elements in the
-     * specified sorted set.   This priority queue will be ordered
-     * according to the same ordering as the given sorted set.
-     *
-     * @param  c the sorted set whose elements are to be placed
-     *         into this priority queue
-     * @throws ClassCastException if elements of the specified sorted
-     *         set cannot be compared to one another according to the
-     *         sorted set's ordering
-     * @throws NullPointerException if the specified sorted set or any
-     *         of its elements are null
-     */
-    @SuppressWarnings("unchecked")
-    public PriorityQueue(SortedSet<? extends E> c) {
-        this.comparator = (Comparator<? super E>) c.comparator();
-        initElementsFromCollection(c);
-    }
-
-    private void initFromPriorityQueue(PriorityQueue<? extends E> c) {
-        if (c.getClass() == PriorityQueue.class) {
-            this.queue = c.toArray();
-            this.size = c.size();
-        } else {
-            initFromCollection(c);
-        }
-    }
-
-    private void initElementsFromCollection(Collection<? extends E> c) {
-        Object[] a = c.toArray();
-        // If c.toArray incorrectly doesn't return Object[], copy it.
-        if (a.getClass() != Object[].class)
-            a = Arrays.copyOf(a, a.length, Object[].class);
-        int len = a.length;
-        if (len == 1 || this.comparator != null)
-            for (int i = 0; i < len; i++)
-                if (a[i] == null)
-                    throw new NullPointerException();
-        this.queue = a;
-        this.size = a.length;
-    }
-
-    /**
-     * Initializes queue array with elements from the given Collection.
-     *
-     * @param c the collection
-     */
-    private void initFromCollection(Collection<? extends E> c) {
-        initElementsFromCollection(c);
-        heapify();
-    }
-
-    /**
-     * The maximum size of array to allocate.
-     * Some VMs reserve some header words in an array.
-     * Attempts to allocate larger arrays may result in
-     * OutOfMemoryError: Requested array size exceeds VM limit
-     */
-    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
-    /**
-     * Increases the capacity of the array.
-     *
-     * @param minCapacity the desired minimum capacity
-     */
-    private void grow(int minCapacity) {
-        int oldCapacity = queue.length;
-        // Double size if small; else grow by 50%
-        int newCapacity = oldCapacity + ((oldCapacity < 64) ?
-                                         (oldCapacity + 2) :
-                                         (oldCapacity >> 1));
-        // overflow-conscious code
-        if (newCapacity - MAX_ARRAY_SIZE > 0)
-            newCapacity = hugeCapacity(minCapacity);
-        queue = Arrays.copyOf(queue, newCapacity);
-    }
-
-    private static int hugeCapacity(int minCapacity) {
-        if (minCapacity < 0) // overflow
-            throw new OutOfMemoryError();
-        return (minCapacity > MAX_ARRAY_SIZE) ?
-            Integer.MAX_VALUE :
-            MAX_ARRAY_SIZE;
-    }
-
-    /**
-     * Inserts the specified element into this priority queue.
-     *
-     * @return {@code true} (as specified by {@link Collection#add})
-     * @throws ClassCastException if the specified element cannot be
-     *         compared with elements currently in this priority queue
-     *         according to the priority queue's ordering
-     * @throws NullPointerException if the specified element is null
-     */
-    public boolean add(E e) {
-        return offer(e);
-    }
-
-    /**
-     * Inserts the specified element into this priority queue.
-     *
-     * @return {@code true} (as specified by {@link Queue#offer})
-     * @throws ClassCastException if the specified element cannot be
-     *         compared with elements currently in this priority queue
-     *         according to the priority queue's ordering
-     * @throws NullPointerException if the specified element is null
-     */
-    public boolean offer(E e) {
-        if (e == null)
-            throw new NullPointerException();
-        modCount++;
-        int i = size;
-        if (i >= queue.length)
-            grow(i + 1);
-        size = i + 1;
-        if (i == 0)
-            queue[0] = e;
-        else
-            siftUp(i, e);
-        return true;
-    }
-
-    public E peek() {
-        if (size == 0)
-            return null;
-        return (E) queue[0];
-    }
-
-    private int indexOf(Object o) {
-        if (o != null) {
-            for (int i = 0; i < size; i++)
-                if (o.equals(queue[i]))
-                    return i;
-        }
-        return -1;
-    }
-
-    /**
-     * Removes a single instance of the specified element from this queue,
-     * if it is present.  More formally, removes an element {@code e} such
-     * that {@code o.equals(e)}, if this queue contains one or more such
-     * elements.  Returns {@code true} if and only if this queue contained
-     * the specified element (or equivalently, if this queue changed as a
-     * result of the call).
-     *
-     * @param o element to be removed from this queue, if present
-     * @return {@code true} if this queue changed as a result of the call
-     */
-    public boolean remove(Object o) {
-        int i = indexOf(o);
-        if (i == -1)
-            return false;
-        else {
-            removeAt(i);
-            return true;
-        }
-    }
-
-    /**
-     * Version of remove using reference equality, not equals.
-     * Needed by iterator.remove.
-     *
-     * @param o element to be removed from this queue, if present
-     * @return {@code true} if removed
-     */
-    boolean removeEq(Object o) {
-        for (int i = 0; i < size; i++) {
-            if (o == queue[i]) {
-                removeAt(i);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns {@code true} if this queue contains the specified element.
-     * More formally, returns {@code true} if and only if this queue contains
-     * at least one element {@code e} such that {@code o.equals(e)}.
-     *
-     * @param o object to be checked for containment in this queue
-     * @return {@code true} if this queue contains the specified element
-     */
-    public boolean contains(Object o) {
-        return indexOf(o) != -1;
-    }
-
-    /**
-     * Returns an array containing all of the elements in this queue.
-     * The elements are in no particular order.
-     *
-     * <p>The returned array will be "safe" in that no references to it are
-     * maintained by this queue.  (In other words, this method must allocate
-     * a new array).  The caller is thus free to modify the returned array.
-     *
-     * <p>This method acts as bridge between array-based and collection-based
-     * APIs.
-     *
-     * @return an array containing all of the elements in this queue
-     */
-    public Object[] toArray() {
-        return Arrays.copyOf(queue, size);
-    }
-
-    /**
-     * Returns an array containing all of the elements in this queue; the
-     * runtime type of the returned array is that of the specified array.
-     * The returned array elements are in no particular order.
-     * If the queue fits in the specified array, it is returned therein.
-     * Otherwise, a new array is allocated with the runtime type of the
-     * specified array and the size of this queue.
-     *
-     * <p>If the queue fits in the specified array with room to spare
-     * (i.e., the array has more elements than the queue), the element in
-     * the array immediately following the end of the collection is set to
-     * {@code null}.
-     *
-     * <p>Like the {@link #toArray()} method, this method acts as bridge between
-     * array-based and collection-based APIs.  Further, this method allows
-     * precise control over the runtime type of the output array, and may,
-     * under certain circumstances, be used to save allocation costs.
-     *
-     * <p>Suppose <tt>x</tt> is a queue known to contain only strings.
-     * The following code can be used to dump the queue into a newly
-     * allocated array of <tt>String</tt>:
-     *
-     * <pre>
-     *     String[] y = x.toArray(new String[0]);</pre>
-     *
-     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
-     * <tt>toArray()</tt>.
-     *
-     * @param a the array into which the elements of the queue are to
-     *          be stored, if it is big enough; otherwise, a new array of the
-     *          same runtime type is allocated for this purpose.
-     * @return an array containing all of the elements in this queue
-     * @throws ArrayStoreException if the runtime type of the specified array
-     *         is not a supertype of the runtime type of every element in
-     *         this queue
-     * @throws NullPointerException if the specified array is null
-     */
-    public <T> T[] toArray(T[] a) {
-        if (a.length < size)
-            // Make a new array of a's runtime type, but my contents:
-            return (T[]) Arrays.copyOf(queue, size, a.getClass());
-        System.arraycopy(queue, 0, a, 0, size);
-        if (a.length > size)
-            a[size] = null;
-        return a;
-    }
-
-    /**
-     * Returns an iterator over the elements in this queue. The iterator
-     * does not return the elements in any particular order.
-     *
-     * @return an iterator over the elements in this queue
-     */
-    public Iterator<E> iterator() {
-        return new Itr();
-    }
-
-    private final class Itr implements Iterator<E> {
-        /**
-         * Index (into queue array) of element to be returned by
-         * subsequent call to next.
-         */
-        private int cursor = 0;
-
-        /**
-         * Index of element returned by most recent call to next,
-         * unless that element came from the forgetMeNot list.
-         * Set to -1 if element is deleted by a call to remove.
-         */
-        private int lastRet = -1;
-
-        /**
-         * A queue of elements that were moved from the unvisited portion of
-         * the heap into the visited portion as a result of "unlucky" element
-         * removals during the iteration.  (Unlucky element removals are those
-         * that require a siftup instead of a siftdown.)  We must visit all of
-         * the elements in this list to complete the iteration.  We do this
-         * after we've completed the "normal" iteration.
-         *
-         * We expect that most iterations, even those involving removals,
-         * will not need to store elements in this field.
-         */
-        private ArrayDeque<E> forgetMeNot = null;
-
-        /**
-         * Element returned by the most recent call to next iff that
-         * element was drawn from the forgetMeNot list.
-         */
-        private E lastRetElt = null;
-
-        /**
-         * The modCount value that the iterator believes that the backing
-         * Queue should have.  If this expectation is violated, the iterator
-         * has detected concurrent modification.
-         */
-        private int expectedModCount = modCount;
-
-        public boolean hasNext() {
-            return cursor < size ||
-                (forgetMeNot != null && !forgetMeNot.isEmpty());
-        }
-
-        public E next() {
-            if (expectedModCount != modCount)
-                throw new ConcurrentModificationException();
-            if (cursor < size)
-                return (E) queue[lastRet = cursor++];
-            if (forgetMeNot != null) {
-                lastRet = -1;
-                lastRetElt = forgetMeNot.poll();
-                if (lastRetElt != null)
-                    return lastRetElt;
-            }
-            throw new NoSuchElementException();
-        }
-
-        public void remove() {
-            if (expectedModCount != modCount)
-                throw new ConcurrentModificationException();
-            if (lastRet != -1) {
-                E moved = PriorityQueue.this.removeAt(lastRet);
-                lastRet = -1;
-                if (moved == null)
-                    cursor--;
-                else {
-                    if (forgetMeNot == null)
-                        forgetMeNot = new ArrayDeque<>();
-                    forgetMeNot.add(moved);
-                }
-            } else if (lastRetElt != null) {
-                PriorityQueue.this.removeEq(lastRetElt);
-                lastRetElt = null;
-            } else {
-                throw new IllegalStateException();
-            }
-            expectedModCount = modCount;
-        }
-    }
-
-    public int size() {
-        return size;
-    }
-
-    /**
-     * Removes all of the elements from this priority queue.
-     * The queue will be empty after this call returns.
-     */
-    public void clear() {
-        modCount++;
-        for (int i = 0; i < size; i++)
-            queue[i] = null;
-        size = 0;
-    }
-
-    public E poll() {
-        if (size == 0)
-            return null;
-        int s = --size;
-        modCount++;
-        E result = (E) queue[0];
-        E x = (E) queue[s];
-        queue[s] = null;
-        if (s != 0)
-            siftDown(0, x);
-        return result;
-    }
-
-    /**
-     * Removes the ith element from queue.
-     *
-     * Normally this method leaves the elements at up to i-1,
-     * inclusive, untouched.  Under these circumstances, it returns
-     * null.  Occasionally, in order to maintain the heap invariant,
-     * it must swap a later element of the list with one earlier than
-     * i.  Under these circumstances, this method returns the element
-     * that was previously at the end of the list and is now at some
-     * position before i. This fact is used by iterator.remove so as to
-     * avoid missing traversing elements.
-     */
-    private E removeAt(int i) {
-        assert i >= 0 && i < size;
-        modCount++;
-        int s = --size;
-        if (s == i) // removed last element
-            queue[i] = null;
-        else {
-            E moved = (E) queue[s];
-            queue[s] = null;
-            siftDown(i, moved);
-            if (queue[i] == moved) {
-                siftUp(i, moved);
-                if (queue[i] != moved)
-                    return moved;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Inserts item x at position k, maintaining heap invariant by
-     * promoting x up the tree until it is greater than or equal to
-     * its parent, or is the root.
-     *
-     * To simplify and speed up coercions and comparisons. the
-     * Comparable and Comparator versions are separated into different
-     * methods that are otherwise identical. (Similarly for siftDown.)
-     *
-     * @param k the position to fill
-     * @param x the item to insert
-     */
-    private void siftUp(int k, E x) {
-        if (comparator != null)
-            siftUpUsingComparator(k, x);
-        else
-            siftUpComparable(k, x);
-    }
-
-    private void siftUpComparable(int k, E x) {
-        Comparable<? super E> key = (Comparable<? super E>) x;
-        while (k > 0) {
-            int parent = (k - 1) >>> 1;
-            Object e = queue[parent];
-            if (key.compareTo((E) e) >= 0)
-                break;
-            queue[k] = e;
-            k = parent;
-        }
-        queue[k] = key;
-    }
-
-    private void siftUpUsingComparator(int k, E x) {
-        while (k > 0) {
-            int parent = (k - 1) >>> 1;
-            Object e = queue[parent];
-            if (comparator.compare(x, (E) e) >= 0)
-                break;
-            queue[k] = e;
-            k = parent;
-        }
-        queue[k] = x;
-    }
-
-    /**
-     * Inserts item x at position k, maintaining heap invariant by
-     * demoting x down the tree repeatedly until it is less than or
-     * equal to its children or is a leaf.
-     *
-     * @param k the position to fill
-     * @param x the item to insert
-     */
-    private void siftDown(int k, E x) {
-        if (comparator != null)
-            siftDownUsingComparator(k, x);
-        else
-            siftDownComparable(k, x);
-    }
-
-    private void siftDownComparable(int k, E x) {
-        Comparable<? super E> key = (Comparable<? super E>)x;
-        int half = size >>> 1;        // loop while a non-leaf
-        while (k < half) {
-            int child = (k << 1) + 1; // assume left child is least
-            Object c = queue[child];
-            int right = child + 1;
-            if (right < size &&
-                ((Comparable<? super E>) c).compareTo((E) queue[right]) > 0)
-                c = queue[child = right];
-            if (key.compareTo((E) c) <= 0)
-                break;
-            queue[k] = c;
-            k = child;
-        }
-        queue[k] = key;
-    }
-
-    private void siftDownUsingComparator(int k, E x) {
-        int half = size >>> 1;
-        while (k < half) {
-            int child = (k << 1) + 1;
-            Object c = queue[child];
-            int right = child + 1;
-            if (right < size &&
-                comparator.compare((E) c, (E) queue[right]) > 0)
-                c = queue[child = right];
-            if (comparator.compare(x, (E) c) <= 0)
-                break;
-            queue[k] = c;
-            k = child;
-        }
-        queue[k] = x;
-    }
-
-    /**
-     * Establishes the heap invariant (described above) in the entire tree,
-     * assuming nothing about the order of the elements prior to the call.
-     */
-    private void heapify() {
-        for (int i = (size >>> 1) - 1; i >= 0; i--)
-            siftDown(i, (E) queue[i]);
-    }
-
-    /**
-     * Returns the comparator used to order the elements in this
-     * queue, or {@code null} if this queue is sorted according to
-     * the {@linkplain Comparable natural ordering} of its elements.
-     *
-     * @return the comparator used to order this queue, or
-     *         {@code null} if this queue is sorted according to the
-     *         natural ordering of its elements
-     */
-    public Comparator<? super E> comparator() {
-        return comparator;
-    }
-
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Queue.java
--- a/emul/compact/src/main/java/java/util/Queue.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-package java.util;
-
-/**
- * A collection designed for holding elements prior to processing.
- * Besides basic {@link java.util.Collection Collection} operations,
- * queues provide additional insertion, extraction, and inspection
- * operations.  Each of these methods exists in two forms: one throws
- * an exception if the operation fails, the other returns a special
- * value (either <tt>null</tt> or <tt>false</tt>, depending on the
- * operation).  The latter form of the insert operation is designed
- * specifically for use with capacity-restricted <tt>Queue</tt>
- * implementations; in most implementations, insert operations cannot
- * fail.
- *
- * <p>
- * <table BORDER CELLPADDING=3 CELLSPACING=1>
- *  <tr>
- *    <td></td>
- *    <td ALIGN=CENTER><em>Throws exception</em></td>
- *    <td ALIGN=CENTER><em>Returns special value</em></td>
- *  </tr>
- *  <tr>
- *    <td><b>Insert</b></td>
- *    <td>{@link #add add(e)}</td>
- *    <td>{@link #offer offer(e)}</td>
- *  </tr>
- *  <tr>
- *    <td><b>Remove</b></td>
- *    <td>{@link #remove remove()}</td>
- *    <td>{@link #poll poll()}</td>
- *  </tr>
- *  <tr>
- *    <td><b>Examine</b></td>
- *    <td>{@link #element element()}</td>
- *    <td>{@link #peek peek()}</td>
- *  </tr>
- * </table>
- *
- * <p>Queues typically, but do not necessarily, order elements in a
- * FIFO (first-in-first-out) manner.  Among the exceptions are
- * priority queues, which order elements according to a supplied
- * comparator, or the elements' natural ordering, and LIFO queues (or
- * stacks) which order the elements LIFO (last-in-first-out).
- * Whatever the ordering used, the <em>head</em> of the queue is that
- * element which would be removed by a call to {@link #remove() } or
- * {@link #poll()}.  In a FIFO queue, all new elements are inserted at
- * the <em> tail</em> of the queue. Other kinds of queues may use
- * different placement rules.  Every <tt>Queue</tt> implementation
- * must specify its ordering properties.
- *
- * <p>The {@link #offer offer} method inserts an element if possible,
- * otherwise returning <tt>false</tt>.  This differs from the {@link
- * java.util.Collection#add Collection.add} method, which can fail to
- * add an element only by throwing an unchecked exception.  The
- * <tt>offer</tt> method is designed for use when failure is a normal,
- * rather than exceptional occurrence, for example, in fixed-capacity
- * (or &quot;bounded&quot;) queues.
- *
- * <p>The {@link #remove()} and {@link #poll()} methods remove and
- * return the head of the queue.
- * Exactly which element is removed from the queue is a
- * function of the queue's ordering policy, which differs from
- * implementation to implementation. The <tt>remove()</tt> and
- * <tt>poll()</tt> methods differ only in their behavior when the
- * queue is empty: the <tt>remove()</tt> method throws an exception,
- * while the <tt>poll()</tt> method returns <tt>null</tt>.
- *
- * <p>The {@link #element()} and {@link #peek()} methods return, but do
- * not remove, the head of the queue.
- *
- * <p>The <tt>Queue</tt> interface does not define the <i>blocking queue
- * methods</i>, which are common in concurrent programming.  These methods,
- * which wait for elements to appear or for space to become available, are
- * defined in the {@link java.util.concurrent.BlockingQueue} interface, which
- * extends this interface.
- *
- * <p><tt>Queue</tt> implementations generally do not allow insertion
- * of <tt>null</tt> elements, although some implementations, such as
- * {@link LinkedList}, do not prohibit insertion of <tt>null</tt>.
- * Even in the implementations that permit it, <tt>null</tt> should
- * not be inserted into a <tt>Queue</tt>, as <tt>null</tt> is also
- * used as a special return value by the <tt>poll</tt> method to
- * indicate that the queue contains no elements.
- *
- * <p><tt>Queue</tt> implementations generally do not define
- * element-based versions of methods <tt>equals</tt> and
- * <tt>hashCode</tt> but instead inherit the identity based versions
- * from class <tt>Object</tt>, because element-based equality is not
- * always well-defined for queues with the same elements but different
- * ordering properties.
- *
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @see java.util.Collection
- * @see LinkedList
- * @see PriorityQueue
- * @see java.util.concurrent.LinkedBlockingQueue
- * @see java.util.concurrent.BlockingQueue
- * @see java.util.concurrent.ArrayBlockingQueue
- * @see java.util.concurrent.LinkedBlockingQueue
- * @see java.util.concurrent.PriorityBlockingQueue
- * @since 1.5
- * @author Doug Lea
- * @param <E> the type of elements held in this collection
- */
-public interface Queue<E> extends Collection<E> {
-    /**
-     * Inserts the specified element into this queue if it is possible to do so
-     * immediately without violating capacity restrictions, returning
-     * <tt>true</tt> upon success and throwing an <tt>IllegalStateException</tt>
-     * if no space is currently available.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> (as specified by {@link Collection#add})
-     * @throws IllegalStateException if the element cannot be added at this
-     *         time due to capacity restrictions
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this queue
-     * @throws NullPointerException if the specified element is null and
-     *         this queue does not permit null elements
-     * @throws IllegalArgumentException if some property of this element
-     *         prevents it from being added to this queue
-     */
-    boolean add(E e);
-
-    /**
-     * Inserts the specified element into this queue if it is possible to do
-     * so immediately without violating capacity restrictions.
-     * When using a capacity-restricted queue, this method is generally
-     * preferable to {@link #add}, which can fail to insert an element only
-     * by throwing an exception.
-     *
-     * @param e the element to add
-     * @return <tt>true</tt> if the element was added to this queue, else
-     *         <tt>false</tt>
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this queue
-     * @throws NullPointerException if the specified element is null and
-     *         this queue does not permit null elements
-     * @throws IllegalArgumentException if some property of this element
-     *         prevents it from being added to this queue
-     */
-    boolean offer(E e);
-
-    /**
-     * Retrieves and removes the head of this queue.  This method differs
-     * from {@link #poll poll} only in that it throws an exception if this
-     * queue is empty.
-     *
-     * @return the head of this queue
-     * @throws NoSuchElementException if this queue is empty
-     */
-    E remove();
-
-    /**
-     * Retrieves and removes the head of this queue,
-     * or returns <tt>null</tt> if this queue is empty.
-     *
-     * @return the head of this queue, or <tt>null</tt> if this queue is empty
-     */
-    E poll();
-
-    /**
-     * Retrieves, but does not remove, the head of this queue.  This method
-     * differs from {@link #peek peek} only in that it throws an exception
-     * if this queue is empty.
-     *
-     * @return the head of this queue
-     * @throws NoSuchElementException if this queue is empty
-     */
-    E element();
-
-    /**
-     * Retrieves, but does not remove, the head of this queue,
-     * or returns <tt>null</tt> if this queue is empty.
-     *
-     * @return the head of this queue, or <tt>null</tt> if this queue is empty
-     */
-    E peek();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Random.java
--- a/emul/compact/src/main/java/java/util/Random.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,503 +0,0 @@
-/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * An instance of this class is used to generate a stream of
- * pseudorandom numbers. The class uses a 48-bit seed, which is
- * modified using a linear congruential formula. (See Donald Knuth,
- * <i>The Art of Computer Programming, Volume 2</i>, Section 3.2.1.)
- * <p>
- * If two instances of {@code Random} are created with the same
- * seed, and the same sequence of method calls is made for each, they
- * will generate and return identical sequences of numbers. In order to
- * guarantee this property, particular algorithms are specified for the
- * class {@code Random}. Java implementations must use all the algorithms
- * shown here for the class {@code Random}, for the sake of absolute
- * portability of Java code. However, subclasses of class {@code Random}
- * are permitted to use other algorithms, so long as they adhere to the
- * general contracts for all the methods.
- * <p>
- * The algorithms implemented by class {@code Random} use a
- * {@code protected} utility method that on each invocation can supply
- * up to 32 pseudorandomly generated bits.
- * <p>
- * Many applications will find the method {@link Math#random} simpler to use.
- *
- * <p>Instances of {@code java.util.Random} are threadsafe.
- * However, the concurrent use of the same {@code java.util.Random}
- * instance across threads may encounter contention and consequent
- * poor performance. Consider instead using
- * {@link java.util.concurrent.ThreadLocalRandom} in multithreaded
- * designs.
- *
- * <p>Instances of {@code java.util.Random} are not cryptographically
- * secure.  Consider instead using {@link java.security.SecureRandom} to
- * get a cryptographically secure pseudo-random number generator for use
- * by security-sensitive applications.
- *
- * @author  Frank Yellin
- * @since   1.0
- */
-public
-class Random implements java.io.Serializable {
-    /** use serialVersionUID from JDK 1.1 for interoperability */
-    static final long serialVersionUID = 3905348978240129619L;
-
-    /**
-     * The internal state associated with this pseudorandom number generator.
-     * (The specs for the methods in this class describe the ongoing
-     * computation of this value.)
-     */
-    private long seed;
-
-    private static final long multiplier = 0x5DEECE66DL;
-    private static final long addend = 0xBL;
-    private static final long mask = (1L << 48) - 1;
-
-    /**
-     * Creates a new random number generator. This constructor sets
-     * the seed of the random number generator to a value very likely
-     * to be distinct from any other invocation of this constructor.
-     */
-    public Random() {
-        this(seedUniquifier() ^ System.nanoTime());
-    }
-    
-    private static synchronized long seedUniquifier() {
-        // L'Ecuyer, "Tables of Linear Congruential Generators of
-        // Different Sizes and Good Lattice Structure", 1999
-        long current = seedUniquifier;
-        long next = current * 181783497276652981L;
-        seedUniquifier = next;
-        return next;
-    }
-
-    private static long seedUniquifier = 8682522807148012L;
-
-    /**
-     * Creates a new random number generator using a single {@code long} seed.
-     * The seed is the initial value of the internal state of the pseudorandom
-     * number generator which is maintained by method {@link #next}.
-     *
-     * <p>The invocation {@code new Random(seed)} is equivalent to:
-     *  <pre> {@code
-     * Random rnd = new Random();
-     * rnd.setSeed(seed);}</pre>
-     *
-     * @param seed the initial seed
-     * @see   #setSeed(long)
-     */
-    public Random(long seed) {
-        this.seed = initialScramble(seed);
-    }
-
-    private static long initialScramble(long seed) {
-        return (seed ^ multiplier) & mask;
-    }
-
-    /**
-     * Sets the seed of this random number generator using a single
-     * {@code long} seed. The general contract of {@code setSeed} is
-     * that it alters the state of this random number generator object
-     * so as to be in exactly the same state as if it had just been
-     * created with the argument {@code seed} as a seed. The method
-     * {@code setSeed} is implemented by class {@code Random} by
-     * atomically updating the seed to
-     *  <pre>{@code (seed ^ 0x5DEECE66DL) & ((1L << 48) - 1)}</pre>
-     * and clearing the {@code haveNextNextGaussian} flag used by {@link
-     * #nextGaussian}.
-     *
-     * <p>The implementation of {@code setSeed} by class {@code Random}
-     * happens to use only 48 bits of the given seed. In general, however,
-     * an overriding method may use all 64 bits of the {@code long}
-     * argument as a seed value.
-     *
-     * @param seed the initial seed
-     */
-    synchronized public void setSeed(long seed) {
-        this.seed = initialScramble(seed);
-        haveNextNextGaussian = false;
-    }
-
-    /**
-     * Generates the next pseudorandom number. Subclasses should
-     * override this, as this is used by all other methods.
-     *
-     * <p>The general contract of {@code next} is that it returns an
-     * {@code int} value and if the argument {@code bits} is between
-     * {@code 1} and {@code 32} (inclusive), then that many low-order
-     * bits of the returned value will be (approximately) independently
-     * chosen bit values, each of which is (approximately) equally
-     * likely to be {@code 0} or {@code 1}. The method {@code next} is
-     * implemented by class {@code Random} by atomically updating the seed to
-     *  <pre>{@code (seed * 0x5DEECE66DL + 0xBL) & ((1L << 48) - 1)}</pre>
-     * and returning
-     *  <pre>{@code (int)(seed >>> (48 - bits))}.</pre>
-     *
-     * This is a linear congruential pseudorandom number generator, as
-     * defined by D. H. Lehmer and described by Donald E. Knuth in
-     * <i>The Art of Computer Programming,</i> Volume 3:
-     * <i>Seminumerical Algorithms</i>, section 3.2.1.
-     *
-     * @param  bits random bits
-     * @return the next pseudorandom value from this random number
-     *         generator's sequence
-     * @since  1.1
-     */
-    protected synchronized int next(int bits) {
-        long oldseed, nextseed;
-        long seed = this.seed;
-        oldseed = seed;
-        nextseed = (oldseed * multiplier + addend) & mask;
-        this.seed = nextseed;
-        return (int)(nextseed >>> (48 - bits));
-    }
-
-    /**
-     * Generates random bytes and places them into a user-supplied
-     * byte array.  The number of random bytes produced is equal to
-     * the length of the byte array.
-     *
-     * <p>The method {@code nextBytes} is implemented by class {@code Random}
-     * as if by:
-     *  <pre> {@code
-     * public void nextBytes(byte[] bytes) {
-     *   for (int i = 0; i < bytes.length; )
-     *     for (int rnd = nextInt(), n = Math.min(bytes.length - i, 4);
-     *          n-- > 0; rnd >>= 8)
-     *       bytes[i++] = (byte)rnd;
-     * }}</pre>
-     *
-     * @param  bytes the byte array to fill with random bytes
-     * @throws NullPointerException if the byte array is null
-     * @since  1.1
-     */
-    public void nextBytes(byte[] bytes) {
-        for (int i = 0, len = bytes.length; i < len; )
-            for (int rnd = nextInt(),
-                     n = Math.min(len - i, Integer.SIZE/Byte.SIZE);
-                 n-- > 0; rnd >>= Byte.SIZE)
-                bytes[i++] = (byte)rnd;
-    }
-
-    /**
-     * Returns the next pseudorandom, uniformly distributed {@code int}
-     * value from this random number generator's sequence. The general
-     * contract of {@code nextInt} is that one {@code int} value is
-     * pseudorandomly generated and returned. All 2<font size="-1"><sup>32
-     * </sup></font> possible {@code int} values are produced with
-     * (approximately) equal probability.
-     *
-     * <p>The method {@code nextInt} is implemented by class {@code Random}
-     * as if by:
-     *  <pre> {@code
-     * public int nextInt() {
-     *   return next(32);
-     * }}</pre>
-     *
-     * @return the next pseudorandom, uniformly distributed {@code int}
-     *         value from this random number generator's sequence
-     */
-    public int nextInt() {
-        return next(32);
-    }
-
-    /**
-     * Returns a pseudorandom, uniformly distributed {@code int} value
-     * between 0 (inclusive) and the specified value (exclusive), drawn from
-     * this random number generator's sequence.  The general contract of
-     * {@code nextInt} is that one {@code int} value in the specified range
-     * is pseudorandomly generated and returned.  All {@code n} possible
-     * {@code int} values are produced with (approximately) equal
-     * probability.  The method {@code nextInt(int n)} is implemented by
-     * class {@code Random} as if by:
-     *  <pre> {@code
-     * public int nextInt(int n) {
-     *   if (n <= 0)
-     *     throw new IllegalArgumentException("n must be positive");
-     *
-     *   if ((n & -n) == n)  // i.e., n is a power of 2
-     *     return (int)((n * (long)next(31)) >> 31);
-     *
-     *   int bits, val;
-     *   do {
-     *       bits = next(31);
-     *       val = bits % n;
-     *   } while (bits - val + (n-1) < 0);
-     *   return val;
-     * }}</pre>
-     *
-     * <p>The hedge "approximately" is used in the foregoing description only
-     * because the next method is only approximately an unbiased source of
-     * independently chosen bits.  If it were a perfect source of randomly
-     * chosen bits, then the algorithm shown would choose {@code int}
-     * values from the stated range with perfect uniformity.
-     * <p>
-     * The algorithm is slightly tricky.  It rejects values that would result
-     * in an uneven distribution (due to the fact that 2^31 is not divisible
-     * by n). The probability of a value being rejected depends on n.  The
-     * worst case is n=2^30+1, for which the probability of a reject is 1/2,
-     * and the expected number of iterations before the loop terminates is 2.
-     * <p>
-     * The algorithm treats the case where n is a power of two specially: it
-     * returns the correct number of high-order bits from the underlying
-     * pseudo-random number generator.  In the absence of special treatment,
-     * the correct number of <i>low-order</i> bits would be returned.  Linear
-     * congruential pseudo-random number generators such as the one
-     * implemented by this class are known to have short periods in the
-     * sequence of values of their low-order bits.  Thus, this special case
-     * greatly increases the length of the sequence of values returned by
-     * successive calls to this method if n is a small power of two.
-     *
-     * @param n the bound on the random number to be returned.  Must be
-     *        positive.
-     * @return the next pseudorandom, uniformly distributed {@code int}
-     *         value between {@code 0} (inclusive) and {@code n} (exclusive)
-     *         from this random number generator's sequence
-     * @throws IllegalArgumentException if n is not positive
-     * @since 1.2
-     */
-
-    public int nextInt(int n) {
-        if (n <= 0)
-            throw new IllegalArgumentException("n must be positive");
-
-        if ((n & -n) == n)  // i.e., n is a power of 2
-            return (int)((n * (long)next(31)) >> 31);
-
-        int bits, val;
-        do {
-            bits = next(31);
-            val = bits % n;
-        } while (bits - val + (n-1) < 0);
-        return val;
-    }
-
-    /**
-     * Returns the next pseudorandom, uniformly distributed {@code long}
-     * value from this random number generator's sequence. The general
-     * contract of {@code nextLong} is that one {@code long} value is
-     * pseudorandomly generated and returned.
-     *
-     * <p>The method {@code nextLong} is implemented by class {@code Random}
-     * as if by:
-     *  <pre> {@code
-     * public long nextLong() {
-     *   return ((long)next(32) << 32) + next(32);
-     * }}</pre>
-     *
-     * Because class {@code Random} uses a seed with only 48 bits,
-     * this algorithm will not return all possible {@code long} values.
-     *
-     * @return the next pseudorandom, uniformly distributed {@code long}
-     *         value from this random number generator's sequence
-     */
-    public long nextLong() {
-        // it's okay that the bottom word remains signed.
-        return ((long)(next(32)) << 32) + next(32);
-    }
-
-    /**
-     * Returns the next pseudorandom, uniformly distributed
-     * {@code boolean} value from this random number generator's
-     * sequence. The general contract of {@code nextBoolean} is that one
-     * {@code boolean} value is pseudorandomly generated and returned.  The
-     * values {@code true} and {@code false} are produced with
-     * (approximately) equal probability.
-     *
-     * <p>The method {@code nextBoolean} is implemented by class {@code Random}
-     * as if by:
-     *  <pre> {@code
-     * public boolean nextBoolean() {
-     *   return next(1) != 0;
-     * }}</pre>
-     *
-     * @return the next pseudorandom, uniformly distributed
-     *         {@code boolean} value from this random number generator's
-     *         sequence
-     * @since 1.2
-     */
-    public boolean nextBoolean() {
-        return next(1) != 0;
-    }
-
-    /**
-     * Returns the next pseudorandom, uniformly distributed {@code float}
-     * value between {@code 0.0} and {@code 1.0} from this random
-     * number generator's sequence.
-     *
-     * <p>The general contract of {@code nextFloat} is that one
-     * {@code float} value, chosen (approximately) uniformly from the
-     * range {@code 0.0f} (inclusive) to {@code 1.0f} (exclusive), is
-     * pseudorandomly generated and returned. All 2<font
-     * size="-1"><sup>24</sup></font> possible {@code float} values
-     * of the form <i>m&nbsp;x&nbsp</i>2<font
-     * size="-1"><sup>-24</sup></font>, where <i>m</i> is a positive
-     * integer less than 2<font size="-1"><sup>24</sup> </font>, are
-     * produced with (approximately) equal probability.
-     *
-     * <p>The method {@code nextFloat} is implemented by class {@code Random}
-     * as if by:
-     *  <pre> {@code
-     * public float nextFloat() {
-     *   return next(24) / ((float)(1 << 24));
-     * }}</pre>
-     *
-     * <p>The hedge "approximately" is used in the foregoing description only
-     * because the next method is only approximately an unbiased source of
-     * independently chosen bits. If it were a perfect source of randomly
-     * chosen bits, then the algorithm shown would choose {@code float}
-     * values from the stated range with perfect uniformity.<p>
-     * [In early versions of Java, the result was incorrectly calculated as:
-     *  <pre> {@code
-     *   return next(30) / ((float)(1 << 30));}</pre>
-     * This might seem to be equivalent, if not better, but in fact it
-     * introduced a slight nonuniformity because of the bias in the rounding
-     * of floating-point numbers: it was slightly more likely that the
-     * low-order bit of the significand would be 0 than that it would be 1.]
-     *
-     * @return the next pseudorandom, uniformly distributed {@code float}
-     *         value between {@code 0.0} and {@code 1.0} from this
-     *         random number generator's sequence
-     */
-    public float nextFloat() {
-        return next(24) / ((float)(1 << 24));
-    }
-
-    /**
-     * Returns the next pseudorandom, uniformly distributed
-     * {@code double} value between {@code 0.0} and
-     * {@code 1.0} from this random number generator's sequence.
-     *
-     * <p>The general contract of {@code nextDouble} is that one
-     * {@code double} value, chosen (approximately) uniformly from the
-     * range {@code 0.0d} (inclusive) to {@code 1.0d} (exclusive), is
-     * pseudorandomly generated and returned.
-     *
-     * <p>The method {@code nextDouble} is implemented by class {@code Random}
-     * as if by:
-     *  <pre> {@code
-     * public double nextDouble() {
-     *   return (((long)next(26) << 27) + next(27))
-     *     / (double)(1L << 53);
-     * }}</pre>
-     *
-     * <p>The hedge "approximately" is used in the foregoing description only
-     * because the {@code next} method is only approximately an unbiased
-     * source of independently chosen bits. If it were a perfect source of
-     * randomly chosen bits, then the algorithm shown would choose
-     * {@code double} values from the stated range with perfect uniformity.
-     * <p>[In early versions of Java, the result was incorrectly calculated as:
-     *  <pre> {@code
-     *   return (((long)next(27) << 27) + next(27))
-     *     / (double)(1L << 54);}</pre>
-     * This might seem to be equivalent, if not better, but in fact it
-     * introduced a large nonuniformity because of the bias in the rounding
-     * of floating-point numbers: it was three times as likely that the
-     * low-order bit of the significand would be 0 than that it would be 1!
-     * This nonuniformity probably doesn't matter much in practice, but we
-     * strive for perfection.]
-     *
-     * @return the next pseudorandom, uniformly distributed {@code double}
-     *         value between {@code 0.0} and {@code 1.0} from this
-     *         random number generator's sequence
-     * @see Math#random
-     */
-    public double nextDouble() {
-        return (((long)(next(26)) << 27) + next(27))
-            / (double)(1L << 53);
-    }
-
-    private double nextNextGaussian;
-    private boolean haveNextNextGaussian = false;
-
-    /**
-     * Returns the next pseudorandom, Gaussian ("normally") distributed
-     * {@code double} value with mean {@code 0.0} and standard
-     * deviation {@code 1.0} from this random number generator's sequence.
-     * <p>
-     * The general contract of {@code nextGaussian} is that one
-     * {@code double} value, chosen from (approximately) the usual
-     * normal distribution with mean {@code 0.0} and standard deviation
-     * {@code 1.0}, is pseudorandomly generated and returned.
-     *
-     * <p>The method {@code nextGaussian} is implemented by class
-     * {@code Random} as if by a threadsafe version of the following:
-     *  <pre> {@code
-     * private double nextNextGaussian;
-     * private boolean haveNextNextGaussian = false;
-     *
-     * public double nextGaussian() {
-     *   if (haveNextNextGaussian) {
-     *     haveNextNextGaussian = false;
-     *     return nextNextGaussian;
-     *   } else {
-     *     double v1, v2, s;
-     *     do {
-     *       v1 = 2 * nextDouble() - 1;   // between -1.0 and 1.0
-     *       v2 = 2 * nextDouble() - 1;   // between -1.0 and 1.0
-     *       s = v1 * v1 + v2 * v2;
-     *     } while (s >= 1 || s == 0);
-     *     double multiplier = StrictMath.sqrt(-2 * StrictMath.log(s)/s);
-     *     nextNextGaussian = v2 * multiplier;
-     *     haveNextNextGaussian = true;
-     *     return v1 * multiplier;
-     *   }
-     * }}</pre>
-     * This uses the <i>polar method</i> of G. E. P. Box, M. E. Muller, and
-     * G. Marsaglia, as described by Donald E. Knuth in <i>The Art of
-     * Computer Programming</i>, Volume 3: <i>Seminumerical Algorithms</i>,
-     * section 3.4.1, subsection C, algorithm P. Note that it generates two
-     * independent values at the cost of only one call to {@code StrictMath.log}
-     * and one call to {@code StrictMath.sqrt}.
-     *
-     * @return the next pseudorandom, Gaussian ("normally") distributed
-     *         {@code double} value with mean {@code 0.0} and
-     *         standard deviation {@code 1.0} from this random number
-     *         generator's sequence
-     */
-    synchronized public double nextGaussian() {
-        // See Knuth, ACP, Section 3.4.1 Algorithm C.
-        if (haveNextNextGaussian) {
-            haveNextNextGaussian = false;
-            return nextNextGaussian;
-        } else {
-            double v1, v2, s;
-            do {
-                v1 = 2 * nextDouble() - 1; // between -1 and 1
-                v2 = 2 * nextDouble() - 1; // between -1 and 1
-                s = v1 * v1 + v2 * v2;
-            } while (s >= 1 || s == 0);
-            double multiplier = Math.sqrt(-2 * Math.log(s)/s);
-            nextNextGaussian = v2 * multiplier;
-            haveNextNextGaussian = true;
-            return v1 * multiplier;
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/RandomAccess.java
--- a/emul/compact/src/main/java/java/util/RandomAccess.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * Marker interface used by <tt>List</tt> implementations to indicate that
- * they support fast (generally constant time) random access.  The primary
- * purpose of this interface is to allow generic algorithms to alter their
- * behavior to provide good performance when applied to either random or
- * sequential access lists.
- *
- * <p>The best algorithms for manipulating random access lists (such as
- * <tt>ArrayList</tt>) can produce quadratic behavior when applied to
- * sequential access lists (such as <tt>LinkedList</tt>).  Generic list
- * algorithms are encouraged to check whether the given list is an
- * <tt>instanceof</tt> this interface before applying an algorithm that would
- * provide poor performance if it were applied to a sequential access list,
- * and to alter their behavior if necessary to guarantee acceptable
- * performance.
- *
- * <p>It is recognized that the distinction between random and sequential
- * access is often fuzzy.  For example, some <tt>List</tt> implementations
- * provide asymptotically linear access times if they get huge, but constant
- * access times in practice.  Such a <tt>List</tt> implementation
- * should generally implement this interface.  As a rule of thumb, a
- * <tt>List</tt> implementation should implement this interface if,
- * for typical instances of the class, this loop:
- * <pre>
- *     for (int i=0, n=list.size(); i &lt; n; i++)
- *         list.get(i);
- * </pre>
- * runs faster than this loop:
- * <pre>
- *     for (Iterator i=list.iterator(); i.hasNext(); )
- *         i.next();
- * </pre>
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @since 1.4
- */
-public interface RandomAccess {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/ServiceConfigurationError.java
--- a/emul/compact/src/main/java/java/util/ServiceConfigurationError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-
-/**
- * Error thrown when something goes wrong while loading a service provider.
- *
- * <p> This error will be thrown in the following situations:
- *
- * <ul>
- *
- *   <li> The format of a provider-configuration file violates the <a
- *   href="ServiceLoader.html#format">specification</a>; </li>
- *
- *   <li> An {@link java.io.IOException IOException} occurs while reading a
- *   provider-configuration file; </li>
- *
- *   <li> A concrete provider class named in a provider-configuration file
- *   cannot be found; </li>
- *
- *   <li> A concrete provider class is not a subclass of the service class;
- *   </li>
- *
- *   <li> A concrete provider class cannot be instantiated; or
- *
- *   <li> Some other kind of error occurs. </li>
- *
- * </ul>
- *
- *
- * @author Mark Reinhold
- * @since 1.6
- */
-
-public class ServiceConfigurationError
-    extends Error
-{
-
-    private static final long serialVersionUID = 74132770414881L;
-
-    /**
-     * Constructs a new instance with the specified message.
-     *
-     * @param  msg  The message, or <tt>null</tt> if there is no message
-     *
-     */
-    public ServiceConfigurationError(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Constructs a new instance with the specified message and cause.
-     *
-     * @param  msg  The message, or <tt>null</tt> if there is no message
-     *
-     * @param  cause  The cause, or <tt>null</tt> if the cause is nonexistent
-     *                or unknown
-     */
-    public ServiceConfigurationError(String msg, Throwable cause) {
-        super(msg, cause);
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/ServiceLoader.java
--- a/emul/compact/src/main/java/java/util/ServiceLoader.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,538 +0,0 @@
-/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-
-/**
- * A simple service-provider loading facility.
- *
- * <p> A <i>service</i> is a well-known set of interfaces and (usually
- * abstract) classes.  A <i>service provider</i> is a specific implementation
- * of a service.  The classes in a provider typically implement the interfaces
- * and subclass the classes defined in the service itself.  Service providers
- * can be installed in an implementation of the Java platform in the form of
- * extensions, that is, jar files placed into any of the usual extension
- * directories.  Providers can also be made available by adding them to the
- * application's class path or by some other platform-specific means.
- *
- * <p> For the purpose of loading, a service is represented by a single type,
- * that is, a single interface or abstract class.  (A concrete class can be
- * used, but this is not recommended.)  A provider of a given service contains
- * one or more concrete classes that extend this <i>service type</i> with data
- * and code specific to the provider.  The <i>provider class</i> is typically
- * not the entire provider itself but rather a proxy which contains enough
- * information to decide whether the provider is able to satisfy a particular
- * request together with code that can create the actual provider on demand.
- * The details of provider classes tend to be highly service-specific; no
- * single class or interface could possibly unify them, so no such type is
- * defined here.  The only requirement enforced by this facility is that
- * provider classes must have a zero-argument constructor so that they can be
- * instantiated during loading.
- *
- * <p><a name="format"> A service provider is identified by placing a
- * <i>provider-configuration file</i> in the resource directory
- * <tt>META-INF/services</tt>.  The file's name is the fully-qualified <a
- * href="../lang/ClassLoader.html#name">binary name</a> of the service's type.
- * The file contains a list of fully-qualified binary names of concrete
- * provider classes, one per line.  Space and tab characters surrounding each
- * name, as well as blank lines, are ignored.  The comment character is
- * <tt>'#'</tt> (<tt>'&#92;u0023'</tt>, <font size="-1">NUMBER SIGN</font>); on
- * each line all characters following the first comment character are ignored.
- * The file must be encoded in UTF-8.
- *
- * <p> If a particular concrete provider class is named in more than one
- * configuration file, or is named in the same configuration file more than
- * once, then the duplicates are ignored.  The configuration file naming a
- * particular provider need not be in the same jar file or other distribution
- * unit as the provider itself.  The provider must be accessible from the same
- * class loader that was initially queried to locate the configuration file;
- * note that this is not necessarily the class loader from which the file was
- * actually loaded.
- *
- * <p> Providers are located and instantiated lazily, that is, on demand.  A
- * service loader maintains a cache of the providers that have been loaded so
- * far.  Each invocation of the {@link #iterator iterator} method returns an
- * iterator that first yields all of the elements of the cache, in
- * instantiation order, and then lazily locates and instantiates any remaining
- * providers, adding each one to the cache in turn.  The cache can be cleared
- * via the {@link #reload reload} method.
- *
- * <p> Service loaders always execute in the security context of the caller.
- * Trusted system code should typically invoke the methods in this class, and
- * the methods of the iterators which they return, from within a privileged
- * security context.
- *
- * <p> Instances of this class are not safe for use by multiple concurrent
- * threads.
- *
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
- * method in this class will cause a {@link NullPointerException} to be thrown.
- *
- *
- * <p><span style="font-weight: bold; padding-right: 1em">Example</span>
- * Suppose we have a service type <tt>com.example.CodecSet</tt> which is
- * intended to represent sets of encoder/decoder pairs for some protocol.  In
- * this case it is an abstract class with two abstract methods:
- *
- * <blockquote><pre>
- * public abstract Encoder getEncoder(String encodingName);
- * public abstract Decoder getDecoder(String encodingName);</pre></blockquote>
- *
- * Each method returns an appropriate object or <tt>null</tt> if the provider
- * does not support the given encoding.  Typical providers support more than
- * one encoding.
- *
- * <p> If <tt>com.example.impl.StandardCodecs</tt> is an implementation of the
- * <tt>CodecSet</tt> service then its jar file also contains a file named
- *
- * <blockquote><pre>
- * META-INF/services/com.example.CodecSet</pre></blockquote>
- *
- * <p> This file contains the single line:
- *
- * <blockquote><pre>
- * com.example.impl.StandardCodecs    # Standard codecs</pre></blockquote>
- *
- * <p> The <tt>CodecSet</tt> class creates and saves a single service instance
- * at initialization:
- *
- * <blockquote><pre>
- * private static ServiceLoader&lt;CodecSet&gt; codecSetLoader
- *     = ServiceLoader.load(CodecSet.class);</pre></blockquote>
- *
- * <p> To locate an encoder for a given encoding name it defines a static
- * factory method which iterates through the known and available providers,
- * returning only when it has located a suitable encoder or has run out of
- * providers.
- *
- * <blockquote><pre>
- * public static Encoder getEncoder(String encodingName) {
- *     for (CodecSet cp : codecSetLoader) {
- *         Encoder enc = cp.getEncoder(encodingName);
- *         if (enc != null)
- *             return enc;
- *     }
- *     return null;
- * }</pre></blockquote>
- *
- * <p> A <tt>getDecoder</tt> method is defined similarly.
- *
- *
- * <p><span style="font-weight: bold; padding-right: 1em">Usage Note</span> If
- * the class path of a class loader that is used for provider loading includes
- * remote network URLs then those URLs will be dereferenced in the process of
- * searching for provider-configuration files.
- *
- * <p> This activity is normal, although it may cause puzzling entries to be
- * created in web-server logs.  If a web server is not configured correctly,
- * however, then this activity may cause the provider-loading algorithm to fail
- * spuriously.
- *
- * <p> A web server should return an HTTP 404 (Not Found) response when a
- * requested resource does not exist.  Sometimes, however, web servers are
- * erroneously configured to return an HTTP 200 (OK) response along with a
- * helpful HTML error page in such cases.  This will cause a {@link
- * ServiceConfigurationError} to be thrown when this class attempts to parse
- * the HTML page as a provider-configuration file.  The best solution to this
- * problem is to fix the misconfigured web server to return the correct
- * response code (HTTP 404) along with the HTML error page.
- *
- * @param  <S>
- *         The type of the service to be loaded by this loader
- *
- * @author Mark Reinhold
- * @since 1.6
- */
-
-public final class ServiceLoader<S>
-    implements Iterable<S>
-{
-
-    private static final String PREFIX = "META-INF/services/";
-
-    // The class or interface representing the service being loaded
-    private Class<S> service;
-
-    // The class loader used to locate, load, and instantiate providers
-    private ClassLoader loader;
-
-    // Cached providers, in instantiation order
-    private LinkedHashMap<String,S> providers = new LinkedHashMap<>();
-
-    // The current lazy-lookup iterator
-    private LazyIterator lookupIterator;
-
-    /**
-     * Clear this loader's provider cache so that all providers will be
-     * reloaded.
-     *
-     * <p> After invoking this method, subsequent invocations of the {@link
-     * #iterator() iterator} method will lazily look up and instantiate
-     * providers from scratch, just as is done by a newly-created loader.
-     *
-     * <p> This method is intended for use in situations in which new providers
-     * can be installed into a running Java virtual machine.
-     */
-    public void reload() {
-        providers.clear();
-        lookupIterator = new LazyIterator(service, loader);
-    }
-
-    private ServiceLoader(Class<S> svc, ClassLoader cl) {
-        service = svc;
-        loader = cl;
-        reload();
-    }
-
-    private static void fail(Class service, String msg, Throwable cause)
-        throws ServiceConfigurationError
-    {
-        throw new ServiceConfigurationError(service.getName() + ": " + msg,
-                                            cause);
-    }
-
-    private static void fail(Class service, String msg)
-        throws ServiceConfigurationError
-    {
-        throw new ServiceConfigurationError(service.getName() + ": " + msg);
-    }
-
-    private static void fail(Class service, URL u, int line, String msg)
-        throws ServiceConfigurationError
-    {
-        fail(service, u + ":" + line + ": " + msg);
-    }
-
-    // Parse a single line from the given configuration file, adding the name
-    // on the line to the names list.
-    //
-    private int parseLine(Class service, URL u, BufferedReader r, int lc,
-                          List<String> names)
-        throws IOException, ServiceConfigurationError
-    {
-        String ln = r.readLine();
-        if (ln == null) {
-            return -1;
-        }
-        int ci = ln.indexOf('#');
-        if (ci >= 0) ln = ln.substring(0, ci);
-        ln = ln.trim();
-        int n = ln.length();
-        if (n != 0) {
-            if ((ln.indexOf(' ') >= 0) || (ln.indexOf('\t') >= 0))
-                fail(service, u, lc, "Illegal configuration-file syntax");
-            int cp = ln.codePointAt(0);
-            if (!Character.isJavaIdentifierStart(cp))
-                fail(service, u, lc, "Illegal provider-class name: " + ln);
-            for (int i = Character.charCount(cp); i < n; i += Character.charCount(cp)) {
-                cp = ln.codePointAt(i);
-                if (!Character.isJavaIdentifierPart(cp) && (cp != '.'))
-                    fail(service, u, lc, "Illegal provider-class name: " + ln);
-            }
-            if (!providers.containsKey(ln) && !names.contains(ln))
-                names.add(ln);
-        }
-        return lc + 1;
-    }
-
-    // Parse the content of the given URL as a provider-configuration file.
-    //
-    // @param  service
-    //         The service type for which providers are being sought;
-    //         used to construct error detail strings
-    //
-    // @param  u
-    //         The URL naming the configuration file to be parsed
-    //
-    // @return A (possibly empty) iterator that will yield the provider-class
-    //         names in the given configuration file that are not yet members
-    //         of the returned set
-    //
-    // @throws ServiceConfigurationError
-    //         If an I/O error occurs while reading from the given URL, or
-    //         if a configuration-file format error is detected
-    //
-    private Iterator<String> parse(Class service, URL u)
-        throws ServiceConfigurationError
-    {
-        InputStream in = null;
-        BufferedReader r = null;
-        ArrayList<String> names = new ArrayList<>();
-        try {
-            in = u.openStream();
-            r = new BufferedReader(new InputStreamReader(in, "utf-8"));
-            int lc = 1;
-            while ((lc = parseLine(service, u, r, lc, names)) >= 0);
-        } catch (IOException x) {
-            fail(service, "Error reading configuration file", x);
-        } finally {
-            try {
-                if (r != null) r.close();
-                if (in != null) in.close();
-            } catch (IOException y) {
-                fail(service, "Error closing configuration file", y);
-            }
-        }
-        return names.iterator();
-    }
-
-    // Private inner class implementing fully-lazy provider lookup
-    //
-    private class LazyIterator
-        implements Iterator<S>
-    {
-
-        Class<S> service;
-        ClassLoader loader;
-        Enumeration<URL> configs = null;
-        Iterator<String> pending = null;
-        String nextName = null;
-
-        private LazyIterator(Class<S> service, ClassLoader loader) {
-            this.service = service;
-            this.loader = loader;
-        }
-
-        public boolean hasNext() {
-            if (nextName != null) {
-                return true;
-            }
-            if (configs == null) {
-                try {
-                    String fullName = PREFIX + service.getName();
-                    if (loader == null)
-                        configs = ClassLoader.getSystemResources(fullName);
-                    else
-                        configs = loader.getResources(fullName);
-                } catch (IOException x) {
-                    fail(service, "Error locating configuration files", x);
-                }
-            }
-            while ((pending == null) || !pending.hasNext()) {
-                if (!configs.hasMoreElements()) {
-                    return false;
-                }
-                pending = parse(service, configs.nextElement());
-            }
-            nextName = pending.next();
-            return true;
-        }
-
-        public S next() {
-            if (!hasNext()) {
-                throw new NoSuchElementException();
-            }
-            String cn = nextName;
-            nextName = null;
-            try {
-                S p = service.cast(Class.forName(cn, true, loader)
-                                   .newInstance());
-                providers.put(cn, p);
-                return p;
-            } catch (ClassNotFoundException x) {
-                fail(service,
-                     "Provider " + cn + " not found");
-            } catch (Throwable x) {
-                fail(service,
-                     "Provider " + cn + " could not be instantiated: " + x,
-                     x);
-            }
-            throw new Error();          // This cannot happen
-        }
-
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-
-    }
-
-    /**
-     * Lazily loads the available providers of this loader's service.
-     *
-     * <p> The iterator returned by this method first yields all of the
-     * elements of the provider cache, in instantiation order.  It then lazily
-     * loads and instantiates any remaining providers, adding each one to the
-     * cache in turn.
-     *
-     * <p> To achieve laziness the actual work of parsing the available
-     * provider-configuration files and instantiating providers must be done by
-     * the iterator itself.  Its {@link java.util.Iterator#hasNext hasNext} and
-     * {@link java.util.Iterator#next next} methods can therefore throw a
-     * {@link ServiceConfigurationError} if a provider-configuration file
-     * violates the specified format, or if it names a provider class that
-     * cannot be found and instantiated, or if the result of instantiating the
-     * class is not assignable to the service type, or if any other kind of
-     * exception or error is thrown as the next provider is located and
-     * instantiated.  To write robust code it is only necessary to catch {@link
-     * ServiceConfigurationError} when using a service iterator.
-     *
-     * <p> If such an error is thrown then subsequent invocations of the
-     * iterator will make a best effort to locate and instantiate the next
-     * available provider, but in general such recovery cannot be guaranteed.
-     *
-     * <blockquote style="font-size: smaller; line-height: 1.2"><span
-     * style="padding-right: 1em; font-weight: bold">Design Note</span>
-     * Throwing an error in these cases may seem extreme.  The rationale for
-     * this behavior is that a malformed provider-configuration file, like a
-     * malformed class file, indicates a serious problem with the way the Java
-     * virtual machine is configured or is being used.  As such it is
-     * preferable to throw an error rather than try to recover or, even worse,
-     * fail silently.</blockquote>
-     *
-     * <p> The iterator returned by this method does not support removal.
-     * Invoking its {@link java.util.Iterator#remove() remove} method will
-     * cause an {@link UnsupportedOperationException} to be thrown.
-     *
-     * @return  An iterator that lazily loads providers for this loader's
-     *          service
-     */
-    public Iterator<S> iterator() {
-        return new Iterator<S>() {
-
-            Iterator<Map.Entry<String,S>> knownProviders
-                = providers.entrySet().iterator();
-
-            public boolean hasNext() {
-                if (knownProviders.hasNext())
-                    return true;
-                return lookupIterator.hasNext();
-            }
-
-            public S next() {
-                if (knownProviders.hasNext())
-                    return knownProviders.next().getValue();
-                return lookupIterator.next();
-            }
-
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-
-        };
-    }
-
-    /**
-     * Creates a new service loader for the given service type and class
-     * loader.
-     *
-     * @param  service
-     *         The interface or abstract class representing the service
-     *
-     * @param  loader
-     *         The class loader to be used to load provider-configuration files
-     *         and provider classes, or <tt>null</tt> if the system class
-     *         loader (or, failing that, the bootstrap class loader) is to be
-     *         used
-     *
-     * @return A new service loader
-     */
-    public static <S> ServiceLoader<S> load(Class<S> service,
-                                            ClassLoader loader)
-    {
-        return new ServiceLoader<>(service, loader);
-    }
-
-    /**
-     * Creates a new service loader for the given service type, using the
-     * current thread's {@linkplain java.lang.Thread#getContextClassLoader
-     * context class loader}.
-     *
-     * <p> An invocation of this convenience method of the form
-     *
-     * <blockquote><pre>
-     * ServiceLoader.load(<i>service</i>)</pre></blockquote>
-     *
-     * is equivalent to
-     *
-     * <blockquote><pre>
-     * ServiceLoader.load(<i>service</i>,
-     *                    Thread.currentThread().getContextClassLoader())</pre></blockquote>
-     *
-     * @param  service
-     *         The interface or abstract class representing the service
-     *
-     * @return A new service loader
-     */
-    public static <S> ServiceLoader<S> load(Class<S> service) {
-        ClassLoader cl = null; // XXX: Thread.currentThread().getContextClassLoader();
-        return ServiceLoader.load(service, cl);
-    }
-
-    /**
-     * Creates a new service loader for the given service type, using the
-     * extension class loader.
-     *
-     * <p> This convenience method simply locates the extension class loader,
-     * call it <tt><i>extClassLoader</i></tt>, and then returns
-     *
-     * <blockquote><pre>
-     * ServiceLoader.load(<i>service</i>, <i>extClassLoader</i>)</pre></blockquote>
-     *
-     * <p> If the extension class loader cannot be found then the system class
-     * loader is used; if there is no system class loader then the bootstrap
-     * class loader is used.
-     *
-     * <p> This method is intended for use when only installed providers are
-     * desired.  The resulting service will only find and load providers that
-     * have been installed into the current Java virtual machine; providers on
-     * the application's class path will be ignored.
-     *
-     * @param  service
-     *         The interface or abstract class representing the service
-     *
-     * @return A new service loader
-     */
-    public static <S> ServiceLoader<S> loadInstalled(Class<S> service) {
-        ClassLoader cl = ClassLoader.getSystemClassLoader();
-        ClassLoader prev = null;
-        while (cl != null) {
-            prev = cl;
-            cl = cl.getParent();
-        }
-        return ServiceLoader.load(service, prev);
-    }
-
-    /**
-     * Returns a string describing this service.
-     *
-     * @return  A descriptive string
-     */
-    public String toString() {
-        return "java.util.ServiceLoader[" + service.getName() + "]";
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Set.java
--- a/emul/compact/src/main/java/java/util/Set.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,385 +0,0 @@
-/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * A collection that contains no duplicate elements.  More formally, sets
- * contain no pair of elements <code>e1</code> and <code>e2</code> such that
- * <code>e1.equals(e2)</code>, and at most one null element.  As implied by
- * its name, this interface models the mathematical <i>set</i> abstraction.
- *
- * <p>The <tt>Set</tt> interface places additional stipulations, beyond those
- * inherited from the <tt>Collection</tt> interface, on the contracts of all
- * constructors and on the contracts of the <tt>add</tt>, <tt>equals</tt> and
- * <tt>hashCode</tt> methods.  Declarations for other inherited methods are
- * also included here for convenience.  (The specifications accompanying these
- * declarations have been tailored to the <tt>Set</tt> interface, but they do
- * not contain any additional stipulations.)
- *
- * <p>The additional stipulation on constructors is, not surprisingly,
- * that all constructors must create a set that contains no duplicate elements
- * (as defined above).
- *
- * <p>Note: Great care must be exercised if mutable objects are used as set
- * elements.  The behavior of a set is not specified if the value of an object
- * is changed in a manner that affects <tt>equals</tt> comparisons while the
- * object is an element in the set.  A special case of this prohibition is
- * that it is not permissible for a set to contain itself as an element.
- *
- * <p>Some set implementations have restrictions on the elements that
- * they may contain.  For example, some implementations prohibit null elements,
- * and some have restrictions on the types of their elements.  Attempting to
- * add an ineligible element throws an unchecked exception, typically
- * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.  Attempting
- * to query the presence of an ineligible element may throw an exception,
- * or it may simply return false; some implementations will exhibit the former
- * behavior and some will exhibit the latter.  More generally, attempting an
- * operation on an ineligible element whose completion would not result in
- * the insertion of an ineligible element into the set may throw an
- * exception or it may succeed, at the option of the implementation.
- * Such exceptions are marked as "optional" in the specification for this
- * interface.
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <E> the type of elements maintained by this set
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see Collection
- * @see List
- * @see SortedSet
- * @see HashSet
- * @see TreeSet
- * @see AbstractSet
- * @see Collections#singleton(java.lang.Object)
- * @see Collections#EMPTY_SET
- * @since 1.2
- */
-
-public interface Set<E> extends Collection<E> {
-    // Query Operations
-
-    /**
-     * Returns the number of elements in this set (its cardinality).  If this
-     * set contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
-     * <tt>Integer.MAX_VALUE</tt>.
-     *
-     * @return the number of elements in this set (its cardinality)
-     */
-    int size();
-
-    /**
-     * Returns <tt>true</tt> if this set contains no elements.
-     *
-     * @return <tt>true</tt> if this set contains no elements
-     */
-    boolean isEmpty();
-
-    /**
-     * Returns <tt>true</tt> if this set contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this set
-     * contains an element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
-     *
-     * @param o element whose presence in this set is to be tested
-     * @return <tt>true</tt> if this set contains the specified element
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this set
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         set does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     */
-    boolean contains(Object o);
-
-    /**
-     * Returns an iterator over the elements in this set.  The elements are
-     * returned in no particular order (unless this set is an instance of some
-     * class that provides a guarantee).
-     *
-     * @return an iterator over the elements in this set
-     */
-    Iterator<E> iterator();
-
-    /**
-     * Returns an array containing all of the elements in this set.
-     * If this set makes any guarantees as to what order its elements
-     * are returned by its iterator, this method must return the
-     * elements in the same order.
-     *
-     * <p>The returned array will be "safe" in that no references to it
-     * are maintained by this set.  (In other words, this method must
-     * allocate a new array even if this set is backed by an array).
-     * The caller is thus free to modify the returned array.
-     *
-     * <p>This method acts as bridge between array-based and collection-based
-     * APIs.
-     *
-     * @return an array containing all the elements in this set
-     */
-    Object[] toArray();
-
-    /**
-     * Returns an array containing all of the elements in this set; the
-     * runtime type of the returned array is that of the specified array.
-     * If the set fits in the specified array, it is returned therein.
-     * Otherwise, a new array is allocated with the runtime type of the
-     * specified array and the size of this set.
-     *
-     * <p>If this set fits in the specified array with room to spare
-     * (i.e., the array has more elements than this set), the element in
-     * the array immediately following the end of the set is set to
-     * <tt>null</tt>.  (This is useful in determining the length of this
-     * set <i>only</i> if the caller knows that this set does not contain
-     * any null elements.)
-     *
-     * <p>If this set makes any guarantees as to what order its elements
-     * are returned by its iterator, this method must return the elements
-     * in the same order.
-     *
-     * <p>Like the {@link #toArray()} method, this method acts as bridge between
-     * array-based and collection-based APIs.  Further, this method allows
-     * precise control over the runtime type of the output array, and may,
-     * under certain circumstances, be used to save allocation costs.
-     *
-     * <p>Suppose <tt>x</tt> is a set known to contain only strings.
-     * The following code can be used to dump the set into a newly allocated
-     * array of <tt>String</tt>:
-     *
-     * <pre>
-     *     String[] y = x.toArray(new String[0]);</pre>
-     *
-     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
-     * <tt>toArray()</tt>.
-     *
-     * @param a the array into which the elements of this set are to be
-     *        stored, if it is big enough; otherwise, a new array of the same
-     *        runtime type is allocated for this purpose.
-     * @return an array containing all the elements in this set
-     * @throws ArrayStoreException if the runtime type of the specified array
-     *         is not a supertype of the runtime type of every element in this
-     *         set
-     * @throws NullPointerException if the specified array is null
-     */
-    <T> T[] toArray(T[] a);
-
-
-    // Modification Operations
-
-    /**
-     * Adds the specified element to this set if it is not already present
-     * (optional operation).  More formally, adds the specified element
-     * <tt>e</tt> to this set if the set contains no element <tt>e2</tt>
-     * such that
-     * <tt>(e==null&nbsp;?&nbsp;e2==null&nbsp;:&nbsp;e.equals(e2))</tt>.
-     * If this set already contains the element, the call leaves the set
-     * unchanged and returns <tt>false</tt>.  In combination with the
-     * restriction on constructors, this ensures that sets never contain
-     * duplicate elements.
-     *
-     * <p>The stipulation above does not imply that sets must accept all
-     * elements; sets may refuse to add any particular element, including
-     * <tt>null</tt>, and throw an exception, as described in the
-     * specification for {@link Collection#add Collection.add}.
-     * Individual set implementations should clearly document any
-     * restrictions on the elements that they may contain.
-     *
-     * @param e element to be added to this set
-     * @return <tt>true</tt> if this set did not already contain the specified
-     *         element
-     * @throws UnsupportedOperationException if the <tt>add</tt> operation
-     *         is not supported by this set
-     * @throws ClassCastException if the class of the specified element
-     *         prevents it from being added to this set
-     * @throws NullPointerException if the specified element is null and this
-     *         set does not permit null elements
-     * @throws IllegalArgumentException if some property of the specified element
-     *         prevents it from being added to this set
-     */
-    boolean add(E e);
-
-
-    /**
-     * Removes the specified element from this set if it is present
-     * (optional operation).  More formally, removes an element <tt>e</tt>
-     * such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>, if
-     * this set contains such an element.  Returns <tt>true</tt> if this set
-     * contained the element (or equivalently, if this set changed as a
-     * result of the call).  (This set will not contain the element once the
-     * call returns.)
-     *
-     * @param o object to be removed from this set, if present
-     * @return <tt>true</tt> if this set contained the specified element
-     * @throws ClassCastException if the type of the specified element
-     *         is incompatible with this set
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified element is null and this
-     *         set does not permit null elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
-     *         is not supported by this set
-     */
-    boolean remove(Object o);
-
-
-    // Bulk Operations
-
-    /**
-     * Returns <tt>true</tt> if this set contains all of the elements of the
-     * specified collection.  If the specified collection is also a set, this
-     * method returns <tt>true</tt> if it is a <i>subset</i> of this set.
-     *
-     * @param  c collection to be checked for containment in this set
-     * @return <tt>true</tt> if this set contains all of the elements of the
-     *         specified collection
-     * @throws ClassCastException if the types of one or more elements
-     *         in the specified collection are incompatible with this
-     *         set
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if the specified collection contains one
-     *         or more null elements and this set does not permit null
-     *         elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see    #contains(Object)
-     */
-    boolean containsAll(Collection<?> c);
-
-    /**
-     * Adds all of the elements in the specified collection to this set if
-     * they're not already present (optional operation).  If the specified
-     * collection is also a set, the <tt>addAll</tt> operation effectively
-     * modifies this set so that its value is the <i>union</i> of the two
-     * sets.  The behavior of this operation is undefined if the specified
-     * collection is modified while the operation is in progress.
-     *
-     * @param  c collection containing elements to be added to this set
-     * @return <tt>true</tt> if this set changed as a result of the call
-     *
-     * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
-     *         is not supported by this set
-     * @throws ClassCastException if the class of an element of the
-     *         specified collection prevents it from being added to this set
-     * @throws NullPointerException if the specified collection contains one
-     *         or more null elements and this set does not permit null
-     *         elements, or if the specified collection is null
-     * @throws IllegalArgumentException if some property of an element of the
-     *         specified collection prevents it from being added to this set
-     * @see #add(Object)
-     */
-    boolean addAll(Collection<? extends E> c);
-
-    /**
-     * Retains only the elements in this set that are contained in the
-     * specified collection (optional operation).  In other words, removes
-     * from this set all of its elements that are not contained in the
-     * specified collection.  If the specified collection is also a set, this
-     * operation effectively modifies this set so that its value is the
-     * <i>intersection</i> of the two sets.
-     *
-     * @param  c collection containing elements to be retained in this set
-     * @return <tt>true</tt> if this set changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
-     *         is not supported by this set
-     * @throws ClassCastException if the class of an element of this set
-     *         is incompatible with the specified collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this set contains a null element and the
-     *         specified collection does not permit null elements
-     *         (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see #remove(Object)
-     */
-    boolean retainAll(Collection<?> c);
-
-    /**
-     * Removes from this set all of its elements that are contained in the
-     * specified collection (optional operation).  If the specified
-     * collection is also a set, this operation effectively modifies this
-     * set so that its value is the <i>asymmetric set difference</i> of
-     * the two sets.
-     *
-     * @param  c collection containing elements to be removed from this set
-     * @return <tt>true</tt> if this set changed as a result of the call
-     * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
-     *         is not supported by this set
-     * @throws ClassCastException if the class of an element of this set
-     *         is incompatible with the specified collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this set contains a null element and the
-     *         specified collection does not permit null elements
-     *         (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @see #remove(Object)
-     * @see #contains(Object)
-     */
-    boolean removeAll(Collection<?> c);
-
-    /**
-     * Removes all of the elements from this set (optional operation).
-     * The set will be empty after this call returns.
-     *
-     * @throws UnsupportedOperationException if the <tt>clear</tt> method
-     *         is not supported by this set
-     */
-    void clear();
-
-
-    // Comparison and hashing
-
-    /**
-     * Compares the specified object with this set for equality.  Returns
-     * <tt>true</tt> if the specified object is also a set, the two sets
-     * have the same size, and every member of the specified set is
-     * contained in this set (or equivalently, every member of this set is
-     * contained in the specified set).  This definition ensures that the
-     * equals method works properly across different implementations of the
-     * set interface.
-     *
-     * @param o object to be compared for equality with this set
-     * @return <tt>true</tt> if the specified object is equal to this set
-     */
-    boolean equals(Object o);
-
-    /**
-     * Returns the hash code value for this set.  The hash code of a set is
-     * defined to be the sum of the hash codes of the elements in the set,
-     * where the hash code of a <tt>null</tt> element is defined to be zero.
-     * This ensures that <tt>s1.equals(s2)</tt> implies that
-     * <tt>s1.hashCode()==s2.hashCode()</tt> for any two sets <tt>s1</tt>
-     * and <tt>s2</tt>, as required by the general contract of
-     * {@link Object#hashCode}.
-     *
-     * @return the hash code value for this set
-     * @see Object#equals(Object)
-     * @see Set#equals(Object)
-     */
-    int hashCode();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/SortedMap.java
--- a/emul/compact/src/main/java/java/util/SortedMap.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * A {@link Map} that further provides a <em>total ordering</em> on its keys.
- * The map is ordered according to the {@linkplain Comparable natural
- * ordering} of its keys, or by a {@link Comparator} typically
- * provided at sorted map creation time.  This order is reflected when
- * iterating over the sorted map's collection views (returned by the
- * {@code entrySet}, {@code keySet} and {@code values} methods).
- * Several additional operations are provided to take advantage of the
- * ordering.  (This interface is the map analogue of {@link SortedSet}.)
- *
- * <p>All keys inserted into a sorted map must implement the {@code Comparable}
- * interface (or be accepted by the specified comparator).  Furthermore, all
- * such keys must be <em>mutually comparable</em>: {@code k1.compareTo(k2)} (or
- * {@code comparator.compare(k1, k2)}) must not throw a
- * {@code ClassCastException} for any keys {@code k1} and {@code k2} in
- * the sorted map.  Attempts to violate this restriction will cause the
- * offending method or constructor invocation to throw a
- * {@code ClassCastException}.
- *
- * <p>Note that the ordering maintained by a sorted map (whether or not an
- * explicit comparator is provided) must be <em>consistent with equals</em> if
- * the sorted map is to correctly implement the {@code Map} interface.  (See
- * the {@code Comparable} interface or {@code Comparator} interface for a
- * precise definition of <em>consistent with equals</em>.)  This is so because
- * the {@code Map} interface is defined in terms of the {@code equals}
- * operation, but a sorted map performs all key comparisons using its
- * {@code compareTo} (or {@code compare}) method, so two keys that are
- * deemed equal by this method are, from the standpoint of the sorted map,
- * equal.  The behavior of a tree map <em>is</em> well-defined even if its
- * ordering is inconsistent with equals; it just fails to obey the general
- * contract of the {@code Map} interface.
- *
- * <p>All general-purpose sorted map implementation classes should provide four
- * "standard" constructors. It is not possible to enforce this recommendation
- * though as required constructors cannot be specified by interfaces. The
- * expected "standard" constructors for all sorted map implementations are:
- * <ol>
- *   <li>A void (no arguments) constructor, which creates an empty sorted map
- *   sorted according to the natural ordering of its keys.</li>
- *   <li>A constructor with a single argument of type {@code Comparator}, which
- *   creates an empty sorted map sorted according to the specified comparator.</li>
- *   <li>A constructor with a single argument of type {@code Map}, which creates
- *   a new map with the same key-value mappings as its argument, sorted
- *   according to the keys' natural ordering.</li>
- *   <li>A constructor with a single argument of type {@code SortedMap}, which
- *   creates a new sorted map with the same key-value mappings and the same
- *   ordering as the input sorted map.</li>
- * </ol>
- *
- * <p><strong>Note</strong>: several methods return submaps with restricted key
- * ranges. Such ranges are <em>half-open</em>, that is, they include their low
- * endpoint but not their high endpoint (where applicable).  If you need a
- * <em>closed range</em> (which includes both endpoints), and the key type
- * allows for calculation of the successor of a given key, merely request
- * the subrange from {@code lowEndpoint} to
- * {@code successor(highEndpoint)}.  For example, suppose that {@code m}
- * is a map whose keys are strings.  The following idiom obtains a view
- * containing all of the key-value mappings in {@code m} whose keys are
- * between {@code low} and {@code high}, inclusive:<pre>
- *   SortedMap&lt;String, V&gt; sub = m.subMap(low, high+"\0");</pre>
- *
- * A similar technique can be used to generate an <em>open range</em>
- * (which contains neither endpoint).  The following idiom obtains a
- * view containing all of the key-value mappings in {@code m} whose keys
- * are between {@code low} and {@code high}, exclusive:<pre>
- *   SortedMap&lt;String, V&gt; sub = m.subMap(low+"\0", high);</pre>
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- *
- * @author  Josh Bloch
- * @see Map
- * @see TreeMap
- * @see SortedSet
- * @see Comparator
- * @see Comparable
- * @see Collection
- * @see ClassCastException
- * @since 1.2
- */
-
-public interface SortedMap<K,V> extends Map<K,V> {
-    /**
-     * Returns the comparator used to order the keys in this map, or
-     * {@code null} if this map uses the {@linkplain Comparable
-     * natural ordering} of its keys.
-     *
-     * @return the comparator used to order the keys in this map,
-     *         or {@code null} if this map uses the natural ordering
-     *         of its keys
-     */
-    Comparator<? super K> comparator();
-
-    /**
-     * Returns a view of the portion of this map whose keys range from
-     * {@code fromKey}, inclusive, to {@code toKey}, exclusive.  (If
-     * {@code fromKey} and {@code toKey} are equal, the returned map
-     * is empty.)  The returned map is backed by this map, so changes
-     * in the returned map are reflected in this map, and vice-versa.
-     * The returned map supports all optional map operations that this
-     * map supports.
-     *
-     * <p>The returned map will throw an {@code IllegalArgumentException}
-     * on an attempt to insert a key outside its range.
-     *
-     * @param fromKey low endpoint (inclusive) of the keys in the returned map
-     * @param toKey high endpoint (exclusive) of the keys in the returned map
-     * @return a view of the portion of this map whose keys range from
-     *         {@code fromKey}, inclusive, to {@code toKey}, exclusive
-     * @throws ClassCastException if {@code fromKey} and {@code toKey}
-     *         cannot be compared to one another using this map's comparator
-     *         (or, if the map has no comparator, using natural ordering).
-     *         Implementations may, but are not required to, throw this
-     *         exception if {@code fromKey} or {@code toKey}
-     *         cannot be compared to keys currently in the map.
-     * @throws NullPointerException if {@code fromKey} or {@code toKey}
-     *         is null and this map does not permit null keys
-     * @throws IllegalArgumentException if {@code fromKey} is greater than
-     *         {@code toKey}; or if this map itself has a restricted
-     *         range, and {@code fromKey} or {@code toKey} lies
-     *         outside the bounds of the range
-     */
-    SortedMap<K,V> subMap(K fromKey, K toKey);
-
-    /**
-     * Returns a view of the portion of this map whose keys are
-     * strictly less than {@code toKey}.  The returned map is backed
-     * by this map, so changes in the returned map are reflected in
-     * this map, and vice-versa.  The returned map supports all
-     * optional map operations that this map supports.
-     *
-     * <p>The returned map will throw an {@code IllegalArgumentException}
-     * on an attempt to insert a key outside its range.
-     *
-     * @param toKey high endpoint (exclusive) of the keys in the returned map
-     * @return a view of the portion of this map whose keys are strictly
-     *         less than {@code toKey}
-     * @throws ClassCastException if {@code toKey} is not compatible
-     *         with this map's comparator (or, if the map has no comparator,
-     *         if {@code toKey} does not implement {@link Comparable}).
-     *         Implementations may, but are not required to, throw this
-     *         exception if {@code toKey} cannot be compared to keys
-     *         currently in the map.
-     * @throws NullPointerException if {@code toKey} is null and
-     *         this map does not permit null keys
-     * @throws IllegalArgumentException if this map itself has a
-     *         restricted range, and {@code toKey} lies outside the
-     *         bounds of the range
-     */
-    SortedMap<K,V> headMap(K toKey);
-
-    /**
-     * Returns a view of the portion of this map whose keys are
-     * greater than or equal to {@code fromKey}.  The returned map is
-     * backed by this map, so changes in the returned map are
-     * reflected in this map, and vice-versa.  The returned map
-     * supports all optional map operations that this map supports.
-     *
-     * <p>The returned map will throw an {@code IllegalArgumentException}
-     * on an attempt to insert a key outside its range.
-     *
-     * @param fromKey low endpoint (inclusive) of the keys in the returned map
-     * @return a view of the portion of this map whose keys are greater
-     *         than or equal to {@code fromKey}
-     * @throws ClassCastException if {@code fromKey} is not compatible
-     *         with this map's comparator (or, if the map has no comparator,
-     *         if {@code fromKey} does not implement {@link Comparable}).
-     *         Implementations may, but are not required to, throw this
-     *         exception if {@code fromKey} cannot be compared to keys
-     *         currently in the map.
-     * @throws NullPointerException if {@code fromKey} is null and
-     *         this map does not permit null keys
-     * @throws IllegalArgumentException if this map itself has a
-     *         restricted range, and {@code fromKey} lies outside the
-     *         bounds of the range
-     */
-    SortedMap<K,V> tailMap(K fromKey);
-
-    /**
-     * Returns the first (lowest) key currently in this map.
-     *
-     * @return the first (lowest) key currently in this map
-     * @throws NoSuchElementException if this map is empty
-     */
-    K firstKey();
-
-    /**
-     * Returns the last (highest) key currently in this map.
-     *
-     * @return the last (highest) key currently in this map
-     * @throws NoSuchElementException if this map is empty
-     */
-    K lastKey();
-
-    /**
-     * Returns a {@link Set} view of the keys contained in this map.
-     * The set's iterator returns the keys in ascending order.
-     * The set is backed by the map, so changes to the map are
-     * reflected in the set, and vice-versa.  If the map is modified
-     * while an iteration over the set is in progress (except through
-     * the iterator's own {@code remove} operation), the results of
-     * the iteration are undefined.  The set supports element removal,
-     * which removes the corresponding mapping from the map, via the
-     * {@code Iterator.remove}, {@code Set.remove},
-     * {@code removeAll}, {@code retainAll}, and {@code clear}
-     * operations.  It does not support the {@code add} or {@code addAll}
-     * operations.
-     *
-     * @return a set view of the keys contained in this map, sorted in
-     *         ascending order
-     */
-    Set<K> keySet();
-
-    /**
-     * Returns a {@link Collection} view of the values contained in this map.
-     * The collection's iterator returns the values in ascending order
-     * of the corresponding keys.
-     * The collection is backed by the map, so changes to the map are
-     * reflected in the collection, and vice-versa.  If the map is
-     * modified while an iteration over the collection is in progress
-     * (except through the iterator's own {@code remove} operation),
-     * the results of the iteration are undefined.  The collection
-     * supports element removal, which removes the corresponding
-     * mapping from the map, via the {@code Iterator.remove},
-     * {@code Collection.remove}, {@code removeAll},
-     * {@code retainAll} and {@code clear} operations.  It does not
-     * support the {@code add} or {@code addAll} operations.
-     *
-     * @return a collection view of the values contained in this map,
-     *         sorted in ascending key order
-     */
-    Collection<V> values();
-
-    /**
-     * Returns a {@link Set} view of the mappings contained in this map.
-     * The set's iterator returns the entries in ascending key order.
-     * The set is backed by the map, so changes to the map are
-     * reflected in the set, and vice-versa.  If the map is modified
-     * while an iteration over the set is in progress (except through
-     * the iterator's own {@code remove} operation, or through the
-     * {@code setValue} operation on a map entry returned by the
-     * iterator) the results of the iteration are undefined.  The set
-     * supports element removal, which removes the corresponding
-     * mapping from the map, via the {@code Iterator.remove},
-     * {@code Set.remove}, {@code removeAll}, {@code retainAll} and
-     * {@code clear} operations.  It does not support the
-     * {@code add} or {@code addAll} operations.
-     *
-     * @return a set view of the mappings contained in this map,
-     *         sorted in ascending key order
-     */
-    Set<Map.Entry<K, V>> entrySet();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/SortedSet.java
--- a/emul/compact/src/main/java/java/util/SortedSet.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * A {@link Set} that further provides a <i>total ordering</i> on its elements.
- * The elements are ordered using their {@linkplain Comparable natural
- * ordering}, or by a {@link Comparator} typically provided at sorted
- * set creation time.  The set's iterator will traverse the set in
- * ascending element order. Several additional operations are provided
- * to take advantage of the ordering.  (This interface is the set
- * analogue of {@link SortedMap}.)
- *
- * <p>All elements inserted into a sorted set must implement the <tt>Comparable</tt>
- * interface (or be accepted by the specified comparator).  Furthermore, all
- * such elements must be <i>mutually comparable</i>: <tt>e1.compareTo(e2)</tt>
- * (or <tt>comparator.compare(e1, e2)</tt>) must not throw a
- * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and <tt>e2</tt> in
- * the sorted set.  Attempts to violate this restriction will cause the
- * offending method or constructor invocation to throw a
- * <tt>ClassCastException</tt>.
- *
- * <p>Note that the ordering maintained by a sorted set (whether or not an
- * explicit comparator is provided) must be <i>consistent with equals</i> if
- * the sorted set is to correctly implement the <tt>Set</tt> interface.  (See
- * the <tt>Comparable</tt> interface or <tt>Comparator</tt> interface for a
- * precise definition of <i>consistent with equals</i>.)  This is so because
- * the <tt>Set</tt> interface is defined in terms of the <tt>equals</tt>
- * operation, but a sorted set performs all element comparisons using its
- * <tt>compareTo</tt> (or <tt>compare</tt>) method, so two elements that are
- * deemed equal by this method are, from the standpoint of the sorted set,
- * equal.  The behavior of a sorted set <i>is</i> well-defined even if its
- * ordering is inconsistent with equals; it just fails to obey the general
- * contract of the <tt>Set</tt> interface.
- *
- * <p>All general-purpose sorted set implementation classes should
- * provide four "standard" constructors: 1) A void (no arguments)
- * constructor, which creates an empty sorted set sorted according to
- * the natural ordering of its elements.  2) A constructor with a
- * single argument of type <tt>Comparator</tt>, which creates an empty
- * sorted set sorted according to the specified comparator.  3) A
- * constructor with a single argument of type <tt>Collection</tt>,
- * which creates a new sorted set with the same elements as its
- * argument, sorted according to the natural ordering of the elements.
- * 4) A constructor with a single argument of type <tt>SortedSet</tt>,
- * which creates a new sorted set with the same elements and the same
- * ordering as the input sorted set.  There is no way to enforce this
- * recommendation, as interfaces cannot contain constructors.
- *
- * <p>Note: several methods return subsets with restricted ranges.
- * Such ranges are <i>half-open</i>, that is, they include their low
- * endpoint but not their high endpoint (where applicable).
- * If you need a <i>closed range</i> (which includes both endpoints), and
- * the element type allows for calculation of the successor of a given
- * value, merely request the subrange from <tt>lowEndpoint</tt> to
- * <tt>successor(highEndpoint)</tt>.  For example, suppose that <tt>s</tt>
- * is a sorted set of strings.  The following idiom obtains a view
- * containing all of the strings in <tt>s</tt> from <tt>low</tt> to
- * <tt>high</tt>, inclusive:<pre>
- *   SortedSet&lt;String&gt; sub = s.subSet(low, high+"\0");</pre>
- *
- * A similar technique can be used to generate an <i>open range</i> (which
- * contains neither endpoint).  The following idiom obtains a view
- * containing all of the Strings in <tt>s</tt> from <tt>low</tt> to
- * <tt>high</tt>, exclusive:<pre>
- *   SortedSet&lt;String&gt; sub = s.subSet(low+"\0", high);</pre>
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <E> the type of elements maintained by this set
- *
- * @author  Josh Bloch
- * @see Set
- * @see TreeSet
- * @see SortedMap
- * @see Collection
- * @see Comparable
- * @see Comparator
- * @see ClassCastException
- * @since 1.2
- */
-
-public interface SortedSet<E> extends Set<E> {
-    /**
-     * Returns the comparator used to order the elements in this set,
-     * or <tt>null</tt> if this set uses the {@linkplain Comparable
-     * natural ordering} of its elements.
-     *
-     * @return the comparator used to order the elements in this set,
-     *         or <tt>null</tt> if this set uses the natural ordering
-     *         of its elements
-     */
-    Comparator<? super E> comparator();
-
-    /**
-     * Returns a view of the portion of this set whose elements range
-     * from <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>,
-     * exclusive.  (If <tt>fromElement</tt> and <tt>toElement</tt> are
-     * equal, the returned set is empty.)  The returned set is backed
-     * by this set, so changes in the returned set are reflected in
-     * this set, and vice-versa.  The returned set supports all
-     * optional set operations that this set supports.
-     *
-     * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
-     * on an attempt to insert an element outside its range.
-     *
-     * @param fromElement low endpoint (inclusive) of the returned set
-     * @param toElement high endpoint (exclusive) of the returned set
-     * @return a view of the portion of this set whose elements range from
-     *         <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>, exclusive
-     * @throws ClassCastException if <tt>fromElement</tt> and
-     *         <tt>toElement</tt> cannot be compared to one another using this
-     *         set's comparator (or, if the set has no comparator, using
-     *         natural ordering).  Implementations may, but are not required
-     *         to, throw this exception if <tt>fromElement</tt> or
-     *         <tt>toElement</tt> cannot be compared to elements currently in
-     *         the set.
-     * @throws NullPointerException if <tt>fromElement</tt> or
-     *         <tt>toElement</tt> is null and this set does not permit null
-     *         elements
-     * @throws IllegalArgumentException if <tt>fromElement</tt> is
-     *         greater than <tt>toElement</tt>; or if this set itself
-     *         has a restricted range, and <tt>fromElement</tt> or
-     *         <tt>toElement</tt> lies outside the bounds of the range
-     */
-    SortedSet<E> subSet(E fromElement, E toElement);
-
-    /**
-     * Returns a view of the portion of this set whose elements are
-     * strictly less than <tt>toElement</tt>.  The returned set is
-     * backed by this set, so changes in the returned set are
-     * reflected in this set, and vice-versa.  The returned set
-     * supports all optional set operations that this set supports.
-     *
-     * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
-     * on an attempt to insert an element outside its range.
-     *
-     * @param toElement high endpoint (exclusive) of the returned set
-     * @return a view of the portion of this set whose elements are strictly
-     *         less than <tt>toElement</tt>
-     * @throws ClassCastException if <tt>toElement</tt> is not compatible
-     *         with this set's comparator (or, if the set has no comparator,
-     *         if <tt>toElement</tt> does not implement {@link Comparable}).
-     *         Implementations may, but are not required to, throw this
-     *         exception if <tt>toElement</tt> cannot be compared to elements
-     *         currently in the set.
-     * @throws NullPointerException if <tt>toElement</tt> is null and
-     *         this set does not permit null elements
-     * @throws IllegalArgumentException if this set itself has a
-     *         restricted range, and <tt>toElement</tt> lies outside the
-     *         bounds of the range
-     */
-    SortedSet<E> headSet(E toElement);
-
-    /**
-     * Returns a view of the portion of this set whose elements are
-     * greater than or equal to <tt>fromElement</tt>.  The returned
-     * set is backed by this set, so changes in the returned set are
-     * reflected in this set, and vice-versa.  The returned set
-     * supports all optional set operations that this set supports.
-     *
-     * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
-     * on an attempt to insert an element outside its range.
-     *
-     * @param fromElement low endpoint (inclusive) of the returned set
-     * @return a view of the portion of this set whose elements are greater
-     *         than or equal to <tt>fromElement</tt>
-     * @throws ClassCastException if <tt>fromElement</tt> is not compatible
-     *         with this set's comparator (or, if the set has no comparator,
-     *         if <tt>fromElement</tt> does not implement {@link Comparable}).
-     *         Implementations may, but are not required to, throw this
-     *         exception if <tt>fromElement</tt> cannot be compared to elements
-     *         currently in the set.
-     * @throws NullPointerException if <tt>fromElement</tt> is null
-     *         and this set does not permit null elements
-     * @throws IllegalArgumentException if this set itself has a
-     *         restricted range, and <tt>fromElement</tt> lies outside the
-     *         bounds of the range
-     */
-    SortedSet<E> tailSet(E fromElement);
-
-    /**
-     * Returns the first (lowest) element currently in this set.
-     *
-     * @return the first (lowest) element currently in this set
-     * @throws NoSuchElementException if this set is empty
-     */
-    E first();
-
-    /**
-     * Returns the last (highest) element currently in this set.
-     *
-     * @return the last (highest) element currently in this set
-     * @throws NoSuchElementException if this set is empty
-     */
-    E last();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Stack.java
--- a/emul/compact/src/main/java/java/util/Stack.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * The <code>Stack</code> class represents a last-in-first-out
- * (LIFO) stack of objects. It extends class <tt>Vector</tt> with five
- * operations that allow a vector to be treated as a stack. The usual
- * <tt>push</tt> and <tt>pop</tt> operations are provided, as well as a
- * method to <tt>peek</tt> at the top item on the stack, a method to test
- * for whether the stack is <tt>empty</tt>, and a method to <tt>search</tt>
- * the stack for an item and discover how far it is from the top.
- * <p>
- * When a stack is first created, it contains no items.
- *
- * <p>A more complete and consistent set of LIFO stack operations is
- * provided by the {@link Deque} interface and its implementations, which
- * should be used in preference to this class.  For example:
- * <pre>   {@code
- *   Deque<Integer> stack = new ArrayDeque<Integer>();}</pre>
- *
- * @author  Jonathan Payne
- * @since   JDK1.0
- */
-public
-class Stack<E> extends Vector<E> {
-    /**
-     * Creates an empty Stack.
-     */
-    public Stack() {
-    }
-
-    /**
-     * Pushes an item onto the top of this stack. This has exactly
-     * the same effect as:
-     * <blockquote><pre>
-     * addElement(item)</pre></blockquote>
-     *
-     * @param   item   the item to be pushed onto this stack.
-     * @return  the <code>item</code> argument.
-     * @see     java.util.Vector#addElement
-     */
-    public E push(E item) {
-        addElement(item);
-
-        return item;
-    }
-
-    /**
-     * Removes the object at the top of this stack and returns that
-     * object as the value of this function.
-     *
-     * @return  The object at the top of this stack (the last item
-     *          of the <tt>Vector</tt> object).
-     * @throws  EmptyStackException  if this stack is empty.
-     */
-    public synchronized E pop() {
-        E       obj;
-        int     len = size();
-
-        obj = peek();
-        removeElementAt(len - 1);
-
-        return obj;
-    }
-
-    /**
-     * Looks at the object at the top of this stack without removing it
-     * from the stack.
-     *
-     * @return  the object at the top of this stack (the last item
-     *          of the <tt>Vector</tt> object).
-     * @throws  EmptyStackException  if this stack is empty.
-     */
-    public synchronized E peek() {
-        int     len = size();
-
-        if (len == 0)
-            throw new EmptyStackException();
-        return elementAt(len - 1);
-    }
-
-    /**
-     * Tests if this stack is empty.
-     *
-     * @return  <code>true</code> if and only if this stack contains
-     *          no items; <code>false</code> otherwise.
-     */
-    public boolean empty() {
-        return size() == 0;
-    }
-
-    /**
-     * Returns the 1-based position where an object is on this stack.
-     * If the object <tt>o</tt> occurs as an item in this stack, this
-     * method returns the distance from the top of the stack of the
-     * occurrence nearest the top of the stack; the topmost item on the
-     * stack is considered to be at distance <tt>1</tt>. The <tt>equals</tt>
-     * method is used to compare <tt>o</tt> to the
-     * items in this stack.
-     *
-     * @param   o   the desired object.
-     * @return  the 1-based position from the top of the stack where
-     *          the object is located; the return value <code>-1</code>
-     *          indicates that the object is not on the stack.
-     */
-    public synchronized int search(Object o) {
-        int i = lastIndexOf(o);
-
-        if (i >= 0) {
-            return size() - i;
-        }
-        return -1;
-    }
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = 1224463164541339165L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/StringTokenizer.java
--- a/emul/compact/src/main/java/java/util/StringTokenizer.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,431 +0,0 @@
-/*
- * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-import java.lang.*;
-
-/**
- * The string tokenizer class allows an application to break a
- * string into tokens. The tokenization method is much simpler than
- * the one used by the <code>StreamTokenizer</code> class. The
- * <code>StringTokenizer</code> methods do not distinguish among
- * identifiers, numbers, and quoted strings, nor do they recognize
- * and skip comments.
- * <p>
- * The set of delimiters (the characters that separate tokens) may
- * be specified either at creation time or on a per-token basis.
- * <p>
- * An instance of <code>StringTokenizer</code> behaves in one of two
- * ways, depending on whether it was created with the
- * <code>returnDelims</code> flag having the value <code>true</code>
- * or <code>false</code>:
- * <ul>
- * <li>If the flag is <code>false</code>, delimiter characters serve to
- *     separate tokens. A token is a maximal sequence of consecutive
- *     characters that are not delimiters.
- * <li>If the flag is <code>true</code>, delimiter characters are themselves
- *     considered to be tokens. A token is thus either one delimiter
- *     character, or a maximal sequence of consecutive characters that are
- *     not delimiters.
- * </ul><p>
- * A <tt>StringTokenizer</tt> object internally maintains a current
- * position within the string to be tokenized. Some operations advance this
- * current position past the characters processed.<p>
- * A token is returned by taking a substring of the string that was used to
- * create the <tt>StringTokenizer</tt> object.
- * <p>
- * The following is one example of the use of the tokenizer. The code:
- * <blockquote><pre>
- *     StringTokenizer st = new StringTokenizer("this is a test");
- *     while (st.hasMoreTokens()) {
- *         System.out.println(st.nextToken());
- *     }
- * </pre></blockquote>
- * <p>
- * prints the following output:
- * <blockquote><pre>
- *     this
- *     is
- *     a
- *     test
- * </pre></blockquote>
- *
- * <p>
- * <tt>StringTokenizer</tt> is a legacy class that is retained for
- * compatibility reasons although its use is discouraged in new code. It is
- * recommended that anyone seeking this functionality use the <tt>split</tt>
- * method of <tt>String</tt> or the java.util.regex package instead.
- * <p>
- * The following example illustrates how the <tt>String.split</tt>
- * method can be used to break up a string into its basic tokens:
- * <blockquote><pre>
- *     String[] result = "this is a test".split("\\s");
- *     for (int x=0; x&lt;result.length; x++)
- *         System.out.println(result[x]);
- * </pre></blockquote>
- * <p>
- * prints the following output:
- * <blockquote><pre>
- *     this
- *     is
- *     a
- *     test
- * </pre></blockquote>
- *
- * @author  unascribed
- * @see     java.io.StreamTokenizer
- * @since   JDK1.0
- */
-public
-class StringTokenizer implements Enumeration<Object> {
-    private int currentPosition;
-    private int newPosition;
-    private int maxPosition;
-    private String str;
-    private String delimiters;
-    private boolean retDelims;
-    private boolean delimsChanged;
-
-    /**
-     * maxDelimCodePoint stores the value of the delimiter character with the
-     * highest value. It is used to optimize the detection of delimiter
-     * characters.
-     *
-     * It is unlikely to provide any optimization benefit in the
-     * hasSurrogates case because most string characters will be
-     * smaller than the limit, but we keep it so that the two code
-     * paths remain similar.
-     */
-    private int maxDelimCodePoint;
-
-    /**
-     * If delimiters include any surrogates (including surrogate
-     * pairs), hasSurrogates is true and the tokenizer uses the
-     * different code path. This is because String.indexOf(int)
-     * doesn't handle unpaired surrogates as a single character.
-     */
-    private boolean hasSurrogates = false;
-
-    /**
-     * When hasSurrogates is true, delimiters are converted to code
-     * points and isDelimiter(int) is used to determine if the given
-     * codepoint is a delimiter.
-     */
-    private int[] delimiterCodePoints;
-
-    /**
-     * Set maxDelimCodePoint to the highest char in the delimiter set.
-     */
-    private void setMaxDelimCodePoint() {
-        if (delimiters == null) {
-            maxDelimCodePoint = 0;
-            return;
-        }
-
-        int m = 0;
-        int c;
-        int count = 0;
-        for (int i = 0; i < delimiters.length(); i += Character.charCount(c)) {
-            c = delimiters.charAt(i);
-            if (c >= Character.MIN_HIGH_SURROGATE && c <= Character.MAX_LOW_SURROGATE) {
-                c = delimiters.codePointAt(i);
-                hasSurrogates = true;
-            }
-            if (m < c)
-                m = c;
-            count++;
-        }
-        maxDelimCodePoint = m;
-
-        if (hasSurrogates) {
-            delimiterCodePoints = new int[count];
-            for (int i = 0, j = 0; i < count; i++, j += Character.charCount(c)) {
-                c = delimiters.codePointAt(j);
-                delimiterCodePoints[i] = c;
-            }
-        }
-    }
-
-    /**
-     * Constructs a string tokenizer for the specified string. All
-     * characters in the <code>delim</code> argument are the delimiters
-     * for separating tokens.
-     * <p>
-     * If the <code>returnDelims</code> flag is <code>true</code>, then
-     * the delimiter characters are also returned as tokens. Each
-     * delimiter is returned as a string of length one. If the flag is
-     * <code>false</code>, the delimiter characters are skipped and only
-     * serve as separators between tokens.
-     * <p>
-     * Note that if <tt>delim</tt> is <tt>null</tt>, this constructor does
-     * not throw an exception. However, trying to invoke other methods on the
-     * resulting <tt>StringTokenizer</tt> may result in a
-     * <tt>NullPointerException</tt>.
-     *
-     * @param   str            a string to be parsed.
-     * @param   delim          the delimiters.
-     * @param   returnDelims   flag indicating whether to return the delimiters
-     *                         as tokens.
-     * @exception NullPointerException if str is <CODE>null</CODE>
-     */
-    public StringTokenizer(String str, String delim, boolean returnDelims) {
-        currentPosition = 0;
-        newPosition = -1;
-        delimsChanged = false;
-        this.str = str;
-        maxPosition = str.length();
-        delimiters = delim;
-        retDelims = returnDelims;
-        setMaxDelimCodePoint();
-    }
-
-    /**
-     * Constructs a string tokenizer for the specified string. The
-     * characters in the <code>delim</code> argument are the delimiters
-     * for separating tokens. Delimiter characters themselves will not
-     * be treated as tokens.
-     * <p>
-     * Note that if <tt>delim</tt> is <tt>null</tt>, this constructor does
-     * not throw an exception. However, trying to invoke other methods on the
-     * resulting <tt>StringTokenizer</tt> may result in a
-     * <tt>NullPointerException</tt>.
-     *
-     * @param   str     a string to be parsed.
-     * @param   delim   the delimiters.
-     * @exception NullPointerException if str is <CODE>null</CODE>
-     */
-    public StringTokenizer(String str, String delim) {
-        this(str, delim, false);
-    }
-
-    /**
-     * Constructs a string tokenizer for the specified string. The
-     * tokenizer uses the default delimiter set, which is
-     * <code>"&nbsp;&#92;t&#92;n&#92;r&#92;f"</code>: the space character,
-     * the tab character, the newline character, the carriage-return character,
-     * and the form-feed character. Delimiter characters themselves will
-     * not be treated as tokens.
-     *
-     * @param   str   a string to be parsed.
-     * @exception NullPointerException if str is <CODE>null</CODE>
-     */
-    public StringTokenizer(String str) {
-        this(str, " \t\n\r\f", false);
-    }
-
-    /**
-     * Skips delimiters starting from the specified position. If retDelims
-     * is false, returns the index of the first non-delimiter character at or
-     * after startPos. If retDelims is true, startPos is returned.
-     */
-    private int skipDelimiters(int startPos) {
-        if (delimiters == null)
-            throw new NullPointerException();
-
-        int position = startPos;
-        while (!retDelims && position < maxPosition) {
-            if (!hasSurrogates) {
-                char c = str.charAt(position);
-                if ((c > maxDelimCodePoint) || (delimiters.indexOf(c) < 0))
-                    break;
-                position++;
-            } else {
-                int c = str.codePointAt(position);
-                if ((c > maxDelimCodePoint) || !isDelimiter(c)) {
-                    break;
-                }
-                position += Character.charCount(c);
-            }
-        }
-        return position;
-    }
-
-    /**
-     * Skips ahead from startPos and returns the index of the next delimiter
-     * character encountered, or maxPosition if no such delimiter is found.
-     */
-    private int scanToken(int startPos) {
-        int position = startPos;
-        while (position < maxPosition) {
-            if (!hasSurrogates) {
-                char c = str.charAt(position);
-                if ((c <= maxDelimCodePoint) && (delimiters.indexOf(c) >= 0))
-                    break;
-                position++;
-            } else {
-                int c = str.codePointAt(position);
-                if ((c <= maxDelimCodePoint) && isDelimiter(c))
-                    break;
-                position += Character.charCount(c);
-            }
-        }
-        if (retDelims && (startPos == position)) {
-            if (!hasSurrogates) {
-                char c = str.charAt(position);
-                if ((c <= maxDelimCodePoint) && (delimiters.indexOf(c) >= 0))
-                    position++;
-            } else {
-                int c = str.codePointAt(position);
-                if ((c <= maxDelimCodePoint) && isDelimiter(c))
-                    position += Character.charCount(c);
-            }
-        }
-        return position;
-    }
-
-    private boolean isDelimiter(int codePoint) {
-        for (int i = 0; i < delimiterCodePoints.length; i++) {
-            if (delimiterCodePoints[i] == codePoint) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Tests if there are more tokens available from this tokenizer's string.
-     * If this method returns <tt>true</tt>, then a subsequent call to
-     * <tt>nextToken</tt> with no argument will successfully return a token.
-     *
-     * @return  <code>true</code> if and only if there is at least one token
-     *          in the string after the current position; <code>false</code>
-     *          otherwise.
-     */
-    public boolean hasMoreTokens() {
-        /*
-         * Temporarily store this position and use it in the following
-         * nextToken() method only if the delimiters haven't been changed in
-         * that nextToken() invocation.
-         */
-        newPosition = skipDelimiters(currentPosition);
-        return (newPosition < maxPosition);
-    }
-
-    /**
-     * Returns the next token from this string tokenizer.
-     *
-     * @return     the next token from this string tokenizer.
-     * @exception  NoSuchElementException  if there are no more tokens in this
-     *               tokenizer's string.
-     */
-    public String nextToken() {
-        /*
-         * If next position already computed in hasMoreElements() and
-         * delimiters have changed between the computation and this invocation,
-         * then use the computed value.
-         */
-
-        currentPosition = (newPosition >= 0 && !delimsChanged) ?
-            newPosition : skipDelimiters(currentPosition);
-
-        /* Reset these anyway */
-        delimsChanged = false;
-        newPosition = -1;
-
-        if (currentPosition >= maxPosition)
-            throw new NoSuchElementException();
-        int start = currentPosition;
-        currentPosition = scanToken(currentPosition);
-        return str.substring(start, currentPosition);
-    }
-
-    /**
-     * Returns the next token in this string tokenizer's string. First,
-     * the set of characters considered to be delimiters by this
-     * <tt>StringTokenizer</tt> object is changed to be the characters in
-     * the string <tt>delim</tt>. Then the next token in the string
-     * after the current position is returned. The current position is
-     * advanced beyond the recognized token.  The new delimiter set
-     * remains the default after this call.
-     *
-     * @param      delim   the new delimiters.
-     * @return     the next token, after switching to the new delimiter set.
-     * @exception  NoSuchElementException  if there are no more tokens in this
-     *               tokenizer's string.
-     * @exception NullPointerException if delim is <CODE>null</CODE>
-     */
-    public String nextToken(String delim) {
-        delimiters = delim;
-
-        /* delimiter string specified, so set the appropriate flag. */
-        delimsChanged = true;
-
-        setMaxDelimCodePoint();
-        return nextToken();
-    }
-
-    /**
-     * Returns the same value as the <code>hasMoreTokens</code>
-     * method. It exists so that this class can implement the
-     * <code>Enumeration</code> interface.
-     *
-     * @return  <code>true</code> if there are more tokens;
-     *          <code>false</code> otherwise.
-     * @see     java.util.Enumeration
-     * @see     java.util.StringTokenizer#hasMoreTokens()
-     */
-    public boolean hasMoreElements() {
-        return hasMoreTokens();
-    }
-
-    /**
-     * Returns the same value as the <code>nextToken</code> method,
-     * except that its declared return value is <code>Object</code> rather than
-     * <code>String</code>. It exists so that this class can implement the
-     * <code>Enumeration</code> interface.
-     *
-     * @return     the next token in the string.
-     * @exception  NoSuchElementException  if there are no more tokens in this
-     *               tokenizer's string.
-     * @see        java.util.Enumeration
-     * @see        java.util.StringTokenizer#nextToken()
-     */
-    public Object nextElement() {
-        return nextToken();
-    }
-
-    /**
-     * Calculates the number of times that this tokenizer's
-     * <code>nextToken</code> method can be called before it generates an
-     * exception. The current position is not advanced.
-     *
-     * @return  the number of tokens remaining in the string using the current
-     *          delimiter set.
-     * @see     java.util.StringTokenizer#nextToken()
-     */
-    public int countTokens() {
-        int count = 0;
-        int currpos = currentPosition;
-        while (currpos < maxPosition) {
-            currpos = skipDelimiters(currpos);
-            if (currpos >= maxPosition)
-                break;
-            currpos = scanToken(currpos);
-            count++;
-        }
-        return count;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/TimSort.java
--- a/emul/compact/src/main/java/java/util/TimSort.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,929 +0,0 @@
-/*
- * Copyright 2009 Google Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-
-/**
- * A stable, adaptive, iterative mergesort that requires far fewer than
- * n lg(n) comparisons when running on partially sorted arrays, while
- * offering performance comparable to a traditional mergesort when run
- * on random arrays.  Like all proper mergesorts, this sort is stable and
- * runs O(n log n) time (worst case).  In the worst case, this sort requires
- * temporary storage space for n/2 object references; in the best case,
- * it requires only a small constant amount of space.
- *
- * This implementation was adapted from Tim Peters's list sort for
- * Python, which is described in detail here:
- *
- *   http://svn.python.org/projects/python/trunk/Objects/listsort.txt
- *
- * Tim's C code may be found here:
- *
- *   http://svn.python.org/projects/python/trunk/Objects/listobject.c
- *
- * The underlying techniques are described in this paper (and may have
- * even earlier origins):
- *
- *  "Optimistic Sorting and Information Theoretic Complexity"
- *  Peter McIlroy
- *  SODA (Fourth Annual ACM-SIAM Symposium on Discrete Algorithms),
- *  pp 467-474, Austin, Texas, 25-27 January 1993.
- *
- * While the API to this class consists solely of static methods, it is
- * (privately) instantiable; a TimSort instance holds the state of an ongoing
- * sort, assuming the input array is large enough to warrant the full-blown
- * TimSort. Small arrays are sorted in place, using a binary insertion sort.
- *
- * @author Josh Bloch
- */
-class TimSort<T> {
-    /**
-     * This is the minimum sized sequence that will be merged.  Shorter
-     * sequences will be lengthened by calling binarySort.  If the entire
-     * array is less than this length, no merges will be performed.
-     *
-     * This constant should be a power of two.  It was 64 in Tim Peter's C
-     * implementation, but 32 was empirically determined to work better in
-     * this implementation.  In the unlikely event that you set this constant
-     * to be a number that's not a power of two, you'll need to change the
-     * {@link #minRunLength} computation.
-     *
-     * If you decrease this constant, you must change the stackLen
-     * computation in the TimSort constructor, or you risk an
-     * ArrayOutOfBounds exception.  See listsort.txt for a discussion
-     * of the minimum stack length required as a function of the length
-     * of the array being sorted and the minimum merge sequence length.
-     */
-    private static final int MIN_MERGE = 32;
-
-    /**
-     * The array being sorted.
-     */
-    private final T[] a;
-
-    /**
-     * The comparator for this sort.
-     */
-    private final Comparator<? super T> c;
-
-    /**
-     * When we get into galloping mode, we stay there until both runs win less
-     * often than MIN_GALLOP consecutive times.
-     */
-    private static final int  MIN_GALLOP = 7;
-
-    /**
-     * This controls when we get *into* galloping mode.  It is initialized
-     * to MIN_GALLOP.  The mergeLo and mergeHi methods nudge it higher for
-     * random data, and lower for highly structured data.
-     */
-    private int minGallop = MIN_GALLOP;
-
-    /**
-     * Maximum initial size of tmp array, which is used for merging.  The array
-     * can grow to accommodate demand.
-     *
-     * Unlike Tim's original C version, we do not allocate this much storage
-     * when sorting smaller arrays.  This change was required for performance.
-     */
-    private static final int INITIAL_TMP_STORAGE_LENGTH = 256;
-
-    /**
-     * Temp storage for merges.
-     */
-    private T[] tmp; // Actual runtime type will be Object[], regardless of T
-
-    /**
-     * A stack of pending runs yet to be merged.  Run i starts at
-     * address base[i] and extends for len[i] elements.  It's always
-     * true (so long as the indices are in bounds) that:
-     *
-     *     runBase[i] + runLen[i] == runBase[i + 1]
-     *
-     * so we could cut the storage for this, but it's a minor amount,
-     * and keeping all the info explicit simplifies the code.
-     */
-    private int stackSize = 0;  // Number of pending runs on stack
-    private final int[] runBase;
-    private final int[] runLen;
-
-    /**
-     * Creates a TimSort instance to maintain the state of an ongoing sort.
-     *
-     * @param a the array to be sorted
-     * @param c the comparator to determine the order of the sort
-     */
-    private TimSort(T[] a, Comparator<? super T> c) {
-        this.a = a;
-        this.c = c;
-
-        // Allocate temp storage (which may be increased later if necessary)
-        int len = a.length;
-        @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
-        T[] newArray = (T[]) new Object[len < 2 * INITIAL_TMP_STORAGE_LENGTH ?
-                                        len >>> 1 : INITIAL_TMP_STORAGE_LENGTH];
-        tmp = newArray;
-
-        /*
-         * Allocate runs-to-be-merged stack (which cannot be expanded).  The
-         * stack length requirements are described in listsort.txt.  The C
-         * version always uses the same stack length (85), but this was
-         * measured to be too expensive when sorting "mid-sized" arrays (e.g.,
-         * 100 elements) in Java.  Therefore, we use smaller (but sufficiently
-         * large) stack lengths for smaller arrays.  The "magic numbers" in the
-         * computation below must be changed if MIN_MERGE is decreased.  See
-         * the MIN_MERGE declaration above for more information.
-         */
-        int stackLen = (len <    120  ?  5 :
-                        len <   1542  ? 10 :
-                        len < 119151  ? 19 : 40);
-        runBase = new int[stackLen];
-        runLen = new int[stackLen];
-    }
-
-    /*
-     * The next two methods (which are package private and static) constitute
-     * the entire API of this class.  Each of these methods obeys the contract
-     * of the public method with the same signature in java.util.Arrays.
-     */
-
-    static <T> void sort(T[] a, Comparator<? super T> c) {
-        sort(a, 0, a.length, c);
-    }
-
-    static <T> void sort(T[] a, int lo, int hi, Comparator<? super T> c) {
-        if (c == null) {
-            Arrays.sort(a, lo, hi);
-            return;
-        }
-
-        rangeCheck(a.length, lo, hi);
-        int nRemaining  = hi - lo;
-        if (nRemaining < 2)
-            return;  // Arrays of size 0 and 1 are always sorted
-
-        // If array is small, do a "mini-TimSort" with no merges
-        if (nRemaining < MIN_MERGE) {
-            int initRunLen = countRunAndMakeAscending(a, lo, hi, c);
-            binarySort(a, lo, hi, lo + initRunLen, c);
-            return;
-        }
-
-        /**
-         * March over the array once, left to right, finding natural runs,
-         * extending short natural runs to minRun elements, and merging runs
-         * to maintain stack invariant.
-         */
-        TimSort<T> ts = new TimSort<>(a, c);
-        int minRun = minRunLength(nRemaining);
-        do {
-            // Identify next run
-            int runLen = countRunAndMakeAscending(a, lo, hi, c);
-
-            // If run is short, extend to min(minRun, nRemaining)
-            if (runLen < minRun) {
-                int force = nRemaining <= minRun ? nRemaining : minRun;
-                binarySort(a, lo, lo + force, lo + runLen, c);
-                runLen = force;
-            }
-
-            // Push run onto pending-run stack, and maybe merge
-            ts.pushRun(lo, runLen);
-            ts.mergeCollapse();
-
-            // Advance to find next run
-            lo += runLen;
-            nRemaining -= runLen;
-        } while (nRemaining != 0);
-
-        // Merge all remaining runs to complete sort
-        assert lo == hi;
-        ts.mergeForceCollapse();
-        assert ts.stackSize == 1;
-    }
-
-    /**
-     * Sorts the specified portion of the specified array using a binary
-     * insertion sort.  This is the best method for sorting small numbers
-     * of elements.  It requires O(n log n) compares, but O(n^2) data
-     * movement (worst case).
-     *
-     * If the initial part of the specified range is already sorted,
-     * this method can take advantage of it: the method assumes that the
-     * elements from index {@code lo}, inclusive, to {@code start},
-     * exclusive are already sorted.
-     *
-     * @param a the array in which a range is to be sorted
-     * @param lo the index of the first element in the range to be sorted
-     * @param hi the index after the last element in the range to be sorted
-     * @param start the index of the first element in the range that is
-     *        not already known to be sorted ({@code lo <= start <= hi})
-     * @param c comparator to used for the sort
-     */
-    @SuppressWarnings("fallthrough")
-    private static <T> void binarySort(T[] a, int lo, int hi, int start,
-                                       Comparator<? super T> c) {
-        assert lo <= start && start <= hi;
-        if (start == lo)
-            start++;
-        for ( ; start < hi; start++) {
-            T pivot = a[start];
-
-            // Set left (and right) to the index where a[start] (pivot) belongs
-            int left = lo;
-            int right = start;
-            assert left <= right;
-            /*
-             * Invariants:
-             *   pivot >= all in [lo, left).
-             *   pivot <  all in [right, start).
-             */
-            while (left < right) {
-                int mid = (left + right) >>> 1;
-                if (c.compare(pivot, a[mid]) < 0)
-                    right = mid;
-                else
-                    left = mid + 1;
-            }
-            assert left == right;
-
-            /*
-             * The invariants still hold: pivot >= all in [lo, left) and
-             * pivot < all in [left, start), so pivot belongs at left.  Note
-             * that if there are elements equal to pivot, left points to the
-             * first slot after them -- that's why this sort is stable.
-             * Slide elements over to make room for pivot.
-             */
-            int n = start - left;  // The number of elements to move
-            // Switch is just an optimization for arraycopy in default case
-            switch (n) {
-                case 2:  a[left + 2] = a[left + 1];
-                case 1:  a[left + 1] = a[left];
-                         break;
-                default: System.arraycopy(a, left, a, left + 1, n);
-            }
-            a[left] = pivot;
-        }
-    }
-
-    /**
-     * Returns the length of the run beginning at the specified position in
-     * the specified array and reverses the run if it is descending (ensuring
-     * that the run will always be ascending when the method returns).
-     *
-     * A run is the longest ascending sequence with:
-     *
-     *    a[lo] <= a[lo + 1] <= a[lo + 2] <= ...
-     *
-     * or the longest descending sequence with:
-     *
-     *    a[lo] >  a[lo + 1] >  a[lo + 2] >  ...
-     *
-     * For its intended use in a stable mergesort, the strictness of the
-     * definition of "descending" is needed so that the call can safely
-     * reverse a descending sequence without violating stability.
-     *
-     * @param a the array in which a run is to be counted and possibly reversed
-     * @param lo index of the first element in the run
-     * @param hi index after the last element that may be contained in the run.
-              It is required that {@code lo < hi}.
-     * @param c the comparator to used for the sort
-     * @return  the length of the run beginning at the specified position in
-     *          the specified array
-     */
-    private static <T> int countRunAndMakeAscending(T[] a, int lo, int hi,
-                                                    Comparator<? super T> c) {
-        assert lo < hi;
-        int runHi = lo + 1;
-        if (runHi == hi)
-            return 1;
-
-        // Find end of run, and reverse range if descending
-        if (c.compare(a[runHi++], a[lo]) < 0) { // Descending
-            while (runHi < hi && c.compare(a[runHi], a[runHi - 1]) < 0)
-                runHi++;
-            reverseRange(a, lo, runHi);
-        } else {                              // Ascending
-            while (runHi < hi && c.compare(a[runHi], a[runHi - 1]) >= 0)
-                runHi++;
-        }
-
-        return runHi - lo;
-    }
-
-    /**
-     * Reverse the specified range of the specified array.
-     *
-     * @param a the array in which a range is to be reversed
-     * @param lo the index of the first element in the range to be reversed
-     * @param hi the index after the last element in the range to be reversed
-     */
-    private static void reverseRange(Object[] a, int lo, int hi) {
-        hi--;
-        while (lo < hi) {
-            Object t = a[lo];
-            a[lo++] = a[hi];
-            a[hi--] = t;
-        }
-    }
-
-    /**
-     * Returns the minimum acceptable run length for an array of the specified
-     * length. Natural runs shorter than this will be extended with
-     * {@link #binarySort}.
-     *
-     * Roughly speaking, the computation is:
-     *
-     *  If n < MIN_MERGE, return n (it's too small to bother with fancy stuff).
-     *  Else if n is an exact power of 2, return MIN_MERGE/2.
-     *  Else return an int k, MIN_MERGE/2 <= k <= MIN_MERGE, such that n/k
-     *   is close to, but strictly less than, an exact power of 2.
-     *
-     * For the rationale, see listsort.txt.
-     *
-     * @param n the length of the array to be sorted
-     * @return the length of the minimum run to be merged
-     */
-    private static int minRunLength(int n) {
-        assert n >= 0;
-        int r = 0;      // Becomes 1 if any 1 bits are shifted off
-        while (n >= MIN_MERGE) {
-            r |= (n & 1);
-            n >>= 1;
-        }
-        return n + r;
-    }
-
-    /**
-     * Pushes the specified run onto the pending-run stack.
-     *
-     * @param runBase index of the first element in the run
-     * @param runLen  the number of elements in the run
-     */
-    private void pushRun(int runBase, int runLen) {
-        this.runBase[stackSize] = runBase;
-        this.runLen[stackSize] = runLen;
-        stackSize++;
-    }
-
-    /**
-     * Examines the stack of runs waiting to be merged and merges adjacent runs
-     * until the stack invariants are reestablished:
-     *
-     *     1. runLen[i - 3] > runLen[i - 2] + runLen[i - 1]
-     *     2. runLen[i - 2] > runLen[i - 1]
-     *
-     * This method is called each time a new run is pushed onto the stack,
-     * so the invariants are guaranteed to hold for i < stackSize upon
-     * entry to the method.
-     */
-    private void mergeCollapse() {
-        while (stackSize > 1) {
-            int n = stackSize - 2;
-            if (n > 0 && runLen[n-1] <= runLen[n] + runLen[n+1]) {
-                if (runLen[n - 1] < runLen[n + 1])
-                    n--;
-                mergeAt(n);
-            } else if (runLen[n] <= runLen[n + 1]) {
-                mergeAt(n);
-            } else {
-                break; // Invariant is established
-            }
-        }
-    }
-
-    /**
-     * Merges all runs on the stack until only one remains.  This method is
-     * called once, to complete the sort.
-     */
-    private void mergeForceCollapse() {
-        while (stackSize > 1) {
-            int n = stackSize - 2;
-            if (n > 0 && runLen[n - 1] < runLen[n + 1])
-                n--;
-            mergeAt(n);
-        }
-    }
-
-    /**
-     * Merges the two runs at stack indices i and i+1.  Run i must be
-     * the penultimate or antepenultimate run on the stack.  In other words,
-     * i must be equal to stackSize-2 or stackSize-3.
-     *
-     * @param i stack index of the first of the two runs to merge
-     */
-    private void mergeAt(int i) {
-        assert stackSize >= 2;
-        assert i >= 0;
-        assert i == stackSize - 2 || i == stackSize - 3;
-
-        int base1 = runBase[i];
-        int len1 = runLen[i];
-        int base2 = runBase[i + 1];
-        int len2 = runLen[i + 1];
-        assert len1 > 0 && len2 > 0;
-        assert base1 + len1 == base2;
-
-        /*
-         * Record the length of the combined runs; if i is the 3rd-last
-         * run now, also slide over the last run (which isn't involved
-         * in this merge).  The current run (i+1) goes away in any case.
-         */
-        runLen[i] = len1 + len2;
-        if (i == stackSize - 3) {
-            runBase[i + 1] = runBase[i + 2];
-            runLen[i + 1] = runLen[i + 2];
-        }
-        stackSize--;
-
-        /*
-         * Find where the first element of run2 goes in run1. Prior elements
-         * in run1 can be ignored (because they're already in place).
-         */
-        int k = gallopRight(a[base2], a, base1, len1, 0, c);
-        assert k >= 0;
-        base1 += k;
-        len1 -= k;
-        if (len1 == 0)
-            return;
-
-        /*
-         * Find where the last element of run1 goes in run2. Subsequent elements
-         * in run2 can be ignored (because they're already in place).
-         */
-        len2 = gallopLeft(a[base1 + len1 - 1], a, base2, len2, len2 - 1, c);
-        assert len2 >= 0;
-        if (len2 == 0)
-            return;
-
-        // Merge remaining runs, using tmp array with min(len1, len2) elements
-        if (len1 <= len2)
-            mergeLo(base1, len1, base2, len2);
-        else
-            mergeHi(base1, len1, base2, len2);
-    }
-
-    /**
-     * Locates the position at which to insert the specified key into the
-     * specified sorted range; if the range contains an element equal to key,
-     * returns the index of the leftmost equal element.
-     *
-     * @param key the key whose insertion point to search for
-     * @param a the array in which to search
-     * @param base the index of the first element in the range
-     * @param len the length of the range; must be > 0
-     * @param hint the index at which to begin the search, 0 <= hint < n.
-     *     The closer hint is to the result, the faster this method will run.
-     * @param c the comparator used to order the range, and to search
-     * @return the int k,  0 <= k <= n such that a[b + k - 1] < key <= a[b + k],
-     *    pretending that a[b - 1] is minus infinity and a[b + n] is infinity.
-     *    In other words, key belongs at index b + k; or in other words,
-     *    the first k elements of a should precede key, and the last n - k
-     *    should follow it.
-     */
-    private static <T> int gallopLeft(T key, T[] a, int base, int len, int hint,
-                                      Comparator<? super T> c) {
-        assert len > 0 && hint >= 0 && hint < len;
-        int lastOfs = 0;
-        int ofs = 1;
-        if (c.compare(key, a[base + hint]) > 0) {
-            // Gallop right until a[base+hint+lastOfs] < key <= a[base+hint+ofs]
-            int maxOfs = len - hint;
-            while (ofs < maxOfs && c.compare(key, a[base + hint + ofs]) > 0) {
-                lastOfs = ofs;
-                ofs = (ofs << 1) + 1;
-                if (ofs <= 0)   // int overflow
-                    ofs = maxOfs;
-            }
-            if (ofs > maxOfs)
-                ofs = maxOfs;
-
-            // Make offsets relative to base
-            lastOfs += hint;
-            ofs += hint;
-        } else { // key <= a[base + hint]
-            // Gallop left until a[base+hint-ofs] < key <= a[base+hint-lastOfs]
-            final int maxOfs = hint + 1;
-            while (ofs < maxOfs && c.compare(key, a[base + hint - ofs]) <= 0) {
-                lastOfs = ofs;
-                ofs = (ofs << 1) + 1;
-                if (ofs <= 0)   // int overflow
-                    ofs = maxOfs;
-            }
-            if (ofs > maxOfs)
-                ofs = maxOfs;
-
-            // Make offsets relative to base
-            int tmp = lastOfs;
-            lastOfs = hint - ofs;
-            ofs = hint - tmp;
-        }
-        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
-
-        /*
-         * Now a[base+lastOfs] < key <= a[base+ofs], so key belongs somewhere
-         * to the right of lastOfs but no farther right than ofs.  Do a binary
-         * search, with invariant a[base + lastOfs - 1] < key <= a[base + ofs].
-         */
-        lastOfs++;
-        while (lastOfs < ofs) {
-            int m = lastOfs + ((ofs - lastOfs) >>> 1);
-
-            if (c.compare(key, a[base + m]) > 0)
-                lastOfs = m + 1;  // a[base + m] < key
-            else
-                ofs = m;          // key <= a[base + m]
-        }
-        assert lastOfs == ofs;    // so a[base + ofs - 1] < key <= a[base + ofs]
-        return ofs;
-    }
-
-    /**
-     * Like gallopLeft, except that if the range contains an element equal to
-     * key, gallopRight returns the index after the rightmost equal element.
-     *
-     * @param key the key whose insertion point to search for
-     * @param a the array in which to search
-     * @param base the index of the first element in the range
-     * @param len the length of the range; must be > 0
-     * @param hint the index at which to begin the search, 0 <= hint < n.
-     *     The closer hint is to the result, the faster this method will run.
-     * @param c the comparator used to order the range, and to search
-     * @return the int k,  0 <= k <= n such that a[b + k - 1] <= key < a[b + k]
-     */
-    private static <T> int gallopRight(T key, T[] a, int base, int len,
-                                       int hint, Comparator<? super T> c) {
-        assert len > 0 && hint >= 0 && hint < len;
-
-        int ofs = 1;
-        int lastOfs = 0;
-        if (c.compare(key, a[base + hint]) < 0) {
-            // Gallop left until a[b+hint - ofs] <= key < a[b+hint - lastOfs]
-            int maxOfs = hint + 1;
-            while (ofs < maxOfs && c.compare(key, a[base + hint - ofs]) < 0) {
-                lastOfs = ofs;
-                ofs = (ofs << 1) + 1;
-                if (ofs <= 0)   // int overflow
-                    ofs = maxOfs;
-            }
-            if (ofs > maxOfs)
-                ofs = maxOfs;
-
-            // Make offsets relative to b
-            int tmp = lastOfs;
-            lastOfs = hint - ofs;
-            ofs = hint - tmp;
-        } else { // a[b + hint] <= key
-            // Gallop right until a[b+hint + lastOfs] <= key < a[b+hint + ofs]
-            int maxOfs = len - hint;
-            while (ofs < maxOfs && c.compare(key, a[base + hint + ofs]) >= 0) {
-                lastOfs = ofs;
-                ofs = (ofs << 1) + 1;
-                if (ofs <= 0)   // int overflow
-                    ofs = maxOfs;
-            }
-            if (ofs > maxOfs)
-                ofs = maxOfs;
-
-            // Make offsets relative to b
-            lastOfs += hint;
-            ofs += hint;
-        }
-        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
-
-        /*
-         * Now a[b + lastOfs] <= key < a[b + ofs], so key belongs somewhere to
-         * the right of lastOfs but no farther right than ofs.  Do a binary
-         * search, with invariant a[b + lastOfs - 1] <= key < a[b + ofs].
-         */
-        lastOfs++;
-        while (lastOfs < ofs) {
-            int m = lastOfs + ((ofs - lastOfs) >>> 1);
-
-            if (c.compare(key, a[base + m]) < 0)
-                ofs = m;          // key < a[b + m]
-            else
-                lastOfs = m + 1;  // a[b + m] <= key
-        }
-        assert lastOfs == ofs;    // so a[b + ofs - 1] <= key < a[b + ofs]
-        return ofs;
-    }
-
-    /**
-     * Merges two adjacent runs in place, in a stable fashion.  The first
-     * element of the first run must be greater than the first element of the
-     * second run (a[base1] > a[base2]), and the last element of the first run
-     * (a[base1 + len1-1]) must be greater than all elements of the second run.
-     *
-     * For performance, this method should be called only when len1 <= len2;
-     * its twin, mergeHi should be called if len1 >= len2.  (Either method
-     * may be called if len1 == len2.)
-     *
-     * @param base1 index of first element in first run to be merged
-     * @param len1  length of first run to be merged (must be > 0)
-     * @param base2 index of first element in second run to be merged
-     *        (must be aBase + aLen)
-     * @param len2  length of second run to be merged (must be > 0)
-     */
-    private void mergeLo(int base1, int len1, int base2, int len2) {
-        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
-
-        // Copy first run into temp array
-        T[] a = this.a; // For performance
-        T[] tmp = ensureCapacity(len1);
-        System.arraycopy(a, base1, tmp, 0, len1);
-
-        int cursor1 = 0;       // Indexes into tmp array
-        int cursor2 = base2;   // Indexes int a
-        int dest = base1;      // Indexes int a
-
-        // Move first element of second run and deal with degenerate cases
-        a[dest++] = a[cursor2++];
-        if (--len2 == 0) {
-            System.arraycopy(tmp, cursor1, a, dest, len1);
-            return;
-        }
-        if (len1 == 1) {
-            System.arraycopy(a, cursor2, a, dest, len2);
-            a[dest + len2] = tmp[cursor1]; // Last elt of run 1 to end of merge
-            return;
-        }
-
-        Comparator<? super T> c = this.c;  // Use local variable for performance
-        int minGallop = this.minGallop;    //  "    "       "     "      "
-    outer:
-        while (true) {
-            int count1 = 0; // Number of times in a row that first run won
-            int count2 = 0; // Number of times in a row that second run won
-
-            /*
-             * Do the straightforward thing until (if ever) one run starts
-             * winning consistently.
-             */
-            do {
-                assert len1 > 1 && len2 > 0;
-                if (c.compare(a[cursor2], tmp[cursor1]) < 0) {
-                    a[dest++] = a[cursor2++];
-                    count2++;
-                    count1 = 0;
-                    if (--len2 == 0)
-                        break outer;
-                } else {
-                    a[dest++] = tmp[cursor1++];
-                    count1++;
-                    count2 = 0;
-                    if (--len1 == 1)
-                        break outer;
-                }
-            } while ((count1 | count2) < minGallop);
-
-            /*
-             * One run is winning so consistently that galloping may be a
-             * huge win. So try that, and continue galloping until (if ever)
-             * neither run appears to be winning consistently anymore.
-             */
-            do {
-                assert len1 > 1 && len2 > 0;
-                count1 = gallopRight(a[cursor2], tmp, cursor1, len1, 0, c);
-                if (count1 != 0) {
-                    System.arraycopy(tmp, cursor1, a, dest, count1);
-                    dest += count1;
-                    cursor1 += count1;
-                    len1 -= count1;
-                    if (len1 <= 1) // len1 == 1 || len1 == 0
-                        break outer;
-                }
-                a[dest++] = a[cursor2++];
-                if (--len2 == 0)
-                    break outer;
-
-                count2 = gallopLeft(tmp[cursor1], a, cursor2, len2, 0, c);
-                if (count2 != 0) {
-                    System.arraycopy(a, cursor2, a, dest, count2);
-                    dest += count2;
-                    cursor2 += count2;
-                    len2 -= count2;
-                    if (len2 == 0)
-                        break outer;
-                }
-                a[dest++] = tmp[cursor1++];
-                if (--len1 == 1)
-                    break outer;
-                minGallop--;
-            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
-            if (minGallop < 0)
-                minGallop = 0;
-            minGallop += 2;  // Penalize for leaving gallop mode
-        }  // End of "outer" loop
-        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
-
-        if (len1 == 1) {
-            assert len2 > 0;
-            System.arraycopy(a, cursor2, a, dest, len2);
-            a[dest + len2] = tmp[cursor1]; //  Last elt of run 1 to end of merge
-        } else if (len1 == 0) {
-            throw new IllegalArgumentException(
-                "Comparison method violates its general contract!");
-        } else {
-            assert len2 == 0;
-            assert len1 > 1;
-            System.arraycopy(tmp, cursor1, a, dest, len1);
-        }
-    }
-
-    /**
-     * Like mergeLo, except that this method should be called only if
-     * len1 >= len2; mergeLo should be called if len1 <= len2.  (Either method
-     * may be called if len1 == len2.)
-     *
-     * @param base1 index of first element in first run to be merged
-     * @param len1  length of first run to be merged (must be > 0)
-     * @param base2 index of first element in second run to be merged
-     *        (must be aBase + aLen)
-     * @param len2  length of second run to be merged (must be > 0)
-     */
-    private void mergeHi(int base1, int len1, int base2, int len2) {
-        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
-
-        // Copy second run into temp array
-        T[] a = this.a; // For performance
-        T[] tmp = ensureCapacity(len2);
-        System.arraycopy(a, base2, tmp, 0, len2);
-
-        int cursor1 = base1 + len1 - 1;  // Indexes into a
-        int cursor2 = len2 - 1;          // Indexes into tmp array
-        int dest = base2 + len2 - 1;     // Indexes into a
-
-        // Move last element of first run and deal with degenerate cases
-        a[dest--] = a[cursor1--];
-        if (--len1 == 0) {
-            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
-            return;
-        }
-        if (len2 == 1) {
-            dest -= len1;
-            cursor1 -= len1;
-            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
-            a[dest] = tmp[cursor2];
-            return;
-        }
-
-        Comparator<? super T> c = this.c;  // Use local variable for performance
-        int minGallop = this.minGallop;    //  "    "       "     "      "
-    outer:
-        while (true) {
-            int count1 = 0; // Number of times in a row that first run won
-            int count2 = 0; // Number of times in a row that second run won
-
-            /*
-             * Do the straightforward thing until (if ever) one run
-             * appears to win consistently.
-             */
-            do {
-                assert len1 > 0 && len2 > 1;
-                if (c.compare(tmp[cursor2], a[cursor1]) < 0) {
-                    a[dest--] = a[cursor1--];
-                    count1++;
-                    count2 = 0;
-                    if (--len1 == 0)
-                        break outer;
-                } else {
-                    a[dest--] = tmp[cursor2--];
-                    count2++;
-                    count1 = 0;
-                    if (--len2 == 1)
-                        break outer;
-                }
-            } while ((count1 | count2) < minGallop);
-
-            /*
-             * One run is winning so consistently that galloping may be a
-             * huge win. So try that, and continue galloping until (if ever)
-             * neither run appears to be winning consistently anymore.
-             */
-            do {
-                assert len1 > 0 && len2 > 1;
-                count1 = len1 - gallopRight(tmp[cursor2], a, base1, len1, len1 - 1, c);
-                if (count1 != 0) {
-                    dest -= count1;
-                    cursor1 -= count1;
-                    len1 -= count1;
-                    System.arraycopy(a, cursor1 + 1, a, dest + 1, count1);
-                    if (len1 == 0)
-                        break outer;
-                }
-                a[dest--] = tmp[cursor2--];
-                if (--len2 == 1)
-                    break outer;
-
-                count2 = len2 - gallopLeft(a[cursor1], tmp, 0, len2, len2 - 1, c);
-                if (count2 != 0) {
-                    dest -= count2;
-                    cursor2 -= count2;
-                    len2 -= count2;
-                    System.arraycopy(tmp, cursor2 + 1, a, dest + 1, count2);
-                    if (len2 <= 1)  // len2 == 1 || len2 == 0
-                        break outer;
-                }
-                a[dest--] = a[cursor1--];
-                if (--len1 == 0)
-                    break outer;
-                minGallop--;
-            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
-            if (minGallop < 0)
-                minGallop = 0;
-            minGallop += 2;  // Penalize for leaving gallop mode
-        }  // End of "outer" loop
-        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
-
-        if (len2 == 1) {
-            assert len1 > 0;
-            dest -= len1;
-            cursor1 -= len1;
-            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
-            a[dest] = tmp[cursor2];  // Move first elt of run2 to front of merge
-        } else if (len2 == 0) {
-            throw new IllegalArgumentException(
-                "Comparison method violates its general contract!");
-        } else {
-            assert len1 == 0;
-            assert len2 > 0;
-            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
-        }
-    }
-
-    /**
-     * Ensures that the external array tmp has at least the specified
-     * number of elements, increasing its size if necessary.  The size
-     * increases exponentially to ensure amortized linear time complexity.
-     *
-     * @param minCapacity the minimum required capacity of the tmp array
-     * @return tmp, whether or not it grew
-     */
-    private T[] ensureCapacity(int minCapacity) {
-        if (tmp.length < minCapacity) {
-            // Compute smallest power of 2 > minCapacity
-            int newSize = minCapacity;
-            newSize |= newSize >> 1;
-            newSize |= newSize >> 2;
-            newSize |= newSize >> 4;
-            newSize |= newSize >> 8;
-            newSize |= newSize >> 16;
-            newSize++;
-
-            if (newSize < 0) // Not bloody likely!
-                newSize = minCapacity;
-            else
-                newSize = Math.min(newSize, a.length >>> 1);
-
-            @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
-            T[] newArray = (T[]) new Object[newSize];
-            tmp = newArray;
-        }
-        return tmp;
-    }
-
-    /**
-     * Checks that fromIndex and toIndex are in range, and throws an
-     * appropriate exception if they aren't.
-     *
-     * @param arrayLen the length of the array
-     * @param fromIndex the index of the first element of the range
-     * @param toIndex the index after the last element of the range
-     * @throws IllegalArgumentException if fromIndex > toIndex
-     * @throws ArrayIndexOutOfBoundsException if fromIndex < 0
-     *         or toIndex > arrayLen
-     */
-    private static void rangeCheck(int arrayLen, int fromIndex, int toIndex) {
-        if (fromIndex > toIndex)
-            throw new IllegalArgumentException("fromIndex(" + fromIndex +
-                       ") > toIndex(" + toIndex+")");
-        if (fromIndex < 0)
-            throw new ArrayIndexOutOfBoundsException(fromIndex);
-        if (toIndex > arrayLen)
-            throw new ArrayIndexOutOfBoundsException(toIndex);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/Vector.java
--- a/emul/compact/src/main/java/java/util/Vector.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1194 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-
-/**
- * The {@code Vector} class implements a growable array of
- * objects. Like an array, it contains components that can be
- * accessed using an integer index. However, the size of a
- * {@code Vector} can grow or shrink as needed to accommodate
- * adding and removing items after the {@code Vector} has been created.
- *
- * <p>Each vector tries to optimize storage management by maintaining a
- * {@code capacity} and a {@code capacityIncrement}. The
- * {@code capacity} is always at least as large as the vector
- * size; it is usually larger because as components are added to the
- * vector, the vector's storage increases in chunks the size of
- * {@code capacityIncrement}. An application can increase the
- * capacity of a vector before inserting a large number of
- * components; this reduces the amount of incremental reallocation.
- *
- * <p><a name="fail-fast"/>
- * The iterators returned by this class's {@link #iterator() iterator} and
- * {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>:
- * if the vector is structurally modified at any time after the iterator is
- * created, in any way except through the iterator's own
- * {@link ListIterator#remove() remove} or
- * {@link ListIterator#add(Object) add} methods, the iterator will throw a
- * {@link ConcurrentModificationException}.  Thus, in the face of
- * concurrent modification, the iterator fails quickly and cleanly, rather
- * than risking arbitrary, non-deterministic behavior at an undetermined
- * time in the future.  The {@link Enumeration Enumerations} returned by
- * the {@link #elements() elements} method are <em>not</em> fail-fast.
- *
- * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
- * as it is, generally speaking, impossible to make any hard guarantees in the
- * presence of unsynchronized concurrent modification.  Fail-fast iterators
- * throw {@code ConcurrentModificationException} on a best-effort basis.
- * Therefore, it would be wrong to write a program that depended on this
- * exception for its correctness:  <i>the fail-fast behavior of iterators
- * should be used only to detect bugs.</i>
- *
- * <p>As of the Java 2 platform v1.2, this class was retrofitted to
- * implement the {@link List} interface, making it a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.  Unlike the new collection
- * implementations, {@code Vector} is synchronized.  If a thread-safe
- * implementation is not needed, it is recommended to use {@link
- * ArrayList} in place of {@code Vector}.
- *
- * @author  Lee Boynton
- * @author  Jonathan Payne
- * @see Collection
- * @see LinkedList
- * @since   JDK1.0
- */
-public class Vector<E>
-    extends AbstractList<E>
-    implements List<E>, RandomAccess, Cloneable, java.io.Serializable
-{
-    /**
-     * The array buffer into which the components of the vector are
-     * stored. The capacity of the vector is the length of this array buffer,
-     * and is at least large enough to contain all the vector's elements.
-     *
-     * <p>Any array elements following the last element in the Vector are null.
-     *
-     * @serial
-     */
-    protected Object[] elementData;
-
-    /**
-     * The number of valid components in this {@code Vector} object.
-     * Components {@code elementData[0]} through
-     * {@code elementData[elementCount-1]} are the actual items.
-     *
-     * @serial
-     */
-    protected int elementCount;
-
-    /**
-     * The amount by which the capacity of the vector is automatically
-     * incremented when its size becomes greater than its capacity.  If
-     * the capacity increment is less than or equal to zero, the capacity
-     * of the vector is doubled each time it needs to grow.
-     *
-     * @serial
-     */
-    protected int capacityIncrement;
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = -2767605614048989439L;
-
-    /**
-     * Constructs an empty vector with the specified initial capacity and
-     * capacity increment.
-     *
-     * @param   initialCapacity     the initial capacity of the vector
-     * @param   capacityIncrement   the amount by which the capacity is
-     *                              increased when the vector overflows
-     * @throws IllegalArgumentException if the specified initial capacity
-     *         is negative
-     */
-    public Vector(int initialCapacity, int capacityIncrement) {
-        super();
-        if (initialCapacity < 0)
-            throw new IllegalArgumentException("Illegal Capacity: "+
-                                               initialCapacity);
-        this.elementData = new Object[initialCapacity];
-        this.capacityIncrement = capacityIncrement;
-    }
-
-    /**
-     * Constructs an empty vector with the specified initial capacity and
-     * with its capacity increment equal to zero.
-     *
-     * @param   initialCapacity   the initial capacity of the vector
-     * @throws IllegalArgumentException if the specified initial capacity
-     *         is negative
-     */
-    public Vector(int initialCapacity) {
-        this(initialCapacity, 0);
-    }
-
-    /**
-     * Constructs an empty vector so that its internal data array
-     * has size {@code 10} and its standard capacity increment is
-     * zero.
-     */
-    public Vector() {
-        this(10);
-    }
-
-    /**
-     * Constructs a vector containing the elements of the specified
-     * collection, in the order they are returned by the collection's
-     * iterator.
-     *
-     * @param c the collection whose elements are to be placed into this
-     *       vector
-     * @throws NullPointerException if the specified collection is null
-     * @since   1.2
-     */
-    public Vector(Collection<? extends E> c) {
-        elementData = c.toArray();
-        elementCount = elementData.length;
-        // c.toArray might (incorrectly) not return Object[] (see 6260652)
-        if (elementData.getClass() != Object[].class)
-            elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
-    }
-
-    /**
-     * Copies the components of this vector into the specified array.
-     * The item at index {@code k} in this vector is copied into
-     * component {@code k} of {@code anArray}.
-     *
-     * @param  anArray the array into which the components get copied
-     * @throws NullPointerException if the given array is null
-     * @throws IndexOutOfBoundsException if the specified array is not
-     *         large enough to hold all the components of this vector
-     * @throws ArrayStoreException if a component of this vector is not of
-     *         a runtime type that can be stored in the specified array
-     * @see #toArray(Object[])
-     */
-    public synchronized void copyInto(Object[] anArray) {
-        System.arraycopy(elementData, 0, anArray, 0, elementCount);
-    }
-
-    /**
-     * Trims the capacity of this vector to be the vector's current
-     * size. If the capacity of this vector is larger than its current
-     * size, then the capacity is changed to equal the size by replacing
-     * its internal data array, kept in the field {@code elementData},
-     * with a smaller one. An application can use this operation to
-     * minimize the storage of a vector.
-     */
-    public synchronized void trimToSize() {
-        modCount++;
-        int oldCapacity = elementData.length;
-        if (elementCount < oldCapacity) {
-            elementData = Arrays.copyOf(elementData, elementCount);
-        }
-    }
-
-    /**
-     * Increases the capacity of this vector, if necessary, to ensure
-     * that it can hold at least the number of components specified by
-     * the minimum capacity argument.
-     *
-     * <p>If the current capacity of this vector is less than
-     * {@code minCapacity}, then its capacity is increased by replacing its
-     * internal data array, kept in the field {@code elementData}, with a
-     * larger one.  The size of the new data array will be the old size plus
-     * {@code capacityIncrement}, unless the value of
-     * {@code capacityIncrement} is less than or equal to zero, in which case
-     * the new capacity will be twice the old capacity; but if this new size
-     * is still smaller than {@code minCapacity}, then the new capacity will
-     * be {@code minCapacity}.
-     *
-     * @param minCapacity the desired minimum capacity
-     */
-    public synchronized void ensureCapacity(int minCapacity) {
-        if (minCapacity > 0) {
-            modCount++;
-            ensureCapacityHelper(minCapacity);
-        }
-    }
-
-    /**
-     * This implements the unsynchronized semantics of ensureCapacity.
-     * Synchronized methods in this class can internally call this
-     * method for ensuring capacity without incurring the cost of an
-     * extra synchronization.
-     *
-     * @see #ensureCapacity(int)
-     */
-    private void ensureCapacityHelper(int minCapacity) {
-        // overflow-conscious code
-        if (minCapacity - elementData.length > 0)
-            grow(minCapacity);
-    }
-
-    /**
-     * The maximum size of array to allocate.
-     * Some VMs reserve some header words in an array.
-     * Attempts to allocate larger arrays may result in
-     * OutOfMemoryError: Requested array size exceeds VM limit
-     */
-    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
-    private void grow(int minCapacity) {
-        // overflow-conscious code
-        int oldCapacity = elementData.length;
-        int newCapacity = oldCapacity + ((capacityIncrement > 0) ?
-                                         capacityIncrement : oldCapacity);
-        if (newCapacity - minCapacity < 0)
-            newCapacity = minCapacity;
-        if (newCapacity - MAX_ARRAY_SIZE > 0)
-            newCapacity = hugeCapacity(minCapacity);
-        elementData = Arrays.copyOf(elementData, newCapacity);
-    }
-
-    private static int hugeCapacity(int minCapacity) {
-        if (minCapacity < 0) // overflow
-            throw new OutOfMemoryError();
-        return (minCapacity > MAX_ARRAY_SIZE) ?
-            Integer.MAX_VALUE :
-            MAX_ARRAY_SIZE;
-    }
-
-    /**
-     * Sets the size of this vector. If the new size is greater than the
-     * current size, new {@code null} items are added to the end of
-     * the vector. If the new size is less than the current size, all
-     * components at index {@code newSize} and greater are discarded.
-     *
-     * @param  newSize   the new size of this vector
-     * @throws ArrayIndexOutOfBoundsException if the new size is negative
-     */
-    public synchronized void setSize(int newSize) {
-        modCount++;
-        if (newSize > elementCount) {
-            ensureCapacityHelper(newSize);
-        } else {
-            for (int i = newSize ; i < elementCount ; i++) {
-                elementData[i] = null;
-            }
-        }
-        elementCount = newSize;
-    }
-
-    /**
-     * Returns the current capacity of this vector.
-     *
-     * @return  the current capacity (the length of its internal
-     *          data array, kept in the field {@code elementData}
-     *          of this vector)
-     */
-    public synchronized int capacity() {
-        return elementData.length;
-    }
-
-    /**
-     * Returns the number of components in this vector.
-     *
-     * @return  the number of components in this vector
-     */
-    public synchronized int size() {
-        return elementCount;
-    }
-
-    /**
-     * Tests if this vector has no components.
-     *
-     * @return  {@code true} if and only if this vector has
-     *          no components, that is, its size is zero;
-     *          {@code false} otherwise.
-     */
-    public synchronized boolean isEmpty() {
-        return elementCount == 0;
-    }
-
-    /**
-     * Returns an enumeration of the components of this vector. The
-     * returned {@code Enumeration} object will generate all items in
-     * this vector. The first item generated is the item at index {@code 0},
-     * then the item at index {@code 1}, and so on.
-     *
-     * @return  an enumeration of the components of this vector
-     * @see     Iterator
-     */
-    public Enumeration<E> elements() {
-        return new Enumeration<E>() {
-            int count = 0;
-
-            public boolean hasMoreElements() {
-                return count < elementCount;
-            }
-
-            public E nextElement() {
-                synchronized (Vector.this) {
-                    if (count < elementCount) {
-                        return elementData(count++);
-                    }
-                }
-                throw new NoSuchElementException("Vector Enumeration");
-            }
-        };
-    }
-
-    /**
-     * Returns {@code true} if this vector contains the specified element.
-     * More formally, returns {@code true} if and only if this vector
-     * contains at least one element {@code e} such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
-     *
-     * @param o element whose presence in this vector is to be tested
-     * @return {@code true} if this vector contains the specified element
-     */
-    public boolean contains(Object o) {
-        return indexOf(o, 0) >= 0;
-    }
-
-    /**
-     * Returns the index of the first occurrence of the specified element
-     * in this vector, or -1 if this vector does not contain the element.
-     * More formally, returns the lowest index {@code i} such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-     * or -1 if there is no such index.
-     *
-     * @param o element to search for
-     * @return the index of the first occurrence of the specified element in
-     *         this vector, or -1 if this vector does not contain the element
-     */
-    public int indexOf(Object o) {
-        return indexOf(o, 0);
-    }
-
-    /**
-     * Returns the index of the first occurrence of the specified element in
-     * this vector, searching forwards from {@code index}, or returns -1 if
-     * the element is not found.
-     * More formally, returns the lowest index {@code i} such that
-     * <tt>(i&nbsp;&gt;=&nbsp;index&nbsp;&amp;&amp;&nbsp;(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i))))</tt>,
-     * or -1 if there is no such index.
-     *
-     * @param o element to search for
-     * @param index index to start searching from
-     * @return the index of the first occurrence of the element in
-     *         this vector at position {@code index} or later in the vector;
-     *         {@code -1} if the element is not found.
-     * @throws IndexOutOfBoundsException if the specified index is negative
-     * @see     Object#equals(Object)
-     */
-    public synchronized int indexOf(Object o, int index) {
-        if (o == null) {
-            for (int i = index ; i < elementCount ; i++)
-                if (elementData[i]==null)
-                    return i;
-        } else {
-            for (int i = index ; i < elementCount ; i++)
-                if (o.equals(elementData[i]))
-                    return i;
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index of the last occurrence of the specified element
-     * in this vector, or -1 if this vector does not contain the element.
-     * More formally, returns the highest index {@code i} such that
-     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-     * or -1 if there is no such index.
-     *
-     * @param o element to search for
-     * @return the index of the last occurrence of the specified element in
-     *         this vector, or -1 if this vector does not contain the element
-     */
-    public synchronized int lastIndexOf(Object o) {
-        return lastIndexOf(o, elementCount-1);
-    }
-
-    /**
-     * Returns the index of the last occurrence of the specified element in
-     * this vector, searching backwards from {@code index}, or returns -1 if
-     * the element is not found.
-     * More formally, returns the highest index {@code i} such that
-     * <tt>(i&nbsp;&lt;=&nbsp;index&nbsp;&amp;&amp;&nbsp;(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i))))</tt>,
-     * or -1 if there is no such index.
-     *
-     * @param o element to search for
-     * @param index index to start searching backwards from
-     * @return the index of the last occurrence of the element at position
-     *         less than or equal to {@code index} in this vector;
-     *         -1 if the element is not found.
-     * @throws IndexOutOfBoundsException if the specified index is greater
-     *         than or equal to the current size of this vector
-     */
-    public synchronized int lastIndexOf(Object o, int index) {
-        if (index >= elementCount)
-            throw new IndexOutOfBoundsException(index + " >= "+ elementCount);
-
-        if (o == null) {
-            for (int i = index; i >= 0; i--)
-                if (elementData[i]==null)
-                    return i;
-        } else {
-            for (int i = index; i >= 0; i--)
-                if (o.equals(elementData[i]))
-                    return i;
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the component at the specified index.
-     *
-     * <p>This method is identical in functionality to the {@link #get(int)}
-     * method (which is part of the {@link List} interface).
-     *
-     * @param      index   an index into this vector
-     * @return     the component at the specified index
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index >= size()})
-     */
-    public synchronized E elementAt(int index) {
-        if (index >= elementCount) {
-            throw new ArrayIndexOutOfBoundsException(index + " >= " + elementCount);
-        }
-
-        return elementData(index);
-    }
-
-    /**
-     * Returns the first component (the item at index {@code 0}) of
-     * this vector.
-     *
-     * @return     the first component of this vector
-     * @throws NoSuchElementException if this vector has no components
-     */
-    public synchronized E firstElement() {
-        if (elementCount == 0) {
-            throw new NoSuchElementException();
-        }
-        return elementData(0);
-    }
-
-    /**
-     * Returns the last component of the vector.
-     *
-     * @return  the last component of the vector, i.e., the component at index
-     *          <code>size()&nbsp;-&nbsp;1</code>.
-     * @throws NoSuchElementException if this vector is empty
-     */
-    public synchronized E lastElement() {
-        if (elementCount == 0) {
-            throw new NoSuchElementException();
-        }
-        return elementData(elementCount - 1);
-    }
-
-    /**
-     * Sets the component at the specified {@code index} of this
-     * vector to be the specified object. The previous component at that
-     * position is discarded.
-     *
-     * <p>The index must be a value greater than or equal to {@code 0}
-     * and less than the current size of the vector.
-     *
-     * <p>This method is identical in functionality to the
-     * {@link #set(int, Object) set(int, E)}
-     * method (which is part of the {@link List} interface). Note that the
-     * {@code set} method reverses the order of the parameters, to more closely
-     * match array usage.  Note also that the {@code set} method returns the
-     * old value that was stored at the specified position.
-     *
-     * @param      obj     what the component is to be set to
-     * @param      index   the specified index
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index >= size()})
-     */
-    public synchronized void setElementAt(E obj, int index) {
-        if (index >= elementCount) {
-            throw new ArrayIndexOutOfBoundsException(index + " >= " +
-                                                     elementCount);
-        }
-        elementData[index] = obj;
-    }
-
-    /**
-     * Deletes the component at the specified index. Each component in
-     * this vector with an index greater or equal to the specified
-     * {@code index} is shifted downward to have an index one
-     * smaller than the value it had previously. The size of this vector
-     * is decreased by {@code 1}.
-     *
-     * <p>The index must be a value greater than or equal to {@code 0}
-     * and less than the current size of the vector.
-     *
-     * <p>This method is identical in functionality to the {@link #remove(int)}
-     * method (which is part of the {@link List} interface).  Note that the
-     * {@code remove} method returns the old value that was stored at the
-     * specified position.
-     *
-     * @param      index   the index of the object to remove
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index >= size()})
-     */
-    public synchronized void removeElementAt(int index) {
-        modCount++;
-        if (index >= elementCount) {
-            throw new ArrayIndexOutOfBoundsException(index + " >= " +
-                                                     elementCount);
-        }
-        else if (index < 0) {
-            throw new ArrayIndexOutOfBoundsException(index);
-        }
-        int j = elementCount - index - 1;
-        if (j > 0) {
-            System.arraycopy(elementData, index + 1, elementData, index, j);
-        }
-        elementCount--;
-        elementData[elementCount] = null; /* to let gc do its work */
-    }
-
-    /**
-     * Inserts the specified object as a component in this vector at the
-     * specified {@code index}. Each component in this vector with
-     * an index greater or equal to the specified {@code index} is
-     * shifted upward to have an index one greater than the value it had
-     * previously.
-     *
-     * <p>The index must be a value greater than or equal to {@code 0}
-     * and less than or equal to the current size of the vector. (If the
-     * index is equal to the current size of the vector, the new element
-     * is appended to the Vector.)
-     *
-     * <p>This method is identical in functionality to the
-     * {@link #add(int, Object) add(int, E)}
-     * method (which is part of the {@link List} interface).  Note that the
-     * {@code add} method reverses the order of the parameters, to more closely
-     * match array usage.
-     *
-     * @param      obj     the component to insert
-     * @param      index   where to insert the new component
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index > size()})
-     */
-    public synchronized void insertElementAt(E obj, int index) {
-        modCount++;
-        if (index > elementCount) {
-            throw new ArrayIndexOutOfBoundsException(index
-                                                     + " > " + elementCount);
-        }
-        ensureCapacityHelper(elementCount + 1);
-        System.arraycopy(elementData, index, elementData, index + 1, elementCount - index);
-        elementData[index] = obj;
-        elementCount++;
-    }
-
-    /**
-     * Adds the specified component to the end of this vector,
-     * increasing its size by one. The capacity of this vector is
-     * increased if its size becomes greater than its capacity.
-     *
-     * <p>This method is identical in functionality to the
-     * {@link #add(Object) add(E)}
-     * method (which is part of the {@link List} interface).
-     *
-     * @param   obj   the component to be added
-     */
-    public synchronized void addElement(E obj) {
-        modCount++;
-        ensureCapacityHelper(elementCount + 1);
-        elementData[elementCount++] = obj;
-    }
-
-    /**
-     * Removes the first (lowest-indexed) occurrence of the argument
-     * from this vector. If the object is found in this vector, each
-     * component in the vector with an index greater or equal to the
-     * object's index is shifted downward to have an index one smaller
-     * than the value it had previously.
-     *
-     * <p>This method is identical in functionality to the
-     * {@link #remove(Object)} method (which is part of the
-     * {@link List} interface).
-     *
-     * @param   obj   the component to be removed
-     * @return  {@code true} if the argument was a component of this
-     *          vector; {@code false} otherwise.
-     */
-    public synchronized boolean removeElement(Object obj) {
-        modCount++;
-        int i = indexOf(obj);
-        if (i >= 0) {
-            removeElementAt(i);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Removes all components from this vector and sets its size to zero.
-     *
-     * <p>This method is identical in functionality to the {@link #clear}
-     * method (which is part of the {@link List} interface).
-     */
-    public synchronized void removeAllElements() {
-        modCount++;
-        // Let gc do its work
-        for (int i = 0; i < elementCount; i++)
-            elementData[i] = null;
-
-        elementCount = 0;
-    }
-
-    /**
-     * Returns a clone of this vector. The copy will contain a
-     * reference to a clone of the internal data array, not a reference
-     * to the original internal data array of this {@code Vector} object.
-     *
-     * @return  a clone of this vector
-     */
-    public synchronized Object clone() {
-        try {
-            @SuppressWarnings("unchecked")
-                Vector<E> v = (Vector<E>) super.clone();
-            v.elementData = Arrays.copyOf(elementData, elementCount);
-            v.modCount = 0;
-            return v;
-        } catch (CloneNotSupportedException e) {
-            // this shouldn't happen, since we are Cloneable
-            throw new InternalError();
-        }
-    }
-
-    /**
-     * Returns an array containing all of the elements in this Vector
-     * in the correct order.
-     *
-     * @since 1.2
-     */
-    public synchronized Object[] toArray() {
-        return Arrays.copyOf(elementData, elementCount);
-    }
-
-    /**
-     * Returns an array containing all of the elements in this Vector in the
-     * correct order; the runtime type of the returned array is that of the
-     * specified array.  If the Vector fits in the specified array, it is
-     * returned therein.  Otherwise, a new array is allocated with the runtime
-     * type of the specified array and the size of this Vector.
-     *
-     * <p>If the Vector fits in the specified array with room to spare
-     * (i.e., the array has more elements than the Vector),
-     * the element in the array immediately following the end of the
-     * Vector is set to null.  (This is useful in determining the length
-     * of the Vector <em>only</em> if the caller knows that the Vector
-     * does not contain any null elements.)
-     *
-     * @param a the array into which the elements of the Vector are to
-     *          be stored, if it is big enough; otherwise, a new array of the
-     *          same runtime type is allocated for this purpose.
-     * @return an array containing the elements of the Vector
-     * @throws ArrayStoreException if the runtime type of a is not a supertype
-     * of the runtime type of every element in this Vector
-     * @throws NullPointerException if the given array is null
-     * @since 1.2
-     */
-    @SuppressWarnings("unchecked")
-    public synchronized <T> T[] toArray(T[] a) {
-        if (a.length < elementCount)
-            return (T[]) Arrays.copyOf(elementData, elementCount, a.getClass());
-
-        System.arraycopy(elementData, 0, a, 0, elementCount);
-
-        if (a.length > elementCount)
-            a[elementCount] = null;
-
-        return a;
-    }
-
-    // Positional Access Operations
-
-    @SuppressWarnings("unchecked")
-    E elementData(int index) {
-        return (E) elementData[index];
-    }
-
-    /**
-     * Returns the element at the specified position in this Vector.
-     *
-     * @param index index of the element to return
-     * @return object at the specified index
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *            ({@code index < 0 || index >= size()})
-     * @since 1.2
-     */
-    public synchronized E get(int index) {
-        if (index >= elementCount)
-            throw new ArrayIndexOutOfBoundsException(index);
-
-        return elementData(index);
-    }
-
-    /**
-     * Replaces the element at the specified position in this Vector with the
-     * specified element.
-     *
-     * @param index index of the element to replace
-     * @param element element to be stored at the specified position
-     * @return the element previously at the specified position
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index >= size()})
-     * @since 1.2
-     */
-    public synchronized E set(int index, E element) {
-        if (index >= elementCount)
-            throw new ArrayIndexOutOfBoundsException(index);
-
-        E oldValue = elementData(index);
-        elementData[index] = element;
-        return oldValue;
-    }
-
-    /**
-     * Appends the specified element to the end of this Vector.
-     *
-     * @param e element to be appended to this Vector
-     * @return {@code true} (as specified by {@link Collection#add})
-     * @since 1.2
-     */
-    public synchronized boolean add(E e) {
-        modCount++;
-        ensureCapacityHelper(elementCount + 1);
-        elementData[elementCount++] = e;
-        return true;
-    }
-
-    /**
-     * Removes the first occurrence of the specified element in this Vector
-     * If the Vector does not contain the element, it is unchanged.  More
-     * formally, removes the element with the lowest index i such that
-     * {@code (o==null ? get(i)==null : o.equals(get(i)))} (if such
-     * an element exists).
-     *
-     * @param o element to be removed from this Vector, if present
-     * @return true if the Vector contained the specified element
-     * @since 1.2
-     */
-    public boolean remove(Object o) {
-        return removeElement(o);
-    }
-
-    /**
-     * Inserts the specified element at the specified position in this Vector.
-     * Shifts the element currently at that position (if any) and any
-     * subsequent elements to the right (adds one to their indices).
-     *
-     * @param index index at which the specified element is to be inserted
-     * @param element element to be inserted
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index > size()})
-     * @since 1.2
-     */
-    public void add(int index, E element) {
-        insertElementAt(element, index);
-    }
-
-    /**
-     * Removes the element at the specified position in this Vector.
-     * Shifts any subsequent elements to the left (subtracts one from their
-     * indices).  Returns the element that was removed from the Vector.
-     *
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index >= size()})
-     * @param index the index of the element to be removed
-     * @return element that was removed
-     * @since 1.2
-     */
-    public synchronized E remove(int index) {
-        modCount++;
-        if (index >= elementCount)
-            throw new ArrayIndexOutOfBoundsException(index);
-        E oldValue = elementData(index);
-
-        int numMoved = elementCount - index - 1;
-        if (numMoved > 0)
-            System.arraycopy(elementData, index+1, elementData, index,
-                             numMoved);
-        elementData[--elementCount] = null; // Let gc do its work
-
-        return oldValue;
-    }
-
-    /**
-     * Removes all of the elements from this Vector.  The Vector will
-     * be empty after this call returns (unless it throws an exception).
-     *
-     * @since 1.2
-     */
-    public void clear() {
-        removeAllElements();
-    }
-
-    // Bulk Operations
-
-    /**
-     * Returns true if this Vector contains all of the elements in the
-     * specified Collection.
-     *
-     * @param   c a collection whose elements will be tested for containment
-     *          in this Vector
-     * @return true if this Vector contains all of the elements in the
-     *         specified collection
-     * @throws NullPointerException if the specified collection is null
-     */
-    public synchronized boolean containsAll(Collection<?> c) {
-        return super.containsAll(c);
-    }
-
-    /**
-     * Appends all of the elements in the specified Collection to the end of
-     * this Vector, in the order that they are returned by the specified
-     * Collection's Iterator.  The behavior of this operation is undefined if
-     * the specified Collection is modified while the operation is in progress.
-     * (This implies that the behavior of this call is undefined if the
-     * specified Collection is this Vector, and this Vector is nonempty.)
-     *
-     * @param c elements to be inserted into this Vector
-     * @return {@code true} if this Vector changed as a result of the call
-     * @throws NullPointerException if the specified collection is null
-     * @since 1.2
-     */
-    public synchronized boolean addAll(Collection<? extends E> c) {
-        modCount++;
-        Object[] a = c.toArray();
-        int numNew = a.length;
-        ensureCapacityHelper(elementCount + numNew);
-        System.arraycopy(a, 0, elementData, elementCount, numNew);
-        elementCount += numNew;
-        return numNew != 0;
-    }
-
-    /**
-     * Removes from this Vector all of its elements that are contained in the
-     * specified Collection.
-     *
-     * @param c a collection of elements to be removed from the Vector
-     * @return true if this Vector changed as a result of the call
-     * @throws ClassCastException if the types of one or more elements
-     *         in this vector are incompatible with the specified
-     *         collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this vector contains one or more null
-     *         elements and the specified collection does not support null
-     *         elements
-     * (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @since 1.2
-     */
-    public synchronized boolean removeAll(Collection<?> c) {
-        return super.removeAll(c);
-    }
-
-    /**
-     * Retains only the elements in this Vector that are contained in the
-     * specified Collection.  In other words, removes from this Vector all
-     * of its elements that are not contained in the specified Collection.
-     *
-     * @param c a collection of elements to be retained in this Vector
-     *          (all other elements are removed)
-     * @return true if this Vector changed as a result of the call
-     * @throws ClassCastException if the types of one or more elements
-     *         in this vector are incompatible with the specified
-     *         collection
-     * (<a href="Collection.html#optional-restrictions">optional</a>)
-     * @throws NullPointerException if this vector contains one or more null
-     *         elements and the specified collection does not support null
-     *         elements
-     *         (<a href="Collection.html#optional-restrictions">optional</a>),
-     *         or if the specified collection is null
-     * @since 1.2
-     */
-    public synchronized boolean retainAll(Collection<?> c) {
-        return super.retainAll(c);
-    }
-
-    /**
-     * Inserts all of the elements in the specified Collection into this
-     * Vector at the specified position.  Shifts the element currently at
-     * that position (if any) and any subsequent elements to the right
-     * (increases their indices).  The new elements will appear in the Vector
-     * in the order that they are returned by the specified Collection's
-     * iterator.
-     *
-     * @param index index at which to insert the first element from the
-     *              specified collection
-     * @param c elements to be inserted into this Vector
-     * @return {@code true} if this Vector changed as a result of the call
-     * @throws ArrayIndexOutOfBoundsException if the index is out of range
-     *         ({@code index < 0 || index > size()})
-     * @throws NullPointerException if the specified collection is null
-     * @since 1.2
-     */
-    public synchronized boolean addAll(int index, Collection<? extends E> c) {
-        modCount++;
-        if (index < 0 || index > elementCount)
-            throw new ArrayIndexOutOfBoundsException(index);
-
-        Object[] a = c.toArray();
-        int numNew = a.length;
-        ensureCapacityHelper(elementCount + numNew);
-
-        int numMoved = elementCount - index;
-        if (numMoved > 0)
-            System.arraycopy(elementData, index, elementData, index + numNew,
-                             numMoved);
-
-        System.arraycopy(a, 0, elementData, index, numNew);
-        elementCount += numNew;
-        return numNew != 0;
-    }
-
-    /**
-     * Compares the specified Object with this Vector for equality.  Returns
-     * true if and only if the specified Object is also a List, both Lists
-     * have the same size, and all corresponding pairs of elements in the two
-     * Lists are <em>equal</em>.  (Two elements {@code e1} and
-     * {@code e2} are <em>equal</em> if {@code (e1==null ? e2==null :
-     * e1.equals(e2))}.)  In other words, two Lists are defined to be
-     * equal if they contain the same elements in the same order.
-     *
-     * @param o the Object to be compared for equality with this Vector
-     * @return true if the specified Object is equal to this Vector
-     */
-    public synchronized boolean equals(Object o) {
-        return super.equals(o);
-    }
-
-    /**
-     * Returns the hash code value for this Vector.
-     */
-    public synchronized int hashCode() {
-        return super.hashCode();
-    }
-
-    /**
-     * Returns a string representation of this Vector, containing
-     * the String representation of each element.
-     */
-    public synchronized String toString() {
-        return super.toString();
-    }
-
-    /**
-     * Returns a view of the portion of this List between fromIndex,
-     * inclusive, and toIndex, exclusive.  (If fromIndex and toIndex are
-     * equal, the returned List is empty.)  The returned List is backed by this
-     * List, so changes in the returned List are reflected in this List, and
-     * vice-versa.  The returned List supports all of the optional List
-     * operations supported by this List.
-     *
-     * <p>This method eliminates the need for explicit range operations (of
-     * the sort that commonly exist for arrays).  Any operation that expects
-     * a List can be used as a range operation by operating on a subList view
-     * instead of a whole List.  For example, the following idiom
-     * removes a range of elements from a List:
-     * <pre>
-     *      list.subList(from, to).clear();
-     * </pre>
-     * Similar idioms may be constructed for indexOf and lastIndexOf,
-     * and all of the algorithms in the Collections class can be applied to
-     * a subList.
-     *
-     * <p>The semantics of the List returned by this method become undefined if
-     * the backing list (i.e., this List) is <i>structurally modified</i> in
-     * any way other than via the returned List.  (Structural modifications are
-     * those that change the size of the List, or otherwise perturb it in such
-     * a fashion that iterations in progress may yield incorrect results.)
-     *
-     * @param fromIndex low endpoint (inclusive) of the subList
-     * @param toIndex high endpoint (exclusive) of the subList
-     * @return a view of the specified range within this List
-     * @throws IndexOutOfBoundsException if an endpoint index value is out of range
-     *         {@code (fromIndex < 0 || toIndex > size)}
-     * @throws IllegalArgumentException if the endpoint indices are out of order
-     *         {@code (fromIndex > toIndex)}
-     */
-    public synchronized List<E> subList(int fromIndex, int toIndex) {
-        return Collections.synchronizedList(super.subList(fromIndex, toIndex),
-                                            this);
-    }
-
-    /**
-     * Removes from this list all of the elements whose index is between
-     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
-     * Shifts any succeeding elements to the left (reduces their index).
-     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
-     * (If {@code toIndex==fromIndex}, this operation has no effect.)
-     */
-    protected synchronized void removeRange(int fromIndex, int toIndex) {
-        modCount++;
-        int numMoved = elementCount - toIndex;
-        System.arraycopy(elementData, toIndex, elementData, fromIndex,
-                         numMoved);
-
-        // Let gc do its work
-        int newElementCount = elementCount - (toIndex-fromIndex);
-        while (elementCount != newElementCount)
-            elementData[--elementCount] = null;
-    }
-
-    /**
-     * Returns a list iterator over the elements in this list (in proper
-     * sequence), starting at the specified position in the list.
-     * The specified index indicates the first element that would be
-     * returned by an initial call to {@link ListIterator#next next}.
-     * An initial call to {@link ListIterator#previous previous} would
-     * return the element with the specified index minus one.
-     *
-     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
-     *
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public synchronized ListIterator<E> listIterator(int index) {
-        if (index < 0 || index > elementCount)
-            throw new IndexOutOfBoundsException("Index: "+index);
-        return new ListItr(index);
-    }
-
-    /**
-     * Returns a list iterator over the elements in this list (in proper
-     * sequence).
-     *
-     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
-     *
-     * @see #listIterator(int)
-     */
-    public synchronized ListIterator<E> listIterator() {
-        return new ListItr(0);
-    }
-
-    /**
-     * Returns an iterator over the elements in this list in proper sequence.
-     *
-     * <p>The returned iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
-     *
-     * @return an iterator over the elements in this list in proper sequence
-     */
-    public synchronized Iterator<E> iterator() {
-        return new Itr();
-    }
-
-    /**
-     * An optimized version of AbstractList.Itr
-     */
-    private class Itr implements Iterator<E> {
-        int cursor;       // index of next element to return
-        int lastRet = -1; // index of last element returned; -1 if no such
-        int expectedModCount = modCount;
-
-        public boolean hasNext() {
-            // Racy but within spec, since modifications are checked
-            // within or after synchronization in next/previous
-            return cursor != elementCount;
-        }
-
-        public E next() {
-            synchronized (Vector.this) {
-                checkForComodification();
-                int i = cursor;
-                if (i >= elementCount)
-                    throw new NoSuchElementException();
-                cursor = i + 1;
-                return elementData(lastRet = i);
-            }
-        }
-
-        public void remove() {
-            if (lastRet == -1)
-                throw new IllegalStateException();
-            synchronized (Vector.this) {
-                checkForComodification();
-                Vector.this.remove(lastRet);
-                expectedModCount = modCount;
-            }
-            cursor = lastRet;
-            lastRet = -1;
-        }
-
-        final void checkForComodification() {
-            if (modCount != expectedModCount)
-                throw new ConcurrentModificationException();
-        }
-    }
-
-    /**
-     * An optimized version of AbstractList.ListItr
-     */
-    final class ListItr extends Itr implements ListIterator<E> {
-        ListItr(int index) {
-            super();
-            cursor = index;
-        }
-
-        public boolean hasPrevious() {
-            return cursor != 0;
-        }
-
-        public int nextIndex() {
-            return cursor;
-        }
-
-        public int previousIndex() {
-            return cursor - 1;
-        }
-
-        public E previous() {
-            synchronized (Vector.this) {
-                checkForComodification();
-                int i = cursor - 1;
-                if (i < 0)
-                    throw new NoSuchElementException();
-                cursor = i;
-                return elementData(lastRet = i);
-            }
-        }
-
-        public void set(E e) {
-            if (lastRet == -1)
-                throw new IllegalStateException();
-            synchronized (Vector.this) {
-                checkForComodification();
-                Vector.this.set(lastRet, e);
-            }
-        }
-
-        public void add(E e) {
-            int i = cursor;
-            synchronized (Vector.this) {
-                checkForComodification();
-                Vector.this.add(i, e);
-                expectedModCount = modCount;
-            }
-            cursor = i + 1;
-            lastRet = -1;
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/concurrent/Callable.java
--- a/emul/compact/src/main/java/java/util/concurrent/Callable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-package java.util.concurrent;
-
-/**
- * A task that returns a result and may throw an exception.
- * Implementors define a single method with no arguments called
- * <tt>call</tt>.
- *
- * <p>The <tt>Callable</tt> interface is similar to {@link
- * java.lang.Runnable}, in that both are designed for classes whose
- * instances are potentially executed by another thread.  A
- * <tt>Runnable</tt>, however, does not return a result and cannot
- * throw a checked exception.
- *
- * <p> The {@link Executors} class contains utility methods to
- * convert from other common forms to <tt>Callable</tt> classes.
- *
- * @see Executor
- * @since 1.5
- * @author Doug Lea
- * @param <V> the result type of method <tt>call</tt>
- */
-public interface Callable<V> {
-    /**
-     * Computes a result, or throws an exception if unable to do so.
-     *
-     * @return computed result
-     * @throws Exception if unable to compute a result
-     */
-    V call() throws Exception;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/main/java/java/util/concurrent/TimeUnit.java
--- a/emul/compact/src/main/java/java/util/concurrent/TimeUnit.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,367 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-package java.util.concurrent;
-
-/**
- * A <tt>TimeUnit</tt> represents time durations at a given unit of
- * granularity and provides utility methods to convert across units,
- * and to perform timing and delay operations in these units.  A
- * <tt>TimeUnit</tt> does not maintain time information, but only
- * helps organize and use time representations that may be maintained
- * separately across various contexts.  A nanosecond is defined as one
- * thousandth of a microsecond, a microsecond as one thousandth of a
- * millisecond, a millisecond as one thousandth of a second, a minute
- * as sixty seconds, an hour as sixty minutes, and a day as twenty four
- * hours.
- *
- * <p>A <tt>TimeUnit</tt> is mainly used to inform time-based methods
- * how a given timing parameter should be interpreted. For example,
- * the following code will timeout in 50 milliseconds if the {@link
- * java.util.concurrent.locks.Lock lock} is not available:
- *
- * <pre>  Lock lock = ...;
- *  if (lock.tryLock(50L, TimeUnit.MILLISECONDS)) ...
- * </pre>
- * while this code will timeout in 50 seconds:
- * <pre>
- *  Lock lock = ...;
- *  if (lock.tryLock(50L, TimeUnit.SECONDS)) ...
- * </pre>
- *
- * Note however, that there is no guarantee that a particular timeout
- * implementation will be able to notice the passage of time at the
- * same granularity as the given <tt>TimeUnit</tt>.
- *
- * @since 1.5
- * @author Doug Lea
- */
-public enum TimeUnit {
-    NANOSECONDS {
-        public long toNanos(long d)   { return d; }
-        public long toMicros(long d)  { return d/(C1/C0); }
-        public long toMillis(long d)  { return d/(C2/C0); }
-        public long toSeconds(long d) { return d/(C3/C0); }
-        public long toMinutes(long d) { return d/(C4/C0); }
-        public long toHours(long d)   { return d/(C5/C0); }
-        public long toDays(long d)    { return d/(C6/C0); }
-        public long convert(long d, TimeUnit u) { return u.toNanos(d); }
-        int excessNanos(long d, long m) { return (int)(d - (m*C2)); }
-    },
-    MICROSECONDS {
-        public long toNanos(long d)   { return x(d, C1/C0, MAX/(C1/C0)); }
-        public long toMicros(long d)  { return d; }
-        public long toMillis(long d)  { return d/(C2/C1); }
-        public long toSeconds(long d) { return d/(C3/C1); }
-        public long toMinutes(long d) { return d/(C4/C1); }
-        public long toHours(long d)   { return d/(C5/C1); }
-        public long toDays(long d)    { return d/(C6/C1); }
-        public long convert(long d, TimeUnit u) { return u.toMicros(d); }
-        int excessNanos(long d, long m) { return (int)((d*C1) - (m*C2)); }
-    },
-    MILLISECONDS {
-        public long toNanos(long d)   { return x(d, C2/C0, MAX/(C2/C0)); }
-        public long toMicros(long d)  { return x(d, C2/C1, MAX/(C2/C1)); }
-        public long toMillis(long d)  { return d; }
-        public long toSeconds(long d) { return d/(C3/C2); }
-        public long toMinutes(long d) { return d/(C4/C2); }
-        public long toHours(long d)   { return d/(C5/C2); }
-        public long toDays(long d)    { return d/(C6/C2); }
-        public long convert(long d, TimeUnit u) { return u.toMillis(d); }
-        int excessNanos(long d, long m) { return 0; }
-    },
-    SECONDS {
-        public long toNanos(long d)   { return x(d, C3/C0, MAX/(C3/C0)); }
-        public long toMicros(long d)  { return x(d, C3/C1, MAX/(C3/C1)); }
-        public long toMillis(long d)  { return x(d, C3/C2, MAX/(C3/C2)); }
-        public long toSeconds(long d) { return d; }
-        public long toMinutes(long d) { return d/(C4/C3); }
-        public long toHours(long d)   { return d/(C5/C3); }
-        public long toDays(long d)    { return d/(C6/C3); }
-        public long convert(long d, TimeUnit u) { return u.toSeconds(d); }
-        int excessNanos(long d, long m) { return 0; }
-    },
-    MINUTES {
-        public long toNanos(long d)   { return x(d, C4/C0, MAX/(C4/C0)); }
-        public long toMicros(long d)  { return x(d, C4/C1, MAX/(C4/C1)); }
-        public long toMillis(long d)  { return x(d, C4/C2, MAX/(C4/C2)); }
-        public long toSeconds(long d) { return x(d, C4/C3, MAX/(C4/C3)); }
-        public long toMinutes(long d) { return d; }
-        public long toHours(long d)   { return d/(C5/C4); }
-        public long toDays(long d)    { return d/(C6/C4); }
-        public long convert(long d, TimeUnit u) { return u.toMinutes(d); }
-        int excessNanos(long d, long m) { return 0; }
-    },
-    HOURS {
-        public long toNanos(long d)   { return x(d, C5/C0, MAX/(C5/C0)); }
-        public long toMicros(long d)  { return x(d, C5/C1, MAX/(C5/C1)); }
-        public long toMillis(long d)  { return x(d, C5/C2, MAX/(C5/C2)); }
-        public long toSeconds(long d) { return x(d, C5/C3, MAX/(C5/C3)); }
-        public long toMinutes(long d) { return x(d, C5/C4, MAX/(C5/C4)); }
-        public long toHours(long d)   { return d; }
-        public long toDays(long d)    { return d/(C6/C5); }
-        public long convert(long d, TimeUnit u) { return u.toHours(d); }
-        int excessNanos(long d, long m) { return 0; }
-    },
-    DAYS {
-        public long toNanos(long d)   { return x(d, C6/C0, MAX/(C6/C0)); }
-        public long toMicros(long d)  { return x(d, C6/C1, MAX/(C6/C1)); }
-        public long toMillis(long d)  { return x(d, C6/C2, MAX/(C6/C2)); }
-        public long toSeconds(long d) { return x(d, C6/C3, MAX/(C6/C3)); }
-        public long toMinutes(long d) { return x(d, C6/C4, MAX/(C6/C4)); }
-        public long toHours(long d)   { return x(d, C6/C5, MAX/(C6/C5)); }
-        public long toDays(long d)    { return d; }
-        public long convert(long d, TimeUnit u) { return u.toDays(d); }
-        int excessNanos(long d, long m) { return 0; }
-    };
-
-    // Handy constants for conversion methods
-    static final long C0 = 1L;
-    static final long C1 = C0 * 1000L;
-    static final long C2 = C1 * 1000L;
-    static final long C3 = C2 * 1000L;
-    static final long C4 = C3 * 60L;
-    static final long C5 = C4 * 60L;
-    static final long C6 = C5 * 24L;
-
-    static final long MAX = Long.MAX_VALUE;
-
-    /**
-     * Scale d by m, checking for overflow.
-     * This has a short name to make above code more readable.
-     */
-    static long x(long d, long m, long over) {
-        if (d >  over) return Long.MAX_VALUE;
-        if (d < -over) return Long.MIN_VALUE;
-        return d * m;
-    }
-
-    // To maintain full signature compatibility with 1.5, and to improve the
-    // clarity of the generated javadoc (see 6287639: Abstract methods in
-    // enum classes should not be listed as abstract), method convert
-    // etc. are not declared abstract but otherwise act as abstract methods.
-
-    /**
-     * Convert the given time duration in the given unit to this
-     * unit.  Conversions from finer to coarser granularities
-     * truncate, so lose precision. For example converting
-     * <tt>999</tt> milliseconds to seconds results in
-     * <tt>0</tt>. Conversions from coarser to finer granularities
-     * with arguments that would numerically overflow saturate to
-     * <tt>Long.MIN_VALUE</tt> if negative or <tt>Long.MAX_VALUE</tt>
-     * if positive.
-     *
-     * <p>For example, to convert 10 minutes to milliseconds, use:
-     * <tt>TimeUnit.MILLISECONDS.convert(10L, TimeUnit.MINUTES)</tt>
-     *
-     * @param sourceDuration the time duration in the given <tt>sourceUnit</tt>
-     * @param sourceUnit the unit of the <tt>sourceDuration</tt> argument
-     * @return the converted duration in this unit,
-     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
-     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
-     */
-    public long convert(long sourceDuration, TimeUnit sourceUnit) {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Equivalent to <tt>NANOSECONDS.convert(duration, this)</tt>.
-     * @param duration the duration
-     * @return the converted duration,
-     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
-     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
-     * @see #convert
-     */
-    public long toNanos(long duration) {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Equivalent to <tt>MICROSECONDS.convert(duration, this)</tt>.
-     * @param duration the duration
-     * @return the converted duration,
-     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
-     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
-     * @see #convert
-     */
-    public long toMicros(long duration) {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Equivalent to <tt>MILLISECONDS.convert(duration, this)</tt>.
-     * @param duration the duration
-     * @return the converted duration,
-     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
-     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
-     * @see #convert
-     */
-    public long toMillis(long duration) {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Equivalent to <tt>SECONDS.convert(duration, this)</tt>.
-     * @param duration the duration
-     * @return the converted duration,
-     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
-     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
-     * @see #convert
-     */
-    public long toSeconds(long duration) {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Equivalent to <tt>MINUTES.convert(duration, this)</tt>.
-     * @param duration the duration
-     * @return the converted duration,
-     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
-     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
-     * @see #convert
-     * @since 1.6
-     */
-    public long toMinutes(long duration) {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Equivalent to <tt>HOURS.convert(duration, this)</tt>.
-     * @param duration the duration
-     * @return the converted duration,
-     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
-     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
-     * @see #convert
-     * @since 1.6
-     */
-    public long toHours(long duration) {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Equivalent to <tt>DAYS.convert(duration, this)</tt>.
-     * @param duration the duration
-     * @return the converted duration
-     * @see #convert
-     * @since 1.6
-     */
-    public long toDays(long duration) {
-        throw new AbstractMethodError();
-    }
-
-    /**
-     * Utility to compute the excess-nanosecond argument to wait,
-     * sleep, join.
-     * @param d the duration
-     * @param m the number of milliseconds
-     * @return the number of nanoseconds
-     */
-    abstract int excessNanos(long d, long m);
-
-    /**
-     * Performs a timed {@link Object#wait(long, int) Object.wait}
-     * using this time unit.
-     * This is a convenience method that converts timeout arguments
-     * into the form required by the <tt>Object.wait</tt> method.
-     *
-     * <p>For example, you could implement a blocking <tt>poll</tt>
-     * method (see {@link BlockingQueue#poll BlockingQueue.poll})
-     * using:
-     *
-     *  <pre> {@code
-     * public synchronized Object poll(long timeout, TimeUnit unit)
-     *     throws InterruptedException {
-     *   while (empty) {
-     *     unit.timedWait(this, timeout);
-     *     ...
-     *   }
-     * }}</pre>
-     *
-     * @param obj the object to wait on
-     * @param timeout the maximum time to wait. If less than
-     * or equal to zero, do not wait at all.
-     * @throws InterruptedException if interrupted while waiting
-     */
-    public void timedWait(Object obj, long timeout)
-            throws InterruptedException {
-        if (timeout > 0) {
-            long ms = toMillis(timeout);
-            int ns = excessNanos(timeout, ms);
-            obj.wait(ms, ns);
-        }
-    }
-
-    /**
-     * Performs a timed {@link Thread#join(long, int) Thread.join}
-     * using this time unit.
-     * This is a convenience method that converts time arguments into the
-     * form required by the <tt>Thread.join</tt> method.
-     *
-     * @param thread the thread to wait for
-     * @param timeout the maximum time to wait. If less than
-     * or equal to zero, do not wait at all.
-     * @throws InterruptedException if interrupted while waiting
-     */
-//    public void timedJoin(Thread thread, long timeout)
-//            throws InterruptedException {
-//        if (timeout > 0) {
-//            long ms = toMillis(timeout);
-//            int ns = excessNanos(timeout, ms);
-//            thread.join(ms, ns);
-//        }
-//    }
-
-    /**
-     * Performs a {@link Thread#sleep(long, int) Thread.sleep} using
-     * this time unit.
-     * This is a convenience method that converts time arguments into the
-     * form required by the <tt>Thread.sleep</tt> method.
-     *
-     * @param timeout the minimum time to sleep. If less than
-     * or equal to zero, do not sleep at all.
-     * @throws InterruptedException if interrupted while sleeping
-     */
-    public void sleep(long timeout) throws InterruptedException {
-        if (timeout > 0) {
-            long ms = toMillis(timeout);
-            int ns = excessNanos(timeout, ms);
-            Object o = new Object();
-            synchronized (o) {
-                o.wait(ms, ns);
-            }
-        }
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/CollectionsTest.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/CollectionsTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.compact.tck;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Vector;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class CollectionsTest {
-    @Compare public String sortStringsInArray() {
-        List<String> list = new ArrayList<>();
-        list.add("one");
-        list.add("two");
-        list.add("three");
-        list.add("four");
-        list.add("five");
-        list.add("six");
-        list.add("seven");
-        list.add("eight");
-        list.add("nine");
-        list.add("ten");
-        
-        String[] arr = list.toArray(new String[list.size()]);
-        Arrays.sort(arr);
-        
-        return Arrays.asList(arr).toString();
-    }
-    
-    @Compare public String sortStringsInHashSet() {
-        Collection<String> list = new HashSet<>();
-        list.add("one");
-        list.add("two");
-        list.add("three");
-        list.add("four");
-        list.add("five");
-        list.add("six");
-        list.add("seven");
-        list.add("eight");
-        list.add("nine");
-        list.add("ten");
-        
-        String[] arr = list.toArray(new String[0]);
-        Arrays.sort(arr);
-        
-        return Arrays.asList(arr).toString();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Compare public String sortStringsInHashMapWithComparator() {
-        class C implements Comparator<Map.Entry<String,Integer>> {
-            public int compare(Map.Entry<String, Integer> o1, Map.Entry<String, Integer> o2) {
-                return o1.getKey().compareTo(o2.getKey());
-            }
-        }
-        
-        Map<String,Integer> map = new HashMap<>();
-        map.put("one", 1);
-        map.put("two", 2);
-        map.put("three", 3);
-        map.put("four", 4);
-        map.put("five", 5);
-        map.put("six", 6);
-        map.put("seven", 7);
-        map.put("eight", 8);
-        map.put("nine", 9);
-        map.put("ten", 10);
-        
-        List<Entry<String,Integer>> arr = new Vector<>();
-        arr.addAll(map.entrySet());
-        return arr.toString();
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(CollectionsTest.class);
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.compact.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-
-public class JFXIssuesTest {
-    private abstract class Application {
-        public abstract int getID();
-    }
-    
-    private class MyApplication extends Application {
-
-        @Override
-        public int getID() {
-            return 1;
-        }
-        
-    } 
-    
-    @Compare public boolean isClassAssignable() {
-        return Application.class.isAssignableFrom(MyApplication.class);
-    }
-    
-    @Factory public static Object[] create() {
-        return VMTest.create(JFXIssuesTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/RandomTest.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/RandomTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.compact.tck;
-
-import java.util.Random;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class RandomTest {
-    @Compare public boolean canInstantiateRandom() {
-        Random r = new Random();
-        r.nextInt();
-        return r != null;
-    }
-
-    
-    @Factory public static Object[] create() {
-        return VMTest.create(RandomTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ReaderTest.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ReaderTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.compact.tck;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ReaderTest {
-    @Compare public String readUTFString() throws IOException {
-        byte[] arr = { 
-            (byte)-59, (byte)-67, (byte)108, (byte)117, (byte)-59, (byte)-91, 
-            (byte)111, (byte)117, (byte)-60, (byte)-115, (byte)107, (byte)-61, 
-            (byte)-67, (byte)32, (byte)107, (byte)-59, (byte)-81, (byte)-59, 
-            (byte)-120 
-        };
-        ByteArrayInputStream is = new ByteArrayInputStream(arr);
-        InputStreamReader r = new InputStreamReader(is, "UTF-8");
-        
-        StringBuilder sb = new StringBuilder();
-        for (;;) {
-            int ch = r.read();
-            if (ch == -1) {
-                break;
-            }
-            sb.append((char)ch);
-        }
-        return sb.toString().toString();
-    }
-    @Compare public String stringToBytes() throws UnsupportedEncodingException {
-        return Arrays.toString("\u017dlu\u0165ou\u010dk\u00fd k\u016f\u0148".getBytes("UTF-8"));
-    }
-    
-    @Factory public static Object[] create() {
-        return VMTest.create(ReaderTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ServiceLoaderTest.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ServiceLoaderTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.compact.tck;
-
-import java.io.IOException;
-import java.util.ServiceLoader;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.openide.util.lookup.ServiceProvider;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ServiceLoaderTest {
-    @Compare//(scripting = false) 
-    public Object findsIOException() {
-//      delayStart();
-        for (IOException e : ServiceLoader.load(IOException.class)) {
-            return "Found service: " + e.getClass().getName();
-        }
-        return null;
-    }
-/*    
-    @org.apidesign.bck2brwsr.core.JavaScriptBody(args = { "a" }, body = "alert(a);")
-    private static void alert(String a) {
-    }
-    private void delayStart() {
-        for (int i = 0; i < 10; i++) {
-            alert("State: " + i);
-            for (int j = 0; j < 493208409; j++) ;
-        }
-    }
-*/
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(ServiceLoaderTest.class);
-    }
-
-    
-    @ServiceProvider(service = IOException.class)
-    public static class MyException extends IOException {
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipArchive.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipArchive.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.compact.tck;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.zip.ZipEntry;
-import org.apidesign.bck2brwsr.emul.zip.ZipInputStream;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class ZipArchive {
-    private final Map<String, byte[]> entries = new LinkedHashMap<>();
-
-    public static ZipArchive createZip(InputStream is) throws IOException {
-        ZipArchive a = new ZipArchive();
-        readZip(is, a);
-        return a;
-    }
-
-    public static ZipArchive createReal(InputStream is) throws IOException {
-        ZipArchive a = new ZipArchive();
-        realZip(is, a);
-        return a;
-    }
-
-    /**
-     * Registers entry name and data
-     */
-    final void register(String entry, InputStream is) throws IOException {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        for (;;) {
-            int ch = is.read();
-            if (ch == -1) {
-                break;
-            }
-            os.write(ch);
-        }
-        os.close();
-        entries.put(entry, os.toByteArray());
-    }
-
-    @Override
-    public int hashCode() {
-        return entries.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ZipArchive other = (ZipArchive) obj;
-        if (!Objects.deepEquals(this.entries, other.entries)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, byte[]> en : entries.entrySet()) {
-            String string = en.getKey();
-            byte[] bs = en.getValue();
-            sb.append(string).append(" = ").append(Arrays.toString(bs)).append("\n");
-        }
-        return sb.toString();
-    }
-
-    public void assertEquals(ZipArchive zip, String msg) {
-        boolean ok = true;
-        StringBuilder sb = new StringBuilder();
-        sb.append(msg);
-        for (Map.Entry<String, byte[]> en : entries.entrySet()) {
-            String string = en.getKey();
-            byte[] bs = en.getValue();
-            byte[] other = zip.entries.get(string);
-            sb.append("\n");
-            if (other == null) {
-                sb.append("EXTRA ").append(string).append(" = ").append(Arrays.toString(bs));
-                ok = false;
-                continue;
-            }
-            if (Arrays.equals(bs, other)) {
-                sb.append("OK    ").append(string);
-                continue;
-            } else {
-                sb.append("DIFF  ").append(string).append(" = ").append(Arrays.toString(bs)).append("\n");
-                sb.append("    TO").append(string).append(" = ").append(Arrays.toString(other)).append("\n");
-                ok = false;
-                continue;
-            }
-        }
-        for (Map.Entry<String, byte[]> entry : zip.entries.entrySet()) {
-            String string = entry.getKey();
-            if (entries.get(string) == null) {
-                sb.append("MISS  ").append(string).append(" = ").append(Arrays.toString(entry.getValue()));
-                ok = false;
-            }
-        }
-        if (!ok) {
-            assert false : sb.toString();
-        }
-    }
-
-    public static void readZip(InputStream is, ZipArchive data) throws IOException {
-        ZipInputStream zip = new org.apidesign.bck2brwsr.emul.zip.ZipInputStream(is);
-        for (;;) {
-            ZipEntry en = zip.getNextEntry();
-            if (en == null) {
-                return;
-            }
-            data.register(en.getName(), zip);
-        }
-    }
-
-    public static void realZip(InputStream is, ZipArchive data) throws IOException {
-        java.util.zip.ZipInputStream zip = new java.util.zip.ZipInputStream(is);
-        for (;;) {
-            ZipEntry en = zip.getNextEntry();
-            if (en == null) {
-                return;
-            }
-            data.register(en.getName(), zip);
-        }
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipCompatibilityTest.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipCompatibilityTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.compact.tck;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ZipCompatibilityTest {
-    @Compare
-    public String testDemoStaticCalculator() throws IOException {
-        InputStream is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
-        ZipArchive zip = ZipArchive.createZip(is);
-        return zip.toString();
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(ZipCompatibilityTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipVsJzLibTest.java
--- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipVsJzLibTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.compact.tck;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ZipVsJzLibTest {
-    @Test public void r() throws IOException {
-        InputStream is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
-        ZipArchive zip = ZipArchive.createZip(is);
-        
-        is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
-        ZipArchive real = ZipArchive.createReal(is);
-        
-        real.assertEquals(zip, "Are they the same?");
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/compact/src/test/resources/org/apidesign/bck2brwsr/compact/tck/demo.static.calculator-0.3-SNAPSHOT.jar
Binary file emul/compact/src/test/resources/org/apidesign/bck2brwsr/compact/tck/demo.static.calculator-0.3-SNAPSHOT.jar has changed
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/pom.xml
--- a/emul/mini/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign.bck2brwsr</groupId>
-    <artifactId>emul.pom</artifactId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>emul.mini</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <name>Minimal API Profile</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>core</artifactId>
-      <version>0.3-SNAPSHOT</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>6.5.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>2.5.1</version>
-              <configuration>
-                  <compilerArguments>
-                      <bootclasspath>netbeans.ignore.jdk.bootsclasspath</bootclasspath>
-                  </compilerArguments>
-                 <source>1.7</source>
-                 <target>1.7</target>
-              </configuration>
-          </plugin>
-      </plugins>
-  </build>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/ByteArrayInputStream.java
--- a/emul/mini/src/main/java/java/io/ByteArrayInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,285 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * A <code>ByteArrayInputStream</code> contains
- * an internal buffer that contains bytes that
- * may be read from the stream. An internal
- * counter keeps track of the next byte to
- * be supplied by the <code>read</code> method.
- * <p>
- * Closing a <tt>ByteArrayInputStream</tt> has no effect. The methods in
- * this class can be called after the stream has been closed without
- * generating an <tt>IOException</tt>.
- *
- * @author  Arthur van Hoff
- * @see     java.io.StringBufferInputStream
- * @since   JDK1.0
- */
-public
-class ByteArrayInputStream extends InputStream {
-
-    /**
-     * An array of bytes that was provided
-     * by the creator of the stream. Elements <code>buf[0]</code>
-     * through <code>buf[count-1]</code> are the
-     * only bytes that can ever be read from the
-     * stream;  element <code>buf[pos]</code> is
-     * the next byte to be read.
-     */
-    protected byte buf[];
-
-    /**
-     * The index of the next character to read from the input stream buffer.
-     * This value should always be nonnegative
-     * and not larger than the value of <code>count</code>.
-     * The next byte to be read from the input stream buffer
-     * will be <code>buf[pos]</code>.
-     */
-    protected int pos;
-
-    /**
-     * The currently marked position in the stream.
-     * ByteArrayInputStream objects are marked at position zero by
-     * default when constructed.  They may be marked at another
-     * position within the buffer by the <code>mark()</code> method.
-     * The current buffer position is set to this point by the
-     * <code>reset()</code> method.
-     * <p>
-     * If no mark has been set, then the value of mark is the offset
-     * passed to the constructor (or 0 if the offset was not supplied).
-     *
-     * @since   JDK1.1
-     */
-    protected int mark = 0;
-
-    /**
-     * The index one greater than the last valid character in the input
-     * stream buffer.
-     * This value should always be nonnegative
-     * and not larger than the length of <code>buf</code>.
-     * It  is one greater than the position of
-     * the last byte within <code>buf</code> that
-     * can ever be read  from the input stream buffer.
-     */
-    protected int count;
-
-    /**
-     * Creates a <code>ByteArrayInputStream</code>
-     * so that it  uses <code>buf</code> as its
-     * buffer array.
-     * The buffer array is not copied.
-     * The initial value of <code>pos</code>
-     * is <code>0</code> and the initial value
-     * of  <code>count</code> is the length of
-     * <code>buf</code>.
-     *
-     * @param   buf   the input buffer.
-     */
-    public ByteArrayInputStream(byte buf[]) {
-        this.buf = buf;
-        this.pos = 0;
-        this.count = buf.length;
-    }
-
-    /**
-     * Creates <code>ByteArrayInputStream</code>
-     * that uses <code>buf</code> as its
-     * buffer array. The initial value of <code>pos</code>
-     * is <code>offset</code> and the initial value
-     * of <code>count</code> is the minimum of <code>offset+length</code>
-     * and <code>buf.length</code>.
-     * The buffer array is not copied. The buffer's mark is
-     * set to the specified offset.
-     *
-     * @param   buf      the input buffer.
-     * @param   offset   the offset in the buffer of the first byte to read.
-     * @param   length   the maximum number of bytes to read from the buffer.
-     */
-    public ByteArrayInputStream(byte buf[], int offset, int length) {
-        this.buf = buf;
-        this.pos = offset;
-        this.count = Math.min(offset + length, buf.length);
-        this.mark = offset;
-    }
-
-    /**
-     * Reads the next byte of data from this input stream. The value
-     * byte is returned as an <code>int</code> in the range
-     * <code>0</code> to <code>255</code>. If no byte is available
-     * because the end of the stream has been reached, the value
-     * <code>-1</code> is returned.
-     * <p>
-     * This <code>read</code> method
-     * cannot block.
-     *
-     * @return  the next byte of data, or <code>-1</code> if the end of the
-     *          stream has been reached.
-     */
-    public synchronized int read() {
-        return (pos < count) ? (buf[pos++] & 0xff) : -1;
-    }
-
-    /**
-     * Reads up to <code>len</code> bytes of data into an array of bytes
-     * from this input stream.
-     * If <code>pos</code> equals <code>count</code>,
-     * then <code>-1</code> is returned to indicate
-     * end of file. Otherwise, the  number <code>k</code>
-     * of bytes read is equal to the smaller of
-     * <code>len</code> and <code>count-pos</code>.
-     * If <code>k</code> is positive, then bytes
-     * <code>buf[pos]</code> through <code>buf[pos+k-1]</code>
-     * are copied into <code>b[off]</code>  through
-     * <code>b[off+k-1]</code> in the manner performed
-     * by <code>System.arraycopy</code>. The
-     * value <code>k</code> is added into <code>pos</code>
-     * and <code>k</code> is returned.
-     * <p>
-     * This <code>read</code> method cannot block.
-     *
-     * @param   b     the buffer into which the data is read.
-     * @param   off   the start offset in the destination array <code>b</code>
-     * @param   len   the maximum number of bytes read.
-     * @return  the total number of bytes read into the buffer, or
-     *          <code>-1</code> if there is no more data because the end of
-     *          the stream has been reached.
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     */
-    public synchronized int read(byte b[], int off, int len) {
-        if (b == null) {
-            throw new NullPointerException();
-        } else if (off < 0 || len < 0 || len > b.length - off) {
-            throw new IndexOutOfBoundsException();
-        }
-
-        if (pos >= count) {
-            return -1;
-        }
-
-        int avail = count - pos;
-        if (len > avail) {
-            len = avail;
-        }
-        if (len <= 0) {
-            return 0;
-        }
-        System.arraycopy(buf, pos, b, off, len);
-        pos += len;
-        return len;
-    }
-
-    /**
-     * Skips <code>n</code> bytes of input from this input stream. Fewer
-     * bytes might be skipped if the end of the input stream is reached.
-     * The actual number <code>k</code>
-     * of bytes to be skipped is equal to the smaller
-     * of <code>n</code> and  <code>count-pos</code>.
-     * The value <code>k</code> is added into <code>pos</code>
-     * and <code>k</code> is returned.
-     *
-     * @param   n   the number of bytes to be skipped.
-     * @return  the actual number of bytes skipped.
-     */
-    public synchronized long skip(long n) {
-        long k = count - pos;
-        if (n < k) {
-            k = n < 0 ? 0 : n;
-        }
-
-        pos += k;
-        return k;
-    }
-
-    /**
-     * Returns the number of remaining bytes that can be read (or skipped over)
-     * from this input stream.
-     * <p>
-     * The value returned is <code>count&nbsp;- pos</code>,
-     * which is the number of bytes remaining to be read from the input buffer.
-     *
-     * @return  the number of remaining bytes that can be read (or skipped
-     *          over) from this input stream without blocking.
-     */
-    public synchronized int available() {
-        return count - pos;
-    }
-
-    /**
-     * Tests if this <code>InputStream</code> supports mark/reset. The
-     * <code>markSupported</code> method of <code>ByteArrayInputStream</code>
-     * always returns <code>true</code>.
-     *
-     * @since   JDK1.1
-     */
-    public boolean markSupported() {
-        return true;
-    }
-
-    /**
-     * Set the current marked position in the stream.
-     * ByteArrayInputStream objects are marked at position zero by
-     * default when constructed.  They may be marked at another
-     * position within the buffer by this method.
-     * <p>
-     * If no mark has been set, then the value of the mark is the
-     * offset passed to the constructor (or 0 if the offset was not
-     * supplied).
-     *
-     * <p> Note: The <code>readAheadLimit</code> for this class
-     *  has no meaning.
-     *
-     * @since   JDK1.1
-     */
-    public void mark(int readAheadLimit) {
-        mark = pos;
-    }
-
-    /**
-     * Resets the buffer to the marked position.  The marked position
-     * is 0 unless another position was marked or an offset was specified
-     * in the constructor.
-     */
-    public synchronized void reset() {
-        pos = mark;
-    }
-
-    /**
-     * Closing a <tt>ByteArrayInputStream</tt> has no effect. The methods in
-     * this class can be called after the stream has been closed without
-     * generating an <tt>IOException</tt>.
-     * <p>
-     */
-    public void close() throws IOException {
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/Closeable.java
--- a/emul/mini/src/main/java/java/io/Closeable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.io.IOException;
-
-/**
- * A {@code Closeable} is a source or destination of data that can be closed.
- * The close method is invoked to release resources that the object is
- * holding (such as open files).
- *
- * @since 1.5
- */
-
-public interface Closeable extends AutoCloseable {
-
-    /**
-     * Closes this stream and releases any system resources associated
-     * with it. If the stream is already closed then invoking this
-     * method has no effect.
-     *
-     * @throws IOException if an I/O error occurs
-     */
-    public void close() throws IOException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/DataInput.java
--- a/emul/mini/src/main/java/java/io/DataInput.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,635 +0,0 @@
-/*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * The <code>DataInput</code> interface provides
- * for reading bytes from a binary stream and
- * reconstructing from them data in any of
- * the Java primitive types. There is also
- * a
- * facility for reconstructing a <code>String</code>
- * from data in
- * <a href="#modified-utf-8">modified UTF-8</a>
- * format.
- * <p>
- * It is generally true of all the reading
- * routines in this interface that if end of
- * file is reached before the desired number
- * of bytes has been read, an <code>EOFException</code>
- * (which is a kind of <code>IOException</code>)
- * is thrown. If any byte cannot be read for
- * any reason other than end of file, an <code>IOException</code>
- * other than <code>EOFException</code> is
- * thrown. In particular, an <code>IOException</code>
- * may be thrown if the input stream has been
- * closed.
- *
- * <h4><a name="modified-utf-8">Modified UTF-8</a></h4>
- * <p>
- * Implementations of the DataInput and DataOutput interfaces represent
- * Unicode strings in a format that is a slight modification of UTF-8.
- * (For information regarding the standard UTF-8 format, see section
- * <i>3.9 Unicode Encoding Forms</i> of <i>The Unicode Standard, Version
- * 4.0</i>).
- * Note that in the following tables, the most significant bit appears in the
- * far left-hand column.
- * <p>
- * All characters in the range <code>'&#92;u0001'</code> to
- * <code>'&#92;u007F'</code> are represented by a single byte:
- *
- * <blockquote>
- *   <table border="1" cellspacing="0" cellpadding="8" width="50%"
- *          summary="Bit values and bytes">
- *     <tr>
- *       <td></td>
- *       <th id="bit">Bit Values</th>
- *     </tr>
- *     <tr>
- *       <th id="byte1">Byte 1</th>
- *       <td>
- *         <table border="1" cellspacing="0" width="100%">
- *           <tr>
- *             <td width="12%"><center>0</center>
- *             <td colspan="7"><center>bits 6-0</center>
- *           </tr>
- *         </table>
- *       </td>
- *     </tr>
- *   </table>
- * </blockquote>
- *
- * <p>
- * The null character <code>'&#92;u0000'</code> and characters in the
- * range <code>'&#92;u0080'</code> to <code>'&#92;u07FF'</code> are
- * represented by a pair of bytes:
- *
- * <blockquote>
- *   <table border="1" cellspacing="0" cellpadding="8" width="50%"
- *          summary="Bit values and bytes">
- *     <tr>
- *       <td></td>
- *       <th id="bit">Bit Values</th>
- *     </tr>
- *     <tr>
- *       <th id="byte1">Byte 1</th>
- *       <td>
- *         <table border="1" cellspacing="0" width="100%">
- *           <tr>
- *             <td width="12%"><center>1</center>
- *             <td width="13%"><center>1</center>
- *             <td width="12%"><center>0</center>
- *             <td colspan="5"><center>bits 10-6</center>
- *           </tr>
- *         </table>
- *       </td>
- *     </tr>
- *     <tr>
- *       <th id="byte2">Byte 2</th>
- *       <td>
- *         <table border="1" cellspacing="0" width="100%">
- *           <tr>
- *             <td width="12%"><center>1</center>
- *             <td width="13%"><center>0</center>
- *             <td colspan="6"><center>bits 5-0</center>
- *           </tr>
- *         </table>
- *       </td>
- *     </tr>
- *   </table>
- *  </blockquote>
- *
- * <br>
- * <code>char</code> values in the range <code>'&#92;u0800'</code> to
- * <code>'&#92;uFFFF'</code> are represented by three bytes:
- *
- * <blockquote>
- *   <table border="1" cellspacing="0" cellpadding="8" width="50%"
- *          summary="Bit values and bytes">
- *     <tr>
- *       <td></td>
- *       <th id="bit">Bit Values</th>
- *     </tr>
- *     <tr>
- *       <th id="byte1">Byte 1</th>
- *       <td>
- *         <table border="1" cellspacing="0" width="100%">
- *           <tr>
- *             <td width="12%"><center>1</center>
- *             <td width="13%"><center>1</center>
- *             <td width="12%"><center>1</center>
- *             <td width="13%"><center>0</center>
- *             <td colspan="4"><center>bits 15-12</center>
- *           </tr>
- *         </table>
- *       </td>
- *     </tr>
- *     <tr>
- *       <th id="byte2">Byte 2</th>
- *       <td>
- *         <table border="1" cellspacing="0" width="100%">
- *           <tr>
- *             <td width="12%"><center>1</center>
- *             <td width="13%"><center>0</center>
- *             <td colspan="6"><center>bits 11-6</center>
- *           </tr>
- *         </table>
- *       </td>
- *     </tr>
- *     <tr>
- *       <th id="byte3">Byte 3</th>
- *       <td>
- *         <table border="1" cellspacing="0" width="100%">
- *           <tr>
- *             <td width="12%"><center>1</center>
- *             <td width="13%"><center>0</center>
- *             <td colspan="6"><center>bits 5-0</center>
- *           </tr>
- *         </table>
- *       </td>
- *     </tr>
- *   </table>
- *  </blockquote>
- *
- * <p>
- * The differences between this format and the
- * standard UTF-8 format are the following:
- * <ul>
- * <li>The null byte <code>'&#92;u0000'</code> is encoded in 2-byte format
- *     rather than 1-byte, so that the encoded strings never have
- *     embedded nulls.
- * <li>Only the 1-byte, 2-byte, and 3-byte formats are used.
- * <li><a href="../lang/Character.html#unicode">Supplementary characters</a>
- *     are represented in the form of surrogate pairs.
- * </ul>
- * @author  Frank Yellin
- * @see     java.io.DataInputStream
- * @see     java.io.DataOutput
- * @since   JDK1.0
- */
-public
-interface DataInput {
-    /**
-     * Reads some bytes from an input
-     * stream and stores them into the buffer
-     * array <code>b</code>. The number of bytes
-     * read is equal
-     * to the length of <code>b</code>.
-     * <p>
-     * This method blocks until one of the
-     * following conditions occurs:<p>
-     * <ul>
-     * <li><code>b.length</code>
-     * bytes of input data are available, in which
-     * case a normal return is made.
-     *
-     * <li>End of
-     * file is detected, in which case an <code>EOFException</code>
-     * is thrown.
-     *
-     * <li>An I/O error occurs, in
-     * which case an <code>IOException</code> other
-     * than <code>EOFException</code> is thrown.
-     * </ul>
-     * <p>
-     * If <code>b</code> is <code>null</code>,
-     * a <code>NullPointerException</code> is thrown.
-     * If <code>b.length</code> is zero, then
-     * no bytes are read. Otherwise, the first
-     * byte read is stored into element <code>b[0]</code>,
-     * the next one into <code>b[1]</code>, and
-     * so on.
-     * If an exception is thrown from
-     * this method, then it may be that some but
-     * not all bytes of <code>b</code> have been
-     * updated with data from the input stream.
-     *
-     * @param     b   the buffer into which the data is read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    void readFully(byte b[]) throws IOException;
-
-    /**
-     *
-     * Reads <code>len</code>
-     * bytes from
-     * an input stream.
-     * <p>
-     * This method
-     * blocks until one of the following conditions
-     * occurs:<p>
-     * <ul>
-     * <li><code>len</code> bytes
-     * of input data are available, in which case
-     * a normal return is made.
-     *
-     * <li>End of file
-     * is detected, in which case an <code>EOFException</code>
-     * is thrown.
-     *
-     * <li>An I/O error occurs, in
-     * which case an <code>IOException</code> other
-     * than <code>EOFException</code> is thrown.
-     * </ul>
-     * <p>
-     * If <code>b</code> is <code>null</code>,
-     * a <code>NullPointerException</code> is thrown.
-     * If <code>off</code> is negative, or <code>len</code>
-     * is negative, or <code>off+len</code> is
-     * greater than the length of the array <code>b</code>,
-     * then an <code>IndexOutOfBoundsException</code>
-     * is thrown.
-     * If <code>len</code> is zero,
-     * then no bytes are read. Otherwise, the first
-     * byte read is stored into element <code>b[off]</code>,
-     * the next one into <code>b[off+1]</code>,
-     * and so on. The number of bytes read is,
-     * at most, equal to <code>len</code>.
-     *
-     * @param     b   the buffer into which the data is read.
-     * @param off  an int specifying the offset into the data.
-     * @param len  an int specifying the number of bytes to read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    void readFully(byte b[], int off, int len) throws IOException;
-
-    /**
-     * Makes an attempt to skip over
-     * <code>n</code> bytes
-     * of data from the input
-     * stream, discarding the skipped bytes. However,
-     * it may skip
-     * over some smaller number of
-     * bytes, possibly zero. This may result from
-     * any of a
-     * number of conditions; reaching
-     * end of file before <code>n</code> bytes
-     * have been skipped is
-     * only one possibility.
-     * This method never throws an <code>EOFException</code>.
-     * The actual
-     * number of bytes skipped is returned.
-     *
-     * @param      n   the number of bytes to be skipped.
-     * @return     the number of bytes actually skipped.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    int skipBytes(int n) throws IOException;
-
-    /**
-     * Reads one input byte and returns
-     * <code>true</code> if that byte is nonzero,
-     * <code>false</code> if that byte is zero.
-     * This method is suitable for reading
-     * the byte written by the <code>writeBoolean</code>
-     * method of interface <code>DataOutput</code>.
-     *
-     * @return     the <code>boolean</code> value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    boolean readBoolean() throws IOException;
-
-    /**
-     * Reads and returns one input byte.
-     * The byte is treated as a signed value in
-     * the range <code>-128</code> through <code>127</code>,
-     * inclusive.
-     * This method is suitable for
-     * reading the byte written by the <code>writeByte</code>
-     * method of interface <code>DataOutput</code>.
-     *
-     * @return     the 8-bit value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    byte readByte() throws IOException;
-
-    /**
-     * Reads one input byte, zero-extends
-     * it to type <code>int</code>, and returns
-     * the result, which is therefore in the range
-     * <code>0</code>
-     * through <code>255</code>.
-     * This method is suitable for reading
-     * the byte written by the <code>writeByte</code>
-     * method of interface <code>DataOutput</code>
-     * if the argument to <code>writeByte</code>
-     * was intended to be a value in the range
-     * <code>0</code> through <code>255</code>.
-     *
-     * @return     the unsigned 8-bit value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    int readUnsignedByte() throws IOException;
-
-    /**
-     * Reads two input bytes and returns
-     * a <code>short</code> value. Let <code>a</code>
-     * be the first byte read and <code>b</code>
-     * be the second byte. The value
-     * returned
-     * is:
-     * <p><pre><code>(short)((a &lt;&lt; 8) | (b &amp; 0xff))
-     * </code></pre>
-     * This method
-     * is suitable for reading the bytes written
-     * by the <code>writeShort</code> method of
-     * interface <code>DataOutput</code>.
-     *
-     * @return     the 16-bit value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    short readShort() throws IOException;
-
-    /**
-     * Reads two input bytes and returns
-     * an <code>int</code> value in the range <code>0</code>
-     * through <code>65535</code>. Let <code>a</code>
-     * be the first byte read and
-     * <code>b</code>
-     * be the second byte. The value returned is:
-     * <p><pre><code>(((a &amp; 0xff) &lt;&lt; 8) | (b &amp; 0xff))
-     * </code></pre>
-     * This method is suitable for reading the bytes
-     * written by the <code>writeShort</code> method
-     * of interface <code>DataOutput</code>  if
-     * the argument to <code>writeShort</code>
-     * was intended to be a value in the range
-     * <code>0</code> through <code>65535</code>.
-     *
-     * @return     the unsigned 16-bit value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    int readUnsignedShort() throws IOException;
-
-    /**
-     * Reads two input bytes and returns a <code>char</code> value.
-     * Let <code>a</code>
-     * be the first byte read and <code>b</code>
-     * be the second byte. The value
-     * returned is:
-     * <p><pre><code>(char)((a &lt;&lt; 8) | (b &amp; 0xff))
-     * </code></pre>
-     * This method
-     * is suitable for reading bytes written by
-     * the <code>writeChar</code> method of interface
-     * <code>DataOutput</code>.
-     *
-     * @return     the <code>char</code> value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    char readChar() throws IOException;
-
-    /**
-     * Reads four input bytes and returns an
-     * <code>int</code> value. Let <code>a-d</code>
-     * be the first through fourth bytes read. The value returned is:
-     * <p><pre>
-     * <code>
-     * (((a &amp; 0xff) &lt;&lt; 24) | ((b &amp; 0xff) &lt;&lt; 16) |
-     * &#32;((c &amp; 0xff) &lt;&lt; 8) | (d &amp; 0xff))
-     * </code></pre>
-     * This method is suitable
-     * for reading bytes written by the <code>writeInt</code>
-     * method of interface <code>DataOutput</code>.
-     *
-     * @return     the <code>int</code> value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    int readInt() throws IOException;
-
-    /**
-     * Reads eight input bytes and returns
-     * a <code>long</code> value. Let <code>a-h</code>
-     * be the first through eighth bytes read.
-     * The value returned is:
-     * <p><pre> <code>
-     * (((long)(a &amp; 0xff) &lt;&lt; 56) |
-     *  ((long)(b &amp; 0xff) &lt;&lt; 48) |
-     *  ((long)(c &amp; 0xff) &lt;&lt; 40) |
-     *  ((long)(d &amp; 0xff) &lt;&lt; 32) |
-     *  ((long)(e &amp; 0xff) &lt;&lt; 24) |
-     *  ((long)(f &amp; 0xff) &lt;&lt; 16) |
-     *  ((long)(g &amp; 0xff) &lt;&lt;  8) |
-     *  ((long)(h &amp; 0xff)))
-     * </code></pre>
-     * <p>
-     * This method is suitable
-     * for reading bytes written by the <code>writeLong</code>
-     * method of interface <code>DataOutput</code>.
-     *
-     * @return     the <code>long</code> value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    long readLong() throws IOException;
-
-    /**
-     * Reads four input bytes and returns
-     * a <code>float</code> value. It does this
-     * by first constructing an <code>int</code>
-     * value in exactly the manner
-     * of the <code>readInt</code>
-     * method, then converting this <code>int</code>
-     * value to a <code>float</code> in
-     * exactly the manner of the method <code>Float.intBitsToFloat</code>.
-     * This method is suitable for reading
-     * bytes written by the <code>writeFloat</code>
-     * method of interface <code>DataOutput</code>.
-     *
-     * @return     the <code>float</code> value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    float readFloat() throws IOException;
-
-    /**
-     * Reads eight input bytes and returns
-     * a <code>double</code> value. It does this
-     * by first constructing a <code>long</code>
-     * value in exactly the manner
-     * of the <code>readlong</code>
-     * method, then converting this <code>long</code>
-     * value to a <code>double</code> in exactly
-     * the manner of the method <code>Double.longBitsToDouble</code>.
-     * This method is suitable for reading
-     * bytes written by the <code>writeDouble</code>
-     * method of interface <code>DataOutput</code>.
-     *
-     * @return     the <code>double</code> value read.
-     * @exception  EOFException  if this stream reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    double readDouble() throws IOException;
-
-    /**
-     * Reads the next line of text from the input stream.
-     * It reads successive bytes, converting
-     * each byte separately into a character,
-     * until it encounters a line terminator or
-     * end of
-     * file; the characters read are then
-     * returned as a <code>String</code>. Note
-     * that because this
-     * method processes bytes,
-     * it does not support input of the full Unicode
-     * character set.
-     * <p>
-     * If end of file is encountered
-     * before even one byte can be read, then <code>null</code>
-     * is returned. Otherwise, each byte that is
-     * read is converted to type <code>char</code>
-     * by zero-extension. If the character <code>'\n'</code>
-     * is encountered, it is discarded and reading
-     * ceases. If the character <code>'\r'</code>
-     * is encountered, it is discarded and, if
-     * the following byte converts &#32;to the
-     * character <code>'\n'</code>, then that is
-     * discarded also; reading then ceases. If
-     * end of file is encountered before either
-     * of the characters <code>'\n'</code> and
-     * <code>'\r'</code> is encountered, reading
-     * ceases. Once reading has ceased, a <code>String</code>
-     * is returned that contains all the characters
-     * read and not discarded, taken in order.
-     * Note that every character in this string
-     * will have a value less than <code>&#92;u0100</code>,
-     * that is, <code>(char)256</code>.
-     *
-     * @return the next line of text from the input stream,
-     *         or <CODE>null</CODE> if the end of file is
-     *         encountered before a byte can be read.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    String readLine() throws IOException;
-
-    /**
-     * Reads in a string that has been encoded using a
-     * <a href="#modified-utf-8">modified UTF-8</a>
-     * format.
-     * The general contract of <code>readUTF</code>
-     * is that it reads a representation of a Unicode
-     * character string encoded in modified
-     * UTF-8 format; this string of characters
-     * is then returned as a <code>String</code>.
-     * <p>
-     * First, two bytes are read and used to
-     * construct an unsigned 16-bit integer in
-     * exactly the manner of the <code>readUnsignedShort</code>
-     * method . This integer value is called the
-     * <i>UTF length</i> and specifies the number
-     * of additional bytes to be read. These bytes
-     * are then converted to characters by considering
-     * them in groups. The length of each group
-     * is computed from the value of the first
-     * byte of the group. The byte following a
-     * group, if any, is the first byte of the
-     * next group.
-     * <p>
-     * If the first byte of a group
-     * matches the bit pattern <code>0xxxxxxx</code>
-     * (where <code>x</code> means "may be <code>0</code>
-     * or <code>1</code>"), then the group consists
-     * of just that byte. The byte is zero-extended
-     * to form a character.
-     * <p>
-     * If the first byte
-     * of a group matches the bit pattern <code>110xxxxx</code>,
-     * then the group consists of that byte <code>a</code>
-     * and a second byte <code>b</code>. If there
-     * is no byte <code>b</code> (because byte
-     * <code>a</code> was the last of the bytes
-     * to be read), or if byte <code>b</code> does
-     * not match the bit pattern <code>10xxxxxx</code>,
-     * then a <code>UTFDataFormatException</code>
-     * is thrown. Otherwise, the group is converted
-     * to the character:<p>
-     * <pre><code>(char)(((a&amp; 0x1F) &lt;&lt; 6) | (b &amp; 0x3F))
-     * </code></pre>
-     * If the first byte of a group
-     * matches the bit pattern <code>1110xxxx</code>,
-     * then the group consists of that byte <code>a</code>
-     * and two more bytes <code>b</code> and <code>c</code>.
-     * If there is no byte <code>c</code> (because
-     * byte <code>a</code> was one of the last
-     * two of the bytes to be read), or either
-     * byte <code>b</code> or byte <code>c</code>
-     * does not match the bit pattern <code>10xxxxxx</code>,
-     * then a <code>UTFDataFormatException</code>
-     * is thrown. Otherwise, the group is converted
-     * to the character:<p>
-     * <pre><code>
-     * (char)(((a &amp; 0x0F) &lt;&lt; 12) | ((b &amp; 0x3F) &lt;&lt; 6) | (c &amp; 0x3F))
-     * </code></pre>
-     * If the first byte of a group matches the
-     * pattern <code>1111xxxx</code> or the pattern
-     * <code>10xxxxxx</code>, then a <code>UTFDataFormatException</code>
-     * is thrown.
-     * <p>
-     * If end of file is encountered
-     * at any time during this entire process,
-     * then an <code>EOFException</code> is thrown.
-     * <p>
-     * After every group has been converted to
-     * a character by this process, the characters
-     * are gathered, in the same order in which
-     * their corresponding groups were read from
-     * the input stream, to form a <code>String</code>,
-     * which is returned.
-     * <p>
-     * The <code>writeUTF</code>
-     * method of interface <code>DataOutput</code>
-     * may be used to write data that is suitable
-     * for reading by this method.
-     * @return     a Unicode string.
-     * @exception  EOFException            if this stream reaches the end
-     *               before reading all the bytes.
-     * @exception  IOException             if an I/O error occurs.
-     * @exception  UTFDataFormatException  if the bytes do not represent a
-     *               valid modified UTF-8 encoding of a string.
-     */
-    String readUTF() throws IOException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/DataInputStream.java
--- a/emul/mini/src/main/java/java/io/DataInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,700 +0,0 @@
-/*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * A data input stream lets an application read primitive Java data
- * types from an underlying input stream in a machine-independent
- * way. An application uses a data output stream to write data that
- * can later be read by a data input stream.
- * <p>
- * DataInputStream is not necessarily safe for multithreaded access.
- * Thread safety is optional and is the responsibility of users of
- * methods in this class.
- *
- * @author  Arthur van Hoff
- * @see     java.io.DataOutputStream
- * @since   JDK1.0
- */
-public
-class DataInputStream extends FilterInputStream implements DataInput {
-
-    /**
-     * Creates a DataInputStream that uses the specified
-     * underlying InputStream.
-     *
-     * @param  in   the specified input stream
-     */
-    public DataInputStream(InputStream in) {
-        super(in);
-    }
-
-    /**
-     * working arrays initialized on demand by readUTF
-     */
-    private byte bytearr[] = new byte[80];
-    private char chararr[] = new char[80];
-
-    /**
-     * Reads some number of bytes from the contained input stream and
-     * stores them into the buffer array <code>b</code>. The number of
-     * bytes actually read is returned as an integer. This method blocks
-     * until input data is available, end of file is detected, or an
-     * exception is thrown.
-     *
-     * <p>If <code>b</code> is null, a <code>NullPointerException</code> is
-     * thrown. If the length of <code>b</code> is zero, then no bytes are
-     * read and <code>0</code> is returned; otherwise, there is an attempt
-     * to read at least one byte. If no byte is available because the
-     * stream is at end of file, the value <code>-1</code> is returned;
-     * otherwise, at least one byte is read and stored into <code>b</code>.
-     *
-     * <p>The first byte read is stored into element <code>b[0]</code>, the
-     * next one into <code>b[1]</code>, and so on. The number of bytes read
-     * is, at most, equal to the length of <code>b</code>. Let <code>k</code>
-     * be the number of bytes actually read; these bytes will be stored in
-     * elements <code>b[0]</code> through <code>b[k-1]</code>, leaving
-     * elements <code>b[k]</code> through <code>b[b.length-1]</code>
-     * unaffected.
-     *
-     * <p>The <code>read(b)</code> method has the same effect as:
-     * <blockquote><pre>
-     * read(b, 0, b.length)
-     * </pre></blockquote>
-     *
-     * @param      b   the buffer into which the data is read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end
-     *             of the stream has been reached.
-     * @exception  IOException if the first byte cannot be read for any reason
-     * other than end of file, the stream has been closed and the underlying
-     * input stream does not support reading after close, or another I/O
-     * error occurs.
-     * @see        java.io.FilterInputStream#in
-     * @see        java.io.InputStream#read(byte[], int, int)
-     */
-    public final int read(byte b[]) throws IOException {
-        return in.read(b, 0, b.length);
-    }
-
-    /**
-     * Reads up to <code>len</code> bytes of data from the contained
-     * input stream into an array of bytes.  An attempt is made to read
-     * as many as <code>len</code> bytes, but a smaller number may be read,
-     * possibly zero. The number of bytes actually read is returned as an
-     * integer.
-     *
-     * <p> This method blocks until input data is available, end of file is
-     * detected, or an exception is thrown.
-     *
-     * <p> If <code>len</code> is zero, then no bytes are read and
-     * <code>0</code> is returned; otherwise, there is an attempt to read at
-     * least one byte. If no byte is available because the stream is at end of
-     * file, the value <code>-1</code> is returned; otherwise, at least one
-     * byte is read and stored into <code>b</code>.
-     *
-     * <p> The first byte read is stored into element <code>b[off]</code>, the
-     * next one into <code>b[off+1]</code>, and so on. The number of bytes read
-     * is, at most, equal to <code>len</code>. Let <i>k</i> be the number of
-     * bytes actually read; these bytes will be stored in elements
-     * <code>b[off]</code> through <code>b[off+</code><i>k</i><code>-1]</code>,
-     * leaving elements <code>b[off+</code><i>k</i><code>]</code> through
-     * <code>b[off+len-1]</code> unaffected.
-     *
-     * <p> In every case, elements <code>b[0]</code> through
-     * <code>b[off]</code> and elements <code>b[off+len]</code> through
-     * <code>b[b.length-1]</code> are unaffected.
-     *
-     * @param      b     the buffer into which the data is read.
-     * @param off the start offset in the destination array <code>b</code>
-     * @param      len   the maximum number of bytes read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end
-     *             of the stream has been reached.
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     * @exception  IOException if the first byte cannot be read for any reason
-     * other than end of file, the stream has been closed and the underlying
-     * input stream does not support reading after close, or another I/O
-     * error occurs.
-     * @see        java.io.FilterInputStream#in
-     * @see        java.io.InputStream#read(byte[], int, int)
-     */
-    public final int read(byte b[], int off, int len) throws IOException {
-        return in.read(b, off, len);
-    }
-
-    /**
-     * See the general contract of the <code>readFully</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @param      b   the buffer into which the data is read.
-     * @exception  EOFException  if this input stream reaches the end before
-     *             reading all the bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final void readFully(byte b[]) throws IOException {
-        readFully(b, 0, b.length);
-    }
-
-    /**
-     * See the general contract of the <code>readFully</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset of the data.
-     * @param      len   the number of bytes to read.
-     * @exception  EOFException  if this input stream reaches the end before
-     *               reading all the bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final void readFully(byte b[], int off, int len) throws IOException {
-        if (len < 0)
-            throw new IndexOutOfBoundsException();
-        int n = 0;
-        while (n < len) {
-            int count = in.read(b, off + n, len - n);
-            if (count < 0)
-                throw new EOFException();
-            n += count;
-        }
-    }
-
-    /**
-     * See the general contract of the <code>skipBytes</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes for this operation are read from the contained
-     * input stream.
-     *
-     * @param      n   the number of bytes to be skipped.
-     * @return     the actual number of bytes skipped.
-     * @exception  IOException  if the contained input stream does not support
-     *             seek, or the stream has been closed and
-     *             the contained input stream does not support
-     *             reading after close, or another I/O error occurs.
-     */
-    public final int skipBytes(int n) throws IOException {
-        int total = 0;
-        int cur = 0;
-
-        while ((total<n) && ((cur = (int) in.skip(n-total)) > 0)) {
-            total += cur;
-        }
-
-        return total;
-    }
-
-    /**
-     * See the general contract of the <code>readBoolean</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the <code>boolean</code> value read.
-     * @exception  EOFException  if this input stream has reached the end.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final boolean readBoolean() throws IOException {
-        int ch = in.read();
-        if (ch < 0)
-            throw new EOFException();
-        return (ch != 0);
-    }
-
-    /**
-     * See the general contract of the <code>readByte</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next byte of this input stream as a signed 8-bit
-     *             <code>byte</code>.
-     * @exception  EOFException  if this input stream has reached the end.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final byte readByte() throws IOException {
-        int ch = in.read();
-        if (ch < 0)
-            throw new EOFException();
-        return (byte)(ch);
-    }
-
-    /**
-     * See the general contract of the <code>readUnsignedByte</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next byte of this input stream, interpreted as an
-     *             unsigned 8-bit number.
-     * @exception  EOFException  if this input stream has reached the end.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see         java.io.FilterInputStream#in
-     */
-    public final int readUnsignedByte() throws IOException {
-        int ch = in.read();
-        if (ch < 0)
-            throw new EOFException();
-        return ch;
-    }
-
-    /**
-     * See the general contract of the <code>readShort</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next two bytes of this input stream, interpreted as a
-     *             signed 16-bit number.
-     * @exception  EOFException  if this input stream reaches the end before
-     *               reading two bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final short readShort() throws IOException {
-        int ch1 = in.read();
-        int ch2 = in.read();
-        if ((ch1 | ch2) < 0)
-            throw new EOFException();
-        return (short)((ch1 << 8) + (ch2 << 0));
-    }
-
-    /**
-     * See the general contract of the <code>readUnsignedShort</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next two bytes of this input stream, interpreted as an
-     *             unsigned 16-bit integer.
-     * @exception  EOFException  if this input stream reaches the end before
-     *             reading two bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final int readUnsignedShort() throws IOException {
-        int ch1 = in.read();
-        int ch2 = in.read();
-        if ((ch1 | ch2) < 0)
-            throw new EOFException();
-        return (ch1 << 8) + (ch2 << 0);
-    }
-
-    /**
-     * See the general contract of the <code>readChar</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next two bytes of this input stream, interpreted as a
-     *             <code>char</code>.
-     * @exception  EOFException  if this input stream reaches the end before
-     *               reading two bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final char readChar() throws IOException {
-        int ch1 = in.read();
-        int ch2 = in.read();
-        if ((ch1 | ch2) < 0)
-            throw new EOFException();
-        return (char)((ch1 << 8) + (ch2 << 0));
-    }
-
-    /**
-     * See the general contract of the <code>readInt</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next four bytes of this input stream, interpreted as an
-     *             <code>int</code>.
-     * @exception  EOFException  if this input stream reaches the end before
-     *               reading four bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final int readInt() throws IOException {
-        int ch1 = in.read();
-        int ch2 = in.read();
-        int ch3 = in.read();
-        int ch4 = in.read();
-        if ((ch1 | ch2 | ch3 | ch4) < 0)
-            throw new EOFException();
-        return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0));
-    }
-
-    private byte readBuffer[] = new byte[8];
-
-    /**
-     * See the general contract of the <code>readLong</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next eight bytes of this input stream, interpreted as a
-     *             <code>long</code>.
-     * @exception  EOFException  if this input stream reaches the end before
-     *               reading eight bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public final long readLong() throws IOException {
-        readFully(readBuffer, 0, 8);
-        return (((long)readBuffer[0] << 56) +
-                ((long)(readBuffer[1] & 255) << 48) +
-                ((long)(readBuffer[2] & 255) << 40) +
-                ((long)(readBuffer[3] & 255) << 32) +
-                ((long)(readBuffer[4] & 255) << 24) +
-                ((readBuffer[5] & 255) << 16) +
-                ((readBuffer[6] & 255) <<  8) +
-                ((readBuffer[7] & 255) <<  0));
-    }
-
-    /**
-     * See the general contract of the <code>readFloat</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next four bytes of this input stream, interpreted as a
-     *             <code>float</code>.
-     * @exception  EOFException  if this input stream reaches the end before
-     *               reading four bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.DataInputStream#readInt()
-     * @see        java.lang.Float#intBitsToFloat(int)
-     */
-    public final float readFloat() throws IOException {
-        return Float.intBitsToFloat(readInt());
-    }
-
-    /**
-     * See the general contract of the <code>readDouble</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     the next eight bytes of this input stream, interpreted as a
-     *             <code>double</code>.
-     * @exception  EOFException  if this input stream reaches the end before
-     *               reading eight bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @see        java.io.DataInputStream#readLong()
-     * @see        java.lang.Double#longBitsToDouble(long)
-     */
-    public final double readDouble() throws IOException {
-        int hi = readInt();
-        int low = readInt();
-        return toDouble(hi, low);
-    }
-    
-    @JavaScriptBody(args={ "hi", "low" },
-        body=
-          "if (low == 0) {\n"
-        + "  if (hi === 0x7ff00000) return Number.POSITIVE_INFINITY;\n"
-        + "  if (hi === 0xfff00000) return Number.NEGATIVE_INFINITY;\n"
-        + "}\n"
-        + "if (hi >= 0x7ff00000 && hi <= 0x7fffffff) return Number.NaN;\n"
-        + "if (hi >= 0xfff00000 && hi <= 0xffffffff) return Number.NaN;\n"
-        + "var s = (hi & 0x80000000) === 0 ? 1 : -1;\n"
-        + "var e = (hi >> 20) & 0x7ff;\n"
-        + "var to32 = low >> 0;\n"
-        + "if (e === 0) {\n"
-        + "  if (to32 & 0x80000000) {\n"
-        + "    hi = hi << 1 + 1; low = low << 1;\n"
-        + "  } else {\n"
-        + "    hi = hi << 1; low = low << 1;\n"
-        + "  }\n" 
-        + "} else {\n"
-        + "    hi = (hi & 0xfffff) | 0x100000;\n"
-        + "}\n"
-        + "to32 = low >> 0;\n"
-        + "var m = Math.pow(2.0, 32) * hi + to32;\n"
-        + "var r = s * m * Math.pow(2.0, e - 1075);\n"
-        + "//throw 'exp: ' + e + ' sign: ' + s + ' hi:' + hi + ' low: ' + low + ' m: ' + m + ' r: ' + r;\n"
-        + "return r;\n"
-    )
-    private static double toDouble(int hi, int low) {
-        long both = hi;
-        both = (both << 32) & low;
-        return Double.doubleToLongBits(both);
-    }
-
-    private char lineBuffer[];
-
-    /**
-     * See the general contract of the <code>readLine</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @deprecated This method does not properly convert bytes to characters.
-     * As of JDK&nbsp;1.1, the preferred way to read lines of text is via the
-     * <code>BufferedReader.readLine()</code> method.  Programs that use the
-     * <code>DataInputStream</code> class to read lines can be converted to use
-     * the <code>BufferedReader</code> class by replacing code of the form:
-     * <blockquote><pre>
-     *     DataInputStream d =&nbsp;new&nbsp;DataInputStream(in);
-     * </pre></blockquote>
-     * with:
-     * <blockquote><pre>
-     *     BufferedReader d
-     *          =&nbsp;new&nbsp;BufferedReader(new&nbsp;InputStreamReader(in));
-     * </pre></blockquote>
-     *
-     * @return     the next line of text from this input stream.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.BufferedReader#readLine()
-     * @see        java.io.FilterInputStream#in
-     */
-    @Deprecated
-    public final String readLine() throws IOException {
-        char buf[] = lineBuffer;
-
-        if (buf == null) {
-            buf = lineBuffer = new char[128];
-        }
-
-        int room = buf.length;
-        int offset = 0;
-        int c;
-
-loop:   while (true) {
-            switch (c = in.read()) {
-              case -1:
-              case '\n':
-                break loop;
-
-              case '\r':
-                int c2 = in.read();
-                if ((c2 != '\n') && (c2 != -1)) {
-                    if (!(in instanceof PushbackInputStream)) {
-                        this.in = new PushbackInputStream(in);
-                    }
-                    ((PushbackInputStream)in).unread(c2);
-                }
-                break loop;
-
-              default:
-                if (--room < 0) {
-                    buf = new char[offset + 128];
-                    room = buf.length - offset - 1;
-                    System.arraycopy(lineBuffer, 0, buf, 0, offset);
-                    lineBuffer = buf;
-                }
-                buf[offset++] = (char) c;
-                break;
-            }
-        }
-        if ((c == -1) && (offset == 0)) {
-            return null;
-        }
-        return String.copyValueOf(buf, 0, offset);
-    }
-
-    /**
-     * See the general contract of the <code>readUTF</code>
-     * method of <code>DataInput</code>.
-     * <p>
-     * Bytes
-     * for this operation are read from the contained
-     * input stream.
-     *
-     * @return     a Unicode string.
-     * @exception  EOFException  if this input stream reaches the end before
-     *               reading all the bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @exception  UTFDataFormatException if the bytes do not represent a valid
-     *             modified UTF-8 encoding of a string.
-     * @see        java.io.DataInputStream#readUTF(java.io.DataInput)
-     */
-    public final String readUTF() throws IOException {
-        return readUTF(this);
-    }
-
-    /**
-     * Reads from the
-     * stream <code>in</code> a representation
-     * of a Unicode  character string encoded in
-     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a> format;
-     * this string of characters is then returned as a <code>String</code>.
-     * The details of the modified UTF-8 representation
-     * are  exactly the same as for the <code>readUTF</code>
-     * method of <code>DataInput</code>.
-     *
-     * @param      in   a data input stream.
-     * @return     a Unicode string.
-     * @exception  EOFException            if the input stream reaches the end
-     *               before all the bytes.
-     * @exception  IOException   the stream has been closed and the contained
-     *             input stream does not support reading after close, or
-     *             another I/O error occurs.
-     * @exception  UTFDataFormatException  if the bytes do not represent a
-     *               valid modified UTF-8 encoding of a Unicode string.
-     * @see        java.io.DataInputStream#readUnsignedShort()
-     */
-    public final static String readUTF(DataInput in) throws IOException {
-        int utflen = in.readUnsignedShort();
-        byte[] bytearr = null;
-        char[] chararr = null;
-        if (in instanceof DataInputStream) {
-            DataInputStream dis = (DataInputStream)in;
-            if (dis.bytearr.length < utflen){
-                dis.bytearr = new byte[utflen*2];
-                dis.chararr = new char[utflen*2];
-            }
-            chararr = dis.chararr;
-            bytearr = dis.bytearr;
-        } else {
-            bytearr = new byte[utflen];
-            chararr = new char[utflen];
-        }
-
-        int c, char2, char3;
-        int count = 0;
-        int chararr_count=0;
-
-        in.readFully(bytearr, 0, utflen);
-
-        while (count < utflen) {
-            c = (int) bytearr[count] & 0xff;
-            if (c > 127) break;
-            count++;
-            chararr[chararr_count++]=(char)c;
-        }
-
-        while (count < utflen) {
-            c = (int) bytearr[count] & 0xff;
-            switch (c >> 4) {
-                case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-                    /* 0xxxxxxx*/
-                    count++;
-                    chararr[chararr_count++]=(char)c;
-                    break;
-                case 12: case 13:
-                    /* 110x xxxx   10xx xxxx*/
-                    count += 2;
-                    if (count > utflen)
-                        throw new UTFDataFormatException(
-                            "malformed input: partial character at end");
-                    char2 = (int) bytearr[count-1];
-                    if ((char2 & 0xC0) != 0x80)
-                        throw new UTFDataFormatException(
-                            "malformed input around byte " + count);
-                    chararr[chararr_count++]=(char)(((c & 0x1F) << 6) |
-                                                    (char2 & 0x3F));
-                    break;
-                case 14:
-                    /* 1110 xxxx  10xx xxxx  10xx xxxx */
-                    count += 3;
-                    if (count > utflen)
-                        throw new UTFDataFormatException(
-                            "malformed input: partial character at end");
-                    char2 = (int) bytearr[count-2];
-                    char3 = (int) bytearr[count-1];
-                    if (((char2 & 0xC0) != 0x80) || ((char3 & 0xC0) != 0x80))
-                        throw new UTFDataFormatException(
-                            "malformed input around byte " + (count-1));
-                    chararr[chararr_count++]=(char)(((c     & 0x0F) << 12) |
-                                                    ((char2 & 0x3F) << 6)  |
-                                                    ((char3 & 0x3F) << 0));
-                    break;
-                default:
-                    /* 10xx xxxx,  1111 xxxx */
-                    throw new UTFDataFormatException(
-                        "malformed input around byte " + count);
-            }
-        }
-        // The number of chars produced may be less than utflen
-        return new String(chararr, 0, chararr_count);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/EOFException.java
--- a/emul/mini/src/main/java/java/io/EOFException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Signals that an end of file or end of stream has been reached
- * unexpectedly during input.
- * <p>
- * This exception is mainly used by data input streams to signal end of
- * stream. Note that many other input operations return a special value on
- * end of stream rather than throwing an exception.
- * <p>
- *
- * @author  Frank Yellin
- * @see     java.io.DataInputStream
- * @see     java.io.IOException
- * @since   JDK1.0
- */
-public
-class EOFException extends IOException {
-    private static final long serialVersionUID = 6433858223774886977L;
-
-    /**
-     * Constructs an <code>EOFException</code> with <code>null</code>
-     * as its error detail message.
-     */
-    public EOFException() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>EOFException</code> with the specified detail
-     * message. The string <code>s</code> may later be retrieved by the
-     * <code>{@link java.lang.Throwable#getMessage}</code> method of class
-     * <code>java.lang.Throwable</code>.
-     *
-     * @param   s   the detail message.
-     */
-    public EOFException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/FilterInputStream.java
--- a/emul/mini/src/main/java/java/io/FilterInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * A <code>FilterInputStream</code> contains
- * some other input stream, which it uses as
- * its  basic source of data, possibly transforming
- * the data along the way or providing  additional
- * functionality. The class <code>FilterInputStream</code>
- * itself simply overrides all  methods of
- * <code>InputStream</code> with versions that
- * pass all requests to the contained  input
- * stream. Subclasses of <code>FilterInputStream</code>
- * may further override some of  these methods
- * and may also provide additional methods
- * and fields.
- *
- * @author  Jonathan Payne
- * @since   JDK1.0
- */
-public
-class FilterInputStream extends InputStream {
-    /**
-     * The input stream to be filtered.
-     */
-    protected volatile InputStream in;
-
-    /**
-     * Creates a <code>FilterInputStream</code>
-     * by assigning the  argument <code>in</code>
-     * to the field <code>this.in</code> so as
-     * to remember it for later use.
-     *
-     * @param   in   the underlying input stream, or <code>null</code> if
-     *          this instance is to be created without an underlying stream.
-     */
-    protected FilterInputStream(InputStream in) {
-        this.in = in;
-    }
-
-    /**
-     * Reads the next byte of data from this input stream. The value
-     * byte is returned as an <code>int</code> in the range
-     * <code>0</code> to <code>255</code>. If no byte is available
-     * because the end of the stream has been reached, the value
-     * <code>-1</code> is returned. This method blocks until input data
-     * is available, the end of the stream is detected, or an exception
-     * is thrown.
-     * <p>
-     * This method
-     * simply performs <code>in.read()</code> and returns the result.
-     *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
-     *             stream is reached.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public int read() throws IOException {
-        return in.read();
-    }
-
-    /**
-     * Reads up to <code>byte.length</code> bytes of data from this
-     * input stream into an array of bytes. This method blocks until some
-     * input is available.
-     * <p>
-     * This method simply performs the call
-     * <code>read(b, 0, b.length)</code> and returns
-     * the  result. It is important that it does
-     * <i>not</i> do <code>in.read(b)</code> instead;
-     * certain subclasses of  <code>FilterInputStream</code>
-     * depend on the implementation strategy actually
-     * used.
-     *
-     * @param      b   the buffer into which the data is read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             the stream has been reached.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterInputStream#read(byte[], int, int)
-     */
-    public int read(byte b[]) throws IOException {
-        return read(b, 0, b.length);
-    }
-
-    /**
-     * Reads up to <code>len</code> bytes of data from this input stream
-     * into an array of bytes. If <code>len</code> is not zero, the method
-     * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
-     * <p>
-     * This method simply performs <code>in.read(b, off, len)</code>
-     * and returns the result.
-     *
-     * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in the destination array <code>b</code>
-     * @param      len   the maximum number of bytes read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             the stream has been reached.
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public int read(byte b[], int off, int len) throws IOException {
-        return in.read(b, off, len);
-    }
-
-    /**
-     * Skips over and discards <code>n</code> bytes of data from the
-     * input stream. The <code>skip</code> method may, for a variety of
-     * reasons, end up skipping over some smaller number of bytes,
-     * possibly <code>0</code>. The actual number of bytes skipped is
-     * returned.
-     * <p>
-     * This method simply performs <code>in.skip(n)</code>.
-     *
-     * @param      n   the number of bytes to be skipped.
-     * @return     the actual number of bytes skipped.
-     * @exception  IOException  if the stream does not support seek,
-     *                          or if some other I/O error occurs.
-     */
-    public long skip(long n) throws IOException {
-        return in.skip(n);
-    }
-
-    /**
-     * Returns an estimate of the number of bytes that can be read (or
-     * skipped over) from this input stream without blocking by the next
-     * caller of a method for this input stream. The next caller might be
-     * the same thread or another thread.  A single read or skip of this
-     * many bytes will not block, but may read or skip fewer bytes.
-     * <p>
-     * This method returns the result of {@link #in in}.available().
-     *
-     * @return     an estimate of the number of bytes that can be read (or skipped
-     *             over) from this input stream without blocking.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public int available() throws IOException {
-        return in.available();
-    }
-
-    /**
-     * Closes this input stream and releases any system resources
-     * associated with the stream.
-     * This
-     * method simply performs <code>in.close()</code>.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     */
-    public void close() throws IOException {
-        in.close();
-    }
-
-    /**
-     * Marks the current position in this input stream. A subsequent
-     * call to the <code>reset</code> method repositions this stream at
-     * the last marked position so that subsequent reads re-read the same bytes.
-     * <p>
-     * The <code>readlimit</code> argument tells this input stream to
-     * allow that many bytes to be read before the mark position gets
-     * invalidated.
-     * <p>
-     * This method simply performs <code>in.mark(readlimit)</code>.
-     *
-     * @param   readlimit   the maximum limit of bytes that can be read before
-     *                      the mark position becomes invalid.
-     * @see     java.io.FilterInputStream#in
-     * @see     java.io.FilterInputStream#reset()
-     */
-    public synchronized void mark(int readlimit) {
-        in.mark(readlimit);
-    }
-
-    /**
-     * Repositions this stream to the position at the time the
-     * <code>mark</code> method was last called on this input stream.
-     * <p>
-     * This method
-     * simply performs <code>in.reset()</code>.
-     * <p>
-     * Stream marks are intended to be used in
-     * situations where you need to read ahead a little to see what's in
-     * the stream. Often this is most easily done by invoking some
-     * general parser. If the stream is of the type handled by the
-     * parse, it just chugs along happily. If the stream is not of
-     * that type, the parser should toss an exception when it fails.
-     * If this happens within readlimit bytes, it allows the outer
-     * code to reset the stream and try another parser.
-     *
-     * @exception  IOException  if the stream has not been marked or if the
-     *               mark has been invalidated.
-     * @see        java.io.FilterInputStream#in
-     * @see        java.io.FilterInputStream#mark(int)
-     */
-    public synchronized void reset() throws IOException {
-        in.reset();
-    }
-
-    /**
-     * Tests if this input stream supports the <code>mark</code>
-     * and <code>reset</code> methods.
-     * This method
-     * simply performs <code>in.markSupported()</code>.
-     *
-     * @return  <code>true</code> if this stream type supports the
-     *          <code>mark</code> and <code>reset</code> method;
-     *          <code>false</code> otherwise.
-     * @see     java.io.FilterInputStream#in
-     * @see     java.io.InputStream#mark(int)
-     * @see     java.io.InputStream#reset()
-     */
-    public boolean markSupported() {
-        return in.markSupported();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/IOException.java
--- a/emul/mini/src/main/java/java/io/IOException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Signals that an I/O exception of some sort has occurred. This
- * class is the general class of exceptions produced by failed or
- * interrupted I/O operations.
- *
- * @author  unascribed
- * @see     java.io.InputStream
- * @see     java.io.OutputStream
- * @since   JDK1.0
- */
-public
-class IOException extends Exception {
-    static final long serialVersionUID = 7818375828146090155L;
-
-    /**
-     * Constructs an {@code IOException} with {@code null}
-     * as its error detail message.
-     */
-    public IOException() {
-        super();
-    }
-
-    /**
-     * Constructs an {@code IOException} with the specified detail message.
-     *
-     * @param message
-     *        The detail message (which is saved for later retrieval
-     *        by the {@link #getMessage()} method)
-     */
-    public IOException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs an {@code IOException} with the specified detail message
-     * and cause.
-     *
-     * <p> Note that the detail message associated with {@code cause} is
-     * <i>not</i> automatically incorporated into this exception's detail
-     * message.
-     *
-     * @param message
-     *        The detail message (which is saved for later retrieval
-     *        by the {@link #getMessage()} method)
-     *
-     * @param cause
-     *        The cause (which is saved for later retrieval by the
-     *        {@link #getCause()} method).  (A null value is permitted,
-     *        and indicates that the cause is nonexistent or unknown.)
-     *
-     * @since 1.6
-     */
-    public IOException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs an {@code IOException} with the specified cause and a
-     * detail message of {@code (cause==null ? null : cause.toString())}
-     * (which typically contains the class and detail message of {@code cause}).
-     * This constructor is useful for IO exceptions that are little more
-     * than wrappers for other throwables.
-     *
-     * @param cause
-     *        The cause (which is saved for later retrieval by the
-     *        {@link #getCause()} method).  (A null value is permitted,
-     *        and indicates that the cause is nonexistent or unknown.)
-     *
-     * @since 1.6
-     */
-    public IOException(Throwable cause) {
-        super(cause);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/InputStream.java
--- a/emul/mini/src/main/java/java/io/InputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,370 +0,0 @@
-/*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * This abstract class is the superclass of all classes representing
- * an input stream of bytes.
- *
- * <p> Applications that need to define a subclass of <code>InputStream</code>
- * must always provide a method that returns the next byte of input.
- *
- * @author  Arthur van Hoff
- * @see     java.io.BufferedInputStream
- * @see     java.io.ByteArrayInputStream
- * @see     java.io.DataInputStream
- * @see     java.io.FilterInputStream
- * @see     java.io.InputStream#read()
- * @see     java.io.OutputStream
- * @see     java.io.PushbackInputStream
- * @since   JDK1.0
- */
-public abstract class InputStream implements Closeable {
-
-    // SKIP_BUFFER_SIZE is used to determine the size of skipBuffer
-    private static final int SKIP_BUFFER_SIZE = 2048;
-    // skipBuffer is initialized in skip(long), if needed.
-    private static byte[] skipBuffer;
-
-    /**
-     * Reads the next byte of data from the input stream. The value byte is
-     * returned as an <code>int</code> in the range <code>0</code> to
-     * <code>255</code>. If no byte is available because the end of the stream
-     * has been reached, the value <code>-1</code> is returned. This method
-     * blocks until input data is available, the end of the stream is detected,
-     * or an exception is thrown.
-     *
-     * <p> A subclass must provide an implementation of this method.
-     *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
-     *             stream is reached.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public abstract int read() throws IOException;
-
-    /**
-     * Reads some number of bytes from the input stream and stores them into
-     * the buffer array <code>b</code>. The number of bytes actually read is
-     * returned as an integer.  This method blocks until input data is
-     * available, end of file is detected, or an exception is thrown.
-     *
-     * <p> If the length of <code>b</code> is zero, then no bytes are read and
-     * <code>0</code> is returned; otherwise, there is an attempt to read at
-     * least one byte. If no byte is available because the stream is at the
-     * end of the file, the value <code>-1</code> is returned; otherwise, at
-     * least one byte is read and stored into <code>b</code>.
-     *
-     * <p> The first byte read is stored into element <code>b[0]</code>, the
-     * next one into <code>b[1]</code>, and so on. The number of bytes read is,
-     * at most, equal to the length of <code>b</code>. Let <i>k</i> be the
-     * number of bytes actually read; these bytes will be stored in elements
-     * <code>b[0]</code> through <code>b[</code><i>k</i><code>-1]</code>,
-     * leaving elements <code>b[</code><i>k</i><code>]</code> through
-     * <code>b[b.length-1]</code> unaffected.
-     *
-     * <p> The <code>read(b)</code> method for class <code>InputStream</code>
-     * has the same effect as: <pre><code> read(b, 0, b.length) </code></pre>
-     *
-     * @param      b   the buffer into which the data is read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             the stream has been reached.
-     * @exception  IOException  If the first byte cannot be read for any reason
-     * other than the end of the file, if the input stream has been closed, or
-     * if some other I/O error occurs.
-     * @exception  NullPointerException  if <code>b</code> is <code>null</code>.
-     * @see        java.io.InputStream#read(byte[], int, int)
-     */
-    public int read(byte b[]) throws IOException {
-        return read(b, 0, b.length);
-    }
-
-    /**
-     * Reads up to <code>len</code> bytes of data from the input stream into
-     * an array of bytes.  An attempt is made to read as many as
-     * <code>len</code> bytes, but a smaller number may be read.
-     * The number of bytes actually read is returned as an integer.
-     *
-     * <p> This method blocks until input data is available, end of file is
-     * detected, or an exception is thrown.
-     *
-     * <p> If <code>len</code> is zero, then no bytes are read and
-     * <code>0</code> is returned; otherwise, there is an attempt to read at
-     * least one byte. If no byte is available because the stream is at end of
-     * file, the value <code>-1</code> is returned; otherwise, at least one
-     * byte is read and stored into <code>b</code>.
-     *
-     * <p> The first byte read is stored into element <code>b[off]</code>, the
-     * next one into <code>b[off+1]</code>, and so on. The number of bytes read
-     * is, at most, equal to <code>len</code>. Let <i>k</i> be the number of
-     * bytes actually read; these bytes will be stored in elements
-     * <code>b[off]</code> through <code>b[off+</code><i>k</i><code>-1]</code>,
-     * leaving elements <code>b[off+</code><i>k</i><code>]</code> through
-     * <code>b[off+len-1]</code> unaffected.
-     *
-     * <p> In every case, elements <code>b[0]</code> through
-     * <code>b[off]</code> and elements <code>b[off+len]</code> through
-     * <code>b[b.length-1]</code> are unaffected.
-     *
-     * <p> The <code>read(b,</code> <code>off,</code> <code>len)</code> method
-     * for class <code>InputStream</code> simply calls the method
-     * <code>read()</code> repeatedly. If the first such call results in an
-     * <code>IOException</code>, that exception is returned from the call to
-     * the <code>read(b,</code> <code>off,</code> <code>len)</code> method.  If
-     * any subsequent call to <code>read()</code> results in a
-     * <code>IOException</code>, the exception is caught and treated as if it
-     * were end of file; the bytes read up to that point are stored into
-     * <code>b</code> and the number of bytes read before the exception
-     * occurred is returned. The default implementation of this method blocks
-     * until the requested amount of input data <code>len</code> has been read,
-     * end of file is detected, or an exception is thrown. Subclasses are encouraged
-     * to provide a more efficient implementation of this method.
-     *
-     * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in array <code>b</code>
-     *                   at which the data is written.
-     * @param      len   the maximum number of bytes to read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             the stream has been reached.
-     * @exception  IOException If the first byte cannot be read for any reason
-     * other than end of file, or if the input stream has been closed, or if
-     * some other I/O error occurs.
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     * @see        java.io.InputStream#read()
-     */
-    public int read(byte b[], int off, int len) throws IOException {
-        if (b == null) {
-            throw new NullPointerException();
-        } else if (off < 0 || len < 0 || len > b.length - off) {
-            throw new IndexOutOfBoundsException();
-        } else if (len == 0) {
-            return 0;
-        }
-
-        int c = read();
-        if (c == -1) {
-            return -1;
-        }
-        b[off] = (byte)c;
-
-        int i = 1;
-        try {
-            for (; i < len ; i++) {
-                c = read();
-                if (c == -1) {
-                    break;
-                }
-                b[off + i] = (byte)c;
-            }
-        } catch (IOException ee) {
-        }
-        return i;
-    }
-
-    /**
-     * Skips over and discards <code>n</code> bytes of data from this input
-     * stream. The <code>skip</code> method may, for a variety of reasons, end
-     * up skipping over some smaller number of bytes, possibly <code>0</code>.
-     * This may result from any of a number of conditions; reaching end of file
-     * before <code>n</code> bytes have been skipped is only one possibility.
-     * The actual number of bytes skipped is returned.  If <code>n</code> is
-     * negative, no bytes are skipped.
-     *
-     * <p> The <code>skip</code> method of this class creates a
-     * byte array and then repeatedly reads into it until <code>n</code> bytes
-     * have been read or the end of the stream has been reached. Subclasses are
-     * encouraged to provide a more efficient implementation of this method.
-     * For instance, the implementation may depend on the ability to seek.
-     *
-     * @param      n   the number of bytes to be skipped.
-     * @return     the actual number of bytes skipped.
-     * @exception  IOException  if the stream does not support seek,
-     *                          or if some other I/O error occurs.
-     */
-    public long skip(long n) throws IOException {
-
-        long remaining = n;
-        int nr;
-        if (skipBuffer == null)
-            skipBuffer = new byte[SKIP_BUFFER_SIZE];
-
-        byte[] localSkipBuffer = skipBuffer;
-
-        if (n <= 0) {
-            return 0;
-        }
-
-        while (remaining > 0) {
-            nr = read(localSkipBuffer, 0,
-                      (int) Math.min(SKIP_BUFFER_SIZE, remaining));
-            if (nr < 0) {
-                break;
-            }
-            remaining -= nr;
-        }
-
-        return n - remaining;
-    }
-
-    /**
-     * Returns an estimate of the number of bytes that can be read (or
-     * skipped over) from this input stream without blocking by the next
-     * invocation of a method for this input stream. The next invocation
-     * might be the same thread or another thread.  A single read or skip of this
-     * many bytes will not block, but may read or skip fewer bytes.
-     *
-     * <p> Note that while some implementations of {@code InputStream} will return
-     * the total number of bytes in the stream, many will not.  It is
-     * never correct to use the return value of this method to allocate
-     * a buffer intended to hold all data in this stream.
-     *
-     * <p> A subclass' implementation of this method may choose to throw an
-     * {@link IOException} if this input stream has been closed by
-     * invoking the {@link #close()} method.
-     *
-     * <p> The {@code available} method for class {@code InputStream} always
-     * returns {@code 0}.
-     *
-     * <p> This method should be overridden by subclasses.
-     *
-     * @return     an estimate of the number of bytes that can be read (or skipped
-     *             over) from this input stream without blocking or {@code 0} when
-     *             it reaches the end of the input stream.
-     * @exception  IOException if an I/O error occurs.
-     */
-    public int available() throws IOException {
-        return 0;
-    }
-
-    /**
-     * Closes this input stream and releases any system resources associated
-     * with the stream.
-     *
-     * <p> The <code>close</code> method of <code>InputStream</code> does
-     * nothing.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void close() throws IOException {}
-
-    /**
-     * Marks the current position in this input stream. A subsequent call to
-     * the <code>reset</code> method repositions this stream at the last marked
-     * position so that subsequent reads re-read the same bytes.
-     *
-     * <p> The <code>readlimit</code> arguments tells this input stream to
-     * allow that many bytes to be read before the mark position gets
-     * invalidated.
-     *
-     * <p> The general contract of <code>mark</code> is that, if the method
-     * <code>markSupported</code> returns <code>true</code>, the stream somehow
-     * remembers all the bytes read after the call to <code>mark</code> and
-     * stands ready to supply those same bytes again if and whenever the method
-     * <code>reset</code> is called.  However, the stream is not required to
-     * remember any data at all if more than <code>readlimit</code> bytes are
-     * read from the stream before <code>reset</code> is called.
-     *
-     * <p> Marking a closed stream should not have any effect on the stream.
-     *
-     * <p> The <code>mark</code> method of <code>InputStream</code> does
-     * nothing.
-     *
-     * @param   readlimit   the maximum limit of bytes that can be read before
-     *                      the mark position becomes invalid.
-     * @see     java.io.InputStream#reset()
-     */
-    public synchronized void mark(int readlimit) {}
-
-    /**
-     * Repositions this stream to the position at the time the
-     * <code>mark</code> method was last called on this input stream.
-     *
-     * <p> The general contract of <code>reset</code> is:
-     *
-     * <p><ul>
-     *
-     * <li> If the method <code>markSupported</code> returns
-     * <code>true</code>, then:
-     *
-     *     <ul><li> If the method <code>mark</code> has not been called since
-     *     the stream was created, or the number of bytes read from the stream
-     *     since <code>mark</code> was last called is larger than the argument
-     *     to <code>mark</code> at that last call, then an
-     *     <code>IOException</code> might be thrown.
-     *
-     *     <li> If such an <code>IOException</code> is not thrown, then the
-     *     stream is reset to a state such that all the bytes read since the
-     *     most recent call to <code>mark</code> (or since the start of the
-     *     file, if <code>mark</code> has not been called) will be resupplied
-     *     to subsequent callers of the <code>read</code> method, followed by
-     *     any bytes that otherwise would have been the next input data as of
-     *     the time of the call to <code>reset</code>. </ul>
-     *
-     * <li> If the method <code>markSupported</code> returns
-     * <code>false</code>, then:
-     *
-     *     <ul><li> The call to <code>reset</code> may throw an
-     *     <code>IOException</code>.
-     *
-     *     <li> If an <code>IOException</code> is not thrown, then the stream
-     *     is reset to a fixed state that depends on the particular type of the
-     *     input stream and how it was created. The bytes that will be supplied
-     *     to subsequent callers of the <code>read</code> method depend on the
-     *     particular type of the input stream. </ul></ul>
-     *
-     * <p>The method <code>reset</code> for class <code>InputStream</code>
-     * does nothing except throw an <code>IOException</code>.
-     *
-     * @exception  IOException  if this stream has not been marked or if the
-     *               mark has been invalidated.
-     * @see     java.io.InputStream#mark(int)
-     * @see     java.io.IOException
-     */
-    public synchronized void reset() throws IOException {
-        throw new IOException("mark/reset not supported");
-    }
-
-    /**
-     * Tests if this input stream supports the <code>mark</code> and
-     * <code>reset</code> methods. Whether or not <code>mark</code> and
-     * <code>reset</code> are supported is an invariant property of a
-     * particular input stream instance. The <code>markSupported</code> method
-     * of <code>InputStream</code> returns <code>false</code>.
-     *
-     * @return  <code>true</code> if this stream instance supports the mark
-     *          and reset methods; <code>false</code> otherwise.
-     * @see     java.io.InputStream#mark(int)
-     * @see     java.io.InputStream#reset()
-     */
-    public boolean markSupported() {
-        return false;
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/PushbackInputStream.java
--- a/emul/mini/src/main/java/java/io/PushbackInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,385 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * A <code>PushbackInputStream</code> adds
- * functionality to another input stream, namely
- * the  ability to "push back" or "unread"
- * one byte. This is useful in situations where
- * it is  convenient for a fragment of code
- * to read an indefinite number of data bytes
- * that  are delimited by a particular byte
- * value; after reading the terminating byte,
- * the  code fragment can "unread" it, so that
- * the next read operation on the input stream
- * will reread the byte that was pushed back.
- * For example, bytes representing the  characters
- * constituting an identifier might be terminated
- * by a byte representing an  operator character;
- * a method whose job is to read just an identifier
- * can read until it  sees the operator and
- * then push the operator back to be re-read.
- *
- * @author  David Connelly
- * @author  Jonathan Payne
- * @since   JDK1.0
- */
-public
-class PushbackInputStream extends FilterInputStream {
-    /**
-     * The pushback buffer.
-     * @since   JDK1.1
-     */
-    protected byte[] buf;
-
-    /**
-     * The position within the pushback buffer from which the next byte will
-     * be read.  When the buffer is empty, <code>pos</code> is equal to
-     * <code>buf.length</code>; when the buffer is full, <code>pos</code> is
-     * equal to zero.
-     *
-     * @since   JDK1.1
-     */
-    protected int pos;
-
-    /**
-     * Check to make sure that this stream has not been closed
-     */
-    private void ensureOpen() throws IOException {
-        if (in == null)
-            throw new IOException("Stream closed");
-    }
-
-    /**
-     * Creates a <code>PushbackInputStream</code>
-     * with a pushback buffer of the specified <code>size</code>,
-     * and saves its  argument, the input stream
-     * <code>in</code>, for later use. Initially,
-     * there is no pushed-back byte  (the field
-     * <code>pushBack</code> is initialized to
-     * <code>-1</code>).
-     *
-     * @param  in    the input stream from which bytes will be read.
-     * @param  size  the size of the pushback buffer.
-     * @exception IllegalArgumentException if size is <= 0
-     * @since  JDK1.1
-     */
-    public PushbackInputStream(InputStream in, int size) {
-        super(in);
-        if (size <= 0) {
-            throw new IllegalArgumentException("size <= 0");
-        }
-        this.buf = new byte[size];
-        this.pos = size;
-    }
-
-    /**
-     * Creates a <code>PushbackInputStream</code>
-     * and saves its  argument, the input stream
-     * <code>in</code>, for later use. Initially,
-     * there is no pushed-back byte  (the field
-     * <code>pushBack</code> is initialized to
-     * <code>-1</code>).
-     *
-     * @param   in   the input stream from which bytes will be read.
-     */
-    public PushbackInputStream(InputStream in) {
-        this(in, 1);
-    }
-
-    /**
-     * Reads the next byte of data from this input stream. The value
-     * byte is returned as an <code>int</code> in the range
-     * <code>0</code> to <code>255</code>. If no byte is available
-     * because the end of the stream has been reached, the value
-     * <code>-1</code> is returned. This method blocks until input data
-     * is available, the end of the stream is detected, or an exception
-     * is thrown.
-     *
-     * <p> This method returns the most recently pushed-back byte, if there is
-     * one, and otherwise calls the <code>read</code> method of its underlying
-     * input stream and returns whatever value that method returns.
-     *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
-     *             stream has been reached.
-     * @exception  IOException  if this input stream has been closed by
-     *             invoking its {@link #close()} method,
-     *             or an I/O error occurs.
-     * @see        java.io.InputStream#read()
-     */
-    public int read() throws IOException {
-        ensureOpen();
-        if (pos < buf.length) {
-            return buf[pos++] & 0xff;
-        }
-        return super.read();
-    }
-
-    /**
-     * Reads up to <code>len</code> bytes of data from this input stream into
-     * an array of bytes.  This method first reads any pushed-back bytes; after
-     * that, if fewer than <code>len</code> bytes have been read then it
-     * reads from the underlying input stream. If <code>len</code> is not zero, the method
-     * blocks until at least 1 byte of input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
-     *
-     * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in the destination array <code>b</code>
-     * @param      len   the maximum number of bytes read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             the stream has been reached.
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     * @exception  IOException  if this input stream has been closed by
-     *             invoking its {@link #close()} method,
-     *             or an I/O error occurs.
-     * @see        java.io.InputStream#read(byte[], int, int)
-     */
-    public int read(byte[] b, int off, int len) throws IOException {
-        ensureOpen();
-        if (b == null) {
-            throw new NullPointerException();
-        } else if (off < 0 || len < 0 || len > b.length - off) {
-            throw new IndexOutOfBoundsException();
-        } else if (len == 0) {
-            return 0;
-        }
-
-        int avail = buf.length - pos;
-        if (avail > 0) {
-            if (len < avail) {
-                avail = len;
-            }
-            System.arraycopy(buf, pos, b, off, avail);
-            pos += avail;
-            off += avail;
-            len -= avail;
-        }
-        if (len > 0) {
-            len = super.read(b, off, len);
-            if (len == -1) {
-                return avail == 0 ? -1 : avail;
-            }
-            return avail + len;
-        }
-        return avail;
-    }
-
-    /**
-     * Pushes back a byte by copying it to the front of the pushback buffer.
-     * After this method returns, the next byte to be read will have the value
-     * <code>(byte)b</code>.
-     *
-     * @param      b   the <code>int</code> value whose low-order
-     *                  byte is to be pushed back.
-     * @exception IOException If there is not enough room in the pushback
-     *            buffer for the byte, or this input stream has been closed by
-     *            invoking its {@link #close()} method.
-     */
-    public void unread(int b) throws IOException {
-        ensureOpen();
-        if (pos == 0) {
-            throw new IOException("Push back buffer is full");
-        }
-        buf[--pos] = (byte)b;
-    }
-
-    /**
-     * Pushes back a portion of an array of bytes by copying it to the front
-     * of the pushback buffer.  After this method returns, the next byte to be
-     * read will have the value <code>b[off]</code>, the byte after that will
-     * have the value <code>b[off+1]</code>, and so forth.
-     *
-     * @param b the byte array to push back.
-     * @param off the start offset of the data.
-     * @param len the number of bytes to push back.
-     * @exception IOException If there is not enough room in the pushback
-     *            buffer for the specified number of bytes,
-     *            or this input stream has been closed by
-     *            invoking its {@link #close()} method.
-     * @since     JDK1.1
-     */
-    public void unread(byte[] b, int off, int len) throws IOException {
-        ensureOpen();
-        if (len > pos) {
-            throw new IOException("Push back buffer is full");
-        }
-        pos -= len;
-        System.arraycopy(b, off, buf, pos, len);
-    }
-
-    /**
-     * Pushes back an array of bytes by copying it to the front of the
-     * pushback buffer.  After this method returns, the next byte to be read
-     * will have the value <code>b[0]</code>, the byte after that will have the
-     * value <code>b[1]</code>, and so forth.
-     *
-     * @param b the byte array to push back
-     * @exception IOException If there is not enough room in the pushback
-     *            buffer for the specified number of bytes,
-     *            or this input stream has been closed by
-     *            invoking its {@link #close()} method.
-     * @since     JDK1.1
-     */
-    public void unread(byte[] b) throws IOException {
-        unread(b, 0, b.length);
-    }
-
-    /**
-     * Returns an estimate of the number of bytes that can be read (or
-     * skipped over) from this input stream without blocking by the next
-     * invocation of a method for this input stream. The next invocation might be
-     * the same thread or another thread.  A single read or skip of this
-     * many bytes will not block, but may read or skip fewer bytes.
-     *
-     * <p> The method returns the sum of the number of bytes that have been
-     * pushed back and the value returned by {@link
-     * java.io.FilterInputStream#available available}.
-     *
-     * @return     the number of bytes that can be read (or skipped over) from
-     *             the input stream without blocking.
-     * @exception  IOException  if this input stream has been closed by
-     *             invoking its {@link #close()} method,
-     *             or an I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     * @see        java.io.InputStream#available()
-     */
-    public int available() throws IOException {
-        ensureOpen();
-        int n = buf.length - pos;
-        int avail = super.available();
-        return n > (Integer.MAX_VALUE - avail)
-                    ? Integer.MAX_VALUE
-                    : n + avail;
-    }
-
-    /**
-     * Skips over and discards <code>n</code> bytes of data from this
-     * input stream. The <code>skip</code> method may, for a variety of
-     * reasons, end up skipping over some smaller number of bytes,
-     * possibly zero.  If <code>n</code> is negative, no bytes are skipped.
-     *
-     * <p> The <code>skip</code> method of <code>PushbackInputStream</code>
-     * first skips over the bytes in the pushback buffer, if any.  It then
-     * calls the <code>skip</code> method of the underlying input stream if
-     * more bytes need to be skipped.  The actual number of bytes skipped
-     * is returned.
-     *
-     * @param      n  {@inheritDoc}
-     * @return     {@inheritDoc}
-     * @exception  IOException  if the stream does not support seek,
-     *            or the stream has been closed by
-     *            invoking its {@link #close()} method,
-     *            or an I/O error occurs.
-     * @see        java.io.FilterInputStream#in
-     * @see        java.io.InputStream#skip(long n)
-     * @since      1.2
-     */
-    public long skip(long n) throws IOException {
-        ensureOpen();
-        if (n <= 0) {
-            return 0;
-        }
-
-        long pskip = buf.length - pos;
-        if (pskip > 0) {
-            if (n < pskip) {
-                pskip = n;
-            }
-            pos += pskip;
-            n -= pskip;
-        }
-        if (n > 0) {
-            pskip += super.skip(n);
-        }
-        return pskip;
-    }
-
-    /**
-     * Tests if this input stream supports the <code>mark</code> and
-     * <code>reset</code> methods, which it does not.
-     *
-     * @return   <code>false</code>, since this class does not support the
-     *           <code>mark</code> and <code>reset</code> methods.
-     * @see     java.io.InputStream#mark(int)
-     * @see     java.io.InputStream#reset()
-     */
-    public boolean markSupported() {
-        return false;
-    }
-
-    /**
-     * Marks the current position in this input stream.
-     *
-     * <p> The <code>mark</code> method of <code>PushbackInputStream</code>
-     * does nothing.
-     *
-     * @param   readlimit   the maximum limit of bytes that can be read before
-     *                      the mark position becomes invalid.
-     * @see     java.io.InputStream#reset()
-     */
-    public synchronized void mark(int readlimit) {
-    }
-
-    /**
-     * Repositions this stream to the position at the time the
-     * <code>mark</code> method was last called on this input stream.
-     *
-     * <p> The method <code>reset</code> for class
-     * <code>PushbackInputStream</code> does nothing except throw an
-     * <code>IOException</code>.
-     *
-     * @exception  IOException  if this method is invoked.
-     * @see     java.io.InputStream#mark(int)
-     * @see     java.io.IOException
-     */
-    public synchronized void reset() throws IOException {
-        throw new IOException("mark/reset not supported");
-    }
-
-    /**
-     * Closes this input stream and releases any system resources
-     * associated with the stream.
-     * Once the stream has been closed, further read(), unread(),
-     * available(), reset(), or skip() invocations will throw an IOException.
-     * Closing a previously closed stream has no effect.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public synchronized void close() throws IOException {
-        if (in == null)
-            return;
-        in.close();
-        in = null;
-        buf = null;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/Serializable.java
--- a/emul/mini/src/main/java/java/io/Serializable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Serializability of a class is enabled by the class implementing the
- * java.io.Serializable interface. Classes that do not implement this
- * interface will not have any of their state serialized or
- * deserialized.  All subtypes of a serializable class are themselves
- * serializable.  The serialization interface has no methods or fields
- * and serves only to identify the semantics of being serializable. <p>
- *
- * To allow subtypes of non-serializable classes to be serialized, the
- * subtype may assume responsibility for saving and restoring the
- * state of the supertype's public, protected, and (if accessible)
- * package fields.  The subtype may assume this responsibility only if
- * the class it extends has an accessible no-arg constructor to
- * initialize the class's state.  It is an error to declare a class
- * Serializable if this is not the case.  The error will be detected at
- * runtime. <p>
- *
- * During deserialization, the fields of non-serializable classes will
- * be initialized using the public or protected no-arg constructor of
- * the class.  A no-arg constructor must be accessible to the subclass
- * that is serializable.  The fields of serializable subclasses will
- * be restored from the stream. <p>
- *
- * When traversing a graph, an object may be encountered that does not
- * support the Serializable interface. In this case the
- * NotSerializableException will be thrown and will identify the class
- * of the non-serializable object. <p>
- *
- * Classes that require special handling during the serialization and
- * deserialization process must implement special methods with these exact
- * signatures: <p>
- *
- * <PRE>
- * private void writeObject(java.io.ObjectOutputStream out)
- *     throws IOException
- * private void readObject(java.io.ObjectInputStream in)
- *     throws IOException, ClassNotFoundException;
- * private void readObjectNoData()
- *     throws ObjectStreamException;
- * </PRE>
- *
- * <p>The writeObject method is responsible for writing the state of the
- * object for its particular class so that the corresponding
- * readObject method can restore it.  The default mechanism for saving
- * the Object's fields can be invoked by calling
- * out.defaultWriteObject. The method does not need to concern
- * itself with the state belonging to its superclasses or subclasses.
- * State is saved by writing the individual fields to the
- * ObjectOutputStream using the writeObject method or by using the
- * methods for primitive data types supported by DataOutput.
- *
- * <p>The readObject method is responsible for reading from the stream and
- * restoring the classes fields. It may call in.defaultReadObject to invoke
- * the default mechanism for restoring the object's non-static and
- * non-transient fields.  The defaultReadObject method uses information in
- * the stream to assign the fields of the object saved in the stream with the
- * correspondingly named fields in the current object.  This handles the case
- * when the class has evolved to add new fields. The method does not need to
- * concern itself with the state belonging to its superclasses or subclasses.
- * State is saved by writing the individual fields to the
- * ObjectOutputStream using the writeObject method or by using the
- * methods for primitive data types supported by DataOutput.
- *
- * <p>The readObjectNoData method is responsible for initializing the state of
- * the object for its particular class in the event that the serialization
- * stream does not list the given class as a superclass of the object being
- * deserialized.  This may occur in cases where the receiving party uses a
- * different version of the deserialized instance's class than the sending
- * party, and the receiver's version extends classes that are not extended by
- * the sender's version.  This may also occur if the serialization stream has
- * been tampered; hence, readObjectNoData is useful for initializing
- * deserialized objects properly despite a "hostile" or incomplete source
- * stream.
- *
- * <p>Serializable classes that need to designate an alternative object to be
- * used when writing an object to the stream should implement this
- * special method with the exact signature: <p>
- *
- * <PRE>
- * ANY-ACCESS-MODIFIER Object writeReplace() throws ObjectStreamException;
- * </PRE><p>
- *
- * This writeReplace method is invoked by serialization if the method
- * exists and it would be accessible from a method defined within the
- * class of the object being serialized. Thus, the method can have private,
- * protected and package-private access. Subclass access to this method
- * follows java accessibility rules. <p>
- *
- * Classes that need to designate a replacement when an instance of it
- * is read from the stream should implement this special method with the
- * exact signature.<p>
- *
- * <PRE>
- * ANY-ACCESS-MODIFIER Object readResolve() throws ObjectStreamException;
- * </PRE><p>
- *
- * This readResolve method follows the same invocation rules and
- * accessibility rules as writeReplace.<p>
- *
- * The serialization runtime associates with each serializable class a version
- * number, called a serialVersionUID, which is used during deserialization to
- * verify that the sender and receiver of a serialized object have loaded
- * classes for that object that are compatible with respect to serialization.
- * If the receiver has loaded a class for the object that has a different
- * serialVersionUID than that of the corresponding sender's class, then
- * deserialization will result in an {@link InvalidClassException}.  A
- * serializable class can declare its own serialVersionUID explicitly by
- * declaring a field named <code>"serialVersionUID"</code> that must be static,
- * final, and of type <code>long</code>:<p>
- *
- * <PRE>
- * ANY-ACCESS-MODIFIER static final long serialVersionUID = 42L;
- * </PRE>
- *
- * If a serializable class does not explicitly declare a serialVersionUID, then
- * the serialization runtime will calculate a default serialVersionUID value
- * for that class based on various aspects of the class, as described in the
- * Java(TM) Object Serialization Specification.  However, it is <em>strongly
- * recommended</em> that all serializable classes explicitly declare
- * serialVersionUID values, since the default serialVersionUID computation is
- * highly sensitive to class details that may vary depending on compiler
- * implementations, and can thus result in unexpected
- * <code>InvalidClassException</code>s during deserialization.  Therefore, to
- * guarantee a consistent serialVersionUID value across different java compiler
- * implementations, a serializable class must declare an explicit
- * serialVersionUID value.  It is also strongly advised that explicit
- * serialVersionUID declarations use the <code>private</code> modifier where
- * possible, since such declarations apply only to the immediately declaring
- * class--serialVersionUID fields are not useful as inherited members. Array
- * classes cannot declare an explicit serialVersionUID, so they always have
- * the default computed value, but the requirement for matching
- * serialVersionUID values is waived for array classes.
- *
- * @author  unascribed
- * @see java.io.ObjectOutputStream
- * @see java.io.ObjectInputStream
- * @see java.io.ObjectOutput
- * @see java.io.ObjectInput
- * @see java.io.Externalizable
- * @since   JDK1.1
- */
-public interface Serializable {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/UTFDataFormatException.java
--- a/emul/mini/src/main/java/java/io/UTFDataFormatException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-/**
- * Signals that a malformed string in
- * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
- * format has been read in a data
- * input stream or by any class that implements the data input
- * interface.
- * See the
- * <a href="DataInput.html#modified-utf-8"><code>DataInput</code></a>
- * class description for the format in
- * which modified UTF-8 strings are read and written.
- *
- * @author  Frank Yellin
- * @see     java.io.DataInput
- * @see     java.io.DataInputStream#readUTF(java.io.DataInput)
- * @see     java.io.IOException
- * @since   JDK1.0
- */
-public
-class UTFDataFormatException extends IOException {
-    private static final long serialVersionUID = 420743449228280612L;
-
-    /**
-     * Constructs a <code>UTFDataFormatException</code> with
-     * <code>null</code> as its error detail message.
-     */
-    public UTFDataFormatException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>UTFDataFormatException</code> with the
-     * specified detail message. The string <code>s</code> can be
-     * retrieved later by the
-     * <code>{@link java.lang.Throwable#getMessage}</code>
-     * method of class <code>java.lang.Throwable</code>.
-     *
-     * @param   s   the detail message.
-     */
-    public UTFDataFormatException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/io/UnsupportedEncodingException.java
--- a/emul/mini/src/main/java/java/io/UnsupportedEncodingException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.io;
-
-/**
- * The Character Encoding is not supported.
- *
- * @author  Asmus Freytag
- * @since   JDK1.1
- */
-public class UnsupportedEncodingException
-    extends IOException
-{
-    private static final long serialVersionUID = -4274276298326136670L;
-
-    /**
-     * Constructs an UnsupportedEncodingException without a detail message.
-     */
-    public UnsupportedEncodingException() {
-        super();
-    }
-
-    /**
-     * Constructs an UnsupportedEncodingException with a detail message.
-     * @param s Describes the reason for the exception.
-     */
-    public UnsupportedEncodingException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/AbstractStringBuilder.java
--- a/emul/mini/src/main/java/java/lang/AbstractStringBuilder.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1414 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * A mutable sequence of characters.
- * <p>
- * Implements a modifiable string. At any point in time it contains some
- * particular sequence of characters, but the length and content of the
- * sequence can be changed through certain method calls.
- *
- * @author      Michael McCloskey
- * @author      Martin Buchholz
- * @author      Ulf Zibis
- * @since       1.5
- */
-abstract class AbstractStringBuilder implements Appendable, CharSequence {
-    /**
-     * The value is used for character storage.
-     */
-    char[] value;
-
-    /**
-     * The count is the number of characters used.
-     */
-    int count;
-
-    /**
-     * This no-arg constructor is necessary for serialization of subclasses.
-     */
-    AbstractStringBuilder() {
-    }
-
-    /**
-     * Creates an AbstractStringBuilder of the specified capacity.
-     */
-    AbstractStringBuilder(int capacity) {
-        value = new char[capacity];
-    }
-
-    /**
-     * Returns the length (character count).
-     *
-     * @return  the length of the sequence of characters currently
-     *          represented by this object
-     */
-    public int length() {
-        return count;
-    }
-
-    /**
-     * Returns the current capacity. The capacity is the amount of storage
-     * available for newly inserted characters, beyond which an allocation
-     * will occur.
-     *
-     * @return  the current capacity
-     */
-    public int capacity() {
-        return value.length;
-    }
-
-    /**
-     * Ensures that the capacity is at least equal to the specified minimum.
-     * If the current capacity is less than the argument, then a new internal
-     * array is allocated with greater capacity. The new capacity is the
-     * larger of:
-     * <ul>
-     * <li>The <code>minimumCapacity</code> argument.
-     * <li>Twice the old capacity, plus <code>2</code>.
-     * </ul>
-     * If the <code>minimumCapacity</code> argument is nonpositive, this
-     * method takes no action and simply returns.
-     *
-     * @param   minimumCapacity   the minimum desired capacity.
-     */
-    public void ensureCapacity(int minimumCapacity) {
-        if (minimumCapacity > 0)
-            ensureCapacityInternal(minimumCapacity);
-    }
-
-    /**
-     * This method has the same contract as ensureCapacity, but is
-     * never synchronized.
-     */
-    private void ensureCapacityInternal(int minimumCapacity) {
-        // overflow-conscious code
-        if (minimumCapacity - value.length > 0)
-            expandCapacity(minimumCapacity);
-    }
-
-    /**
-     * This implements the expansion semantics of ensureCapacity with no
-     * size check or synchronization.
-     */
-    void expandCapacity(int minimumCapacity) {
-        int newCapacity = value.length * 2 + 2;
-        if (newCapacity - minimumCapacity < 0)
-            newCapacity = minimumCapacity;
-        if (newCapacity < 0) {
-            if (minimumCapacity < 0) // overflow
-                throw new OutOfMemoryError();
-            newCapacity = Integer.MAX_VALUE;
-        }
-        value = copyOf(value, newCapacity);
-    }
-
-    /**
-     * Attempts to reduce storage used for the character sequence.
-     * If the buffer is larger than necessary to hold its current sequence of
-     * characters, then it may be resized to become more space efficient.
-     * Calling this method may, but is not required to, affect the value
-     * returned by a subsequent call to the {@link #capacity()} method.
-     */
-    public void trimToSize() {
-        if (count < value.length) {
-            value = copyOf(value, count);
-        }
-    }
-
-    /**
-     * Sets the length of the character sequence.
-     * The sequence is changed to a new character sequence
-     * whose length is specified by the argument. For every nonnegative
-     * index <i>k</i> less than <code>newLength</code>, the character at
-     * index <i>k</i> in the new character sequence is the same as the
-     * character at index <i>k</i> in the old sequence if <i>k</i> is less
-     * than the length of the old character sequence; otherwise, it is the
-     * null character <code>'&#92;u0000'</code>.
-     *
-     * In other words, if the <code>newLength</code> argument is less than
-     * the current length, the length is changed to the specified length.
-     * <p>
-     * If the <code>newLength</code> argument is greater than or equal
-     * to the current length, sufficient null characters
-     * (<code>'&#92;u0000'</code>) are appended so that
-     * length becomes the <code>newLength</code> argument.
-     * <p>
-     * The <code>newLength</code> argument must be greater than or equal
-     * to <code>0</code>.
-     *
-     * @param      newLength   the new length
-     * @throws     IndexOutOfBoundsException  if the
-     *               <code>newLength</code> argument is negative.
-     */
-    public void setLength(int newLength) {
-        if (newLength < 0)
-            throw new StringIndexOutOfBoundsException(newLength);
-        ensureCapacityInternal(newLength);
-
-        if (count < newLength) {
-            for (; count < newLength; count++)
-                value[count] = '\0';
-        } else {
-            count = newLength;
-        }
-    }
-
-    /**
-     * Returns the <code>char</code> value in this sequence at the specified index.
-     * The first <code>char</code> value is at index <code>0</code>, the next at index
-     * <code>1</code>, and so on, as in array indexing.
-     * <p>
-     * The index argument must be greater than or equal to
-     * <code>0</code>, and less than the length of this sequence.
-     *
-     * <p>If the <code>char</code> value specified by the index is a
-     * <a href="Character.html#unicode">surrogate</a>, the surrogate
-     * value is returned.
-     *
-     * @param      index   the index of the desired <code>char</code> value.
-     * @return     the <code>char</code> value at the specified index.
-     * @throws     IndexOutOfBoundsException  if <code>index</code> is
-     *             negative or greater than or equal to <code>length()</code>.
-     */
-    public char charAt(int index) {
-        if ((index < 0) || (index >= count))
-            throw new StringIndexOutOfBoundsException(index);
-        return value[index];
-    }
-
-    /**
-     * Returns the character (Unicode code point) at the specified
-     * index. The index refers to <code>char</code> values
-     * (Unicode code units) and ranges from <code>0</code> to
-     * {@link #length()}<code> - 1</code>.
-     *
-     * <p> If the <code>char</code> value specified at the given index
-     * is in the high-surrogate range, the following index is less
-     * than the length of this sequence, and the
-     * <code>char</code> value at the following index is in the
-     * low-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the <code>char</code> value at the given index is returned.
-     *
-     * @param      index the index to the <code>char</code> values
-     * @return     the code point value of the character at the
-     *             <code>index</code>
-     * @exception  IndexOutOfBoundsException  if the <code>index</code>
-     *             argument is negative or not less than the length of this
-     *             sequence.
-     */
-    public int codePointAt(int index) {
-        if ((index < 0) || (index >= count)) {
-            throw new StringIndexOutOfBoundsException(index);
-        }
-        return Character.codePointAt(value, index);
-    }
-
-    /**
-     * Returns the character (Unicode code point) before the specified
-     * index. The index refers to <code>char</code> values
-     * (Unicode code units) and ranges from <code>1</code> to {@link
-     * #length()}.
-     *
-     * <p> If the <code>char</code> value at <code>(index - 1)</code>
-     * is in the low-surrogate range, <code>(index - 2)</code> is not
-     * negative, and the <code>char</code> value at <code>(index -
-     * 2)</code> is in the high-surrogate range, then the
-     * supplementary code point value of the surrogate pair is
-     * returned. If the <code>char</code> value at <code>index -
-     * 1</code> is an unpaired low-surrogate or a high-surrogate, the
-     * surrogate value is returned.
-     *
-     * @param     index the index following the code point that should be returned
-     * @return    the Unicode code point value before the given index.
-     * @exception IndexOutOfBoundsException if the <code>index</code>
-     *            argument is less than 1 or greater than the length
-     *            of this sequence.
-     */
-    public int codePointBefore(int index) {
-        int i = index - 1;
-        if ((i < 0) || (i >= count)) {
-            throw new StringIndexOutOfBoundsException(index);
-        }
-        return Character.codePointBefore(value, index);
-    }
-
-    /**
-     * Returns the number of Unicode code points in the specified text
-     * range of this sequence. The text range begins at the specified
-     * <code>beginIndex</code> and extends to the <code>char</code> at
-     * index <code>endIndex - 1</code>. Thus the length (in
-     * <code>char</code>s) of the text range is
-     * <code>endIndex-beginIndex</code>. Unpaired surrogates within
-     * this sequence count as one code point each.
-     *
-     * @param beginIndex the index to the first <code>char</code> of
-     * the text range.
-     * @param endIndex the index after the last <code>char</code> of
-     * the text range.
-     * @return the number of Unicode code points in the specified text
-     * range
-     * @exception IndexOutOfBoundsException if the
-     * <code>beginIndex</code> is negative, or <code>endIndex</code>
-     * is larger than the length of this sequence, or
-     * <code>beginIndex</code> is larger than <code>endIndex</code>.
-     */
-    public int codePointCount(int beginIndex, int endIndex) {
-        if (beginIndex < 0 || endIndex > count || beginIndex > endIndex) {
-            throw new IndexOutOfBoundsException();
-        }
-        return Character.codePointCountImpl(value, beginIndex, endIndex-beginIndex);
-    }
-
-    /**
-     * Returns the index within this sequence that is offset from the
-     * given <code>index</code> by <code>codePointOffset</code> code
-     * points. Unpaired surrogates within the text range given by
-     * <code>index</code> and <code>codePointOffset</code> count as
-     * one code point each.
-     *
-     * @param index the index to be offset
-     * @param codePointOffset the offset in code points
-     * @return the index within this sequence
-     * @exception IndexOutOfBoundsException if <code>index</code>
-     *   is negative or larger then the length of this sequence,
-     *   or if <code>codePointOffset</code> is positive and the subsequence
-     *   starting with <code>index</code> has fewer than
-     *   <code>codePointOffset</code> code points,
-     *   or if <code>codePointOffset</code> is negative and the subsequence
-     *   before <code>index</code> has fewer than the absolute value of
-     *   <code>codePointOffset</code> code points.
-     */
-    public int offsetByCodePoints(int index, int codePointOffset) {
-        if (index < 0 || index > count) {
-            throw new IndexOutOfBoundsException();
-        }
-        return Character.offsetByCodePointsImpl(value, 0, count,
-                                                index, codePointOffset);
-    }
-
-    /**
-     * Characters are copied from this sequence into the
-     * destination character array <code>dst</code>. The first character to
-     * be copied is at index <code>srcBegin</code>; the last character to
-     * be copied is at index <code>srcEnd-1</code>. The total number of
-     * characters to be copied is <code>srcEnd-srcBegin</code>. The
-     * characters are copied into the subarray of <code>dst</code> starting
-     * at index <code>dstBegin</code> and ending at index:
-     * <p><blockquote><pre>
-     * dstbegin + (srcEnd-srcBegin) - 1
-     * </pre></blockquote>
-     *
-     * @param      srcBegin   start copying at this offset.
-     * @param      srcEnd     stop copying at this offset.
-     * @param      dst        the array to copy the data into.
-     * @param      dstBegin   offset into <code>dst</code>.
-     * @throws     NullPointerException if <code>dst</code> is
-     *             <code>null</code>.
-     * @throws     IndexOutOfBoundsException  if any of the following is true:
-     *             <ul>
-     *             <li><code>srcBegin</code> is negative
-     *             <li><code>dstBegin</code> is negative
-     *             <li>the <code>srcBegin</code> argument is greater than
-     *             the <code>srcEnd</code> argument.
-     *             <li><code>srcEnd</code> is greater than
-     *             <code>this.length()</code>.
-     *             <li><code>dstBegin+srcEnd-srcBegin</code> is greater than
-     *             <code>dst.length</code>
-     *             </ul>
-     */
-    public void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin)
-    {
-        if (srcBegin < 0)
-            throw new StringIndexOutOfBoundsException(srcBegin);
-        if ((srcEnd < 0) || (srcEnd > count))
-            throw new StringIndexOutOfBoundsException(srcEnd);
-        if (srcBegin > srcEnd)
-            throw new StringIndexOutOfBoundsException("srcBegin > srcEnd");
-        System.arraycopy(value, srcBegin, dst, dstBegin, srcEnd - srcBegin);
-    }
-
-    /**
-     * The character at the specified index is set to <code>ch</code>. This
-     * sequence is altered to represent a new character sequence that is
-     * identical to the old character sequence, except that it contains the
-     * character <code>ch</code> at position <code>index</code>.
-     * <p>
-     * The index argument must be greater than or equal to
-     * <code>0</code>, and less than the length of this sequence.
-     *
-     * @param      index   the index of the character to modify.
-     * @param      ch      the new character.
-     * @throws     IndexOutOfBoundsException  if <code>index</code> is
-     *             negative or greater than or equal to <code>length()</code>.
-     */
-    public void setCharAt(int index, char ch) {
-        if ((index < 0) || (index >= count))
-            throw new StringIndexOutOfBoundsException(index);
-        value[index] = ch;
-    }
-
-    /**
-     * Appends the string representation of the {@code Object} argument.
-     * <p>
-     * The overall effect is exactly as if the argument were converted
-     * to a string by the method {@link String#valueOf(Object)},
-     * and the characters of that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   obj   an {@code Object}.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(Object obj) {
-        return append(String.valueOf(obj));
-    }
-
-    /**
-     * Appends the specified string to this character sequence.
-     * <p>
-     * The characters of the {@code String} argument are appended, in
-     * order, increasing the length of this sequence by the length of the
-     * argument. If {@code str} is {@code null}, then the four
-     * characters {@code "null"} are appended.
-     * <p>
-     * Let <i>n</i> be the length of this character sequence just prior to
-     * execution of the {@code append} method. Then the character at
-     * index <i>k</i> in the new character sequence is equal to the character
-     * at index <i>k</i> in the old character sequence, if <i>k</i> is less
-     * than <i>n</i>; otherwise, it is equal to the character at index
-     * <i>k-n</i> in the argument {@code str}.
-     *
-     * @param   str   a string.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(String str) {
-        if (str == null) str = "null";
-        int len = str.length();
-        ensureCapacityInternal(count + len);
-        str.getChars(0, len, value, count);
-        count += len;
-        return this;
-    }
-
-    // Documentation in subclasses because of synchro difference
-    public AbstractStringBuilder append(StringBuffer sb) {
-        if (sb == null)
-            return append("null");
-        int len = sb.length();
-        ensureCapacityInternal(count + len);
-        sb.getChars(0, len, value, count);
-        count += len;
-        return this;
-    }
-
-    // Documentation in subclasses because of synchro difference
-    public AbstractStringBuilder append(CharSequence s) {
-        if (s == null)
-            s = "null";
-        if (s instanceof String)
-            return this.append((String)s);
-        if (s instanceof StringBuffer)
-            return this.append((StringBuffer)s);
-        return this.append(s, 0, s.length());
-    }
-
-    /**
-     * Appends a subsequence of the specified {@code CharSequence} to this
-     * sequence.
-     * <p>
-     * Characters of the argument {@code s}, starting at
-     * index {@code start}, are appended, in order, to the contents of
-     * this sequence up to the (exclusive) index {@code end}. The length
-     * of this sequence is increased by the value of {@code end - start}.
-     * <p>
-     * Let <i>n</i> be the length of this character sequence just prior to
-     * execution of the {@code append} method. Then the character at
-     * index <i>k</i> in this character sequence becomes equal to the
-     * character at index <i>k</i> in this sequence, if <i>k</i> is less than
-     * <i>n</i>; otherwise, it is equal to the character at index
-     * <i>k+start-n</i> in the argument {@code s}.
-     * <p>
-     * If {@code s} is {@code null}, then this method appends
-     * characters as if the s parameter was a sequence containing the four
-     * characters {@code "null"}.
-     *
-     * @param   s the sequence to append.
-     * @param   start   the starting index of the subsequence to be appended.
-     * @param   end     the end index of the subsequence to be appended.
-     * @return  a reference to this object.
-     * @throws     IndexOutOfBoundsException if
-     *             {@code start} is negative, or
-     *             {@code start} is greater than {@code end} or
-     *             {@code end} is greater than {@code s.length()}
-     */
-    public AbstractStringBuilder append(CharSequence s, int start, int end) {
-        if (s == null)
-            s = "null";
-        if ((start < 0) || (start > end) || (end > s.length()))
-            throw new IndexOutOfBoundsException(
-                "start " + start + ", end " + end + ", s.length() "
-                + s.length());
-        int len = end - start;
-        ensureCapacityInternal(count + len);
-        for (int i = start, j = count; i < end; i++, j++)
-            value[j] = s.charAt(i);
-        count += len;
-        return this;
-    }
-
-    /**
-     * Appends the string representation of the {@code char} array
-     * argument to this sequence.
-     * <p>
-     * The characters of the array argument are appended, in order, to
-     * the contents of this sequence. The length of this sequence
-     * increases by the length of the argument.
-     * <p>
-     * The overall effect is exactly as if the argument were converted
-     * to a string by the method {@link String#valueOf(char[])},
-     * and the characters of that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   str   the characters to be appended.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(char[] str) {
-        int len = str.length;
-        ensureCapacityInternal(count + len);
-        System.arraycopy(str, 0, value, count, len);
-        count += len;
-        return this;
-    }
-
-    /**
-     * Appends the string representation of a subarray of the
-     * {@code char} array argument to this sequence.
-     * <p>
-     * Characters of the {@code char} array {@code str}, starting at
-     * index {@code offset}, are appended, in order, to the contents
-     * of this sequence. The length of this sequence increases
-     * by the value of {@code len}.
-     * <p>
-     * The overall effect is exactly as if the arguments were converted
-     * to a string by the method {@link String#valueOf(char[],int,int)},
-     * and the characters of that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   str      the characters to be appended.
-     * @param   offset   the index of the first {@code char} to append.
-     * @param   len      the number of {@code char}s to append.
-     * @return  a reference to this object.
-     * @throws IndexOutOfBoundsException
-     *         if {@code offset < 0} or {@code len < 0}
-     *         or {@code offset+len > str.length}
-     */
-    public AbstractStringBuilder append(char str[], int offset, int len) {
-        if (len > 0)                // let arraycopy report AIOOBE for len < 0
-            ensureCapacityInternal(count + len);
-        System.arraycopy(str, offset, value, count, len);
-        count += len;
-        return this;
-    }
-
-    /**
-     * Appends the string representation of the {@code boolean}
-     * argument to the sequence.
-     * <p>
-     * The overall effect is exactly as if the argument were converted
-     * to a string by the method {@link String#valueOf(boolean)},
-     * and the characters of that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   b   a {@code boolean}.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(boolean b) {
-        if (b) {
-            ensureCapacityInternal(count + 4);
-            value[count++] = 't';
-            value[count++] = 'r';
-            value[count++] = 'u';
-            value[count++] = 'e';
-        } else {
-            ensureCapacityInternal(count + 5);
-            value[count++] = 'f';
-            value[count++] = 'a';
-            value[count++] = 'l';
-            value[count++] = 's';
-            value[count++] = 'e';
-        }
-        return this;
-    }
-
-    /**
-     * Appends the string representation of the {@code char}
-     * argument to this sequence.
-     * <p>
-     * The argument is appended to the contents of this sequence.
-     * The length of this sequence increases by {@code 1}.
-     * <p>
-     * The overall effect is exactly as if the argument were converted
-     * to a string by the method {@link String#valueOf(char)},
-     * and the character in that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   c   a {@code char}.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(char c) {
-        ensureCapacityInternal(count + 1);
-        value[count++] = c;
-        return this;
-    }
-
-    /**
-     * Appends the string representation of the {@code int}
-     * argument to this sequence.
-     * <p>
-     * The overall effect is exactly as if the argument were converted
-     * to a string by the method {@link String#valueOf(int)},
-     * and the characters of that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   i   an {@code int}.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(int i) {
-        return append(Integer.toString(i));
-    }
-
-    /**
-     * Appends the string representation of the {@code long}
-     * argument to this sequence.
-     * <p>
-     * The overall effect is exactly as if the argument were converted
-     * to a string by the method {@link String#valueOf(long)},
-     * and the characters of that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   l   a {@code long}.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(long l) {
-        if (l == Long.MIN_VALUE) {
-            append("-9223372036854775808");
-            return this;
-        }
-        int appendedLength = (l < 0) ? Long.stringSize(-l) + 1
-                                     : Long.stringSize(l);
-        int spaceNeeded = count + appendedLength;
-        ensureCapacityInternal(spaceNeeded);
-        Long.getChars(l, spaceNeeded, value);
-        count = spaceNeeded;
-        return this;
-    }
-
-    /**
-     * Appends the string representation of the {@code float}
-     * argument to this sequence.
-     * <p>
-     * The overall effect is exactly as if the argument were converted
-     * to a string by the method {@link String#valueOf(float)},
-     * and the characters of that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   f   a {@code float}.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(float f) {
-        return append(Float.toString(f));
-    }
-
-    /**
-     * Appends the string representation of the {@code double}
-     * argument to this sequence.
-     * <p>
-     * The overall effect is exactly as if the argument were converted
-     * to a string by the method {@link String#valueOf(double)},
-     * and the characters of that string were then
-     * {@link #append(String) appended} to this character sequence.
-     *
-     * @param   d   a {@code double}.
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder append(double d) {
-        return append(Double.toString(d));
-    }
-
-    /**
-     * Removes the characters in a substring of this sequence.
-     * The substring begins at the specified {@code start} and extends to
-     * the character at index {@code end - 1} or to the end of the
-     * sequence if no such character exists. If
-     * {@code start} is equal to {@code end}, no changes are made.
-     *
-     * @param      start  The beginning index, inclusive.
-     * @param      end    The ending index, exclusive.
-     * @return     This object.
-     * @throws     StringIndexOutOfBoundsException  if {@code start}
-     *             is negative, greater than {@code length()}, or
-     *             greater than {@code end}.
-     */
-    public AbstractStringBuilder delete(int start, int end) {
-        if (start < 0)
-            throw new StringIndexOutOfBoundsException(start);
-        if (end > count)
-            end = count;
-        if (start > end)
-            throw new StringIndexOutOfBoundsException();
-        int len = end - start;
-        if (len > 0) {
-            System.arraycopy(value, start+len, value, start, count-end);
-            count -= len;
-        }
-        return this;
-    }
-
-    /**
-     * Appends the string representation of the {@code codePoint}
-     * argument to this sequence.
-     *
-     * <p> The argument is appended to the contents of this sequence.
-     * The length of this sequence increases by
-     * {@link Character#charCount(int) Character.charCount(codePoint)}.
-     *
-     * <p> The overall effect is exactly as if the argument were
-     * converted to a {@code char} array by the method
-     * {@link Character#toChars(int)} and the character in that array
-     * were then {@link #append(char[]) appended} to this character
-     * sequence.
-     *
-     * @param   codePoint   a Unicode code point
-     * @return  a reference to this object.
-     * @exception IllegalArgumentException if the specified
-     * {@code codePoint} isn't a valid Unicode code point
-     */
-    public AbstractStringBuilder appendCodePoint(int codePoint) {
-        final int count = this.count;
-
-        if (Character.isBmpCodePoint(codePoint)) {
-            ensureCapacityInternal(count + 1);
-            value[count] = (char) codePoint;
-            this.count = count + 1;
-        } else if (Character.isValidCodePoint(codePoint)) {
-            ensureCapacityInternal(count + 2);
-            Character.toSurrogates(codePoint, value, count);
-            this.count = count + 2;
-        } else {
-            throw new IllegalArgumentException();
-        }
-        return this;
-    }
-
-    /**
-     * Removes the <code>char</code> at the specified position in this
-     * sequence. This sequence is shortened by one <code>char</code>.
-     *
-     * <p>Note: If the character at the given index is a supplementary
-     * character, this method does not remove the entire character. If
-     * correct handling of supplementary characters is required,
-     * determine the number of <code>char</code>s to remove by calling
-     * <code>Character.charCount(thisSequence.codePointAt(index))</code>,
-     * where <code>thisSequence</code> is this sequence.
-     *
-     * @param       index  Index of <code>char</code> to remove
-     * @return      This object.
-     * @throws      StringIndexOutOfBoundsException  if the <code>index</code>
-     *              is negative or greater than or equal to
-     *              <code>length()</code>.
-     */
-    public AbstractStringBuilder deleteCharAt(int index) {
-        if ((index < 0) || (index >= count))
-            throw new StringIndexOutOfBoundsException(index);
-        System.arraycopy(value, index+1, value, index, count-index-1);
-        count--;
-        return this;
-    }
-
-    /**
-     * Replaces the characters in a substring of this sequence
-     * with characters in the specified <code>String</code>. The substring
-     * begins at the specified <code>start</code> and extends to the character
-     * at index <code>end - 1</code> or to the end of the
-     * sequence if no such character exists. First the
-     * characters in the substring are removed and then the specified
-     * <code>String</code> is inserted at <code>start</code>. (This
-     * sequence will be lengthened to accommodate the
-     * specified String if necessary.)
-     *
-     * @param      start    The beginning index, inclusive.
-     * @param      end      The ending index, exclusive.
-     * @param      str   String that will replace previous contents.
-     * @return     This object.
-     * @throws     StringIndexOutOfBoundsException  if <code>start</code>
-     *             is negative, greater than <code>length()</code>, or
-     *             greater than <code>end</code>.
-     */
-    public AbstractStringBuilder replace(int start, int end, String str) {
-        if (start < 0)
-            throw new StringIndexOutOfBoundsException(start);
-        if (start > count)
-            throw new StringIndexOutOfBoundsException("start > length()");
-        if (start > end)
-            throw new StringIndexOutOfBoundsException("start > end");
-
-        if (end > count)
-            end = count;
-        int len = str.length();
-        int newCount = count + len - (end - start);
-        ensureCapacityInternal(newCount);
-
-        System.arraycopy(value, end, value, start + len, count - end);
-        str.getChars(value, start);
-        count = newCount;
-        return this;
-    }
-
-    /**
-     * Returns a new <code>String</code> that contains a subsequence of
-     * characters currently contained in this character sequence. The
-     * substring begins at the specified index and extends to the end of
-     * this sequence.
-     *
-     * @param      start    The beginning index, inclusive.
-     * @return     The new string.
-     * @throws     StringIndexOutOfBoundsException  if <code>start</code> is
-     *             less than zero, or greater than the length of this object.
-     */
-    public String substring(int start) {
-        return substring(start, count);
-    }
-
-    /**
-     * Returns a new character sequence that is a subsequence of this sequence.
-     *
-     * <p> An invocation of this method of the form
-     *
-     * <blockquote><pre>
-     * sb.subSequence(begin,&nbsp;end)</pre></blockquote>
-     *
-     * behaves in exactly the same way as the invocation
-     *
-     * <blockquote><pre>
-     * sb.substring(begin,&nbsp;end)</pre></blockquote>
-     *
-     * This method is provided so that this class can
-     * implement the {@link CharSequence} interface. </p>
-     *
-     * @param      start   the start index, inclusive.
-     * @param      end     the end index, exclusive.
-     * @return     the specified subsequence.
-     *
-     * @throws  IndexOutOfBoundsException
-     *          if <tt>start</tt> or <tt>end</tt> are negative,
-     *          if <tt>end</tt> is greater than <tt>length()</tt>,
-     *          or if <tt>start</tt> is greater than <tt>end</tt>
-     * @spec JSR-51
-     */
-    public CharSequence subSequence(int start, int end) {
-        return substring(start, end);
-    }
-
-    /**
-     * Returns a new <code>String</code> that contains a subsequence of
-     * characters currently contained in this sequence. The
-     * substring begins at the specified <code>start</code> and
-     * extends to the character at index <code>end - 1</code>.
-     *
-     * @param      start    The beginning index, inclusive.
-     * @param      end      The ending index, exclusive.
-     * @return     The new string.
-     * @throws     StringIndexOutOfBoundsException  if <code>start</code>
-     *             or <code>end</code> are negative or greater than
-     *             <code>length()</code>, or <code>start</code> is
-     *             greater than <code>end</code>.
-     */
-    public String substring(int start, int end) {
-        if (start < 0)
-            throw new StringIndexOutOfBoundsException(start);
-        if (end > count)
-            throw new StringIndexOutOfBoundsException(end);
-        if (start > end)
-            throw new StringIndexOutOfBoundsException(end - start);
-        return new String(value, start, end - start);
-    }
-
-    /**
-     * Inserts the string representation of a subarray of the {@code str}
-     * array argument into this sequence. The subarray begins at the
-     * specified {@code offset} and extends {@code len} {@code char}s.
-     * The characters of the subarray are inserted into this sequence at
-     * the position indicated by {@code index}. The length of this
-     * sequence increases by {@code len} {@code char}s.
-     *
-     * @param      index    position at which to insert subarray.
-     * @param      str       A {@code char} array.
-     * @param      offset   the index of the first {@code char} in subarray to
-     *             be inserted.
-     * @param      len      the number of {@code char}s in the subarray to
-     *             be inserted.
-     * @return     This object
-     * @throws     StringIndexOutOfBoundsException  if {@code index}
-     *             is negative or greater than {@code length()}, or
-     *             {@code offset} or {@code len} are negative, or
-     *             {@code (offset+len)} is greater than
-     *             {@code str.length}.
-     */
-    public AbstractStringBuilder insert(int index, char[] str, int offset,
-                                        int len)
-    {
-        if ((index < 0) || (index > length()))
-            throw new StringIndexOutOfBoundsException(index);
-        if ((offset < 0) || (len < 0) || (offset > str.length - len))
-            throw new StringIndexOutOfBoundsException(
-                "offset " + offset + ", len " + len + ", str.length "
-                + str.length);
-        ensureCapacityInternal(count + len);
-        System.arraycopy(value, index, value, index + len, count - index);
-        System.arraycopy(str, offset, value, index, len);
-        count += len;
-        return this;
-    }
-
-    /**
-     * Inserts the string representation of the {@code Object}
-     * argument into this character sequence.
-     * <p>
-     * The overall effect is exactly as if the second argument were
-     * converted to a string by the method {@link String#valueOf(Object)},
-     * and the characters of that string were then
-     * {@link #insert(int,String) inserted} into this character
-     * sequence at the indicated offset.
-     * <p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      obj      an {@code Object}.
-     * @return     a reference to this object.
-     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, Object obj) {
-        return insert(offset, String.valueOf(obj));
-    }
-
-    /**
-     * Inserts the string into this character sequence.
-     * <p>
-     * The characters of the {@code String} argument are inserted, in
-     * order, into this sequence at the indicated offset, moving up any
-     * characters originally above that position and increasing the length
-     * of this sequence by the length of the argument. If
-     * {@code str} is {@code null}, then the four characters
-     * {@code "null"} are inserted into this sequence.
-     * <p>
-     * The character at index <i>k</i> in the new character sequence is
-     * equal to:
-     * <ul>
-     * <li>the character at index <i>k</i> in the old character sequence, if
-     * <i>k</i> is less than {@code offset}
-     * <li>the character at index <i>k</i>{@code -offset} in the
-     * argument {@code str}, if <i>k</i> is not less than
-     * {@code offset} but is less than {@code offset+str.length()}
-     * <li>the character at index <i>k</i>{@code -str.length()} in the
-     * old character sequence, if <i>k</i> is not less than
-     * {@code offset+str.length()}
-     * </ul><p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      str      a string.
-     * @return     a reference to this object.
-     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, String str) {
-        if ((offset < 0) || (offset > length()))
-            throw new StringIndexOutOfBoundsException(offset);
-        if (str == null)
-            str = "null";
-        int len = str.length();
-        ensureCapacityInternal(count + len);
-        System.arraycopy(value, offset, value, offset + len, count - offset);
-        str.getChars(value, offset);
-        count += len;
-        return this;
-    }
-
-    /**
-     * Inserts the string representation of the {@code char} array
-     * argument into this sequence.
-     * <p>
-     * The characters of the array argument are inserted into the
-     * contents of this sequence at the position indicated by
-     * {@code offset}. The length of this sequence increases by
-     * the length of the argument.
-     * <p>
-     * The overall effect is exactly as if the second argument were
-     * converted to a string by the method {@link String#valueOf(char[])},
-     * and the characters of that string were then
-     * {@link #insert(int,String) inserted} into this character
-     * sequence at the indicated offset.
-     * <p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      str      a character array.
-     * @return     a reference to this object.
-     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, char[] str) {
-        if ((offset < 0) || (offset > length()))
-            throw new StringIndexOutOfBoundsException(offset);
-        int len = str.length;
-        ensureCapacityInternal(count + len);
-        System.arraycopy(value, offset, value, offset + len, count - offset);
-        System.arraycopy(str, 0, value, offset, len);
-        count += len;
-        return this;
-    }
-
-    /**
-     * Inserts the specified {@code CharSequence} into this sequence.
-     * <p>
-     * The characters of the {@code CharSequence} argument are inserted,
-     * in order, into this sequence at the indicated offset, moving up
-     * any characters originally above that position and increasing the length
-     * of this sequence by the length of the argument s.
-     * <p>
-     * The result of this method is exactly the same as if it were an
-     * invocation of this object's
-     * {@link #insert(int,CharSequence,int,int) insert}(dstOffset, s, 0, s.length())
-     * method.
-     *
-     * <p>If {@code s} is {@code null}, then the four characters
-     * {@code "null"} are inserted into this sequence.
-     *
-     * @param      dstOffset   the offset.
-     * @param      s the sequence to be inserted
-     * @return     a reference to this object.
-     * @throws     IndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int dstOffset, CharSequence s) {
-        if (s == null)
-            s = "null";
-        if (s instanceof String)
-            return this.insert(dstOffset, (String)s);
-        return this.insert(dstOffset, s, 0, s.length());
-    }
-
-    /**
-     * Inserts a subsequence of the specified {@code CharSequence} into
-     * this sequence.
-     * <p>
-     * The subsequence of the argument {@code s} specified by
-     * {@code start} and {@code end} are inserted,
-     * in order, into this sequence at the specified destination offset, moving
-     * up any characters originally above that position. The length of this
-     * sequence is increased by {@code end - start}.
-     * <p>
-     * The character at index <i>k</i> in this sequence becomes equal to:
-     * <ul>
-     * <li>the character at index <i>k</i> in this sequence, if
-     * <i>k</i> is less than {@code dstOffset}
-     * <li>the character at index <i>k</i>{@code +start-dstOffset} in
-     * the argument {@code s}, if <i>k</i> is greater than or equal to
-     * {@code dstOffset} but is less than {@code dstOffset+end-start}
-     * <li>the character at index <i>k</i>{@code -(end-start)} in this
-     * sequence, if <i>k</i> is greater than or equal to
-     * {@code dstOffset+end-start}
-     * </ul><p>
-     * The {@code dstOffset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     * <p>The start argument must be nonnegative, and not greater than
-     * {@code end}.
-     * <p>The end argument must be greater than or equal to
-     * {@code start}, and less than or equal to the length of s.
-     *
-     * <p>If {@code s} is {@code null}, then this method inserts
-     * characters as if the s parameter was a sequence containing the four
-     * characters {@code "null"}.
-     *
-     * @param      dstOffset   the offset in this sequence.
-     * @param      s       the sequence to be inserted.
-     * @param      start   the starting index of the subsequence to be inserted.
-     * @param      end     the end index of the subsequence to be inserted.
-     * @return     a reference to this object.
-     * @throws     IndexOutOfBoundsException  if {@code dstOffset}
-     *             is negative or greater than {@code this.length()}, or
-     *              {@code start} or {@code end} are negative, or
-     *              {@code start} is greater than {@code end} or
-     *              {@code end} is greater than {@code s.length()}
-     */
-     public AbstractStringBuilder insert(int dstOffset, CharSequence s,
-                                         int start, int end) {
-        if (s == null)
-            s = "null";
-        if ((dstOffset < 0) || (dstOffset > this.length()))
-            throw new IndexOutOfBoundsException("dstOffset "+dstOffset);
-        if ((start < 0) || (end < 0) || (start > end) || (end > s.length()))
-            throw new IndexOutOfBoundsException(
-                "start " + start + ", end " + end + ", s.length() "
-                + s.length());
-        int len = end - start;
-        ensureCapacityInternal(count + len);
-        System.arraycopy(value, dstOffset, value, dstOffset + len,
-                         count - dstOffset);
-        for (int i=start; i<end; i++)
-            value[dstOffset++] = s.charAt(i);
-        count += len;
-        return this;
-    }
-
-    /**
-     * Inserts the string representation of the {@code boolean}
-     * argument into this sequence.
-     * <p>
-     * The overall effect is exactly as if the second argument were
-     * converted to a string by the method {@link String#valueOf(boolean)},
-     * and the characters of that string were then
-     * {@link #insert(int,String) inserted} into this character
-     * sequence at the indicated offset.
-     * <p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      b        a {@code boolean}.
-     * @return     a reference to this object.
-     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, boolean b) {
-        return insert(offset, String.valueOf(b));
-    }
-
-    /**
-     * Inserts the string representation of the {@code char}
-     * argument into this sequence.
-     * <p>
-     * The overall effect is exactly as if the second argument were
-     * converted to a string by the method {@link String#valueOf(char)},
-     * and the character in that string were then
-     * {@link #insert(int,String) inserted} into this character
-     * sequence at the indicated offset.
-     * <p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      c        a {@code char}.
-     * @return     a reference to this object.
-     * @throws     IndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, char c) {
-        ensureCapacityInternal(count + 1);
-        System.arraycopy(value, offset, value, offset + 1, count - offset);
-        value[offset] = c;
-        count += 1;
-        return this;
-    }
-
-    /**
-     * Inserts the string representation of the second {@code int}
-     * argument into this sequence.
-     * <p>
-     * The overall effect is exactly as if the second argument were
-     * converted to a string by the method {@link String#valueOf(int)},
-     * and the characters of that string were then
-     * {@link #insert(int,String) inserted} into this character
-     * sequence at the indicated offset.
-     * <p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      i        an {@code int}.
-     * @return     a reference to this object.
-     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, int i) {
-        return insert(offset, String.valueOf(i));
-    }
-
-    /**
-     * Inserts the string representation of the {@code long}
-     * argument into this sequence.
-     * <p>
-     * The overall effect is exactly as if the second argument were
-     * converted to a string by the method {@link String#valueOf(long)},
-     * and the characters of that string were then
-     * {@link #insert(int,String) inserted} into this character
-     * sequence at the indicated offset.
-     * <p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      l        a {@code long}.
-     * @return     a reference to this object.
-     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, long l) {
-        return insert(offset, String.valueOf(l));
-    }
-
-    /**
-     * Inserts the string representation of the {@code float}
-     * argument into this sequence.
-     * <p>
-     * The overall effect is exactly as if the second argument were
-     * converted to a string by the method {@link String#valueOf(float)},
-     * and the characters of that string were then
-     * {@link #insert(int,String) inserted} into this character
-     * sequence at the indicated offset.
-     * <p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      f        a {@code float}.
-     * @return     a reference to this object.
-     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, float f) {
-        return insert(offset, String.valueOf(f));
-    }
-
-    /**
-     * Inserts the string representation of the {@code double}
-     * argument into this sequence.
-     * <p>
-     * The overall effect is exactly as if the second argument were
-     * converted to a string by the method {@link String#valueOf(double)},
-     * and the characters of that string were then
-     * {@link #insert(int,String) inserted} into this character
-     * sequence at the indicated offset.
-     * <p>
-     * The {@code offset} argument must be greater than or equal to
-     * {@code 0}, and less than or equal to the {@linkplain #length() length}
-     * of this sequence.
-     *
-     * @param      offset   the offset.
-     * @param      d        a {@code double}.
-     * @return     a reference to this object.
-     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
-     */
-    public AbstractStringBuilder insert(int offset, double d) {
-        return insert(offset, String.valueOf(d));
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of the
-     * specified substring. The integer returned is the smallest value
-     * <i>k</i> such that:
-     * <blockquote><pre>
-     * this.toString().startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * is <code>true</code>.
-     *
-     * @param   str   any string.
-     * @return  if the string argument occurs as a substring within this
-     *          object, then the index of the first character of the first
-     *          such substring is returned; if it does not occur as a
-     *          substring, <code>-1</code> is returned.
-     * @throws  java.lang.NullPointerException if <code>str</code> is
-     *          <code>null</code>.
-     */
-    public int indexOf(String str) {
-        return indexOf(str, 0);
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of the
-     * specified substring, starting at the specified index.  The integer
-     * returned is the smallest value <tt>k</tt> for which:
-     * <blockquote><pre>
-     *     k >= Math.min(fromIndex, str.length()) &&
-     *                   this.toString().startsWith(str, k)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then -1 is returned.
-     *
-     * @param   str         the substring for which to search.
-     * @param   fromIndex   the index from which to start the search.
-     * @return  the index within this string of the first occurrence of the
-     *          specified substring, starting at the specified index.
-     * @throws  java.lang.NullPointerException if <code>str</code> is
-     *            <code>null</code>.
-     */
-    public int indexOf(String str, int fromIndex) {
-        return toString().indexOf(str, fromIndex);
-    }
-
-    /**
-     * Returns the index within this string of the rightmost occurrence
-     * of the specified substring.  The rightmost empty string "" is
-     * considered to occur at the index value <code>this.length()</code>.
-     * The returned index is the largest value <i>k</i> such that
-     * <blockquote><pre>
-     * this.toString().startsWith(str, k)
-     * </pre></blockquote>
-     * is true.
-     *
-     * @param   str   the substring to search for.
-     * @return  if the string argument occurs one or more times as a substring
-     *          within this object, then the index of the first character of
-     *          the last such substring is returned. If it does not occur as
-     *          a substring, <code>-1</code> is returned.
-     * @throws  java.lang.NullPointerException  if <code>str</code> is
-     *          <code>null</code>.
-     */
-    public int lastIndexOf(String str) {
-        return lastIndexOf(str, count);
-    }
-
-    /**
-     * Returns the index within this string of the last occurrence of the
-     * specified substring. The integer returned is the largest value <i>k</i>
-     * such that:
-     * <blockquote><pre>
-     *     k <= Math.min(fromIndex, str.length()) &&
-     *                   this.toString().startsWith(str, k)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then -1 is returned.
-     *
-     * @param   str         the substring to search for.
-     * @param   fromIndex   the index to start the search from.
-     * @return  the index within this sequence of the last occurrence of the
-     *          specified substring.
-     * @throws  java.lang.NullPointerException if <code>str</code> is
-     *          <code>null</code>.
-     */
-    public int lastIndexOf(String str, int fromIndex) {
-        return String.lastIndexOf(value, 0, count,
-                              str.toCharArray(), 0, str.length(), fromIndex);
-    }
-
-    /**
-     * Causes this character sequence to be replaced by the reverse of
-     * the sequence. If there are any surrogate pairs included in the
-     * sequence, these are treated as single characters for the
-     * reverse operation. Thus, the order of the high-low surrogates
-     * is never reversed.
-     *
-     * Let <i>n</i> be the character length of this character sequence
-     * (not the length in <code>char</code> values) just prior to
-     * execution of the <code>reverse</code> method. Then the
-     * character at index <i>k</i> in the new character sequence is
-     * equal to the character at index <i>n-k-1</i> in the old
-     * character sequence.
-     *
-     * <p>Note that the reverse operation may result in producing
-     * surrogate pairs that were unpaired low-surrogates and
-     * high-surrogates before the operation. For example, reversing
-     * "&#92;uDC00&#92;uD800" produces "&#92;uD800&#92;uDC00" which is
-     * a valid surrogate pair.
-     *
-     * @return  a reference to this object.
-     */
-    public AbstractStringBuilder reverse() {
-        boolean hasSurrogate = false;
-        int n = count - 1;
-        for (int j = (n-1) >> 1; j >= 0; --j) {
-            char temp = value[j];
-            char temp2 = value[n - j];
-            if (!hasSurrogate) {
-                hasSurrogate = (temp >= Character.MIN_SURROGATE && temp <= Character.MAX_SURROGATE)
-                    || (temp2 >= Character.MIN_SURROGATE && temp2 <= Character.MAX_SURROGATE);
-            }
-            value[j] = temp2;
-            value[n - j] = temp;
-        }
-        if (hasSurrogate) {
-            // Reverse back all valid surrogate pairs
-            for (int i = 0; i < count - 1; i++) {
-                char c2 = value[i];
-                if (Character.isLowSurrogate(c2)) {
-                    char c1 = value[i + 1];
-                    if (Character.isHighSurrogate(c1)) {
-                        value[i++] = c1;
-                        value[i] = c2;
-                    }
-                }
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Returns a string representing the data in this sequence.
-     * A new <code>String</code> object is allocated and initialized to
-     * contain the character sequence currently represented by this
-     * object. This <code>String</code> is then returned. Subsequent
-     * changes to this sequence do not affect the contents of the
-     * <code>String</code>.
-     *
-     * @return  a string representation of this sequence of characters.
-     */
-    public abstract String toString();
-
-    /**
-     * Needed by <tt>String</tt> for the contentEquals method.
-     */
-    final char[] getValue() {
-        return value;
-    }
-
-    static char[] copyOfRange(char[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0) {
-            throw new IllegalArgumentException(from + " > " + to);
-        }
-        char[] copy = new char[newLength];
-        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-    // access system property
-    static String getProperty(String nm) {
-        return null;
-    }
-
-    static char[] copyOf(char[] original, int newLength) {
-        char[] copy = new char[newLength];
-        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
-        return copy;
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Appendable.java
--- a/emul/mini/src/main/java/java/lang/Appendable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.io.IOException;
-
-/**
- * An object to which <tt>char</tt> sequences and values can be appended.  The
- * <tt>Appendable</tt> interface must be implemented by any class whose
- * instances are intended to receive formatted output from a {@link
- * java.util.Formatter}.
- *
- * <p> The characters to be appended should be valid Unicode characters as
- * described in <a href="Character.html#unicode">Unicode Character
- * Representation</a>.  Note that supplementary characters may be composed of
- * multiple 16-bit <tt>char</tt> values.
- *
- * <p> Appendables are not necessarily safe for multithreaded access.  Thread
- * safety is the responsibility of classes that extend and implement this
- * interface.
- *
- * <p> Since this interface may be implemented by existing classes
- * with different styles of error handling there is no guarantee that
- * errors will be propagated to the invoker.
- *
- * @since 1.5
- */
-public interface Appendable {
-
-    /**
-     * Appends the specified character sequence to this <tt>Appendable</tt>.
-     *
-     * <p> Depending on which class implements the character sequence
-     * <tt>csq</tt>, the entire sequence may not be appended.  For
-     * instance, if <tt>csq</tt> is a {@link java.nio.CharBuffer} then
-     * the subsequence to append is defined by the buffer's position and limit.
-     *
-     * @param  csq
-     *         The character sequence to append.  If <tt>csq</tt> is
-     *         <tt>null</tt>, then the four characters <tt>"null"</tt> are
-     *         appended to this Appendable.
-     *
-     * @return  A reference to this <tt>Appendable</tt>
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    Appendable append(CharSequence csq) throws IOException;
-
-    /**
-     * Appends a subsequence of the specified character sequence to this
-     * <tt>Appendable</tt>.
-     *
-     * <p> An invocation of this method of the form <tt>out.append(csq, start,
-     * end)</tt> when <tt>csq</tt> is not <tt>null</tt>, behaves in
-     * exactly the same way as the invocation
-     *
-     * <pre>
-     *     out.append(csq.subSequence(start, end)) </pre>
-     *
-     * @param  csq
-     *         The character sequence from which a subsequence will be
-     *         appended.  If <tt>csq</tt> is <tt>null</tt>, then characters
-     *         will be appended as if <tt>csq</tt> contained the four
-     *         characters <tt>"null"</tt>.
-     *
-     * @param  start
-     *         The index of the first character in the subsequence
-     *
-     * @param  end
-     *         The index of the character following the last character in the
-     *         subsequence
-     *
-     * @return  A reference to this <tt>Appendable</tt>
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If <tt>start</tt> or <tt>end</tt> are negative, <tt>start</tt>
-     *          is greater than <tt>end</tt>, or <tt>end</tt> is greater than
-     *          <tt>csq.length()</tt>
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    Appendable append(CharSequence csq, int start, int end) throws IOException;
-
-    /**
-     * Appends the specified character to this <tt>Appendable</tt>.
-     *
-     * @param  c
-     *         The character to append
-     *
-     * @return  A reference to this <tt>Appendable</tt>
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     */
-    Appendable append(char c) throws IOException;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
--- a/emul/mini/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that an array has been accessed with an
- * illegal index. The index is either negative or greater than or
- * equal to the size of the array.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class ArrayIndexOutOfBoundsException extends IndexOutOfBoundsException {
-    private static final long serialVersionUID = -5116101128118950844L;
-
-    /**
-     * Constructs an <code>ArrayIndexOutOfBoundsException</code> with no
-     * detail message.
-     */
-    public ArrayIndexOutOfBoundsException() {
-        super();
-    }
-
-    /**
-     * Constructs a new <code>ArrayIndexOutOfBoundsException</code>
-     * class with an argument indicating the illegal index.
-     *
-     * @param   index   the illegal index.
-     */
-    public ArrayIndexOutOfBoundsException(int index) {
-        super("Array index out of range: " + index);
-    }
-
-    /**
-     * Constructs an <code>ArrayIndexOutOfBoundsException</code> class
-     * with the specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public ArrayIndexOutOfBoundsException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/ArrayStoreException.java
--- a/emul/mini/src/main/java/java/lang/ArrayStoreException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that an attempt has been made to store the
- * wrong type of object into an array of objects. For example, the
- * following code generates an <code>ArrayStoreException</code>:
- * <p><blockquote><pre>
- *     Object x[] = new String[3];
- *     x[0] = new Integer(0);
- * </pre></blockquote>
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class ArrayStoreException extends RuntimeException {
-    private static final long serialVersionUID = -4522193890499838241L;
-
-    /**
-     * Constructs an <code>ArrayStoreException</code> with no detail message.
-     */
-    public ArrayStoreException() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>ArrayStoreException</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public ArrayStoreException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/AssertionError.java
--- a/emul/mini/src/main/java/java/lang/AssertionError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that an assertion has failed.
- *
- * <p>The seven one-argument public constructors provided by this
- * class ensure that the assertion error returned by the invocation:
- * <pre>
- *     new AssertionError(<i>expression</i>)
- * </pre>
- * has as its detail message the <i>string conversion</i> of
- * <i>expression</i> (as defined in section 15.18.1.1 of
- * <cite>The Java&trade; Language Specification</cite>),
- * regardless of the type of <i>expression</i>.
- *
- * @since   1.4
- */
-public class AssertionError extends Error {
-    private static final long serialVersionUID = -5013299493970297370L;
-
-    /**
-     * Constructs an AssertionError with no detail message.
-     */
-    public AssertionError() {
-    }
-
-    /**
-     * This internal constructor does no processing on its string argument,
-     * even if it is a null reference.  The public constructors will
-     * never call this constructor with a null argument.
-     */
-    private AssertionError(String detailMessage) {
-        super(detailMessage);
-    }
-
-    /**
-     * Constructs an AssertionError with its detail message derived
-     * from the specified object, which is converted to a string as
-     * defined in section 15.18.1.1 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *<p>
-     * If the specified object is an instance of {@code Throwable}, it
-     * becomes the <i>cause</i> of the newly constructed assertion error.
-     *
-     * @param detailMessage value to be used in constructing detail message
-     * @see   Throwable#getCause()
-     */
-    public AssertionError(Object detailMessage) {
-        this("" +  detailMessage);
-        if (detailMessage instanceof Throwable)
-            initCause((Throwable) detailMessage);
-    }
-
-    /**
-     * Constructs an AssertionError with its detail message derived
-     * from the specified <code>boolean</code>, which is converted to
-     * a string as defined in section 15.18.1.1 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * @param detailMessage value to be used in constructing detail message
-     */
-    public AssertionError(boolean detailMessage) {
-        this("" +  detailMessage);
-    }
-
-    /**
-     * Constructs an AssertionError with its detail message derived
-     * from the specified <code>char</code>, which is converted to a
-     * string as defined in section 15.18.1.1 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * @param detailMessage value to be used in constructing detail message
-     */
-    public AssertionError(char detailMessage) {
-        this("" +  detailMessage);
-    }
-
-    /**
-     * Constructs an AssertionError with its detail message derived
-     * from the specified <code>int</code>, which is converted to a
-     * string as defined in section 15.18.1.1 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * @param detailMessage value to be used in constructing detail message
-     */
-    public AssertionError(int detailMessage) {
-        this("" +  detailMessage);
-    }
-
-    /**
-     * Constructs an AssertionError with its detail message derived
-     * from the specified <code>long</code>, which is converted to a
-     * string as defined in section 15.18.1.1 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * @param detailMessage value to be used in constructing detail message
-     */
-    public AssertionError(long detailMessage) {
-        this("" +  detailMessage);
-    }
-
-    /**
-     * Constructs an AssertionError with its detail message derived
-     * from the specified <code>float</code>, which is converted to a
-     * string as defined in section 15.18.1.1 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * @param detailMessage value to be used in constructing detail message
-     */
-    public AssertionError(float detailMessage) {
-        this("" +  detailMessage);
-    }
-
-    /**
-     * Constructs an AssertionError with its detail message derived
-     * from the specified <code>double</code>, which is converted to a
-     * string as defined in section 15.18.1.1 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * @param detailMessage value to be used in constructing detail message
-     */
-    public AssertionError(double detailMessage) {
-        this("" +  detailMessage);
-    }
-
-    /**
-     * Constructs a new {@code AssertionError} with the specified
-     * detail message and cause.
-     *
-     * <p>Note that the detail message associated with
-     * {@code cause} is <i>not</i> automatically incorporated in
-     * this error's detail message.
-     *
-     * @param  message the detail message, may be {@code null}
-     * @param  cause the cause, may be {@code null}
-     *
-     * @since 1.7
-     */
-    public AssertionError(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/AutoCloseable.java
--- a/emul/mini/src/main/java/java/lang/AutoCloseable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * A resource that must be closed when it is no longer needed.
- *
- * @author Josh Bloch
- * @since 1.7
- */
-public interface AutoCloseable {
-    /**
-     * Closes this resource, relinquishing any underlying resources.
-     * This method is invoked automatically on objects managed by the
-     * {@code try}-with-resources statement.
-     *
-     * <p>While this interface method is declared to throw {@code
-     * Exception}, implementers are <em>strongly</em> encouraged to
-     * declare concrete implementations of the {@code close} method to
-     * throw more specific exceptions, or to throw no exception at all
-     * if the close operation cannot fail.
-     *
-     * <p><em>Implementers of this interface are also strongly advised
-     * to not have the {@code close} method throw {@link
-     * InterruptedException}.</em>
-     *
-     * This exception interacts with a thread's interrupted status,
-     * and runtime misbehavior is likely to occur if an {@code
-     * InterruptedException} is {@linkplain Throwable#addSuppressed
-     * suppressed}.
-     *
-     * More generally, if it would cause problems for an
-     * exception to be suppressed, the {@code AutoCloseable.close}
-     * method should not throw it.
-     *
-     * <p>Note that unlike the {@link java.io.Closeable#close close}
-     * method of {@link java.io.Closeable}, this {@code close} method
-     * is <em>not</em> required to be idempotent.  In other words,
-     * calling this {@code close} method more than once may have some
-     * visible side effect, unlike {@code Closeable.close} which is
-     * required to have no effect if called more than once.
-     *
-     * However, implementers of this interface are strongly encouraged
-     * to make their {@code close} methods idempotent.
-     *
-     * @throws Exception if this resource cannot be closed
-     */
-    void close() throws Exception;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Boolean.java
--- a/emul/mini/src/main/java/java/lang/Boolean.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * The Boolean class wraps a value of the primitive type
- * {@code boolean} in an object. An object of type
- * {@code Boolean} contains a single field whose type is
- * {@code boolean}.
- * <p>
- * In addition, this class provides many methods for
- * converting a {@code boolean} to a {@code String} and a
- * {@code String} to a {@code boolean}, as well as other
- * constants and methods useful when dealing with a
- * {@code boolean}.
- *
- * @author  Arthur van Hoff
- * @since   JDK1.0
- */
-public final class Boolean implements java.io.Serializable,
-                                      Comparable<Boolean>
-{
-    /**
-     * The {@code Boolean} object corresponding to the primitive
-     * value {@code true}.
-     */
-    public static final Boolean TRUE = new Boolean(true);
-
-    /**
-     * The {@code Boolean} object corresponding to the primitive
-     * value {@code false}.
-     */
-    public static final Boolean FALSE = new Boolean(false);
-
-    /**
-     * The Class object representing the primitive type boolean.
-     *
-     * @since   JDK1.1
-     */
-    public static final Class<Boolean> TYPE = Class.getPrimitiveClass("boolean");
-
-    /**
-     * The value of the Boolean.
-     *
-     * @serial
-     */
-    private final boolean value;
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = -3665804199014368530L;
-
-    /**
-     * Allocates a {@code Boolean} object representing the
-     * {@code value} argument.
-     *
-     * <p><b>Note: It is rarely appropriate to use this constructor.
-     * Unless a <i>new</i> instance is required, the static factory
-     * {@link #valueOf(boolean)} is generally a better choice. It is
-     * likely to yield significantly better space and time performance.</b>
-     *
-     * @param   value   the value of the {@code Boolean}.
-     */
-    public Boolean(boolean value) {
-        this.value = value;
-    }
-
-    /**
-     * Allocates a {@code Boolean} object representing the value
-     * {@code true} if the string argument is not {@code null}
-     * and is equal, ignoring case, to the string {@code "true"}.
-     * Otherwise, allocate a {@code Boolean} object representing the
-     * value {@code false}. Examples:<p>
-     * {@code new Boolean("True")} produces a {@code Boolean} object
-     * that represents {@code true}.<br>
-     * {@code new Boolean("yes")} produces a {@code Boolean} object
-     * that represents {@code false}.
-     *
-     * @param   s   the string to be converted to a {@code Boolean}.
-     */
-    public Boolean(String s) {
-        this(toBoolean(s));
-    }
-
-    /**
-     * Parses the string argument as a boolean.  The {@code boolean}
-     * returned represents the value {@code true} if the string argument
-     * is not {@code null} and is equal, ignoring case, to the string
-     * {@code "true"}. <p>
-     * Example: {@code Boolean.parseBoolean("True")} returns {@code true}.<br>
-     * Example: {@code Boolean.parseBoolean("yes")} returns {@code false}.
-     *
-     * @param      s   the {@code String} containing the boolean
-     *                 representation to be parsed
-     * @return     the boolean represented by the string argument
-     * @since 1.5
-     */
-    public static boolean parseBoolean(String s) {
-        return toBoolean(s);
-    }
-
-    /**
-     * Returns the value of this {@code Boolean} object as a boolean
-     * primitive.
-     *
-     * @return  the primitive {@code boolean} value of this object.
-     */
-    public boolean booleanValue() {
-        return value;
-    }
-
-    /**
-     * Returns a {@code Boolean} instance representing the specified
-     * {@code boolean} value.  If the specified {@code boolean} value
-     * is {@code true}, this method returns {@code Boolean.TRUE};
-     * if it is {@code false}, this method returns {@code Boolean.FALSE}.
-     * If a new {@code Boolean} instance is not required, this method
-     * should generally be used in preference to the constructor
-     * {@link #Boolean(boolean)}, as this method is likely to yield
-     * significantly better space and time performance.
-     *
-     * @param  b a boolean value.
-     * @return a {@code Boolean} instance representing {@code b}.
-     * @since  1.4
-     */
-    public static Boolean valueOf(boolean b) {
-        return (b ? TRUE : FALSE);
-    }
-
-    /**
-     * Returns a {@code Boolean} with a value represented by the
-     * specified string.  The {@code Boolean} returned represents a
-     * true value if the string argument is not {@code null}
-     * and is equal, ignoring case, to the string {@code "true"}.
-     *
-     * @param   s   a string.
-     * @return  the {@code Boolean} value represented by the string.
-     */
-    public static Boolean valueOf(String s) {
-        return toBoolean(s) ? TRUE : FALSE;
-    }
-
-    /**
-     * Returns a {@code String} object representing the specified
-     * boolean.  If the specified boolean is {@code true}, then
-     * the string {@code "true"} will be returned, otherwise the
-     * string {@code "false"} will be returned.
-     *
-     * @param b the boolean to be converted
-     * @return the string representation of the specified {@code boolean}
-     * @since 1.4
-     */
-    public static String toString(boolean b) {
-        return b ? "true" : "false";
-    }
-
-    /**
-     * Returns a {@code String} object representing this Boolean's
-     * value.  If this object represents the value {@code true},
-     * a string equal to {@code "true"} is returned. Otherwise, a
-     * string equal to {@code "false"} is returned.
-     *
-     * @return  a string representation of this object.
-     */
-    public String toString() {
-        return value ? "true" : "false";
-    }
-
-    /**
-     * Returns a hash code for this {@code Boolean} object.
-     *
-     * @return  the integer {@code 1231} if this object represents
-     * {@code true}; returns the integer {@code 1237} if this
-     * object represents {@code false}.
-     */
-    public int hashCode() {
-        return value ? 1231 : 1237;
-    }
-
-    /**
-     * Returns {@code true} if and only if the argument is not
-     * {@code null} and is a {@code Boolean} object that
-     * represents the same {@code boolean} value as this object.
-     *
-     * @param   obj   the object to compare with.
-     * @return  {@code true} if the Boolean objects represent the
-     *          same value; {@code false} otherwise.
-     */
-    public boolean equals(Object obj) {
-        if (obj instanceof Boolean) {
-            return value == ((Boolean)obj).booleanValue();
-        }
-        return false;
-    }
-
-    /**
-     * Returns {@code true} if and only if the system property
-     * named by the argument exists and is equal to the string
-     * {@code "true"}. (Beginning with version 1.0.2 of the
-     * Java<small><sup>TM</sup></small> platform, the test of
-     * this string is case insensitive.) A system property is accessible
-     * through {@code getProperty}, a method defined by the
-     * {@code System} class.
-     * <p>
-     * If there is no property with the specified name, or if the specified
-     * name is empty or null, then {@code false} is returned.
-     *
-     * @param   name   the system property name.
-     * @return  the {@code boolean} value of the system property.
-     * @see     java.lang.System#getProperty(java.lang.String)
-     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
-     */
-    public static boolean getBoolean(String name) {
-        boolean result = false;
-        try {
-            result = toBoolean(AbstractStringBuilder.getProperty(name));
-        } catch (IllegalArgumentException e) {
-        } catch (NullPointerException e) {
-        }
-        return result;
-    }
-
-    /**
-     * Compares this {@code Boolean} instance with another.
-     *
-     * @param   b the {@code Boolean} instance to be compared
-     * @return  zero if this object represents the same boolean value as the
-     *          argument; a positive value if this object represents true
-     *          and the argument represents false; and a negative value if
-     *          this object represents false and the argument represents true
-     * @throws  NullPointerException if the argument is {@code null}
-     * @see     Comparable
-     * @since  1.5
-     */
-    public int compareTo(Boolean b) {
-        return compare(this.value, b.value);
-    }
-
-    /**
-     * Compares two {@code boolean} values.
-     * The value returned is identical to what would be returned by:
-     * <pre>
-     *    Boolean.valueOf(x).compareTo(Boolean.valueOf(y))
-     * </pre>
-     *
-     * @param  x the first {@code boolean} to compare
-     * @param  y the second {@code boolean} to compare
-     * @return the value {@code 0} if {@code x == y};
-     *         a value less than {@code 0} if {@code !x && y}; and
-     *         a value greater than {@code 0} if {@code x && !y}
-     * @since 1.7
-     */
-    public static int compare(boolean x, boolean y) {
-        return (x == y) ? 0 : (x ? 1 : -1);
-    }
-
-    private static boolean toBoolean(String name) {
-        return ((name != null) && name.equalsIgnoreCase("true"));
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Byte.java
--- a/emul/mini/src/main/java/java/lang/Byte.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,452 +0,0 @@
-/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- *
- * The {@code Byte} class wraps a value of primitive type {@code byte}
- * in an object.  An object of type {@code Byte} contains a single
- * field whose type is {@code byte}.
- *
- * <p>In addition, this class provides several methods for converting
- * a {@code byte} to a {@code String} and a {@code String} to a {@code
- * byte}, as well as other constants and methods useful when dealing
- * with a {@code byte}.
- *
- * @author  Nakul Saraiya
- * @author  Joseph D. Darcy
- * @see     java.lang.Number
- * @since   JDK1.1
- */
-public final class Byte extends Number implements Comparable<Byte> {
-
-    /**
-     * A constant holding the minimum value a {@code byte} can
-     * have, -2<sup>7</sup>.
-     */
-    public static final byte   MIN_VALUE = -128;
-
-    /**
-     * A constant holding the maximum value a {@code byte} can
-     * have, 2<sup>7</sup>-1.
-     */
-    public static final byte   MAX_VALUE = 127;
-
-    /**
-     * The {@code Class} instance representing the primitive type
-     * {@code byte}.
-     */
-    public static final Class<Byte>     TYPE = (Class<Byte>) Class.getPrimitiveClass("byte");
-
-    /**
-     * Returns a new {@code String} object representing the
-     * specified {@code byte}. The radix is assumed to be 10.
-     *
-     * @param b the {@code byte} to be converted
-     * @return the string representation of the specified {@code byte}
-     * @see java.lang.Integer#toString(int)
-     */
-    public static String toString(byte b) {
-        return Integer.toString((int)b, 10);
-    }
-
-    private static class ByteCache {
-        private ByteCache(){}
-
-        static final Byte cache[] = new Byte[-(-128) + 127 + 1];
-
-        static {
-            for(int i = 0; i < cache.length; i++)
-                cache[i] = new Byte((byte)(i - 128));
-        }
-    }
-
-    /**
-     * Returns a {@code Byte} instance representing the specified
-     * {@code byte} value.
-     * If a new {@code Byte} instance is not required, this method
-     * should generally be used in preference to the constructor
-     * {@link #Byte(byte)}, as this method is likely to yield
-     * significantly better space and time performance since
-     * all byte values are cached.
-     *
-     * @param  b a byte value.
-     * @return a {@code Byte} instance representing {@code b}.
-     * @since  1.5
-     */
-    public static Byte valueOf(byte b) {
-        final int offset = 128;
-        return ByteCache.cache[(int)b + offset];
-    }
-
-    /**
-     * Parses the string argument as a signed {@code byte} in the
-     * radix specified by the second argument. The characters in the
-     * string must all be digits, of the specified radix (as
-     * determined by whether {@link java.lang.Character#digit(char,
-     * int)} returns a nonnegative value) except that the first
-     * character may be an ASCII minus sign {@code '-'}
-     * (<code>'&#92;u002D'</code>) to indicate a negative value or an
-     * ASCII plus sign {@code '+'} (<code>'&#92;u002B'</code>) to
-     * indicate a positive value.  The resulting {@code byte} value is
-     * returned.
-     *
-     * <p>An exception of type {@code NumberFormatException} is
-     * thrown if any of the following situations occurs:
-     * <ul>
-     * <li> The first argument is {@code null} or is a string of
-     * length zero.
-     *
-     * <li> The radix is either smaller than {@link
-     * java.lang.Character#MIN_RADIX} or larger than {@link
-     * java.lang.Character#MAX_RADIX}.
-     *
-     * <li> Any character of the string is not a digit of the
-     * specified radix, except that the first character may be a minus
-     * sign {@code '-'} (<code>'&#92;u002D'</code>) or plus sign
-     * {@code '+'} (<code>'&#92;u002B'</code>) provided that the
-     * string is longer than length 1.
-     *
-     * <li> The value represented by the string is not a value of type
-     * {@code byte}.
-     * </ul>
-     *
-     * @param s         the {@code String} containing the
-     *                  {@code byte}
-     *                  representation to be parsed
-     * @param radix     the radix to be used while parsing {@code s}
-     * @return          the {@code byte} value represented by the string
-     *                   argument in the specified radix
-     * @throws          NumberFormatException If the string does
-     *                  not contain a parsable {@code byte}.
-     */
-    public static byte parseByte(String s, int radix)
-        throws NumberFormatException {
-        int i = Integer.parseInt(s, radix);
-        if (i < MIN_VALUE || i > MAX_VALUE)
-            throw new NumberFormatException(
-                "Value out of range. Value:\"" + s + "\" Radix:" + radix);
-        return (byte)i;
-    }
-
-    /**
-     * Parses the string argument as a signed decimal {@code
-     * byte}. The characters in the string must all be decimal digits,
-     * except that the first character may be an ASCII minus sign
-     * {@code '-'} (<code>'&#92;u002D'</code>) to indicate a negative
-     * value or an ASCII plus sign {@code '+'}
-     * (<code>'&#92;u002B'</code>) to indicate a positive value. The
-     * resulting {@code byte} value is returned, exactly as if the
-     * argument and the radix 10 were given as arguments to the {@link
-     * #parseByte(java.lang.String, int)} method.
-     *
-     * @param s         a {@code String} containing the
-     *                  {@code byte} representation to be parsed
-     * @return          the {@code byte} value represented by the
-     *                  argument in decimal
-     * @throws          NumberFormatException if the string does not
-     *                  contain a parsable {@code byte}.
-     */
-    public static byte parseByte(String s) throws NumberFormatException {
-        return parseByte(s, 10);
-    }
-
-    /**
-     * Returns a {@code Byte} object holding the value
-     * extracted from the specified {@code String} when parsed
-     * with the radix given by the second argument. The first argument
-     * is interpreted as representing a signed {@code byte} in
-     * the radix specified by the second argument, exactly as if the
-     * argument were given to the {@link #parseByte(java.lang.String,
-     * int)} method. The result is a {@code Byte} object that
-     * represents the {@code byte} value specified by the string.
-     *
-     * <p> In other words, this method returns a {@code Byte} object
-     * equal to the value of:
-     *
-     * <blockquote>
-     * {@code new Byte(Byte.parseByte(s, radix))}
-     * </blockquote>
-     *
-     * @param s         the string to be parsed
-     * @param radix     the radix to be used in interpreting {@code s}
-     * @return          a {@code Byte} object holding the value
-     *                  represented by the string argument in the
-     *                  specified radix.
-     * @throws          NumberFormatException If the {@code String} does
-     *                  not contain a parsable {@code byte}.
-     */
-    public static Byte valueOf(String s, int radix)
-        throws NumberFormatException {
-        return valueOf(parseByte(s, radix));
-    }
-
-    /**
-     * Returns a {@code Byte} object holding the value
-     * given by the specified {@code String}. The argument is
-     * interpreted as representing a signed decimal {@code byte},
-     * exactly as if the argument were given to the {@link
-     * #parseByte(java.lang.String)} method. The result is a
-     * {@code Byte} object that represents the {@code byte}
-     * value specified by the string.
-     *
-     * <p> In other words, this method returns a {@code Byte} object
-     * equal to the value of:
-     *
-     * <blockquote>
-     * {@code new Byte(Byte.parseByte(s))}
-     * </blockquote>
-     *
-     * @param s         the string to be parsed
-     * @return          a {@code Byte} object holding the value
-     *                  represented by the string argument
-     * @throws          NumberFormatException If the {@code String} does
-     *                  not contain a parsable {@code byte}.
-     */
-    public static Byte valueOf(String s) throws NumberFormatException {
-        return valueOf(s, 10);
-    }
-
-    /**
-     * Decodes a {@code String} into a {@code Byte}.
-     * Accepts decimal, hexadecimal, and octal numbers given by
-     * the following grammar:
-     *
-     * <blockquote>
-     * <dl>
-     * <dt><i>DecodableString:</i>
-     * <dd><i>Sign<sub>opt</sub> DecimalNumeral</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0x} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i>
-     * <p>
-     * <dt><i>Sign:</i>
-     * <dd>{@code -}
-     * <dd>{@code +}
-     * </dl>
-     * </blockquote>
-     *
-     * <i>DecimalNumeral</i>, <i>HexDigits</i>, and <i>OctalDigits</i>
-     * are as defined in section 3.10.1 of
-     * <cite>The Java&trade; Language Specification</cite>,
-     * except that underscores are not accepted between digits.
-     *
-     * <p>The sequence of characters following an optional
-     * sign and/or radix specifier ("{@code 0x}", "{@code 0X}",
-     * "{@code #}", or leading zero) is parsed as by the {@code
-     * Byte.parseByte} method with the indicated radix (10, 16, or 8).
-     * This sequence of characters must represent a positive value or
-     * a {@link NumberFormatException} will be thrown.  The result is
-     * negated if first character of the specified {@code String} is
-     * the minus sign.  No whitespace characters are permitted in the
-     * {@code String}.
-     *
-     * @param     nm the {@code String} to decode.
-     * @return   a {@code Byte} object holding the {@code byte}
-     *          value represented by {@code nm}
-     * @throws  NumberFormatException  if the {@code String} does not
-     *            contain a parsable {@code byte}.
-     * @see java.lang.Byte#parseByte(java.lang.String, int)
-     */
-    public static Byte decode(String nm) throws NumberFormatException {
-        int i = Integer.decode(nm);
-        if (i < MIN_VALUE || i > MAX_VALUE)
-            throw new NumberFormatException(
-                    "Value " + i + " out of range from input " + nm);
-        return valueOf((byte)i);
-    }
-
-    /**
-     * The value of the {@code Byte}.
-     *
-     * @serial
-     */
-    private final byte value;
-
-    /**
-     * Constructs a newly allocated {@code Byte} object that
-     * represents the specified {@code byte} value.
-     *
-     * @param value     the value to be represented by the
-     *                  {@code Byte}.
-     */
-    public Byte(byte value) {
-        this.value = value;
-    }
-
-    /**
-     * Constructs a newly allocated {@code Byte} object that
-     * represents the {@code byte} value indicated by the
-     * {@code String} parameter. The string is converted to a
-     * {@code byte} value in exactly the manner used by the
-     * {@code parseByte} method for radix 10.
-     *
-     * @param s         the {@code String} to be converted to a
-     *                  {@code Byte}
-     * @throws           NumberFormatException If the {@code String}
-     *                  does not contain a parsable {@code byte}.
-     * @see        java.lang.Byte#parseByte(java.lang.String, int)
-     */
-    public Byte(String s) throws NumberFormatException {
-        this.value = parseByte(s, 10);
-    }
-
-    /**
-     * Returns the value of this {@code Byte} as a
-     * {@code byte}.
-     */
-    public byte byteValue() {
-        return value;
-    }
-
-    /**
-     * Returns the value of this {@code Byte} as a
-     * {@code short}.
-     */
-    public short shortValue() {
-        return (short)value;
-    }
-
-    /**
-     * Returns the value of this {@code Byte} as an
-     * {@code int}.
-     */
-    public int intValue() {
-        return (int)value;
-    }
-
-    /**
-     * Returns the value of this {@code Byte} as a
-     * {@code long}.
-     */
-    public long longValue() {
-        return (long)value;
-    }
-
-    /**
-     * Returns the value of this {@code Byte} as a
-     * {@code float}.
-     */
-    public float floatValue() {
-        return (float)value;
-    }
-
-    /**
-     * Returns the value of this {@code Byte} as a
-     * {@code double}.
-     */
-    public double doubleValue() {
-        return (double)value;
-    }
-
-    /**
-     * Returns a {@code String} object representing this
-     * {@code Byte}'s value.  The value is converted to signed
-     * decimal representation and returned as a string, exactly as if
-     * the {@code byte} value were given as an argument to the
-     * {@link java.lang.Byte#toString(byte)} method.
-     *
-     * @return  a string representation of the value of this object in
-     *          base&nbsp;10.
-     */
-    public String toString() {
-        return Integer.toString((int)value);
-    }
-
-    /**
-     * Returns a hash code for this {@code Byte}; equal to the result
-     * of invoking {@code intValue()}.
-     *
-     * @return a hash code value for this {@code Byte}
-     */
-    public int hashCode() {
-        return (int)value;
-    }
-
-    /**
-     * Compares this object to the specified object.  The result is
-     * {@code true} if and only if the argument is not
-     * {@code null} and is a {@code Byte} object that
-     * contains the same {@code byte} value as this object.
-     *
-     * @param obj       the object to compare with
-     * @return          {@code true} if the objects are the same;
-     *                  {@code false} otherwise.
-     */
-    public boolean equals(Object obj) {
-        if (obj instanceof Byte) {
-            return value == ((Byte)obj).byteValue();
-        }
-        return false;
-    }
-
-    /**
-     * Compares two {@code Byte} objects numerically.
-     *
-     * @param   anotherByte   the {@code Byte} to be compared.
-     * @return  the value {@code 0} if this {@code Byte} is
-     *          equal to the argument {@code Byte}; a value less than
-     *          {@code 0} if this {@code Byte} is numerically less
-     *          than the argument {@code Byte}; and a value greater than
-     *           {@code 0} if this {@code Byte} is numerically
-     *           greater than the argument {@code Byte} (signed
-     *           comparison).
-     * @since   1.2
-     */
-    public int compareTo(Byte anotherByte) {
-        return compare(this.value, anotherByte.value);
-    }
-
-    /**
-     * Compares two {@code byte} values numerically.
-     * The value returned is identical to what would be returned by:
-     * <pre>
-     *    Byte.valueOf(x).compareTo(Byte.valueOf(y))
-     * </pre>
-     *
-     * @param  x the first {@code byte} to compare
-     * @param  y the second {@code byte} to compare
-     * @return the value {@code 0} if {@code x == y};
-     *         a value less than {@code 0} if {@code x < y}; and
-     *         a value greater than {@code 0} if {@code x > y}
-     * @since 1.7
-     */
-    public static int compare(byte x, byte y) {
-        return x - y;
-    }
-
-    /**
-     * The number of bits used to represent a {@code byte} value in two's
-     * complement binary form.
-     *
-     * @since 1.5
-     */
-    public static final int SIZE = 8;
-
-    /** use serialVersionUID from JDK 1.1. for interoperability */
-    private static final long serialVersionUID = -7183698231559129828L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/CharSequence.java
--- a/emul/mini/src/main/java/java/lang/CharSequence.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-
-/**
- * A <tt>CharSequence</tt> is a readable sequence of <code>char</code> values. This
- * interface provides uniform, read-only access to many different kinds of
- * <code>char</code> sequences.
- * A <code>char</code> value represents a character in the <i>Basic
- * Multilingual Plane (BMP)</i> or a surrogate. Refer to <a
- * href="Character.html#unicode">Unicode Character Representation</a> for details.
- *
- * <p> This interface does not refine the general contracts of the {@link
- * java.lang.Object#equals(java.lang.Object) equals} and {@link
- * java.lang.Object#hashCode() hashCode} methods.  The result of comparing two
- * objects that implement <tt>CharSequence</tt> is therefore, in general,
- * undefined.  Each object may be implemented by a different class, and there
- * is no guarantee that each class will be capable of testing its instances
- * for equality with those of the other.  It is therefore inappropriate to use
- * arbitrary <tt>CharSequence</tt> instances as elements in a set or as keys in
- * a map. </p>
- *
- * @author Mike McCloskey
- * @since 1.4
- * @spec JSR-51
- */
-
-public interface CharSequence {
-
-    /**
-     * Returns the length of this character sequence.  The length is the number
-     * of 16-bit <code>char</code>s in the sequence.</p>
-     *
-     * @return  the number of <code>char</code>s in this sequence
-     */
-    int length();
-
-    /**
-     * Returns the <code>char</code> value at the specified index.  An index ranges from zero
-     * to <tt>length() - 1</tt>.  The first <code>char</code> value of the sequence is at
-     * index zero, the next at index one, and so on, as for array
-     * indexing. </p>
-     *
-     * <p>If the <code>char</code> value specified by the index is a
-     * <a href="{@docRoot}/java/lang/Character.html#unicode">surrogate</a>, the surrogate
-     * value is returned.
-     *
-     * @param   index   the index of the <code>char</code> value to be returned
-     *
-     * @return  the specified <code>char</code> value
-     *
-     * @throws  IndexOutOfBoundsException
-     *          if the <tt>index</tt> argument is negative or not less than
-     *          <tt>length()</tt>
-     */
-    char charAt(int index);
-
-    /**
-     * Returns a new <code>CharSequence</code> that is a subsequence of this sequence.
-     * The subsequence starts with the <code>char</code> value at the specified index and
-     * ends with the <code>char</code> value at index <tt>end - 1</tt>.  The length
-     * (in <code>char</code>s) of the
-     * returned sequence is <tt>end - start</tt>, so if <tt>start == end</tt>
-     * then an empty sequence is returned. </p>
-     *
-     * @param   start   the start index, inclusive
-     * @param   end     the end index, exclusive
-     *
-     * @return  the specified subsequence
-     *
-     * @throws  IndexOutOfBoundsException
-     *          if <tt>start</tt> or <tt>end</tt> are negative,
-     *          if <tt>end</tt> is greater than <tt>length()</tt>,
-     *          or if <tt>start</tt> is greater than <tt>end</tt>
-     */
-    CharSequence subSequence(int start, int end);
-
-    /**
-     * Returns a string containing the characters in this sequence in the same
-     * order as this sequence.  The length of the string will be the length of
-     * this sequence. </p>
-     *
-     * @return  a string consisting of exactly this sequence of characters
-     */
-    public String toString();
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Character.java
--- a/emul/mini/src/main/java/java/lang/Character.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2519 +0,0 @@
-/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- * The {@code Character} class wraps a value of the primitive
- * type {@code char} in an object. An object of type
- * {@code Character} contains a single field whose type is
- * {@code char}.
- * <p>
- * In addition, this class provides several methods for determining
- * a character's category (lowercase letter, digit, etc.) and for converting
- * characters from uppercase to lowercase and vice versa.
- * <p>
- * Character information is based on the Unicode Standard, version 6.0.0.
- * <p>
- * The methods and data of class {@code Character} are defined by
- * the information in the <i>UnicodeData</i> file that is part of the
- * Unicode Character Database maintained by the Unicode
- * Consortium. This file specifies various properties including name
- * and general category for every defined Unicode code point or
- * character range.
- * <p>
- * The file and its description are available from the Unicode Consortium at:
- * <ul>
- * <li><a href="http://www.unicode.org">http://www.unicode.org</a>
- * </ul>
- *
- * <h4><a name="unicode">Unicode Character Representations</a></h4>
- *
- * <p>The {@code char} data type (and therefore the value that a
- * {@code Character} object encapsulates) are based on the
- * original Unicode specification, which defined characters as
- * fixed-width 16-bit entities. The Unicode Standard has since been
- * changed to allow for characters whose representation requires more
- * than 16 bits.  The range of legal <em>code point</em>s is now
- * U+0000 to U+10FFFF, known as <em>Unicode scalar value</em>.
- * (Refer to the <a
- * href="http://www.unicode.org/reports/tr27/#notation"><i>
- * definition</i></a> of the U+<i>n</i> notation in the Unicode
- * Standard.)
- *
- * <p><a name="BMP">The set of characters from U+0000 to U+FFFF is
- * sometimes referred to as the <em>Basic Multilingual Plane (BMP)</em>.
- * <a name="supplementary">Characters</a> whose code points are greater
- * than U+FFFF are called <em>supplementary character</em>s.  The Java
- * platform uses the UTF-16 representation in {@code char} arrays and
- * in the {@code String} and {@code StringBuffer} classes. In
- * this representation, supplementary characters are represented as a pair
- * of {@code char} values, the first from the <em>high-surrogates</em>
- * range, (&#92;uD800-&#92;uDBFF), the second from the
- * <em>low-surrogates</em> range (&#92;uDC00-&#92;uDFFF).
- *
- * <p>A {@code char} value, therefore, represents Basic
- * Multilingual Plane (BMP) code points, including the surrogate
- * code points, or code units of the UTF-16 encoding. An
- * {@code int} value represents all Unicode code points,
- * including supplementary code points. The lower (least significant)
- * 21 bits of {@code int} are used to represent Unicode code
- * points and the upper (most significant) 11 bits must be zero.
- * Unless otherwise specified, the behavior with respect to
- * supplementary characters and surrogate {@code char} values is
- * as follows:
- *
- * <ul>
- * <li>The methods that only accept a {@code char} value cannot support
- * supplementary characters. They treat {@code char} values from the
- * surrogate ranges as undefined characters. For example,
- * {@code Character.isLetter('\u005CuD840')} returns {@code false}, even though
- * this specific value if followed by any low-surrogate value in a string
- * would represent a letter.
- *
- * <li>The methods that accept an {@code int} value support all
- * Unicode characters, including supplementary characters. For
- * example, {@code Character.isLetter(0x2F81A)} returns
- * {@code true} because the code point value represents a letter
- * (a CJK ideograph).
- * </ul>
- *
- * <p>In the Java SE API documentation, <em>Unicode code point</em> is
- * used for character values in the range between U+0000 and U+10FFFF,
- * and <em>Unicode code unit</em> is used for 16-bit
- * {@code char} values that are code units of the <em>UTF-16</em>
- * encoding. For more information on Unicode terminology, refer to the
- * <a href="http://www.unicode.org/glossary/">Unicode Glossary</a>.
- *
- * @author  Lee Boynton
- * @author  Guy Steele
- * @author  Akira Tanaka
- * @author  Martin Buchholz
- * @author  Ulf Zibis
- * @since   1.0
- */
-public final
-class Character implements java.io.Serializable, Comparable<Character> {
-    /**
-     * The minimum radix available for conversion to and from strings.
-     * The constant value of this field is the smallest value permitted
-     * for the radix argument in radix-conversion methods such as the
-     * {@code digit} method, the {@code forDigit} method, and the
-     * {@code toString} method of class {@code Integer}.
-     *
-     * @see     Character#digit(char, int)
-     * @see     Character#forDigit(int, int)
-     * @see     Integer#toString(int, int)
-     * @see     Integer#valueOf(String)
-     */
-    public static final int MIN_RADIX = 2;
-
-    /**
-     * The maximum radix available for conversion to and from strings.
-     * The constant value of this field is the largest value permitted
-     * for the radix argument in radix-conversion methods such as the
-     * {@code digit} method, the {@code forDigit} method, and the
-     * {@code toString} method of class {@code Integer}.
-     *
-     * @see     Character#digit(char, int)
-     * @see     Character#forDigit(int, int)
-     * @see     Integer#toString(int, int)
-     * @see     Integer#valueOf(String)
-     */
-    public static final int MAX_RADIX = 36;
-
-    /**
-     * The constant value of this field is the smallest value of type
-     * {@code char}, {@code '\u005Cu0000'}.
-     *
-     * @since   1.0.2
-     */
-    public static final char MIN_VALUE = '\u0000';
-
-    /**
-     * The constant value of this field is the largest value of type
-     * {@code char}, {@code '\u005CuFFFF'}.
-     *
-     * @since   1.0.2
-     */
-    public static final char MAX_VALUE = '\uFFFF';
-
-    /**
-     * The {@code Class} instance representing the primitive type
-     * {@code char}.
-     *
-     * @since   1.1
-     */
-    public static final Class<Character> TYPE = Class.getPrimitiveClass("char");
-
-    /*
-     * Normative general types
-     */
-
-    /*
-     * General character types
-     */
-
-    /**
-     * General category "Cn" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte UNASSIGNED = 0;
-
-    /**
-     * General category "Lu" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte UPPERCASE_LETTER = 1;
-
-    /**
-     * General category "Ll" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte LOWERCASE_LETTER = 2;
-
-    /**
-     * General category "Lt" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte TITLECASE_LETTER = 3;
-
-    /**
-     * General category "Lm" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte MODIFIER_LETTER = 4;
-
-    /**
-     * General category "Lo" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte OTHER_LETTER = 5;
-
-    /**
-     * General category "Mn" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte NON_SPACING_MARK = 6;
-
-    /**
-     * General category "Me" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte ENCLOSING_MARK = 7;
-
-    /**
-     * General category "Mc" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte COMBINING_SPACING_MARK = 8;
-
-    /**
-     * General category "Nd" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte DECIMAL_DIGIT_NUMBER        = 9;
-
-    /**
-     * General category "Nl" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte LETTER_NUMBER = 10;
-
-    /**
-     * General category "No" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte OTHER_NUMBER = 11;
-
-    /**
-     * General category "Zs" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte SPACE_SEPARATOR = 12;
-
-    /**
-     * General category "Zl" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte LINE_SEPARATOR = 13;
-
-    /**
-     * General category "Zp" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte PARAGRAPH_SEPARATOR = 14;
-
-    /**
-     * General category "Cc" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte CONTROL = 15;
-
-    /**
-     * General category "Cf" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte FORMAT = 16;
-
-    /**
-     * General category "Co" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte PRIVATE_USE = 18;
-
-    /**
-     * General category "Cs" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte SURROGATE = 19;
-
-    /**
-     * General category "Pd" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte DASH_PUNCTUATION = 20;
-
-    /**
-     * General category "Ps" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte START_PUNCTUATION = 21;
-
-    /**
-     * General category "Pe" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte END_PUNCTUATION = 22;
-
-    /**
-     * General category "Pc" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte CONNECTOR_PUNCTUATION = 23;
-
-    /**
-     * General category "Po" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte OTHER_PUNCTUATION = 24;
-
-    /**
-     * General category "Sm" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte MATH_SYMBOL = 25;
-
-    /**
-     * General category "Sc" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte CURRENCY_SYMBOL = 26;
-
-    /**
-     * General category "Sk" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte MODIFIER_SYMBOL = 27;
-
-    /**
-     * General category "So" in the Unicode specification.
-     * @since   1.1
-     */
-    public static final byte OTHER_SYMBOL = 28;
-
-    /**
-     * General category "Pi" in the Unicode specification.
-     * @since   1.4
-     */
-    public static final byte INITIAL_QUOTE_PUNCTUATION = 29;
-
-    /**
-     * General category "Pf" in the Unicode specification.
-     * @since   1.4
-     */
-    public static final byte FINAL_QUOTE_PUNCTUATION = 30;
-
-    /**
-     * Error flag. Use int (code point) to avoid confusion with U+FFFF.
-     */
-    static final int ERROR = 0xFFFFFFFF;
-
-
-    /**
-     * Undefined bidirectional character type. Undefined {@code char}
-     * values have undefined directionality in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_UNDEFINED = -1;
-
-    /**
-     * Strong bidirectional character type "L" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT = 0;
-
-    /**
-     * Strong bidirectional character type "R" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = 1;
-
-    /**
-    * Strong bidirectional character type "AL" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 2;
-
-    /**
-     * Weak bidirectional character type "EN" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER = 3;
-
-    /**
-     * Weak bidirectional character type "ES" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = 4;
-
-    /**
-     * Weak bidirectional character type "ET" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = 5;
-
-    /**
-     * Weak bidirectional character type "AN" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_ARABIC_NUMBER = 6;
-
-    /**
-     * Weak bidirectional character type "CS" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = 7;
-
-    /**
-     * Weak bidirectional character type "NSM" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_NONSPACING_MARK = 8;
-
-    /**
-     * Weak bidirectional character type "BN" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_BOUNDARY_NEUTRAL = 9;
-
-    /**
-     * Neutral bidirectional character type "B" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_PARAGRAPH_SEPARATOR = 10;
-
-    /**
-     * Neutral bidirectional character type "S" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_SEGMENT_SEPARATOR = 11;
-
-    /**
-     * Neutral bidirectional character type "WS" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_WHITESPACE = 12;
-
-    /**
-     * Neutral bidirectional character type "ON" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_OTHER_NEUTRALS = 13;
-
-    /**
-     * Strong bidirectional character type "LRE" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = 14;
-
-    /**
-     * Strong bidirectional character type "LRO" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = 15;
-
-    /**
-     * Strong bidirectional character type "RLE" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 16;
-
-    /**
-     * Strong bidirectional character type "RLO" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 17;
-
-    /**
-     * Weak bidirectional character type "PDF" in the Unicode specification.
-     * @since 1.4
-     */
-    public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 18;
-
-    /**
-     * The minimum value of a
-     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
-     * Unicode high-surrogate code unit</a>
-     * in the UTF-16 encoding, constant {@code '\u005CuD800'}.
-     * A high-surrogate is also known as a <i>leading-surrogate</i>.
-     *
-     * @since 1.5
-     */
-    public static final char MIN_HIGH_SURROGATE = '\uD800';
-
-    /**
-     * The maximum value of a
-     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
-     * Unicode high-surrogate code unit</a>
-     * in the UTF-16 encoding, constant {@code '\u005CuDBFF'}.
-     * A high-surrogate is also known as a <i>leading-surrogate</i>.
-     *
-     * @since 1.5
-     */
-    public static final char MAX_HIGH_SURROGATE = '\uDBFF';
-
-    /**
-     * The minimum value of a
-     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
-     * Unicode low-surrogate code unit</a>
-     * in the UTF-16 encoding, constant {@code '\u005CuDC00'}.
-     * A low-surrogate is also known as a <i>trailing-surrogate</i>.
-     *
-     * @since 1.5
-     */
-    public static final char MIN_LOW_SURROGATE  = '\uDC00';
-
-    /**
-     * The maximum value of a
-     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
-     * Unicode low-surrogate code unit</a>
-     * in the UTF-16 encoding, constant {@code '\u005CuDFFF'}.
-     * A low-surrogate is also known as a <i>trailing-surrogate</i>.
-     *
-     * @since 1.5
-     */
-    public static final char MAX_LOW_SURROGATE  = '\uDFFF';
-
-    /**
-     * The minimum value of a Unicode surrogate code unit in the
-     * UTF-16 encoding, constant {@code '\u005CuD800'}.
-     *
-     * @since 1.5
-     */
-    public static final char MIN_SURROGATE = MIN_HIGH_SURROGATE;
-
-    /**
-     * The maximum value of a Unicode surrogate code unit in the
-     * UTF-16 encoding, constant {@code '\u005CuDFFF'}.
-     *
-     * @since 1.5
-     */
-    public static final char MAX_SURROGATE = MAX_LOW_SURROGATE;
-
-    /**
-     * The minimum value of a
-     * <a href="http://www.unicode.org/glossary/#supplementary_code_point">
-     * Unicode supplementary code point</a>, constant {@code U+10000}.
-     *
-     * @since 1.5
-     */
-    public static final int MIN_SUPPLEMENTARY_CODE_POINT = 0x010000;
-
-    /**
-     * The minimum value of a
-     * <a href="http://www.unicode.org/glossary/#code_point">
-     * Unicode code point</a>, constant {@code U+0000}.
-     *
-     * @since 1.5
-     */
-    public static final int MIN_CODE_POINT = 0x000000;
-
-    /**
-     * The maximum value of a
-     * <a href="http://www.unicode.org/glossary/#code_point">
-     * Unicode code point</a>, constant {@code U+10FFFF}.
-     *
-     * @since 1.5
-     */
-    public static final int MAX_CODE_POINT = 0X10FFFF;
-
-
-    /**
-     * Instances of this class represent particular subsets of the Unicode
-     * character set.  The only family of subsets defined in the
-     * {@code Character} class is {@link Character.UnicodeBlock}.
-     * Other portions of the Java API may define other subsets for their
-     * own purposes.
-     *
-     * @since 1.2
-     */
-    public static class Subset  {
-
-        private String name;
-
-        /**
-         * Constructs a new {@code Subset} instance.
-         *
-         * @param  name  The name of this subset
-         * @exception NullPointerException if name is {@code null}
-         */
-        protected Subset(String name) {
-            if (name == null) {
-                throw new NullPointerException("name");
-            }
-            this.name = name;
-        }
-
-        /**
-         * Compares two {@code Subset} objects for equality.
-         * This method returns {@code true} if and only if
-         * {@code this} and the argument refer to the same
-         * object; since this method is {@code final}, this
-         * guarantee holds for all subclasses.
-         */
-        public final boolean equals(Object obj) {
-            return (this == obj);
-        }
-
-        /**
-         * Returns the standard hash code as defined by the
-         * {@link Object#hashCode} method.  This method
-         * is {@code final} in order to ensure that the
-         * {@code equals} and {@code hashCode} methods will
-         * be consistent in all subclasses.
-         */
-        public final int hashCode() {
-            return super.hashCode();
-        }
-
-        /**
-         * Returns the name of this subset.
-         */
-        public final String toString() {
-            return name;
-        }
-    }
-
-    // See http://www.unicode.org/Public/UNIDATA/Blocks.txt
-    // for the latest specification of Unicode Blocks.
-
-
-    /**
-     * The value of the {@code Character}.
-     *
-     * @serial
-     */
-    private final char value;
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = 3786198910865385080L;
-
-    /**
-     * Constructs a newly allocated {@code Character} object that
-     * represents the specified {@code char} value.
-     *
-     * @param  value   the value to be represented by the
-     *                  {@code Character} object.
-     */
-    public Character(char value) {
-        this.value = value;
-    }
-
-    private static class CharacterCache {
-        private CharacterCache(){}
-
-        static final Character cache[] = new Character[127 + 1];
-
-        static {
-            for (int i = 0; i < cache.length; i++)
-                cache[i] = new Character((char)i);
-        }
-    }
-
-    /**
-     * Returns a <tt>Character</tt> instance representing the specified
-     * <tt>char</tt> value.
-     * If a new <tt>Character</tt> instance is not required, this method
-     * should generally be used in preference to the constructor
-     * {@link #Character(char)}, as this method is likely to yield
-     * significantly better space and time performance by caching
-     * frequently requested values.
-     *
-     * This method will always cache values in the range {@code
-     * '\u005Cu0000'} to {@code '\u005Cu007F'}, inclusive, and may
-     * cache other values outside of this range.
-     *
-     * @param  c a char value.
-     * @return a <tt>Character</tt> instance representing <tt>c</tt>.
-     * @since  1.5
-     */
-    public static Character valueOf(char c) {
-        if (c <= 127) { // must cache
-            return CharacterCache.cache[(int)c];
-        }
-        return new Character(c);
-    }
-
-    /**
-     * Returns the value of this {@code Character} object.
-     * @return  the primitive {@code char} value represented by
-     *          this object.
-     */
-    public char charValue() {
-        return value;
-    }
-
-    /**
-     * Returns a hash code for this {@code Character}; equal to the result
-     * of invoking {@code charValue()}.
-     *
-     * @return a hash code value for this {@code Character}
-     */
-    public int hashCode() {
-        return (int)value;
-    }
-
-    /**
-     * Compares this object against the specified object.
-     * The result is {@code true} if and only if the argument is not
-     * {@code null} and is a {@code Character} object that
-     * represents the same {@code char} value as this object.
-     *
-     * @param   obj   the object to compare with.
-     * @return  {@code true} if the objects are the same;
-     *          {@code false} otherwise.
-     */
-    public boolean equals(Object obj) {
-        if (obj instanceof Character) {
-            return value == ((Character)obj).charValue();
-        }
-        return false;
-    }
-
-    /**
-     * Returns a {@code String} object representing this
-     * {@code Character}'s value.  The result is a string of
-     * length 1 whose sole component is the primitive
-     * {@code char} value represented by this
-     * {@code Character} object.
-     *
-     * @return  a string representation of this object.
-     */
-    public String toString() {
-        char buf[] = {value};
-        return String.valueOf(buf);
-    }
-
-    /**
-     * Returns a {@code String} object representing the
-     * specified {@code char}.  The result is a string of length
-     * 1 consisting solely of the specified {@code char}.
-     *
-     * @param c the {@code char} to be converted
-     * @return the string representation of the specified {@code char}
-     * @since 1.4
-     */
-    public static String toString(char c) {
-        return String.valueOf(c);
-    }
-
-    /**
-     * Determines whether the specified code point is a valid
-     * <a href="http://www.unicode.org/glossary/#code_point">
-     * Unicode code point value</a>.
-     *
-     * @param  codePoint the Unicode code point to be tested
-     * @return {@code true} if the specified code point value is between
-     *         {@link #MIN_CODE_POINT} and
-     *         {@link #MAX_CODE_POINT} inclusive;
-     *         {@code false} otherwise.
-     * @since  1.5
-     */
-    public static boolean isValidCodePoint(int codePoint) {
-        // Optimized form of:
-        //     codePoint >= MIN_CODE_POINT && codePoint <= MAX_CODE_POINT
-        int plane = codePoint >>> 16;
-        return plane < ((MAX_CODE_POINT + 1) >>> 16);
-    }
-
-    /**
-     * Determines whether the specified character (Unicode code point)
-     * is in the <a href="#BMP">Basic Multilingual Plane (BMP)</a>.
-     * Such code points can be represented using a single {@code char}.
-     *
-     * @param  codePoint the character (Unicode code point) to be tested
-     * @return {@code true} if the specified code point is between
-     *         {@link #MIN_VALUE} and {@link #MAX_VALUE} inclusive;
-     *         {@code false} otherwise.
-     * @since  1.7
-     */
-    public static boolean isBmpCodePoint(int codePoint) {
-        return codePoint >>> 16 == 0;
-        // Optimized form of:
-        //     codePoint >= MIN_VALUE && codePoint <= MAX_VALUE
-        // We consistently use logical shift (>>>) to facilitate
-        // additional runtime optimizations.
-    }
-
-    /**
-     * Determines whether the specified character (Unicode code point)
-     * is in the <a href="#supplementary">supplementary character</a> range.
-     *
-     * @param  codePoint the character (Unicode code point) to be tested
-     * @return {@code true} if the specified code point is between
-     *         {@link #MIN_SUPPLEMENTARY_CODE_POINT} and
-     *         {@link #MAX_CODE_POINT} inclusive;
-     *         {@code false} otherwise.
-     * @since  1.5
-     */
-    public static boolean isSupplementaryCodePoint(int codePoint) {
-        return codePoint >= MIN_SUPPLEMENTARY_CODE_POINT
-            && codePoint <  MAX_CODE_POINT + 1;
-    }
-
-    /**
-     * Determines if the given {@code char} value is a
-     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
-     * Unicode high-surrogate code unit</a>
-     * (also known as <i>leading-surrogate code unit</i>).
-     *
-     * <p>Such values do not represent characters by themselves,
-     * but are used in the representation of
-     * <a href="#supplementary">supplementary characters</a>
-     * in the UTF-16 encoding.
-     *
-     * @param  ch the {@code char} value to be tested.
-     * @return {@code true} if the {@code char} value is between
-     *         {@link #MIN_HIGH_SURROGATE} and
-     *         {@link #MAX_HIGH_SURROGATE} inclusive;
-     *         {@code false} otherwise.
-     * @see    Character#isLowSurrogate(char)
-     * @see    Character.UnicodeBlock#of(int)
-     * @since  1.5
-     */
-    public static boolean isHighSurrogate(char ch) {
-        // Help VM constant-fold; MAX_HIGH_SURROGATE + 1 == MIN_LOW_SURROGATE
-        return ch >= MIN_HIGH_SURROGATE && ch < (MAX_HIGH_SURROGATE + 1);
-    }
-
-    /**
-     * Determines if the given {@code char} value is a
-     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
-     * Unicode low-surrogate code unit</a>
-     * (also known as <i>trailing-surrogate code unit</i>).
-     *
-     * <p>Such values do not represent characters by themselves,
-     * but are used in the representation of
-     * <a href="#supplementary">supplementary characters</a>
-     * in the UTF-16 encoding.
-     *
-     * @param  ch the {@code char} value to be tested.
-     * @return {@code true} if the {@code char} value is between
-     *         {@link #MIN_LOW_SURROGATE} and
-     *         {@link #MAX_LOW_SURROGATE} inclusive;
-     *         {@code false} otherwise.
-     * @see    Character#isHighSurrogate(char)
-     * @since  1.5
-     */
-    public static boolean isLowSurrogate(char ch) {
-        return ch >= MIN_LOW_SURROGATE && ch < (MAX_LOW_SURROGATE + 1);
-    }
-
-    /**
-     * Determines if the given {@code char} value is a Unicode
-     * <i>surrogate code unit</i>.
-     *
-     * <p>Such values do not represent characters by themselves,
-     * but are used in the representation of
-     * <a href="#supplementary">supplementary characters</a>
-     * in the UTF-16 encoding.
-     *
-     * <p>A char value is a surrogate code unit if and only if it is either
-     * a {@linkplain #isLowSurrogate(char) low-surrogate code unit} or
-     * a {@linkplain #isHighSurrogate(char) high-surrogate code unit}.
-     *
-     * @param  ch the {@code char} value to be tested.
-     * @return {@code true} if the {@code char} value is between
-     *         {@link #MIN_SURROGATE} and
-     *         {@link #MAX_SURROGATE} inclusive;
-     *         {@code false} otherwise.
-     * @since  1.7
-     */
-    public static boolean isSurrogate(char ch) {
-        return ch >= MIN_SURROGATE && ch < (MAX_SURROGATE + 1);
-    }
-
-    /**
-     * Determines whether the specified pair of {@code char}
-     * values is a valid
-     * <a href="http://www.unicode.org/glossary/#surrogate_pair">
-     * Unicode surrogate pair</a>.
-
-     * <p>This method is equivalent to the expression:
-     * <blockquote><pre>
-     * isHighSurrogate(high) && isLowSurrogate(low)
-     * </pre></blockquote>
-     *
-     * @param  high the high-surrogate code value to be tested
-     * @param  low the low-surrogate code value to be tested
-     * @return {@code true} if the specified high and
-     * low-surrogate code values represent a valid surrogate pair;
-     * {@code false} otherwise.
-     * @since  1.5
-     */
-    public static boolean isSurrogatePair(char high, char low) {
-        return isHighSurrogate(high) && isLowSurrogate(low);
-    }
-
-    /**
-     * Determines the number of {@code char} values needed to
-     * represent the specified character (Unicode code point). If the
-     * specified character is equal to or greater than 0x10000, then
-     * the method returns 2. Otherwise, the method returns 1.
-     *
-     * <p>This method doesn't validate the specified character to be a
-     * valid Unicode code point. The caller must validate the
-     * character value using {@link #isValidCodePoint(int) isValidCodePoint}
-     * if necessary.
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  2 if the character is a valid supplementary character; 1 otherwise.
-     * @see     Character#isSupplementaryCodePoint(int)
-     * @since   1.5
-     */
-    public static int charCount(int codePoint) {
-        return codePoint >= MIN_SUPPLEMENTARY_CODE_POINT ? 2 : 1;
-    }
-
-    /**
-     * Converts the specified surrogate pair to its supplementary code
-     * point value. This method does not validate the specified
-     * surrogate pair. The caller must validate it using {@link
-     * #isSurrogatePair(char, char) isSurrogatePair} if necessary.
-     *
-     * @param  high the high-surrogate code unit
-     * @param  low the low-surrogate code unit
-     * @return the supplementary code point composed from the
-     *         specified surrogate pair.
-     * @since  1.5
-     */
-    public static int toCodePoint(char high, char low) {
-        // Optimized form of:
-        // return ((high - MIN_HIGH_SURROGATE) << 10)
-        //         + (low - MIN_LOW_SURROGATE)
-        //         + MIN_SUPPLEMENTARY_CODE_POINT;
-        return ((high << 10) + low) + (MIN_SUPPLEMENTARY_CODE_POINT
-                                       - (MIN_HIGH_SURROGATE << 10)
-                                       - MIN_LOW_SURROGATE);
-    }
-
-    /**
-     * Returns the code point at the given index of the
-     * {@code CharSequence}. If the {@code char} value at
-     * the given index in the {@code CharSequence} is in the
-     * high-surrogate range, the following index is less than the
-     * length of the {@code CharSequence}, and the
-     * {@code char} value at the following index is in the
-     * low-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the {@code char} value at the given index is returned.
-     *
-     * @param seq a sequence of {@code char} values (Unicode code
-     * units)
-     * @param index the index to the {@code char} values (Unicode
-     * code units) in {@code seq} to be converted
-     * @return the Unicode code point at the given index
-     * @exception NullPointerException if {@code seq} is null.
-     * @exception IndexOutOfBoundsException if the value
-     * {@code index} is negative or not less than
-     * {@link CharSequence#length() seq.length()}.
-     * @since  1.5
-     */
-    public static int codePointAt(CharSequence seq, int index) {
-        char c1 = seq.charAt(index++);
-        if (isHighSurrogate(c1)) {
-            if (index < seq.length()) {
-                char c2 = seq.charAt(index);
-                if (isLowSurrogate(c2)) {
-                    return toCodePoint(c1, c2);
-                }
-            }
-        }
-        return c1;
-    }
-
-    /**
-     * Returns the code point at the given index of the
-     * {@code char} array. If the {@code char} value at
-     * the given index in the {@code char} array is in the
-     * high-surrogate range, the following index is less than the
-     * length of the {@code char} array, and the
-     * {@code char} value at the following index is in the
-     * low-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the {@code char} value at the given index is returned.
-     *
-     * @param a the {@code char} array
-     * @param index the index to the {@code char} values (Unicode
-     * code units) in the {@code char} array to be converted
-     * @return the Unicode code point at the given index
-     * @exception NullPointerException if {@code a} is null.
-     * @exception IndexOutOfBoundsException if the value
-     * {@code index} is negative or not less than
-     * the length of the {@code char} array.
-     * @since  1.5
-     */
-    public static int codePointAt(char[] a, int index) {
-        return codePointAtImpl(a, index, a.length);
-    }
-
-    /**
-     * Returns the code point at the given index of the
-     * {@code char} array, where only array elements with
-     * {@code index} less than {@code limit} can be used. If
-     * the {@code char} value at the given index in the
-     * {@code char} array is in the high-surrogate range, the
-     * following index is less than the {@code limit}, and the
-     * {@code char} value at the following index is in the
-     * low-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the {@code char} value at the given index is returned.
-     *
-     * @param a the {@code char} array
-     * @param index the index to the {@code char} values (Unicode
-     * code units) in the {@code char} array to be converted
-     * @param limit the index after the last array element that
-     * can be used in the {@code char} array
-     * @return the Unicode code point at the given index
-     * @exception NullPointerException if {@code a} is null.
-     * @exception IndexOutOfBoundsException if the {@code index}
-     * argument is negative or not less than the {@code limit}
-     * argument, or if the {@code limit} argument is negative or
-     * greater than the length of the {@code char} array.
-     * @since  1.5
-     */
-    public static int codePointAt(char[] a, int index, int limit) {
-        if (index >= limit || limit < 0 || limit > a.length) {
-            throw new IndexOutOfBoundsException();
-        }
-        return codePointAtImpl(a, index, limit);
-    }
-
-    // throws ArrayIndexOutofBoundsException if index out of bounds
-    static int codePointAtImpl(char[] a, int index, int limit) {
-        char c1 = a[index++];
-        if (isHighSurrogate(c1)) {
-            if (index < limit) {
-                char c2 = a[index];
-                if (isLowSurrogate(c2)) {
-                    return toCodePoint(c1, c2);
-                }
-            }
-        }
-        return c1;
-    }
-
-    /**
-     * Returns the code point preceding the given index of the
-     * {@code CharSequence}. If the {@code char} value at
-     * {@code (index - 1)} in the {@code CharSequence} is in
-     * the low-surrogate range, {@code (index - 2)} is not
-     * negative, and the {@code char} value at {@code (index - 2)}
-     * in the {@code CharSequence} is in the
-     * high-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the {@code char} value at {@code (index - 1)} is
-     * returned.
-     *
-     * @param seq the {@code CharSequence} instance
-     * @param index the index following the code point that should be returned
-     * @return the Unicode code point value before the given index.
-     * @exception NullPointerException if {@code seq} is null.
-     * @exception IndexOutOfBoundsException if the {@code index}
-     * argument is less than 1 or greater than {@link
-     * CharSequence#length() seq.length()}.
-     * @since  1.5
-     */
-    public static int codePointBefore(CharSequence seq, int index) {
-        char c2 = seq.charAt(--index);
-        if (isLowSurrogate(c2)) {
-            if (index > 0) {
-                char c1 = seq.charAt(--index);
-                if (isHighSurrogate(c1)) {
-                    return toCodePoint(c1, c2);
-                }
-            }
-        }
-        return c2;
-    }
-
-    /**
-     * Returns the code point preceding the given index of the
-     * {@code char} array. If the {@code char} value at
-     * {@code (index - 1)} in the {@code char} array is in
-     * the low-surrogate range, {@code (index - 2)} is not
-     * negative, and the {@code char} value at {@code (index - 2)}
-     * in the {@code char} array is in the
-     * high-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the {@code char} value at {@code (index - 1)} is
-     * returned.
-     *
-     * @param a the {@code char} array
-     * @param index the index following the code point that should be returned
-     * @return the Unicode code point value before the given index.
-     * @exception NullPointerException if {@code a} is null.
-     * @exception IndexOutOfBoundsException if the {@code index}
-     * argument is less than 1 or greater than the length of the
-     * {@code char} array
-     * @since  1.5
-     */
-    public static int codePointBefore(char[] a, int index) {
-        return codePointBeforeImpl(a, index, 0);
-    }
-
-    /**
-     * Returns the code point preceding the given index of the
-     * {@code char} array, where only array elements with
-     * {@code index} greater than or equal to {@code start}
-     * can be used. If the {@code char} value at {@code (index - 1)}
-     * in the {@code char} array is in the
-     * low-surrogate range, {@code (index - 2)} is not less than
-     * {@code start}, and the {@code char} value at
-     * {@code (index - 2)} in the {@code char} array is in
-     * the high-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the {@code char} value at {@code (index - 1)} is
-     * returned.
-     *
-     * @param a the {@code char} array
-     * @param index the index following the code point that should be returned
-     * @param start the index of the first array element in the
-     * {@code char} array
-     * @return the Unicode code point value before the given index.
-     * @exception NullPointerException if {@code a} is null.
-     * @exception IndexOutOfBoundsException if the {@code index}
-     * argument is not greater than the {@code start} argument or
-     * is greater than the length of the {@code char} array, or
-     * if the {@code start} argument is negative or not less than
-     * the length of the {@code char} array.
-     * @since  1.5
-     */
-    public static int codePointBefore(char[] a, int index, int start) {
-        if (index <= start || start < 0 || start >= a.length) {
-            throw new IndexOutOfBoundsException();
-        }
-        return codePointBeforeImpl(a, index, start);
-    }
-
-    // throws ArrayIndexOutofBoundsException if index-1 out of bounds
-    static int codePointBeforeImpl(char[] a, int index, int start) {
-        char c2 = a[--index];
-        if (isLowSurrogate(c2)) {
-            if (index > start) {
-                char c1 = a[--index];
-                if (isHighSurrogate(c1)) {
-                    return toCodePoint(c1, c2);
-                }
-            }
-        }
-        return c2;
-    }
-
-    /**
-     * Returns the leading surrogate (a
-     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
-     * high surrogate code unit</a>) of the
-     * <a href="http://www.unicode.org/glossary/#surrogate_pair">
-     * surrogate pair</a>
-     * representing the specified supplementary character (Unicode
-     * code point) in the UTF-16 encoding.  If the specified character
-     * is not a
-     * <a href="Character.html#supplementary">supplementary character</a>,
-     * an unspecified {@code char} is returned.
-     *
-     * <p>If
-     * {@link #isSupplementaryCodePoint isSupplementaryCodePoint(x)}
-     * is {@code true}, then
-     * {@link #isHighSurrogate isHighSurrogate}{@code (highSurrogate(x))} and
-     * {@link #toCodePoint toCodePoint}{@code (highSurrogate(x), }{@link #lowSurrogate lowSurrogate}{@code (x)) == x}
-     * are also always {@code true}.
-     *
-     * @param   codePoint a supplementary character (Unicode code point)
-     * @return  the leading surrogate code unit used to represent the
-     *          character in the UTF-16 encoding
-     * @since   1.7
-     */
-    public static char highSurrogate(int codePoint) {
-        return (char) ((codePoint >>> 10)
-            + (MIN_HIGH_SURROGATE - (MIN_SUPPLEMENTARY_CODE_POINT >>> 10)));
-    }
-
-    /**
-     * Returns the trailing surrogate (a
-     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
-     * low surrogate code unit</a>) of the
-     * <a href="http://www.unicode.org/glossary/#surrogate_pair">
-     * surrogate pair</a>
-     * representing the specified supplementary character (Unicode
-     * code point) in the UTF-16 encoding.  If the specified character
-     * is not a
-     * <a href="Character.html#supplementary">supplementary character</a>,
-     * an unspecified {@code char} is returned.
-     *
-     * <p>If
-     * {@link #isSupplementaryCodePoint isSupplementaryCodePoint(x)}
-     * is {@code true}, then
-     * {@link #isLowSurrogate isLowSurrogate}{@code (lowSurrogate(x))} and
-     * {@link #toCodePoint toCodePoint}{@code (}{@link #highSurrogate highSurrogate}{@code (x), lowSurrogate(x)) == x}
-     * are also always {@code true}.
-     *
-     * @param   codePoint a supplementary character (Unicode code point)
-     * @return  the trailing surrogate code unit used to represent the
-     *          character in the UTF-16 encoding
-     * @since   1.7
-     */
-    public static char lowSurrogate(int codePoint) {
-        return (char) ((codePoint & 0x3ff) + MIN_LOW_SURROGATE);
-    }
-
-    /**
-     * Converts the specified character (Unicode code point) to its
-     * UTF-16 representation. If the specified code point is a BMP
-     * (Basic Multilingual Plane or Plane 0) value, the same value is
-     * stored in {@code dst[dstIndex]}, and 1 is returned. If the
-     * specified code point is a supplementary character, its
-     * surrogate values are stored in {@code dst[dstIndex]}
-     * (high-surrogate) and {@code dst[dstIndex+1]}
-     * (low-surrogate), and 2 is returned.
-     *
-     * @param  codePoint the character (Unicode code point) to be converted.
-     * @param  dst an array of {@code char} in which the
-     * {@code codePoint}'s UTF-16 value is stored.
-     * @param dstIndex the start index into the {@code dst}
-     * array where the converted value is stored.
-     * @return 1 if the code point is a BMP code point, 2 if the
-     * code point is a supplementary code point.
-     * @exception IllegalArgumentException if the specified
-     * {@code codePoint} is not a valid Unicode code point.
-     * @exception NullPointerException if the specified {@code dst} is null.
-     * @exception IndexOutOfBoundsException if {@code dstIndex}
-     * is negative or not less than {@code dst.length}, or if
-     * {@code dst} at {@code dstIndex} doesn't have enough
-     * array element(s) to store the resulting {@code char}
-     * value(s). (If {@code dstIndex} is equal to
-     * {@code dst.length-1} and the specified
-     * {@code codePoint} is a supplementary character, the
-     * high-surrogate value is not stored in
-     * {@code dst[dstIndex]}.)
-     * @since  1.5
-     */
-    public static int toChars(int codePoint, char[] dst, int dstIndex) {
-        if (isBmpCodePoint(codePoint)) {
-            dst[dstIndex] = (char) codePoint;
-            return 1;
-        } else if (isValidCodePoint(codePoint)) {
-            toSurrogates(codePoint, dst, dstIndex);
-            return 2;
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    /**
-     * Converts the specified character (Unicode code point) to its
-     * UTF-16 representation stored in a {@code char} array. If
-     * the specified code point is a BMP (Basic Multilingual Plane or
-     * Plane 0) value, the resulting {@code char} array has
-     * the same value as {@code codePoint}. If the specified code
-     * point is a supplementary code point, the resulting
-     * {@code char} array has the corresponding surrogate pair.
-     *
-     * @param  codePoint a Unicode code point
-     * @return a {@code char} array having
-     *         {@code codePoint}'s UTF-16 representation.
-     * @exception IllegalArgumentException if the specified
-     * {@code codePoint} is not a valid Unicode code point.
-     * @since  1.5
-     */
-    public static char[] toChars(int codePoint) {
-        if (isBmpCodePoint(codePoint)) {
-            return new char[] { (char) codePoint };
-        } else if (isValidCodePoint(codePoint)) {
-            char[] result = new char[2];
-            toSurrogates(codePoint, result, 0);
-            return result;
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    static void toSurrogates(int codePoint, char[] dst, int index) {
-        // We write elements "backwards" to guarantee all-or-nothing
-        dst[index+1] = lowSurrogate(codePoint);
-        dst[index] = highSurrogate(codePoint);
-    }
-
-    /**
-     * Returns the number of Unicode code points in the text range of
-     * the specified char sequence. The text range begins at the
-     * specified {@code beginIndex} and extends to the
-     * {@code char} at index {@code endIndex - 1}. Thus the
-     * length (in {@code char}s) of the text range is
-     * {@code endIndex-beginIndex}. Unpaired surrogates within
-     * the text range count as one code point each.
-     *
-     * @param seq the char sequence
-     * @param beginIndex the index to the first {@code char} of
-     * the text range.
-     * @param endIndex the index after the last {@code char} of
-     * the text range.
-     * @return the number of Unicode code points in the specified text
-     * range
-     * @exception NullPointerException if {@code seq} is null.
-     * @exception IndexOutOfBoundsException if the
-     * {@code beginIndex} is negative, or {@code endIndex}
-     * is larger than the length of the given sequence, or
-     * {@code beginIndex} is larger than {@code endIndex}.
-     * @since  1.5
-     */
-    public static int codePointCount(CharSequence seq, int beginIndex, int endIndex) {
-        int length = seq.length();
-        if (beginIndex < 0 || endIndex > length || beginIndex > endIndex) {
-            throw new IndexOutOfBoundsException();
-        }
-        int n = endIndex - beginIndex;
-        for (int i = beginIndex; i < endIndex; ) {
-            if (isHighSurrogate(seq.charAt(i++)) && i < endIndex &&
-                isLowSurrogate(seq.charAt(i))) {
-                n--;
-                i++;
-            }
-        }
-        return n;
-    }
-
-    /**
-     * Returns the number of Unicode code points in a subarray of the
-     * {@code char} array argument. The {@code offset}
-     * argument is the index of the first {@code char} of the
-     * subarray and the {@code count} argument specifies the
-     * length of the subarray in {@code char}s. Unpaired
-     * surrogates within the subarray count as one code point each.
-     *
-     * @param a the {@code char} array
-     * @param offset the index of the first {@code char} in the
-     * given {@code char} array
-     * @param count the length of the subarray in {@code char}s
-     * @return the number of Unicode code points in the specified subarray
-     * @exception NullPointerException if {@code a} is null.
-     * @exception IndexOutOfBoundsException if {@code offset} or
-     * {@code count} is negative, or if {@code offset +
-     * count} is larger than the length of the given array.
-     * @since  1.5
-     */
-    public static int codePointCount(char[] a, int offset, int count) {
-        if (count > a.length - offset || offset < 0 || count < 0) {
-            throw new IndexOutOfBoundsException();
-        }
-        return codePointCountImpl(a, offset, count);
-    }
-
-    static int codePointCountImpl(char[] a, int offset, int count) {
-        int endIndex = offset + count;
-        int n = count;
-        for (int i = offset; i < endIndex; ) {
-            if (isHighSurrogate(a[i++]) && i < endIndex &&
-                isLowSurrogate(a[i])) {
-                n--;
-                i++;
-            }
-        }
-        return n;
-    }
-
-    /**
-     * Returns the index within the given char sequence that is offset
-     * from the given {@code index} by {@code codePointOffset}
-     * code points. Unpaired surrogates within the text range given by
-     * {@code index} and {@code codePointOffset} count as
-     * one code point each.
-     *
-     * @param seq the char sequence
-     * @param index the index to be offset
-     * @param codePointOffset the offset in code points
-     * @return the index within the char sequence
-     * @exception NullPointerException if {@code seq} is null.
-     * @exception IndexOutOfBoundsException if {@code index}
-     *   is negative or larger then the length of the char sequence,
-     *   or if {@code codePointOffset} is positive and the
-     *   subsequence starting with {@code index} has fewer than
-     *   {@code codePointOffset} code points, or if
-     *   {@code codePointOffset} is negative and the subsequence
-     *   before {@code index} has fewer than the absolute value
-     *   of {@code codePointOffset} code points.
-     * @since 1.5
-     */
-    public static int offsetByCodePoints(CharSequence seq, int index,
-                                         int codePointOffset) {
-        int length = seq.length();
-        if (index < 0 || index > length) {
-            throw new IndexOutOfBoundsException();
-        }
-
-        int x = index;
-        if (codePointOffset >= 0) {
-            int i;
-            for (i = 0; x < length && i < codePointOffset; i++) {
-                if (isHighSurrogate(seq.charAt(x++)) && x < length &&
-                    isLowSurrogate(seq.charAt(x))) {
-                    x++;
-                }
-            }
-            if (i < codePointOffset) {
-                throw new IndexOutOfBoundsException();
-            }
-        } else {
-            int i;
-            for (i = codePointOffset; x > 0 && i < 0; i++) {
-                if (isLowSurrogate(seq.charAt(--x)) && x > 0 &&
-                    isHighSurrogate(seq.charAt(x-1))) {
-                    x--;
-                }
-            }
-            if (i < 0) {
-                throw new IndexOutOfBoundsException();
-            }
-        }
-        return x;
-    }
-
-    /**
-     * Returns the index within the given {@code char} subarray
-     * that is offset from the given {@code index} by
-     * {@code codePointOffset} code points. The
-     * {@code start} and {@code count} arguments specify a
-     * subarray of the {@code char} array. Unpaired surrogates
-     * within the text range given by {@code index} and
-     * {@code codePointOffset} count as one code point each.
-     *
-     * @param a the {@code char} array
-     * @param start the index of the first {@code char} of the
-     * subarray
-     * @param count the length of the subarray in {@code char}s
-     * @param index the index to be offset
-     * @param codePointOffset the offset in code points
-     * @return the index within the subarray
-     * @exception NullPointerException if {@code a} is null.
-     * @exception IndexOutOfBoundsException
-     *   if {@code start} or {@code count} is negative,
-     *   or if {@code start + count} is larger than the length of
-     *   the given array,
-     *   or if {@code index} is less than {@code start} or
-     *   larger then {@code start + count},
-     *   or if {@code codePointOffset} is positive and the text range
-     *   starting with {@code index} and ending with {@code start + count - 1}
-     *   has fewer than {@code codePointOffset} code
-     *   points,
-     *   or if {@code codePointOffset} is negative and the text range
-     *   starting with {@code start} and ending with {@code index - 1}
-     *   has fewer than the absolute value of
-     *   {@code codePointOffset} code points.
-     * @since 1.5
-     */
-    public static int offsetByCodePoints(char[] a, int start, int count,
-                                         int index, int codePointOffset) {
-        if (count > a.length-start || start < 0 || count < 0
-            || index < start || index > start+count) {
-            throw new IndexOutOfBoundsException();
-        }
-        return offsetByCodePointsImpl(a, start, count, index, codePointOffset);
-    }
-
-    static int offsetByCodePointsImpl(char[]a, int start, int count,
-                                      int index, int codePointOffset) {
-        int x = index;
-        if (codePointOffset >= 0) {
-            int limit = start + count;
-            int i;
-            for (i = 0; x < limit && i < codePointOffset; i++) {
-                if (isHighSurrogate(a[x++]) && x < limit &&
-                    isLowSurrogate(a[x])) {
-                    x++;
-                }
-            }
-            if (i < codePointOffset) {
-                throw new IndexOutOfBoundsException();
-            }
-        } else {
-            int i;
-            for (i = codePointOffset; x > start && i < 0; i++) {
-                if (isLowSurrogate(a[--x]) && x > start &&
-                    isHighSurrogate(a[x-1])) {
-                    x--;
-                }
-            }
-            if (i < 0) {
-                throw new IndexOutOfBoundsException();
-            }
-        }
-        return x;
-    }
-
-    /**
-     * Determines if the specified character is a lowercase character.
-     * <p>
-     * A character is lowercase if its general category type, provided
-     * by {@code Character.getType(ch)}, is
-     * {@code LOWERCASE_LETTER}, or it has contributory property
-     * Other_Lowercase as defined by the Unicode Standard.
-     * <p>
-     * The following are examples of lowercase characters:
-     * <p><blockquote><pre>
-     * a b c d e f g h i j k l m n o p q r s t u v w x y z
-     * '&#92;u00DF' '&#92;u00E0' '&#92;u00E1' '&#92;u00E2' '&#92;u00E3' '&#92;u00E4' '&#92;u00E5' '&#92;u00E6'
-     * '&#92;u00E7' '&#92;u00E8' '&#92;u00E9' '&#92;u00EA' '&#92;u00EB' '&#92;u00EC' '&#92;u00ED' '&#92;u00EE'
-     * '&#92;u00EF' '&#92;u00F0' '&#92;u00F1' '&#92;u00F2' '&#92;u00F3' '&#92;u00F4' '&#92;u00F5' '&#92;u00F6'
-     * '&#92;u00F8' '&#92;u00F9' '&#92;u00FA' '&#92;u00FB' '&#92;u00FC' '&#92;u00FD' '&#92;u00FE' '&#92;u00FF'
-     * </pre></blockquote>
-     * <p> Many other Unicode characters are lowercase too.
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isLowerCase(int)} method.
-     *
-     * @param   ch   the character to be tested.
-     * @return  {@code true} if the character is lowercase;
-     *          {@code false} otherwise.
-     * @see     Character#isLowerCase(char)
-     * @see     Character#isTitleCase(char)
-     * @see     Character#toLowerCase(char)
-     * @see     Character#getType(char)
-     */
-    public static boolean isLowerCase(char ch) {
-        return ch == toLowerCase(ch);
-    }
-
-    /**
-     * Determines if the specified character is an uppercase character.
-     * <p>
-     * A character is uppercase if its general category type, provided by
-     * {@code Character.getType(ch)}, is {@code UPPERCASE_LETTER}.
-     * or it has contributory property Other_Uppercase as defined by the Unicode Standard.
-     * <p>
-     * The following are examples of uppercase characters:
-     * <p><blockquote><pre>
-     * A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-     * '&#92;u00C0' '&#92;u00C1' '&#92;u00C2' '&#92;u00C3' '&#92;u00C4' '&#92;u00C5' '&#92;u00C6' '&#92;u00C7'
-     * '&#92;u00C8' '&#92;u00C9' '&#92;u00CA' '&#92;u00CB' '&#92;u00CC' '&#92;u00CD' '&#92;u00CE' '&#92;u00CF'
-     * '&#92;u00D0' '&#92;u00D1' '&#92;u00D2' '&#92;u00D3' '&#92;u00D4' '&#92;u00D5' '&#92;u00D6' '&#92;u00D8'
-     * '&#92;u00D9' '&#92;u00DA' '&#92;u00DB' '&#92;u00DC' '&#92;u00DD' '&#92;u00DE'
-     * </pre></blockquote>
-     * <p> Many other Unicode characters are uppercase too.<p>
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isUpperCase(int)} method.
-     *
-     * @param   ch   the character to be tested.
-     * @return  {@code true} if the character is uppercase;
-     *          {@code false} otherwise.
-     * @see     Character#isLowerCase(char)
-     * @see     Character#isTitleCase(char)
-     * @see     Character#toUpperCase(char)
-     * @see     Character#getType(char)
-     * @since   1.0
-     */
-    public static boolean isUpperCase(char ch) {
-        return ch == toUpperCase(ch);
-    }
-
-    /**
-     * Determines if the specified character is a titlecase character.
-     * <p>
-     * A character is a titlecase character if its general
-     * category type, provided by {@code Character.getType(ch)},
-     * is {@code TITLECASE_LETTER}.
-     * <p>
-     * Some characters look like pairs of Latin letters. For example, there
-     * is an uppercase letter that looks like "LJ" and has a corresponding
-     * lowercase letter that looks like "lj". A third form, which looks like "Lj",
-     * is the appropriate form to use when rendering a word in lowercase
-     * with initial capitals, as for a book title.
-     * <p>
-     * These are some of the Unicode characters for which this method returns
-     * {@code true}:
-     * <ul>
-     * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON}
-     * <li>{@code LATIN CAPITAL LETTER L WITH SMALL LETTER J}
-     * <li>{@code LATIN CAPITAL LETTER N WITH SMALL LETTER J}
-     * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z}
-     * </ul>
-     * <p> Many other Unicode characters are titlecase too.<p>
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isTitleCase(int)} method.
-     *
-     * @param   ch   the character to be tested.
-     * @return  {@code true} if the character is titlecase;
-     *          {@code false} otherwise.
-     * @see     Character#isLowerCase(char)
-     * @see     Character#isUpperCase(char)
-     * @see     Character#toTitleCase(char)
-     * @see     Character#getType(char)
-     * @since   1.0.2
-     */
-    public static boolean isTitleCase(char ch) {
-        return isTitleCase((int)ch);
-    }
-
-    /**
-     * Determines if the specified character (Unicode code point) is a titlecase character.
-     * <p>
-     * A character is a titlecase character if its general
-     * category type, provided by {@link Character#getType(int) getType(codePoint)},
-     * is {@code TITLECASE_LETTER}.
-     * <p>
-     * Some characters look like pairs of Latin letters. For example, there
-     * is an uppercase letter that looks like "LJ" and has a corresponding
-     * lowercase letter that looks like "lj". A third form, which looks like "Lj",
-     * is the appropriate form to use when rendering a word in lowercase
-     * with initial capitals, as for a book title.
-     * <p>
-     * These are some of the Unicode characters for which this method returns
-     * {@code true}:
-     * <ul>
-     * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON}
-     * <li>{@code LATIN CAPITAL LETTER L WITH SMALL LETTER J}
-     * <li>{@code LATIN CAPITAL LETTER N WITH SMALL LETTER J}
-     * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z}
-     * </ul>
-     * <p> Many other Unicode characters are titlecase too.<p>
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  {@code true} if the character is titlecase;
-     *          {@code false} otherwise.
-     * @see     Character#isLowerCase(int)
-     * @see     Character#isUpperCase(int)
-     * @see     Character#toTitleCase(int)
-     * @see     Character#getType(int)
-     * @since   1.5
-     */
-    public static boolean isTitleCase(int codePoint) {
-        return getType(codePoint) == Character.TITLECASE_LETTER;
-    }
-
-    /**
-     * Determines if the specified character is a digit.
-     * <p>
-     * A character is a digit if its general category type, provided
-     * by {@code Character.getType(ch)}, is
-     * {@code DECIMAL_DIGIT_NUMBER}.
-     * <p>
-     * Some Unicode character ranges that contain digits:
-     * <ul>
-     * <li>{@code '\u005Cu0030'} through {@code '\u005Cu0039'},
-     *     ISO-LATIN-1 digits ({@code '0'} through {@code '9'})
-     * <li>{@code '\u005Cu0660'} through {@code '\u005Cu0669'},
-     *     Arabic-Indic digits
-     * <li>{@code '\u005Cu06F0'} through {@code '\u005Cu06F9'},
-     *     Extended Arabic-Indic digits
-     * <li>{@code '\u005Cu0966'} through {@code '\u005Cu096F'},
-     *     Devanagari digits
-     * <li>{@code '\u005CuFF10'} through {@code '\u005CuFF19'},
-     *     Fullwidth digits
-     * </ul>
-     *
-     * Many other character ranges contain digits as well.
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isDigit(int)} method.
-     *
-     * @param   ch   the character to be tested.
-     * @return  {@code true} if the character is a digit;
-     *          {@code false} otherwise.
-     * @see     Character#digit(char, int)
-     * @see     Character#forDigit(int, int)
-     * @see     Character#getType(char)
-     */
-    public static boolean isDigit(char ch) {
-        return String.valueOf(ch).matches("\\d");
-    }
-
-    /**
-     * Determines if the specified character (Unicode code point) is a digit.
-     * <p>
-     * A character is a digit if its general category type, provided
-     * by {@link Character#getType(int) getType(codePoint)}, is
-     * {@code DECIMAL_DIGIT_NUMBER}.
-     * <p>
-     * Some Unicode character ranges that contain digits:
-     * <ul>
-     * <li>{@code '\u005Cu0030'} through {@code '\u005Cu0039'},
-     *     ISO-LATIN-1 digits ({@code '0'} through {@code '9'})
-     * <li>{@code '\u005Cu0660'} through {@code '\u005Cu0669'},
-     *     Arabic-Indic digits
-     * <li>{@code '\u005Cu06F0'} through {@code '\u005Cu06F9'},
-     *     Extended Arabic-Indic digits
-     * <li>{@code '\u005Cu0966'} through {@code '\u005Cu096F'},
-     *     Devanagari digits
-     * <li>{@code '\u005CuFF10'} through {@code '\u005CuFF19'},
-     *     Fullwidth digits
-     * </ul>
-     *
-     * Many other character ranges contain digits as well.
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  {@code true} if the character is a digit;
-     *          {@code false} otherwise.
-     * @see     Character#forDigit(int, int)
-     * @see     Character#getType(int)
-     * @since   1.5
-     */
-    public static boolean isDigit(int codePoint) {
-        return fromCodeChars(codePoint).matches("\\d");
-    }
-    
-    @JavaScriptBody(args = "c", body = "return String.fromCharCode(c);")
-    private native static String fromCodeChars(int codePoint);
-
-    /**
-     * Determines if a character is defined in Unicode.
-     * <p>
-     * A character is defined if at least one of the following is true:
-     * <ul>
-     * <li>It has an entry in the UnicodeData file.
-     * <li>It has a value in a range defined by the UnicodeData file.
-     * </ul>
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isDefined(int)} method.
-     *
-     * @param   ch   the character to be tested
-     * @return  {@code true} if the character has a defined meaning
-     *          in Unicode; {@code false} otherwise.
-     * @see     Character#isDigit(char)
-     * @see     Character#isLetter(char)
-     * @see     Character#isLetterOrDigit(char)
-     * @see     Character#isLowerCase(char)
-     * @see     Character#isTitleCase(char)
-     * @see     Character#isUpperCase(char)
-     * @since   1.0.2
-     */
-    public static boolean isDefined(char ch) {
-        return isDefined((int)ch);
-    }
-
-    /**
-     * Determines if a character (Unicode code point) is defined in Unicode.
-     * <p>
-     * A character is defined if at least one of the following is true:
-     * <ul>
-     * <li>It has an entry in the UnicodeData file.
-     * <li>It has a value in a range defined by the UnicodeData file.
-     * </ul>
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  {@code true} if the character has a defined meaning
-     *          in Unicode; {@code false} otherwise.
-     * @see     Character#isDigit(int)
-     * @see     Character#isLetter(int)
-     * @see     Character#isLetterOrDigit(int)
-     * @see     Character#isLowerCase(int)
-     * @see     Character#isTitleCase(int)
-     * @see     Character#isUpperCase(int)
-     * @since   1.5
-     */
-    public static boolean isDefined(int codePoint) {
-        return getType(codePoint) != Character.UNASSIGNED;
-    }
-
-    /**
-     * Determines if the specified character is a letter.
-     * <p>
-     * A character is considered to be a letter if its general
-     * category type, provided by {@code Character.getType(ch)},
-     * is any of the following:
-     * <ul>
-     * <li> {@code UPPERCASE_LETTER}
-     * <li> {@code LOWERCASE_LETTER}
-     * <li> {@code TITLECASE_LETTER}
-     * <li> {@code MODIFIER_LETTER}
-     * <li> {@code OTHER_LETTER}
-     * </ul>
-     *
-     * Not all letters have case. Many characters are
-     * letters but are neither uppercase nor lowercase nor titlecase.
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isLetter(int)} method.
-     *
-     * @param   ch   the character to be tested.
-     * @return  {@code true} if the character is a letter;
-     *          {@code false} otherwise.
-     * @see     Character#isDigit(char)
-     * @see     Character#isJavaIdentifierStart(char)
-     * @see     Character#isJavaLetter(char)
-     * @see     Character#isJavaLetterOrDigit(char)
-     * @see     Character#isLetterOrDigit(char)
-     * @see     Character#isLowerCase(char)
-     * @see     Character#isTitleCase(char)
-     * @see     Character#isUnicodeIdentifierStart(char)
-     * @see     Character#isUpperCase(char)
-     */
-    public static boolean isLetter(char ch) {
-        return String.valueOf(ch).matches("\\w") && !isDigit(ch);
-    }
-
-    /**
-     * Determines if the specified character (Unicode code point) is a letter.
-     * <p>
-     * A character is considered to be a letter if its general
-     * category type, provided by {@link Character#getType(int) getType(codePoint)},
-     * is any of the following:
-     * <ul>
-     * <li> {@code UPPERCASE_LETTER}
-     * <li> {@code LOWERCASE_LETTER}
-     * <li> {@code TITLECASE_LETTER}
-     * <li> {@code MODIFIER_LETTER}
-     * <li> {@code OTHER_LETTER}
-     * </ul>
-     *
-     * Not all letters have case. Many characters are
-     * letters but are neither uppercase nor lowercase nor titlecase.
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  {@code true} if the character is a letter;
-     *          {@code false} otherwise.
-     * @see     Character#isDigit(int)
-     * @see     Character#isJavaIdentifierStart(int)
-     * @see     Character#isLetterOrDigit(int)
-     * @see     Character#isLowerCase(int)
-     * @see     Character#isTitleCase(int)
-     * @see     Character#isUnicodeIdentifierStart(int)
-     * @see     Character#isUpperCase(int)
-     * @since   1.5
-     */
-    public static boolean isLetter(int codePoint) {
-        return fromCodeChars(codePoint).matches("\\w") && !isDigit(codePoint);
-    }
-
-    /**
-     * Determines if the specified character is a letter or digit.
-     * <p>
-     * A character is considered to be a letter or digit if either
-     * {@code Character.isLetter(char ch)} or
-     * {@code Character.isDigit(char ch)} returns
-     * {@code true} for the character.
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isLetterOrDigit(int)} method.
-     *
-     * @param   ch   the character to be tested.
-     * @return  {@code true} if the character is a letter or digit;
-     *          {@code false} otherwise.
-     * @see     Character#isDigit(char)
-     * @see     Character#isJavaIdentifierPart(char)
-     * @see     Character#isJavaLetter(char)
-     * @see     Character#isJavaLetterOrDigit(char)
-     * @see     Character#isLetter(char)
-     * @see     Character#isUnicodeIdentifierPart(char)
-     * @since   1.0.2
-     */
-    public static boolean isLetterOrDigit(char ch) {
-        return String.valueOf(ch).matches("\\w");
-    }
-
-    /**
-     * Determines if the specified character (Unicode code point) is a letter or digit.
-     * <p>
-     * A character is considered to be a letter or digit if either
-     * {@link #isLetter(int) isLetter(codePoint)} or
-     * {@link #isDigit(int) isDigit(codePoint)} returns
-     * {@code true} for the character.
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  {@code true} if the character is a letter or digit;
-     *          {@code false} otherwise.
-     * @see     Character#isDigit(int)
-     * @see     Character#isJavaIdentifierPart(int)
-     * @see     Character#isLetter(int)
-     * @see     Character#isUnicodeIdentifierPart(int)
-     * @since   1.5
-     */
-    public static boolean isLetterOrDigit(int codePoint) {
-        return fromCodeChars(codePoint).matches("\\w");
-    }
-    
-    static int getType(int x) {
-        throw new UnsupportedOperationException();
-    }
- 
-    /**
-     * Determines if the specified character is
-     * permissible as the first character in a Java identifier.
-     * <p>
-     * A character may start a Java identifier if and only if
-     * one of the following conditions is true:
-     * <ul>
-     * <li> {@link #isLetter(char) isLetter(ch)} returns {@code true}
-     * <li> {@link #getType(char) getType(ch)} returns {@code LETTER_NUMBER}
-     * <li> {@code ch} is a currency symbol (such as {@code '$'})
-     * <li> {@code ch} is a connecting punctuation character (such as {@code '_'}).
-     * </ul>
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isJavaIdentifierStart(int)} method.
-     *
-     * @param   ch the character to be tested.
-     * @return  {@code true} if the character may start a Java identifier;
-     *          {@code false} otherwise.
-     * @see     Character#isJavaIdentifierPart(char)
-     * @see     Character#isLetter(char)
-     * @see     Character#isUnicodeIdentifierStart(char)
-     * @see     javax.lang.model.SourceVersion#isIdentifier(CharSequence)
-     * @since   1.1
-     */
-    public static boolean isJavaIdentifierStart(char ch) {
-        return isJavaIdentifierStart((int)ch);
-    }
-
-    /**
-     * Determines if the character (Unicode code point) is
-     * permissible as the first character in a Java identifier.
-     * <p>
-     * A character may start a Java identifier if and only if
-     * one of the following conditions is true:
-     * <ul>
-     * <li> {@link #isLetter(int) isLetter(codePoint)}
-     *      returns {@code true}
-     * <li> {@link #getType(int) getType(codePoint)}
-     *      returns {@code LETTER_NUMBER}
-     * <li> the referenced character is a currency symbol (such as {@code '$'})
-     * <li> the referenced character is a connecting punctuation character
-     *      (such as {@code '_'}).
-     * </ul>
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  {@code true} if the character may start a Java identifier;
-     *          {@code false} otherwise.
-     * @see     Character#isJavaIdentifierPart(int)
-     * @see     Character#isLetter(int)
-     * @see     Character#isUnicodeIdentifierStart(int)
-     * @see     javax.lang.model.SourceVersion#isIdentifier(CharSequence)
-     * @since   1.5
-     */
-    public static boolean isJavaIdentifierStart(int codePoint) {
-        return 
-            ('A' <= codePoint && codePoint <= 'Z') ||
-            ('a' <= codePoint && codePoint <= 'z');
-    }
-
-    /**
-     * Determines if the specified character may be part of a Java
-     * identifier as other than the first character.
-     * <p>
-     * A character may be part of a Java identifier if any of the following
-     * are true:
-     * <ul>
-     * <li>  it is a letter
-     * <li>  it is a currency symbol (such as {@code '$'})
-     * <li>  it is a connecting punctuation character (such as {@code '_'})
-     * <li>  it is a digit
-     * <li>  it is a numeric letter (such as a Roman numeral character)
-     * <li>  it is a combining mark
-     * <li>  it is a non-spacing mark
-     * <li> {@code isIdentifierIgnorable} returns
-     * {@code true} for the character
-     * </ul>
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isJavaIdentifierPart(int)} method.
-     *
-     * @param   ch      the character to be tested.
-     * @return {@code true} if the character may be part of a
-     *          Java identifier; {@code false} otherwise.
-     * @see     Character#isIdentifierIgnorable(char)
-     * @see     Character#isJavaIdentifierStart(char)
-     * @see     Character#isLetterOrDigit(char)
-     * @see     Character#isUnicodeIdentifierPart(char)
-     * @see     javax.lang.model.SourceVersion#isIdentifier(CharSequence)
-     * @since   1.1
-     */
-    public static boolean isJavaIdentifierPart(char ch) {
-        return isJavaIdentifierPart((int)ch);
-    }
-
-    /**
-     * Determines if the character (Unicode code point) may be part of a Java
-     * identifier as other than the first character.
-     * <p>
-     * A character may be part of a Java identifier if any of the following
-     * are true:
-     * <ul>
-     * <li>  it is a letter
-     * <li>  it is a currency symbol (such as {@code '$'})
-     * <li>  it is a connecting punctuation character (such as {@code '_'})
-     * <li>  it is a digit
-     * <li>  it is a numeric letter (such as a Roman numeral character)
-     * <li>  it is a combining mark
-     * <li>  it is a non-spacing mark
-     * <li> {@link #isIdentifierIgnorable(int)
-     * isIdentifierIgnorable(codePoint)} returns {@code true} for
-     * the character
-     * </ul>
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return {@code true} if the character may be part of a
-     *          Java identifier; {@code false} otherwise.
-     * @see     Character#isIdentifierIgnorable(int)
-     * @see     Character#isJavaIdentifierStart(int)
-     * @see     Character#isLetterOrDigit(int)
-     * @see     Character#isUnicodeIdentifierPart(int)
-     * @see     javax.lang.model.SourceVersion#isIdentifier(CharSequence)
-     * @since   1.5
-     */
-    public static boolean isJavaIdentifierPart(int codePoint) {
-        return isJavaIdentifierStart(codePoint) ||
-            ('0' <= codePoint && codePoint <= '9') || codePoint == '$';
-    }
-   
-    /**
-     * Converts the character argument to lowercase using case
-     * mapping information from the UnicodeData file.
-     * <p>
-     * Note that
-     * {@code Character.isLowerCase(Character.toLowerCase(ch))}
-     * does not always return {@code true} for some ranges of
-     * characters, particularly those that are symbols or ideographs.
-     *
-     * <p>In general, {@link String#toLowerCase()} should be used to map
-     * characters to lowercase. {@code String} case mapping methods
-     * have several benefits over {@code Character} case mapping methods.
-     * {@code String} case mapping methods can perform locale-sensitive
-     * mappings, context-sensitive mappings, and 1:M character mappings, whereas
-     * the {@code Character} case mapping methods cannot.
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #toLowerCase(int)} method.
-     *
-     * @param   ch   the character to be converted.
-     * @return  the lowercase equivalent of the character, if any;
-     *          otherwise, the character itself.
-     * @see     Character#isLowerCase(char)
-     * @see     String#toLowerCase()
-     */
-    public static char toLowerCase(char ch) {
-        return String.valueOf(ch).toLowerCase().charAt(0);
-    }
-
-    /**
-     * Converts the character argument to uppercase using case mapping
-     * information from the UnicodeData file.
-     * <p>
-     * Note that
-     * {@code Character.isUpperCase(Character.toUpperCase(ch))}
-     * does not always return {@code true} for some ranges of
-     * characters, particularly those that are symbols or ideographs.
-     *
-     * <p>In general, {@link String#toUpperCase()} should be used to map
-     * characters to uppercase. {@code String} case mapping methods
-     * have several benefits over {@code Character} case mapping methods.
-     * {@code String} case mapping methods can perform locale-sensitive
-     * mappings, context-sensitive mappings, and 1:M character mappings, whereas
-     * the {@code Character} case mapping methods cannot.
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #toUpperCase(int)} method.
-     *
-     * @param   ch   the character to be converted.
-     * @return  the uppercase equivalent of the character, if any;
-     *          otherwise, the character itself.
-     * @see     Character#isUpperCase(char)
-     * @see     String#toUpperCase()
-     */
-    public static char toUpperCase(char ch) {
-        return String.valueOf(ch).toUpperCase().charAt(0);
-    }
-
-    /**
-     * Returns the numeric value of the character {@code ch} in the
-     * specified radix.
-     * <p>
-     * If the radix is not in the range {@code MIN_RADIX} &le;
-     * {@code radix} &le; {@code MAX_RADIX} or if the
-     * value of {@code ch} is not a valid digit in the specified
-     * radix, {@code -1} is returned. A character is a valid digit
-     * if at least one of the following is true:
-     * <ul>
-     * <li>The method {@code isDigit} is {@code true} of the character
-     *     and the Unicode decimal digit value of the character (or its
-     *     single-character decomposition) is less than the specified radix.
-     *     In this case the decimal digit value is returned.
-     * <li>The character is one of the uppercase Latin letters
-     *     {@code 'A'} through {@code 'Z'} and its code is less than
-     *     {@code radix + 'A' - 10}.
-     *     In this case, {@code ch - 'A' + 10}
-     *     is returned.
-     * <li>The character is one of the lowercase Latin letters
-     *     {@code 'a'} through {@code 'z'} and its code is less than
-     *     {@code radix + 'a' - 10}.
-     *     In this case, {@code ch - 'a' + 10}
-     *     is returned.
-     * <li>The character is one of the fullwidth uppercase Latin letters A
-     *     ({@code '\u005CuFF21'}) through Z ({@code '\u005CuFF3A'})
-     *     and its code is less than
-     *     {@code radix + '\u005CuFF21' - 10}.
-     *     In this case, {@code ch - '\u005CuFF21' + 10}
-     *     is returned.
-     * <li>The character is one of the fullwidth lowercase Latin letters a
-     *     ({@code '\u005CuFF41'}) through z ({@code '\u005CuFF5A'})
-     *     and its code is less than
-     *     {@code radix + '\u005CuFF41' - 10}.
-     *     In this case, {@code ch - '\u005CuFF41' + 10}
-     *     is returned.
-     * </ul>
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #digit(int, int)} method.
-     *
-     * @param   ch      the character to be converted.
-     * @param   radix   the radix.
-     * @return  the numeric value represented by the character in the
-     *          specified radix.
-     * @see     Character#forDigit(int, int)
-     * @see     Character#isDigit(char)
-     */
-    public static int digit(char ch, int radix) {
-        return digit((int)ch, radix);
-    }
-
-    /**
-     * Returns the numeric value of the specified character (Unicode
-     * code point) in the specified radix.
-     *
-     * <p>If the radix is not in the range {@code MIN_RADIX} &le;
-     * {@code radix} &le; {@code MAX_RADIX} or if the
-     * character is not a valid digit in the specified
-     * radix, {@code -1} is returned. A character is a valid digit
-     * if at least one of the following is true:
-     * <ul>
-     * <li>The method {@link #isDigit(int) isDigit(codePoint)} is {@code true} of the character
-     *     and the Unicode decimal digit value of the character (or its
-     *     single-character decomposition) is less than the specified radix.
-     *     In this case the decimal digit value is returned.
-     * <li>The character is one of the uppercase Latin letters
-     *     {@code 'A'} through {@code 'Z'} and its code is less than
-     *     {@code radix + 'A' - 10}.
-     *     In this case, {@code codePoint - 'A' + 10}
-     *     is returned.
-     * <li>The character is one of the lowercase Latin letters
-     *     {@code 'a'} through {@code 'z'} and its code is less than
-     *     {@code radix + 'a' - 10}.
-     *     In this case, {@code codePoint - 'a' + 10}
-     *     is returned.
-     * <li>The character is one of the fullwidth uppercase Latin letters A
-     *     ({@code '\u005CuFF21'}) through Z ({@code '\u005CuFF3A'})
-     *     and its code is less than
-     *     {@code radix + '\u005CuFF21' - 10}.
-     *     In this case,
-     *     {@code codePoint - '\u005CuFF21' + 10}
-     *     is returned.
-     * <li>The character is one of the fullwidth lowercase Latin letters a
-     *     ({@code '\u005CuFF41'}) through z ({@code '\u005CuFF5A'})
-     *     and its code is less than
-     *     {@code radix + '\u005CuFF41'- 10}.
-     *     In this case,
-     *     {@code codePoint - '\u005CuFF41' + 10}
-     *     is returned.
-     * </ul>
-     *
-     * @param   codePoint the character (Unicode code point) to be converted.
-     * @param   radix   the radix.
-     * @return  the numeric value represented by the character in the
-     *          specified radix.
-     * @see     Character#forDigit(int, int)
-     * @see     Character#isDigit(int)
-     * @since   1.5
-     */
-    @JavaScriptBody(args = { "codePoint", "radix" }, body=
-        "var x = parseInt(String.fromCharCode(codePoint), radix);\n"
-      + "return isNaN(x) ? -1 : x;"
-    )
-    public static int digit(int codePoint, int radix) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the {@code int} value that the specified Unicode
-     * character represents. For example, the character
-     * {@code '\u005Cu216C'} (the roman numeral fifty) will return
-     * an int with a value of 50.
-     * <p>
-     * The letters A-Z in their uppercase ({@code '\u005Cu0041'} through
-     * {@code '\u005Cu005A'}), lowercase
-     * ({@code '\u005Cu0061'} through {@code '\u005Cu007A'}), and
-     * full width variant ({@code '\u005CuFF21'} through
-     * {@code '\u005CuFF3A'} and {@code '\u005CuFF41'} through
-     * {@code '\u005CuFF5A'}) forms have numeric values from 10
-     * through 35. This is independent of the Unicode specification,
-     * which does not assign numeric values to these {@code char}
-     * values.
-     * <p>
-     * If the character does not have a numeric value, then -1 is returned.
-     * If the character has a numeric value that cannot be represented as a
-     * nonnegative integer (for example, a fractional value), then -2
-     * is returned.
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #getNumericValue(int)} method.
-     *
-     * @param   ch      the character to be converted.
-     * @return  the numeric value of the character, as a nonnegative {@code int}
-     *           value; -2 if the character has a numeric value that is not a
-     *          nonnegative integer; -1 if the character has no numeric value.
-     * @see     Character#forDigit(int, int)
-     * @see     Character#isDigit(char)
-     * @since   1.1
-     */
-    public static int getNumericValue(char ch) {
-        return getNumericValue((int)ch);
-    }
-
-    /**
-     * Returns the {@code int} value that the specified
-     * character (Unicode code point) represents. For example, the character
-     * {@code '\u005Cu216C'} (the Roman numeral fifty) will return
-     * an {@code int} with a value of 50.
-     * <p>
-     * The letters A-Z in their uppercase ({@code '\u005Cu0041'} through
-     * {@code '\u005Cu005A'}), lowercase
-     * ({@code '\u005Cu0061'} through {@code '\u005Cu007A'}), and
-     * full width variant ({@code '\u005CuFF21'} through
-     * {@code '\u005CuFF3A'} and {@code '\u005CuFF41'} through
-     * {@code '\u005CuFF5A'}) forms have numeric values from 10
-     * through 35. This is independent of the Unicode specification,
-     * which does not assign numeric values to these {@code char}
-     * values.
-     * <p>
-     * If the character does not have a numeric value, then -1 is returned.
-     * If the character has a numeric value that cannot be represented as a
-     * nonnegative integer (for example, a fractional value), then -2
-     * is returned.
-     *
-     * @param   codePoint the character (Unicode code point) to be converted.
-     * @return  the numeric value of the character, as a nonnegative {@code int}
-     *          value; -2 if the character has a numeric value that is not a
-     *          nonnegative integer; -1 if the character has no numeric value.
-     * @see     Character#forDigit(int, int)
-     * @see     Character#isDigit(int)
-     * @since   1.5
-     */
-    public static int getNumericValue(int codePoint) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Determines if the specified character is ISO-LATIN-1 white space.
-     * This method returns {@code true} for the following five
-     * characters only:
-     * <table>
-     * <tr><td>{@code '\t'}</td>            <td>{@code U+0009}</td>
-     *     <td>{@code HORIZONTAL TABULATION}</td></tr>
-     * <tr><td>{@code '\n'}</td>            <td>{@code U+000A}</td>
-     *     <td>{@code NEW LINE}</td></tr>
-     * <tr><td>{@code '\f'}</td>            <td>{@code U+000C}</td>
-     *     <td>{@code FORM FEED}</td></tr>
-     * <tr><td>{@code '\r'}</td>            <td>{@code U+000D}</td>
-     *     <td>{@code CARRIAGE RETURN}</td></tr>
-     * <tr><td>{@code '&nbsp;'}</td>  <td>{@code U+0020}</td>
-     *     <td>{@code SPACE}</td></tr>
-     * </table>
-     *
-     * @param      ch   the character to be tested.
-     * @return     {@code true} if the character is ISO-LATIN-1 white
-     *             space; {@code false} otherwise.
-     * @see        Character#isSpaceChar(char)
-     * @see        Character#isWhitespace(char)
-     * @deprecated Replaced by isWhitespace(char).
-     */
-    @Deprecated
-    public static boolean isSpace(char ch) {
-        return (ch <= 0x0020) &&
-            (((((1L << 0x0009) |
-            (1L << 0x000A) |
-            (1L << 0x000C) |
-            (1L << 0x000D) |
-            (1L << 0x0020)) >> ch) & 1L) != 0);
-    }
-
-
-
-    /**
-     * Determines if the specified character is white space according to Java.
-     * A character is a Java whitespace character if and only if it satisfies
-     * one of the following criteria:
-     * <ul>
-     * <li> It is a Unicode space character ({@code SPACE_SEPARATOR},
-     *      {@code LINE_SEPARATOR}, or {@code PARAGRAPH_SEPARATOR})
-     *      but is not also a non-breaking space ({@code '\u005Cu00A0'},
-     *      {@code '\u005Cu2007'}, {@code '\u005Cu202F'}).
-     * <li> It is {@code '\u005Ct'}, U+0009 HORIZONTAL TABULATION.
-     * <li> It is {@code '\u005Cn'}, U+000A LINE FEED.
-     * <li> It is {@code '\u005Cu000B'}, U+000B VERTICAL TABULATION.
-     * <li> It is {@code '\u005Cf'}, U+000C FORM FEED.
-     * <li> It is {@code '\u005Cr'}, U+000D CARRIAGE RETURN.
-     * <li> It is {@code '\u005Cu001C'}, U+001C FILE SEPARATOR.
-     * <li> It is {@code '\u005Cu001D'}, U+001D GROUP SEPARATOR.
-     * <li> It is {@code '\u005Cu001E'}, U+001E RECORD SEPARATOR.
-     * <li> It is {@code '\u005Cu001F'}, U+001F UNIT SEPARATOR.
-     * </ul>
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isWhitespace(int)} method.
-     *
-     * @param   ch the character to be tested.
-     * @return  {@code true} if the character is a Java whitespace
-     *          character; {@code false} otherwise.
-     * @see     Character#isSpaceChar(char)
-     * @since   1.1
-     */
-    public static boolean isWhitespace(char ch) {
-        return isWhitespace((int)ch);
-    }
-
-    /**
-     * Determines if the specified character (Unicode code point) is
-     * white space according to Java.  A character is a Java
-     * whitespace character if and only if it satisfies one of the
-     * following criteria:
-     * <ul>
-     * <li> It is a Unicode space character ({@link #SPACE_SEPARATOR},
-     *      {@link #LINE_SEPARATOR}, or {@link #PARAGRAPH_SEPARATOR})
-     *      but is not also a non-breaking space ({@code '\u005Cu00A0'},
-     *      {@code '\u005Cu2007'}, {@code '\u005Cu202F'}).
-     * <li> It is {@code '\u005Ct'}, U+0009 HORIZONTAL TABULATION.
-     * <li> It is {@code '\u005Cn'}, U+000A LINE FEED.
-     * <li> It is {@code '\u005Cu000B'}, U+000B VERTICAL TABULATION.
-     * <li> It is {@code '\u005Cf'}, U+000C FORM FEED.
-     * <li> It is {@code '\u005Cr'}, U+000D CARRIAGE RETURN.
-     * <li> It is {@code '\u005Cu001C'}, U+001C FILE SEPARATOR.
-     * <li> It is {@code '\u005Cu001D'}, U+001D GROUP SEPARATOR.
-     * <li> It is {@code '\u005Cu001E'}, U+001E RECORD SEPARATOR.
-     * <li> It is {@code '\u005Cu001F'}, U+001F UNIT SEPARATOR.
-     * </ul>
-     * <p>
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  {@code true} if the character is a Java whitespace
-     *          character; {@code false} otherwise.
-     * @see     Character#isSpaceChar(int)
-     * @since   1.5
-     */
-    public static boolean isWhitespace(int codePoint) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Determines if the specified character is an ISO control
-     * character.  A character is considered to be an ISO control
-     * character if its code is in the range {@code '\u005Cu0000'}
-     * through {@code '\u005Cu001F'} or in the range
-     * {@code '\u005Cu007F'} through {@code '\u005Cu009F'}.
-     *
-     * <p><b>Note:</b> This method cannot handle <a
-     * href="#supplementary"> supplementary characters</a>. To support
-     * all Unicode characters, including supplementary characters, use
-     * the {@link #isISOControl(int)} method.
-     *
-     * @param   ch      the character to be tested.
-     * @return  {@code true} if the character is an ISO control character;
-     *          {@code false} otherwise.
-     *
-     * @see     Character#isSpaceChar(char)
-     * @see     Character#isWhitespace(char)
-     * @since   1.1
-     */
-    public static boolean isISOControl(char ch) {
-        return isISOControl((int)ch);
-    }
-
-    /**
-     * Determines if the referenced character (Unicode code point) is an ISO control
-     * character.  A character is considered to be an ISO control
-     * character if its code is in the range {@code '\u005Cu0000'}
-     * through {@code '\u005Cu001F'} or in the range
-     * {@code '\u005Cu007F'} through {@code '\u005Cu009F'}.
-     *
-     * @param   codePoint the character (Unicode code point) to be tested.
-     * @return  {@code true} if the character is an ISO control character;
-     *          {@code false} otherwise.
-     * @see     Character#isSpaceChar(int)
-     * @see     Character#isWhitespace(int)
-     * @since   1.5
-     */
-    public static boolean isISOControl(int codePoint) {
-        // Optimized form of:
-        //     (codePoint >= 0x00 && codePoint <= 0x1F) ||
-        //     (codePoint >= 0x7F && codePoint <= 0x9F);
-        return codePoint <= 0x9F &&
-            (codePoint >= 0x7F || (codePoint >>> 5 == 0));
-    }
-
-    /**
-     * Determines the character representation for a specific digit in
-     * the specified radix. If the value of {@code radix} is not a
-     * valid radix, or the value of {@code digit} is not a valid
-     * digit in the specified radix, the null character
-     * ({@code '\u005Cu0000'}) is returned.
-     * <p>
-     * The {@code radix} argument is valid if it is greater than or
-     * equal to {@code MIN_RADIX} and less than or equal to
-     * {@code MAX_RADIX}. The {@code digit} argument is valid if
-     * {@code 0 <= digit < radix}.
-     * <p>
-     * If the digit is less than 10, then
-     * {@code '0' + digit} is returned. Otherwise, the value
-     * {@code 'a' + digit - 10} is returned.
-     *
-     * @param   digit   the number to convert to a character.
-     * @param   radix   the radix.
-     * @return  the {@code char} representation of the specified digit
-     *          in the specified radix.
-     * @see     Character#MIN_RADIX
-     * @see     Character#MAX_RADIX
-     * @see     Character#digit(char, int)
-     */
-    public static char forDigit(int digit, int radix) {
-        if ((digit >= radix) || (digit < 0)) {
-            return '\0';
-        }
-        if ((radix < Character.MIN_RADIX) || (radix > Character.MAX_RADIX)) {
-            return '\0';
-        }
-        if (digit < 10) {
-            return (char)('0' + digit);
-        }
-        return (char)('a' - 10 + digit);
-    }
-
-    /**
-     * Compares two {@code Character} objects numerically.
-     *
-     * @param   anotherCharacter   the {@code Character} to be compared.
-
-     * @return  the value {@code 0} if the argument {@code Character}
-     *          is equal to this {@code Character}; a value less than
-     *          {@code 0} if this {@code Character} is numerically less
-     *          than the {@code Character} argument; and a value greater than
-     *          {@code 0} if this {@code Character} is numerically greater
-     *          than the {@code Character} argument (unsigned comparison).
-     *          Note that this is strictly a numerical comparison; it is not
-     *          locale-dependent.
-     * @since   1.2
-     */
-    public int compareTo(Character anotherCharacter) {
-        return compare(this.value, anotherCharacter.value);
-    }
-
-    /**
-     * Compares two {@code char} values numerically.
-     * The value returned is identical to what would be returned by:
-     * <pre>
-     *    Character.valueOf(x).compareTo(Character.valueOf(y))
-     * </pre>
-     *
-     * @param  x the first {@code char} to compare
-     * @param  y the second {@code char} to compare
-     * @return the value {@code 0} if {@code x == y};
-     *         a value less than {@code 0} if {@code x < y}; and
-     *         a value greater than {@code 0} if {@code x > y}
-     * @since 1.7
-     */
-    public static int compare(char x, char y) {
-        return x - y;
-    }
-
-
-    /**
-     * The number of bits used to represent a <tt>char</tt> value in unsigned
-     * binary form, constant {@code 16}.
-     *
-     * @since 1.5
-     */
-    public static final int SIZE = 16;
-
-    /**
-     * Returns the value obtained by reversing the order of the bytes in the
-     * specified <tt>char</tt> value.
-     *
-     * @return the value obtained by reversing (or, equivalently, swapping)
-     *     the bytes in the specified <tt>char</tt> value.
-     * @since 1.5
-     */
-    public static char reverseBytes(char ch) {
-        return (char) (((ch & 0xFF00) >> 8) | (ch << 8));
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Class.java
--- a/emul/mini/src/main/java/java/lang/Class.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1390 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.io.ByteArrayInputStream;
-import org.apidesign.bck2brwsr.emul.reflect.AnnotationImpl;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.TypeVariable;
-import java.net.URL;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.emul.reflect.MethodImpl;
-
-/**
- * Instances of the class {@code Class} represent classes and
- * interfaces in a running Java application.  An enum is a kind of
- * class and an annotation is a kind of interface.  Every array also
- * belongs to a class that is reflected as a {@code Class} object
- * that is shared by all arrays with the same element type and number
- * of dimensions.  The primitive Java types ({@code boolean},
- * {@code byte}, {@code char}, {@code short},
- * {@code int}, {@code long}, {@code float}, and
- * {@code double}), and the keyword {@code void} are also
- * represented as {@code Class} objects.
- *
- * <p> {@code Class} has no public constructor. Instead {@code Class}
- * objects are constructed automatically by the Java Virtual Machine as classes
- * are loaded and by calls to the {@code defineClass} method in the class
- * loader.
- *
- * <p> The following example uses a {@code Class} object to print the
- * class name of an object:
- *
- * <p> <blockquote><pre>
- *     void printClassName(Object obj) {
- *         System.out.println("The class of " + obj +
- *                            " is " + obj.getClass().getName());
- *     }
- * </pre></blockquote>
- *
- * <p> It is also possible to get the {@code Class} object for a named
- * type (or for void) using a class literal.  See Section 15.8.2 of
- * <cite>The Java&trade; Language Specification</cite>.
- * For example:
- *
- * <p> <blockquote>
- *     {@code System.out.println("The name of class Foo is: "+Foo.class.getName());}
- * </blockquote>
- *
- * @param <T> the type of the class modeled by this {@code Class}
- * object.  For example, the type of {@code String.class} is {@code
- * Class<String>}.  Use {@code Class<?>} if the class being modeled is
- * unknown.
- *
- * @author  unascribed
- * @see     java.lang.ClassLoader#defineClass(byte[], int, int)
- * @since   JDK1.0
- */
-public final
-    class Class<T> implements java.io.Serializable,
-                              java.lang.reflect.GenericDeclaration,
-                              java.lang.reflect.Type,
-                              java.lang.reflect.AnnotatedElement {
-    private static final int ANNOTATION= 0x00002000;
-    private static final int ENUM      = 0x00004000;
-    private static final int SYNTHETIC = 0x00001000;
-
-    /*
-     * Constructor. Only the Java Virtual Machine creates Class
-     * objects.
-     */
-    private Class() {}
-
-
-    /**
-     * Converts the object to a string. The string representation is the
-     * string "class" or "interface", followed by a space, and then by the
-     * fully qualified name of the class in the format returned by
-     * {@code getName}.  If this {@code Class} object represents a
-     * primitive type, this method returns the name of the primitive type.  If
-     * this {@code Class} object represents void this method returns
-     * "void".
-     *
-     * @return a string representation of this class object.
-     */
-    public String toString() {
-        return (isInterface() ? "interface " : (isPrimitive() ? "" : "class "))
-            + getName();
-    }
-
-
-    /**
-     * Returns the {@code Class} object associated with the class or
-     * interface with the given string name.  Invoking this method is
-     * equivalent to:
-     *
-     * <blockquote>
-     *  {@code Class.forName(className, true, currentLoader)}
-     * </blockquote>
-     *
-     * where {@code currentLoader} denotes the defining class loader of
-     * the current class.
-     *
-     * <p> For example, the following code fragment returns the
-     * runtime {@code Class} descriptor for the class named
-     * {@code java.lang.Thread}:
-     *
-     * <blockquote>
-     *   {@code Class t = Class.forName("java.lang.Thread")}
-     * </blockquote>
-     * <p>
-     * A call to {@code forName("X")} causes the class named
-     * {@code X} to be initialized.
-     *
-     * @param      className   the fully qualified name of the desired class.
-     * @return     the {@code Class} object for the class with the
-     *             specified name.
-     * @exception LinkageError if the linkage fails
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *            by this method fails
-     * @exception ClassNotFoundException if the class cannot be located
-     */
-    public static Class<?> forName(String className)
-    throws ClassNotFoundException {
-        if (className.startsWith("[")) {
-            Class<?> arrType = defineArray(className);
-            Class<?> c = arrType;
-            while (c != null && c.isArray()) {
-                c = c.getComponentType0(); // verify component type is sane
-            }
-            return arrType;
-        }
-        Class<?> c = loadCls(className, className.replace('.', '_'));
-        if (c == null) {
-            throw new ClassNotFoundException(className);
-        }
-        return c;
-    }
-
-
-    /**
-     * Returns the {@code Class} object associated with the class or
-     * interface with the given string name, using the given class loader.
-     * Given the fully qualified name for a class or interface (in the same
-     * format returned by {@code getName}) this method attempts to
-     * locate, load, and link the class or interface.  The specified class
-     * loader is used to load the class or interface.  If the parameter
-     * {@code loader} is null, the class is loaded through the bootstrap
-     * class loader.  The class is initialized only if the
-     * {@code initialize} parameter is {@code true} and if it has
-     * not been initialized earlier.
-     *
-     * <p> If {@code name} denotes a primitive type or void, an attempt
-     * will be made to locate a user-defined class in the unnamed package whose
-     * name is {@code name}. Therefore, this method cannot be used to
-     * obtain any of the {@code Class} objects representing primitive
-     * types or void.
-     *
-     * <p> If {@code name} denotes an array class, the component type of
-     * the array class is loaded but not initialized.
-     *
-     * <p> For example, in an instance method the expression:
-     *
-     * <blockquote>
-     *  {@code Class.forName("Foo")}
-     * </blockquote>
-     *
-     * is equivalent to:
-     *
-     * <blockquote>
-     *  {@code Class.forName("Foo", true, this.getClass().getClassLoader())}
-     * </blockquote>
-     *
-     * Note that this method throws errors related to loading, linking or
-     * initializing as specified in Sections 12.2, 12.3 and 12.4 of <em>The
-     * Java Language Specification</em>.
-     * Note that this method does not check whether the requested class
-     * is accessible to its caller.
-     *
-     * <p> If the {@code loader} is {@code null}, and a security
-     * manager is present, and the caller's class loader is not null, then this
-     * method calls the security manager's {@code checkPermission} method
-     * with a {@code RuntimePermission("getClassLoader")} permission to
-     * ensure it's ok to access the bootstrap class loader.
-     *
-     * @param name       fully qualified name of the desired class
-     * @param initialize whether the class must be initialized
-     * @param loader     class loader from which the class must be loaded
-     * @return           class object representing the desired class
-     *
-     * @exception LinkageError if the linkage fails
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *            by this method fails
-     * @exception ClassNotFoundException if the class cannot be located by
-     *            the specified class loader
-     *
-     * @see       java.lang.Class#forName(String)
-     * @see       java.lang.ClassLoader
-     * @since     1.2
-     */
-    public static Class<?> forName(String name, boolean initialize,
-                                   ClassLoader loader)
-        throws ClassNotFoundException
-    {
-        return forName(name);
-    }
-    
-    @JavaScriptBody(args = {"n", "c" }, body =
-        "if (!vm[c]) {\n"
-      + "  if (vm.loadClass) {\n"
-      + "    vm.loadClass(n);\n"
-      + "  }\n"
-      + "  if (!vm[c]) return null;\n"
-      + "}\n"
-      + "vm[c](false);"
-      + "return vm[c].$class;"
-    )
-    private static native Class<?> loadCls(String n, String c);
-
-
-    /**
-     * Creates a new instance of the class represented by this {@code Class}
-     * object.  The class is instantiated as if by a {@code new}
-     * expression with an empty argument list.  The class is initialized if it
-     * has not already been initialized.
-     *
-     * <p>Note that this method propagates any exception thrown by the
-     * nullary constructor, including a checked exception.  Use of
-     * this method effectively bypasses the compile-time exception
-     * checking that would otherwise be performed by the compiler.
-     * The {@link
-     * java.lang.reflect.Constructor#newInstance(java.lang.Object...)
-     * Constructor.newInstance} method avoids this problem by wrapping
-     * any exception thrown by the constructor in a (checked) {@link
-     * java.lang.reflect.InvocationTargetException}.
-     *
-     * @return     a newly allocated instance of the class represented by this
-     *             object.
-     * @exception  IllegalAccessException  if the class or its nullary
-     *               constructor is not accessible.
-     * @exception  InstantiationException
-     *               if this {@code Class} represents an abstract class,
-     *               an interface, an array class, a primitive type, or void;
-     *               or if the class has no nullary constructor;
-     *               or if the instantiation fails for some other reason.
-     * @exception  ExceptionInInitializerError if the initialization
-     *               provoked by this method fails.
-     * @exception  SecurityException
-     *             If a security manager, <i>s</i>, is present and any of the
-     *             following conditions is met:
-     *
-     *             <ul>
-     *
-     *             <li> invocation of
-     *             {@link SecurityManager#checkMemberAccess
-     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
-     *             creation of new instances of this class
-     *
-     *             <li> the caller's class loader is not the same as or an
-     *             ancestor of the class loader for the current class and
-     *             invocation of {@link SecurityManager#checkPackageAccess
-     *             s.checkPackageAccess()} denies access to the package
-     *             of this class
-     *
-     *             </ul>
-     *
-     */
-    @JavaScriptBody(args = { "self", "illegal" }, body =
-          "\nvar c = self.cnstr;"
-        + "\nif (c['cons__V']) {"
-        + "\n  if ((c.cons__V.access & 0x1) != 0) {"
-        + "\n    var inst = c();"
-        + "\n    c.cons__V.call(inst);"
-        + "\n    return inst;"
-        + "\n  }"
-        + "\n  return illegal;"
-        + "\n}"
-        + "\nreturn null;"
-    )
-    private static native Object newInstance0(Class<?> self, Object illegal);
-    
-    public T newInstance()
-        throws InstantiationException, IllegalAccessException
-    {
-        Object illegal = new Object();
-        Object inst = newInstance0(this, illegal);
-        if (inst == null) {
-            throw new InstantiationException(getName());
-        }
-        if (inst == illegal) {
-            throw new IllegalAccessException();
-        }
-        return (T)inst;
-    }
-
-    /**
-     * Determines if the specified {@code Object} is assignment-compatible
-     * with the object represented by this {@code Class}.  This method is
-     * the dynamic equivalent of the Java language {@code instanceof}
-     * operator. The method returns {@code true} if the specified
-     * {@code Object} argument is non-null and can be cast to the
-     * reference type represented by this {@code Class} object without
-     * raising a {@code ClassCastException.} It returns {@code false}
-     * otherwise.
-     *
-     * <p> Specifically, if this {@code Class} object represents a
-     * declared class, this method returns {@code true} if the specified
-     * {@code Object} argument is an instance of the represented class (or
-     * of any of its subclasses); it returns {@code false} otherwise. If
-     * this {@code Class} object represents an array class, this method
-     * returns {@code true} if the specified {@code Object} argument
-     * can be converted to an object of the array class by an identity
-     * conversion or by a widening reference conversion; it returns
-     * {@code false} otherwise. If this {@code Class} object
-     * represents an interface, this method returns {@code true} if the
-     * class or any superclass of the specified {@code Object} argument
-     * implements this interface; it returns {@code false} otherwise. If
-     * this {@code Class} object represents a primitive type, this method
-     * returns {@code false}.
-     *
-     * @param   obj the object to check
-     * @return  true if {@code obj} is an instance of this class
-     *
-     * @since JDK1.1
-     */
-    public boolean isInstance(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (isArray()) {
-            return isAssignableFrom(obj.getClass());
-        }
-        
-        String prop = "$instOf_" + getName().replace('.', '_');
-        return hasProperty(obj, prop);
-    }
-    
-    @JavaScriptBody(args = { "who", "prop" }, body = 
-        "if (who[prop]) return true; else return false;"
-    )
-    private static native boolean hasProperty(Object who, String prop);
-
-
-    /**
-     * Determines if the class or interface represented by this
-     * {@code Class} object is either the same as, or is a superclass or
-     * superinterface of, the class or interface represented by the specified
-     * {@code Class} parameter. It returns {@code true} if so;
-     * otherwise it returns {@code false}. If this {@code Class}
-     * object represents a primitive type, this method returns
-     * {@code true} if the specified {@code Class} parameter is
-     * exactly this {@code Class} object; otherwise it returns
-     * {@code false}.
-     *
-     * <p> Specifically, this method tests whether the type represented by the
-     * specified {@code Class} parameter can be converted to the type
-     * represented by this {@code Class} object via an identity conversion
-     * or via a widening reference conversion. See <em>The Java Language
-     * Specification</em>, sections 5.1.1 and 5.1.4 , for details.
-     *
-     * @param cls the {@code Class} object to be checked
-     * @return the {@code boolean} value indicating whether objects of the
-     * type {@code cls} can be assigned to objects of this class
-     * @exception NullPointerException if the specified Class parameter is
-     *            null.
-     * @since JDK1.1
-     */
-    public boolean isAssignableFrom(Class<?> cls) {
-        if (this == cls) {
-            return true;
-        }
-        
-        if (isArray()) {
-            final Class<?> cmpType = cls.getComponentType();
-            if (isPrimitive()) {
-                return this == cmpType;
-            }
-            return cmpType != null && getComponentType().isAssignableFrom(cmpType);
-        }
-        String prop = "$instOf_" + getName().replace('.', '_');
-        return hasCnstrProperty(cls, prop);
-    }
-
-    @JavaScriptBody(args = { "who", "prop" }, body = 
-        "if (who.cnstr.prototype[prop]) return true; else return false;"
-    )
-    private static native boolean hasCnstrProperty(Object who, String prop);
-    
-    
-    /**
-     * Determines if the specified {@code Class} object represents an
-     * interface type.
-     *
-     * @return  {@code true} if this object represents an interface;
-     *          {@code false} otherwise.
-     */
-    public boolean isInterface() {
-        return (getAccess() & 0x200) != 0;
-    }
-    
-    @JavaScriptBody(args = {}, body = "return this.access;")
-    private native int getAccess();
-
-
-    /**
-     * Determines if this {@code Class} object represents an array class.
-     *
-     * @return  {@code true} if this object represents an array class;
-     *          {@code false} otherwise.
-     * @since   JDK1.1
-     */
-    public boolean isArray() {
-        return hasProperty(this, "array"); // NOI18N
-    }
-
-
-    /**
-     * Determines if the specified {@code Class} object represents a
-     * primitive type.
-     *
-     * <p> There are nine predefined {@code Class} objects to represent
-     * the eight primitive types and void.  These are created by the Java
-     * Virtual Machine, and have the same names as the primitive types that
-     * they represent, namely {@code boolean}, {@code byte},
-     * {@code char}, {@code short}, {@code int},
-     * {@code long}, {@code float}, and {@code double}.
-     *
-     * <p> These objects may only be accessed via the following public static
-     * final variables, and are the only {@code Class} objects for which
-     * this method returns {@code true}.
-     *
-     * @return true if and only if this class represents a primitive type
-     *
-     * @see     java.lang.Boolean#TYPE
-     * @see     java.lang.Character#TYPE
-     * @see     java.lang.Byte#TYPE
-     * @see     java.lang.Short#TYPE
-     * @see     java.lang.Integer#TYPE
-     * @see     java.lang.Long#TYPE
-     * @see     java.lang.Float#TYPE
-     * @see     java.lang.Double#TYPE
-     * @see     java.lang.Void#TYPE
-     * @since JDK1.1
-     */
-    @JavaScriptBody(args = {}, body = 
-           "if (this.primitive) return true;"
-        + "else return false;"
-    )
-    public native boolean isPrimitive();
-
-    /**
-     * Returns true if this {@code Class} object represents an annotation
-     * type.  Note that if this method returns true, {@link #isInterface()}
-     * would also return true, as all annotation types are also interfaces.
-     *
-     * @return {@code true} if this class object represents an annotation
-     *      type; {@code false} otherwise
-     * @since 1.5
-     */
-    public boolean isAnnotation() {
-        return (getModifiers() & ANNOTATION) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this class is a synthetic class;
-     * returns {@code false} otherwise.
-     * @return {@code true} if and only if this class is a synthetic class as
-     *         defined by the Java Language Specification.
-     * @since 1.5
-     */
-    public boolean isSynthetic() {
-        return (getModifiers() & SYNTHETIC) != 0;
-    }
-
-    /**
-     * Returns the  name of the entity (class, interface, array class,
-     * primitive type, or void) represented by this {@code Class} object,
-     * as a {@code String}.
-     *
-     * <p> If this class object represents a reference type that is not an
-     * array type then the binary name of the class is returned, as specified
-     * by
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * <p> If this class object represents a primitive type or void, then the
-     * name returned is a {@code String} equal to the Java language
-     * keyword corresponding to the primitive type or void.
-     *
-     * <p> If this class object represents a class of arrays, then the internal
-     * form of the name consists of the name of the element type preceded by
-     * one or more '{@code [}' characters representing the depth of the array
-     * nesting.  The encoding of element type names is as follows:
-     *
-     * <blockquote><table summary="Element types and encodings">
-     * <tr><th> Element Type <th> &nbsp;&nbsp;&nbsp; <th> Encoding
-     * <tr><td> boolean      <td> &nbsp;&nbsp;&nbsp; <td align=center> Z
-     * <tr><td> byte         <td> &nbsp;&nbsp;&nbsp; <td align=center> B
-     * <tr><td> char         <td> &nbsp;&nbsp;&nbsp; <td align=center> C
-     * <tr><td> class or interface
-     *                       <td> &nbsp;&nbsp;&nbsp; <td align=center> L<i>classname</i>;
-     * <tr><td> double       <td> &nbsp;&nbsp;&nbsp; <td align=center> D
-     * <tr><td> float        <td> &nbsp;&nbsp;&nbsp; <td align=center> F
-     * <tr><td> int          <td> &nbsp;&nbsp;&nbsp; <td align=center> I
-     * <tr><td> long         <td> &nbsp;&nbsp;&nbsp; <td align=center> J
-     * <tr><td> short        <td> &nbsp;&nbsp;&nbsp; <td align=center> S
-     * </table></blockquote>
-     *
-     * <p> The class or interface name <i>classname</i> is the binary name of
-     * the class specified above.
-     *
-     * <p> Examples:
-     * <blockquote><pre>
-     * String.class.getName()
-     *     returns "java.lang.String"
-     * byte.class.getName()
-     *     returns "byte"
-     * (new Object[3]).getClass().getName()
-     *     returns "[Ljava.lang.Object;"
-     * (new int[3][4][5][6][7][8][9]).getClass().getName()
-     *     returns "[[[[[[[I"
-     * </pre></blockquote>
-     *
-     * @return  the name of the class or interface
-     *          represented by this object.
-     */
-    public String getName() {
-        return jvmName().replace('/', '.');
-    }
-
-    @JavaScriptBody(args = {}, body = "return this.jvmName;")
-    private native String jvmName();
-
-    
-    /**
-     * Returns an array of {@code TypeVariable} objects that represent the
-     * type variables declared by the generic declaration represented by this
-     * {@code GenericDeclaration} object, in declaration order.  Returns an
-     * array of length 0 if the underlying generic declaration declares no type
-     * variables.
-     *
-     * @return an array of {@code TypeVariable} objects that represent
-     *     the type variables declared by this generic declaration
-     * @throws java.lang.reflect.GenericSignatureFormatError if the generic
-     *     signature of this generic declaration does not conform to
-     *     the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @since 1.5
-     */
-    public TypeVariable<Class<T>>[] getTypeParameters() {
-        throw new UnsupportedOperationException();
-    }
- 
-    /**
-     * Returns the {@code Class} representing the superclass of the entity
-     * (class, interface, primitive type or void) represented by this
-     * {@code Class}.  If this {@code Class} represents either the
-     * {@code Object} class, an interface, a primitive type, or void, then
-     * null is returned.  If this object represents an array class then the
-     * {@code Class} object representing the {@code Object} class is
-     * returned.
-     *
-     * @return the superclass of the class represented by this object.
-     */
-    @JavaScriptBody(args = {}, body = "return this.superclass;")
-    public native Class<? super T> getSuperclass();
-
-    /**
-     * Returns the Java language modifiers for this class or interface, encoded
-     * in an integer. The modifiers consist of the Java Virtual Machine's
-     * constants for {@code public}, {@code protected},
-     * {@code private}, {@code final}, {@code static},
-     * {@code abstract} and {@code interface}; they should be decoded
-     * using the methods of class {@code Modifier}.
-     *
-     * <p> If the underlying class is an array class, then its
-     * {@code public}, {@code private} and {@code protected}
-     * modifiers are the same as those of its component type.  If this
-     * {@code Class} represents a primitive type or void, its
-     * {@code public} modifier is always {@code true}, and its
-     * {@code protected} and {@code private} modifiers are always
-     * {@code false}. If this object represents an array class, a
-     * primitive type or void, then its {@code final} modifier is always
-     * {@code true} and its interface modifier is always
-     * {@code false}. The values of its other modifiers are not determined
-     * by this specification.
-     *
-     * <p> The modifier encodings are defined in <em>The Java Virtual Machine
-     * Specification</em>, table 4.1.
-     *
-     * @return the {@code int} representing the modifiers for this class
-     * @see     java.lang.reflect.Modifier
-     * @since JDK1.1
-     */
-    public int getModifiers() {
-        return getAccess();
-    }
-
-
-    /**
-     * Returns the simple name of the underlying class as given in the
-     * source code. Returns an empty string if the underlying class is
-     * anonymous.
-     *
-     * <p>The simple name of an array is the simple name of the
-     * component type with "[]" appended.  In particular the simple
-     * name of an array whose component type is anonymous is "[]".
-     *
-     * @return the simple name of the underlying class
-     * @since 1.5
-     */
-    public String getSimpleName() {
-        if (isArray())
-            return getComponentType().getSimpleName()+"[]";
-
-        String simpleName = getSimpleBinaryName();
-        if (simpleName == null) { // top level class
-            simpleName = getName();
-            return simpleName.substring(simpleName.lastIndexOf(".")+1); // strip the package name
-        }
-        // According to JLS3 "Binary Compatibility" (13.1) the binary
-        // name of non-package classes (not top level) is the binary
-        // name of the immediately enclosing class followed by a '$' followed by:
-        // (for nested and inner classes): the simple name.
-        // (for local classes): 1 or more digits followed by the simple name.
-        // (for anonymous classes): 1 or more digits.
-
-        // Since getSimpleBinaryName() will strip the binary name of
-        // the immediatly enclosing class, we are now looking at a
-        // string that matches the regular expression "\$[0-9]*"
-        // followed by a simple name (considering the simple of an
-        // anonymous class to be the empty string).
-
-        // Remove leading "\$[0-9]*" from the name
-        int length = simpleName.length();
-        if (length < 1 || simpleName.charAt(0) != '$')
-            throw new IllegalStateException("Malformed class name");
-        int index = 1;
-        while (index < length && isAsciiDigit(simpleName.charAt(index)))
-            index++;
-        // Eventually, this is the empty string iff this is an anonymous class
-        return simpleName.substring(index);
-    }
-
-    /**
-     * Returns the "simple binary name" of the underlying class, i.e.,
-     * the binary name without the leading enclosing class name.
-     * Returns {@code null} if the underlying class is a top level
-     * class.
-     */
-    private String getSimpleBinaryName() {
-        Class<?> enclosingClass = null; // XXX getEnclosingClass();
-        if (enclosingClass == null) // top level class
-            return null;
-        // Otherwise, strip the enclosing class' name
-        try {
-            return getName().substring(enclosingClass.getName().length());
-        } catch (IndexOutOfBoundsException ex) {
-            throw new IllegalStateException("Malformed class name");
-        }
-    }
-
-    /**
-     * Returns an array containing {@code Field} objects reflecting all
-     * the accessible public fields of the class or interface represented by
-     * this {@code Class} object.  The elements in the array returned are
-     * not sorted and are not in any particular order.  This method returns an
-     * array of length 0 if the class or interface has no accessible public
-     * fields, or if it represents an array class, a primitive type, or void.
-     *
-     * <p> Specifically, if this {@code Class} object represents a class,
-     * this method returns the public fields of this class and of all its
-     * superclasses.  If this {@code Class} object represents an
-     * interface, this method returns the fields of this interface and of all
-     * its superinterfaces.
-     *
-     * <p> The implicit length field for array class is not reflected by this
-     * method. User code should use the methods of class {@code Array} to
-     * manipulate arrays.
-     *
-     * <p> See <em>The Java Language Specification</em>, sections 8.2 and 8.3.
-     *
-     * @return the array of {@code Field} objects representing the
-     * public fields
-     * @exception  SecurityException
-     *             If a security manager, <i>s</i>, is present and any of the
-     *             following conditions is met:
-     *
-     *             <ul>
-     *
-     *             <li> invocation of
-     *             {@link SecurityManager#checkMemberAccess
-     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
-     *             access to the fields within this class
-     *
-     *             <li> the caller's class loader is not the same as or an
-     *             ancestor of the class loader for the current class and
-     *             invocation of {@link SecurityManager#checkPackageAccess
-     *             s.checkPackageAccess()} denies access to the package
-     *             of this class
-     *
-     *             </ul>
-     *
-     * @since JDK1.1
-     */
-    public Field[] getFields() throws SecurityException {
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns an array containing {@code Method} objects reflecting all
-     * the public <em>member</em> methods of the class or interface represented
-     * by this {@code Class} object, including those declared by the class
-     * or interface and those inherited from superclasses and
-     * superinterfaces.  Array classes return all the (public) member methods
-     * inherited from the {@code Object} class.  The elements in the array
-     * returned are not sorted and are not in any particular order.  This
-     * method returns an array of length 0 if this {@code Class} object
-     * represents a class or interface that has no public member methods, or if
-     * this {@code Class} object represents a primitive type or void.
-     *
-     * <p> The class initialization method {@code <clinit>} is not
-     * included in the returned array. If the class declares multiple public
-     * member methods with the same parameter types, they are all included in
-     * the returned array.
-     *
-     * <p> See <em>The Java Language Specification</em>, sections 8.2 and 8.4.
-     *
-     * @return the array of {@code Method} objects representing the
-     * public methods of this class
-     * @exception  SecurityException
-     *             If a security manager, <i>s</i>, is present and any of the
-     *             following conditions is met:
-     *
-     *             <ul>
-     *
-     *             <li> invocation of
-     *             {@link SecurityManager#checkMemberAccess
-     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
-     *             access to the methods within this class
-     *
-     *             <li> the caller's class loader is not the same as or an
-     *             ancestor of the class loader for the current class and
-     *             invocation of {@link SecurityManager#checkPackageAccess
-     *             s.checkPackageAccess()} denies access to the package
-     *             of this class
-     *
-     *             </ul>
-     *
-     * @since JDK1.1
-     */
-    public Method[] getMethods() throws SecurityException {
-        return MethodImpl.findMethods(this, 0x01);
-    }
-
-    /**
-     * Returns a {@code Field} object that reflects the specified public
-     * member field of the class or interface represented by this
-     * {@code Class} object. The {@code name} parameter is a
-     * {@code String} specifying the simple name of the desired field.
-     *
-     * <p> The field to be reflected is determined by the algorithm that
-     * follows.  Let C be the class represented by this object:
-     * <OL>
-     * <LI> If C declares a public field with the name specified, that is the
-     *      field to be reflected.</LI>
-     * <LI> If no field was found in step 1 above, this algorithm is applied
-     *      recursively to each direct superinterface of C. The direct
-     *      superinterfaces are searched in the order they were declared.</LI>
-     * <LI> If no field was found in steps 1 and 2 above, and C has a
-     *      superclass S, then this algorithm is invoked recursively upon S.
-     *      If C has no superclass, then a {@code NoSuchFieldException}
-     *      is thrown.</LI>
-     * </OL>
-     *
-     * <p> See <em>The Java Language Specification</em>, sections 8.2 and 8.3.
-     *
-     * @param name the field name
-     * @return  the {@code Field} object of this class specified by
-     * {@code name}
-     * @exception NoSuchFieldException if a field with the specified name is
-     *              not found.
-     * @exception NullPointerException if {@code name} is {@code null}
-     * @exception  SecurityException
-     *             If a security manager, <i>s</i>, is present and any of the
-     *             following conditions is met:
-     *
-     *             <ul>
-     *
-     *             <li> invocation of
-     *             {@link SecurityManager#checkMemberAccess
-     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
-     *             access to the field
-     *
-     *             <li> the caller's class loader is not the same as or an
-     *             ancestor of the class loader for the current class and
-     *             invocation of {@link SecurityManager#checkPackageAccess
-     *             s.checkPackageAccess()} denies access to the package
-     *             of this class
-     *
-     *             </ul>
-     *
-     * @since JDK1.1
-     */
-    public Field getField(String name)
-        throws SecurityException {
-        throw new SecurityException();
-    }
-    
-    
-    /**
-     * Returns a {@code Method} object that reflects the specified public
-     * member method of the class or interface represented by this
-     * {@code Class} object. The {@code name} parameter is a
-     * {@code String} specifying the simple name of the desired method. The
-     * {@code parameterTypes} parameter is an array of {@code Class}
-     * objects that identify the method's formal parameter types, in declared
-     * order. If {@code parameterTypes} is {@code null}, it is
-     * treated as if it were an empty array.
-     *
-     * <p> If the {@code name} is "{@code <init>};"or "{@code <clinit>}" a
-     * {@code NoSuchMethodException} is raised. Otherwise, the method to
-     * be reflected is determined by the algorithm that follows.  Let C be the
-     * class represented by this object:
-     * <OL>
-     * <LI> C is searched for any <I>matching methods</I>. If no matching
-     *      method is found, the algorithm of step 1 is invoked recursively on
-     *      the superclass of C.</LI>
-     * <LI> If no method was found in step 1 above, the superinterfaces of C
-     *      are searched for a matching method. If any such method is found, it
-     *      is reflected.</LI>
-     * </OL>
-     *
-     * To find a matching method in a class C:&nbsp; If C declares exactly one
-     * public method with the specified name and exactly the same formal
-     * parameter types, that is the method reflected. If more than one such
-     * method is found in C, and one of these methods has a return type that is
-     * more specific than any of the others, that method is reflected;
-     * otherwise one of the methods is chosen arbitrarily.
-     *
-     * <p>Note that there may be more than one matching method in a
-     * class because while the Java language forbids a class to
-     * declare multiple methods with the same signature but different
-     * return types, the Java virtual machine does not.  This
-     * increased flexibility in the virtual machine can be used to
-     * implement various language features.  For example, covariant
-     * returns can be implemented with {@linkplain
-     * java.lang.reflect.Method#isBridge bridge methods}; the bridge
-     * method and the method being overridden would have the same
-     * signature but different return types.
-     *
-     * <p> See <em>The Java Language Specification</em>, sections 8.2 and 8.4.
-     *
-     * @param name the name of the method
-     * @param parameterTypes the list of parameters
-     * @return the {@code Method} object that matches the specified
-     * {@code name} and {@code parameterTypes}
-     * @exception NoSuchMethodException if a matching method is not found
-     *            or if the name is "&lt;init&gt;"or "&lt;clinit&gt;".
-     * @exception NullPointerException if {@code name} is {@code null}
-     * @exception  SecurityException
-     *             If a security manager, <i>s</i>, is present and any of the
-     *             following conditions is met:
-     *
-     *             <ul>
-     *
-     *             <li> invocation of
-     *             {@link SecurityManager#checkMemberAccess
-     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
-     *             access to the method
-     *
-     *             <li> the caller's class loader is not the same as or an
-     *             ancestor of the class loader for the current class and
-     *             invocation of {@link SecurityManager#checkPackageAccess
-     *             s.checkPackageAccess()} denies access to the package
-     *             of this class
-     *
-     *             </ul>
-     *
-     * @since JDK1.1
-     */
-    public Method getMethod(String name, Class<?>... parameterTypes)
-        throws SecurityException, NoSuchMethodException {
-        Method m = MethodImpl.findMethod(this, name, parameterTypes);
-        if (m == null) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(getName()).append('.').append(name).append('(');
-            String sep = "";
-            for (int i = 0; i < parameterTypes.length; i++) {
-                sb.append(sep).append(parameterTypes[i].getName());
-                sep = ", ";
-            }
-            sb.append(')');
-            throw new NoSuchMethodException(sb.toString());
-        }
-        return m;
-    }
-    
-    /**
-     * Returns an array of {@code Method} objects reflecting all the
-     * methods declared by the class or interface represented by this
-     * {@code Class} object. This includes public, protected, default
-     * (package) access, and private methods, but excludes inherited methods.
-     * The elements in the array returned are not sorted and are not in any
-     * particular order.  This method returns an array of length 0 if the class
-     * or interface declares no methods, or if this {@code Class} object
-     * represents a primitive type, an array class, or void.  The class
-     * initialization method {@code <clinit>} is not included in the
-     * returned array. If the class declares multiple public member methods
-     * with the same parameter types, they are all included in the returned
-     * array.
-     *
-     * <p> See <em>The Java Language Specification</em>, section 8.2.
-     *
-     * @return    the array of {@code Method} objects representing all the
-     * declared methods of this class
-     * @exception  SecurityException
-     *             If a security manager, <i>s</i>, is present and any of the
-     *             following conditions is met:
-     *
-     *             <ul>
-     *
-     *             <li> invocation of
-     *             {@link SecurityManager#checkMemberAccess
-     *             s.checkMemberAccess(this, Member.DECLARED)} denies
-     *             access to the declared methods within this class
-     *
-     *             <li> the caller's class loader is not the same as or an
-     *             ancestor of the class loader for the current class and
-     *             invocation of {@link SecurityManager#checkPackageAccess
-     *             s.checkPackageAccess()} denies access to the package
-     *             of this class
-     *
-     *             </ul>
-     *
-     * @since JDK1.1
-     */
-    public Method[] getDeclaredMethods() throws SecurityException {
-        throw new SecurityException();
-    }
-    
-    /**
-     * Character.isDigit answers {@code true} to some non-ascii
-     * digits.  This one does not.
-     */
-    private static boolean isAsciiDigit(char c) {
-        return '0' <= c && c <= '9';
-    }
-
-    /**
-     * Returns the canonical name of the underlying class as
-     * defined by the Java Language Specification.  Returns null if
-     * the underlying class does not have a canonical name (i.e., if
-     * it is a local or anonymous class or an array whose component
-     * type does not have a canonical name).
-     * @return the canonical name of the underlying class if it exists, and
-     * {@code null} otherwise.
-     * @since 1.5
-     */
-    public String getCanonicalName() {
-        if (isArray()) {
-            String canonicalName = getComponentType().getCanonicalName();
-            if (canonicalName != null)
-                return canonicalName + "[]";
-            else
-                return null;
-        }
-//        if (isLocalOrAnonymousClass())
-//            return null;
-//        Class<?> enclosingClass = getEnclosingClass();
-        Class<?> enclosingClass = null;
-        if (enclosingClass == null) { // top level class
-            return getName();
-        } else {
-            String enclosingName = enclosingClass.getCanonicalName();
-            if (enclosingName == null)
-                return null;
-            return enclosingName + "." + getSimpleName();
-        }
-    }
-
-    /**
-     * Finds a resource with a given name.  The rules for searching resources
-     * associated with a given class are implemented by the defining
-     * {@linkplain ClassLoader class loader} of the class.  This method
-     * delegates to this object's class loader.  If this object was loaded by
-     * the bootstrap class loader, the method delegates to {@link
-     * ClassLoader#getSystemResourceAsStream}.
-     *
-     * <p> Before delegation, an absolute resource name is constructed from the
-     * given resource name using this algorithm:
-     *
-     * <ul>
-     *
-     * <li> If the {@code name} begins with a {@code '/'}
-     * (<tt>'&#92;u002f'</tt>), then the absolute name of the resource is the
-     * portion of the {@code name} following the {@code '/'}.
-     *
-     * <li> Otherwise, the absolute name is of the following form:
-     *
-     * <blockquote>
-     *   {@code modified_package_name/name}
-     * </blockquote>
-     *
-     * <p> Where the {@code modified_package_name} is the package name of this
-     * object with {@code '/'} substituted for {@code '.'}
-     * (<tt>'&#92;u002e'</tt>).
-     *
-     * </ul>
-     *
-     * @param  name name of the desired resource
-     * @return      A {@link java.io.InputStream} object or {@code null} if
-     *              no resource with this name is found
-     * @throws  NullPointerException If {@code name} is {@code null}
-     * @since  JDK1.1
-     */
-     public InputStream getResourceAsStream(String name) {
-        name = resolveName(name);
-        byte[] arr = getResourceAsStream0(name);
-        return arr == null ? null : new ByteArrayInputStream(arr);
-     }
-     
-     @JavaScriptBody(args = "name", body = 
-         "return (vm.loadBytes) ? vm.loadBytes(name) : null;"
-     )
-     private static native byte[] getResourceAsStream0(String name);
-
-    /**
-     * Finds a resource with a given name.  The rules for searching resources
-     * associated with a given class are implemented by the defining
-     * {@linkplain ClassLoader class loader} of the class.  This method
-     * delegates to this object's class loader.  If this object was loaded by
-     * the bootstrap class loader, the method delegates to {@link
-     * ClassLoader#getSystemResource}.
-     *
-     * <p> Before delegation, an absolute resource name is constructed from the
-     * given resource name using this algorithm:
-     *
-     * <ul>
-     *
-     * <li> If the {@code name} begins with a {@code '/'}
-     * (<tt>'&#92;u002f'</tt>), then the absolute name of the resource is the
-     * portion of the {@code name} following the {@code '/'}.
-     *
-     * <li> Otherwise, the absolute name is of the following form:
-     *
-     * <blockquote>
-     *   {@code modified_package_name/name}
-     * </blockquote>
-     *
-     * <p> Where the {@code modified_package_name} is the package name of this
-     * object with {@code '/'} substituted for {@code '.'}
-     * (<tt>'&#92;u002e'</tt>).
-     *
-     * </ul>
-     *
-     * @param  name name of the desired resource
-     * @return      A  {@link java.net.URL} object or {@code null} if no
-     *              resource with this name is found
-     * @since  JDK1.1
-     */
-    public java.net.URL getResource(String name) {
-        InputStream is = getResourceAsStream(name);
-        return is == null ? null : newResourceURL(URL.class, "res:/" + name, is);
-    }
-    
-    @JavaScriptBody(args = { "url", "spec", "is" }, body = 
-        "var u = url.cnstr(true);\n"
-      + "u.constructor.cons__VLjava_lang_String_2Ljava_io_InputStream_2.call(u, spec, is);\n"
-      + "return u;"
-    )
-    private static native URL newResourceURL(Class<URL> url, String spec, InputStream is);
-
-   /**
-     * Add a package name prefix if the name is not absolute Remove leading "/"
-     * if name is absolute
-     */
-    private String resolveName(String name) {
-        if (name == null) {
-            return name;
-        }
-        if (!name.startsWith("/")) {
-            Class<?> c = this;
-            while (c.isArray()) {
-                c = c.getComponentType();
-            }
-            String baseName = c.getName();
-            int index = baseName.lastIndexOf('.');
-            if (index != -1) {
-                name = baseName.substring(0, index).replace('.', '/')
-                    +"/"+name;
-            }
-        } else {
-            name = name.substring(1);
-        }
-        return name;
-    }
-    
-    /**
-     * Returns the class loader for the class.  Some implementations may use
-     * null to represent the bootstrap class loader. This method will return
-     * null in such implementations if this class was loaded by the bootstrap
-     * class loader.
-     *
-     * <p> If a security manager is present, and the caller's class loader is
-     * not null and the caller's class loader is not the same as or an ancestor of
-     * the class loader for the class whose class loader is requested, then
-     * this method calls the security manager's {@code checkPermission}
-     * method with a {@code RuntimePermission("getClassLoader")}
-     * permission to ensure it's ok to access the class loader for the class.
-     *
-     * <p>If this object
-     * represents a primitive type or void, null is returned.
-     *
-     * @return  the class loader that loaded the class or interface
-     *          represented by this object.
-     * @throws SecurityException
-     *    if a security manager exists and its
-     *    {@code checkPermission} method denies
-     *    access to the class loader for the class.
-     * @see java.lang.ClassLoader
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     */
-    public ClassLoader getClassLoader() {
-        throw new SecurityException();
-    }
-
-    /**
-     * Determines the interfaces implemented by the class or interface
-     * represented by this object.
-     *
-     * <p> If this object represents a class, the return value is an array
-     * containing objects representing all interfaces implemented by the
-     * class. The order of the interface objects in the array corresponds to
-     * the order of the interface names in the {@code implements} clause
-     * of the declaration of the class represented by this object. For
-     * example, given the declaration:
-     * <blockquote>
-     * {@code class Shimmer implements FloorWax, DessertTopping { ... }}
-     * </blockquote>
-     * suppose the value of {@code s} is an instance of
-     * {@code Shimmer}; the value of the expression:
-     * <blockquote>
-     * {@code s.getClass().getInterfaces()[0]}
-     * </blockquote>
-     * is the {@code Class} object that represents interface
-     * {@code FloorWax}; and the value of:
-     * <blockquote>
-     * {@code s.getClass().getInterfaces()[1]}
-     * </blockquote>
-     * is the {@code Class} object that represents interface
-     * {@code DessertTopping}.
-     *
-     * <p> If this object represents an interface, the array contains objects
-     * representing all interfaces extended by the interface. The order of the
-     * interface objects in the array corresponds to the order of the interface
-     * names in the {@code extends} clause of the declaration of the
-     * interface represented by this object.
-     *
-     * <p> If this object represents a class or interface that implements no
-     * interfaces, the method returns an array of length 0.
-     *
-     * <p> If this object represents a primitive type or void, the method
-     * returns an array of length 0.
-     *
-     * @return an array of interfaces implemented by this class.
-     */
-    public native Class<?>[] getInterfaces();
-    
-    /**
-     * Returns the {@code Class} representing the component type of an
-     * array.  If this class does not represent an array class this method
-     * returns null.
-     *
-     * @return the {@code Class} representing the component type of this
-     * class if this class is an array
-     * @see     java.lang.reflect.Array
-     * @since JDK1.1
-     */
-    public Class<?> getComponentType() {
-        if (isArray()) {
-            try {
-                return getComponentType0();
-            } catch (ClassNotFoundException cnfe) {
-                throw new IllegalStateException(cnfe);
-            }
-        }
-        return null;
-    }
-
-    private Class<?> getComponentType0() throws ClassNotFoundException {
-        String n = getName().substring(1);
-        switch (n.charAt(0)) {
-            case 'L': 
-                n = n.substring(1, n.length() - 1);
-                return Class.forName(n);
-            case 'I':
-                return Integer.TYPE;
-            case 'J':
-                return Long.TYPE;
-            case 'D':
-                return Double.TYPE;
-            case 'F':
-                return Float.TYPE;
-            case 'B':
-                return Byte.TYPE;
-            case 'Z':
-                return Boolean.TYPE;
-            case 'S':
-                return Short.TYPE;
-            case 'V':
-                return Void.TYPE;
-            case 'C':
-                return Character.TYPE;
-            case '[':
-                return defineArray(n);
-            default:
-                throw new ClassNotFoundException("Unknown component type of " + getName());
-        }
-    }
-    
-    @JavaScriptBody(args = { "sig" }, body = 
-        "var c = Array[sig];\n" +
-        "if (c) return c;\n" +
-        "c = vm.java_lang_Class(true);\n" +
-        "c.jvmName = sig;\n" +
-        "c.superclass = vm.java_lang_Object(false).$class;\n" +
-        "c.array = true;\n" +
-        "Array[sig] = c;\n" +
-        "return c;"
-    )
-    private static native Class<?> defineArray(String sig);
-    
-    /**
-     * Returns true if and only if this class was declared as an enum in the
-     * source code.
-     *
-     * @return true if and only if this class was declared as an enum in the
-     *     source code
-     * @since 1.5
-     */
-    public boolean isEnum() {
-        // An enum must both directly extend java.lang.Enum and have
-        // the ENUM bit set; classes for specialized enum constants
-        // don't do the former.
-        return (this.getModifiers() & ENUM) != 0 &&
-        this.getSuperclass() == java.lang.Enum.class;
-    }
-
-    /**
-     * Casts an object to the class or interface represented
-     * by this {@code Class} object.
-     *
-     * @param obj the object to be cast
-     * @return the object after casting, or null if obj is null
-     *
-     * @throws ClassCastException if the object is not
-     * null and is not assignable to the type T.
-     *
-     * @since 1.5
-     */
-    public T cast(Object obj) {
-        if (obj != null && !isInstance(obj))
-            throw new ClassCastException(cannotCastMsg(obj));
-        return (T) obj;
-    }
-
-    private String cannotCastMsg(Object obj) {
-        return "Cannot cast " + obj.getClass().getName() + " to " + getName();
-    }
-
-    /**
-     * Casts this {@code Class} object to represent a subclass of the class
-     * represented by the specified class object.  Checks that that the cast
-     * is valid, and throws a {@code ClassCastException} if it is not.  If
-     * this method succeeds, it always returns a reference to this class object.
-     *
-     * <p>This method is useful when a client needs to "narrow" the type of
-     * a {@code Class} object to pass it to an API that restricts the
-     * {@code Class} objects that it is willing to accept.  A cast would
-     * generate a compile-time warning, as the correctness of the cast
-     * could not be checked at runtime (because generic types are implemented
-     * by erasure).
-     *
-     * @return this {@code Class} object, cast to represent a subclass of
-     *    the specified class object.
-     * @throws ClassCastException if this {@code Class} object does not
-     *    represent a subclass of the specified class (here "subclass" includes
-     *    the class itself).
-     * @since 1.5
-     */
-    public <U> Class<? extends U> asSubclass(Class<U> clazz) {
-        if (clazz.isAssignableFrom(this))
-            return (Class<? extends U>) this;
-        else
-            throw new ClassCastException(this.toString());
-    }
-
-    @JavaScriptBody(args = { "ac" }, 
-        body = 
-          "if (this.anno) {"
-        + "  return this.anno['L' + ac.jvmName + ';'];"
-        + "} else return null;"
-    )
-    private Object getAnnotationData(Class<?> annotationClass) {
-        throw new UnsupportedOperationException();
-    }
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
-        Object data = getAnnotationData(annotationClass);
-        return data == null ? null : AnnotationImpl.create(annotationClass, data);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    @JavaScriptBody(args = { "ac" }, 
-        body = "if (this.anno && this.anno['L' + ac.jvmName + ';']) { return true; }"
-        + "else return false;"
-    )
-    public boolean isAnnotationPresent(
-        Class<? extends Annotation> annotationClass) {
-        if (annotationClass == null)
-            throw new NullPointerException();
-
-        return getAnnotation(annotationClass) != null;
-    }
-
-    @JavaScriptBody(args = {}, body = "return this.anno;")
-    private Object getAnnotationData() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getAnnotations() {
-        Object data = getAnnotationData();
-        return data == null ? new Annotation[0] : AnnotationImpl.create(data);
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        throw new UnsupportedOperationException();
-    }
-
-    @JavaScriptBody(args = "type", body = ""
-        + "var c = vm.java_lang_Class(true);"
-        + "c.jvmName = type;"
-        + "c.primitive = true;"
-        + "return c;"
-    )
-    native static Class getPrimitiveClass(String type);
-
-    @JavaScriptBody(args = {}, body = 
-        "return vm.desiredAssertionStatus ? vm.desiredAssertionStatus : false;"
-    )
-    public native boolean desiredAssertionStatus();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/ClassCastException.java
--- a/emul/mini/src/main/java/java/lang/ClassCastException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that the code has attempted to cast an object
- * to a subclass of which it is not an instance. For example, the
- * following code generates a <code>ClassCastException</code>:
- * <p><blockquote><pre>
- *     Object x = new Integer(0);
- *     System.out.println((String)x);
- * </pre></blockquote>
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class ClassCastException extends RuntimeException {
-    private static final long serialVersionUID = -9223365651070458532L;
-
-    /**
-     * Constructs a <code>ClassCastException</code> with no detail message.
-     */
-    public ClassCastException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>ClassCastException</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public ClassCastException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/ClassFormatError.java
--- a/emul/mini/src/main/java/java/lang/ClassFormatError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when the Java Virtual Machine attempts to read a class
- * file and determines that the file is malformed or otherwise cannot
- * be interpreted as a class file.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class ClassFormatError extends LinkageError {
-    private static final long serialVersionUID = -8420114879011949195L;
-
-    /**
-     * Constructs a <code>ClassFormatError</code> with no detail message.
-     */
-    public ClassFormatError() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>ClassFormatError</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public ClassFormatError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/ClassLoader.java
--- a/emul/mini/src/main/java/java/lang/ClassLoader.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,936 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.lang;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- * A class loader is an object that is responsible for loading classes. The
- * class <tt>ClassLoader</tt> is an abstract class.  Given the <a
- * href="#name">binary name</a> of a class, a class loader should attempt to
- * locate or generate data that constitutes a definition for the class.  A
- * typical strategy is to transform the name into a file name and then read a
- * "class file" of that name from a file system.
- *
- * <p> Every {@link Class <tt>Class</tt>} object contains a {@link
- * Class#getClassLoader() reference} to the <tt>ClassLoader</tt> that defined
- * it.
- *
- * <p> <tt>Class</tt> objects for array classes are not created by class
- * loaders, but are created automatically as required by the Java runtime.
- * The class loader for an array class, as returned by {@link
- * Class#getClassLoader()} is the same as the class loader for its element
- * type; if the element type is a primitive type, then the array class has no
- * class loader.
- *
- * <p> Applications implement subclasses of <tt>ClassLoader</tt> in order to
- * extend the manner in which the Java virtual machine dynamically loads
- * classes.
- *
- * <p> Class loaders may typically be used by security managers to indicate
- * security domains.
- *
- * <p> The <tt>ClassLoader</tt> class uses a delegation model to search for
- * classes and resources.  Each instance of <tt>ClassLoader</tt> has an
- * associated parent class loader.  When requested to find a class or
- * resource, a <tt>ClassLoader</tt> instance will delegate the search for the
- * class or resource to its parent class loader before attempting to find the
- * class or resource itself.  The virtual machine's built-in class loader,
- * called the "bootstrap class loader", does not itself have a parent but may
- * serve as the parent of a <tt>ClassLoader</tt> instance.
- *
- * <p> Class loaders that support concurrent loading of classes are known as
- * <em>parallel capable</em> class loaders and are required to register
- * themselves at their class initialization time by invoking the
- * {@link
- * #registerAsParallelCapable <tt>ClassLoader.registerAsParallelCapable</tt>}
- * method. Note that the <tt>ClassLoader</tt> class is registered as parallel
- * capable by default. However, its subclasses still need to register themselves
- * if they are parallel capable. <br>
- * In environments in which the delegation model is not strictly
- * hierarchical, class loaders need to be parallel capable, otherwise class
- * loading can lead to deadlocks because the loader lock is held for the
- * duration of the class loading process (see {@link #loadClass
- * <tt>loadClass</tt>} methods).
- *
- * <p> Normally, the Java virtual machine loads classes from the local file
- * system in a platform-dependent manner.  For example, on UNIX systems, the
- * virtual machine loads classes from the directory defined by the
- * <tt>CLASSPATH</tt> environment variable.
- *
- * <p> However, some classes may not originate from a file; they may originate
- * from other sources, such as the network, or they could be constructed by an
- * application.  The method {@link #defineClass(String, byte[], int, int)
- * <tt>defineClass</tt>} converts an array of bytes into an instance of class
- * <tt>Class</tt>. Instances of this newly defined class can be created using
- * {@link Class#newInstance <tt>Class.newInstance</tt>}.
- *
- * <p> The methods and constructors of objects created by a class loader may
- * reference other classes.  To determine the class(es) referred to, the Java
- * virtual machine invokes the {@link #loadClass <tt>loadClass</tt>} method of
- * the class loader that originally created the class.
- *
- * <p> For example, an application could create a network class loader to
- * download class files from a server.  Sample code might look like:
- *
- * <blockquote><pre>
- *   ClassLoader loader&nbsp;= new NetworkClassLoader(host,&nbsp;port);
- *   Object main&nbsp;= loader.loadClass("Main", true).newInstance();
- *       &nbsp;.&nbsp;.&nbsp;.
- * </pre></blockquote>
- *
- * <p> The network class loader subclass must define the methods {@link
- * #findClass <tt>findClass</tt>} and <tt>loadClassData</tt> to load a class
- * from the network.  Once it has downloaded the bytes that make up the class,
- * it should use the method {@link #defineClass <tt>defineClass</tt>} to
- * create a class instance.  A sample implementation is:
- *
- * <blockquote><pre>
- *     class NetworkClassLoader extends ClassLoader {
- *         String host;
- *         int port;
- *
- *         public Class findClass(String name) {
- *             byte[] b = loadClassData(name);
- *             return defineClass(name, b, 0, b.length);
- *         }
- *
- *         private byte[] loadClassData(String name) {
- *             // load the class data from the connection
- *             &nbsp;.&nbsp;.&nbsp;.
- *         }
- *     }
- * </pre></blockquote>
- *
- * <h4> <a name="name">Binary names</a> </h4>
- *
- * <p> Any class name provided as a {@link String} parameter to methods in
- * <tt>ClassLoader</tt> must be a binary name as defined by
- * <cite>The Java&trade; Language Specification</cite>.
- *
- * <p> Examples of valid class names include:
- * <blockquote><pre>
- *   "java.lang.String"
- *   "javax.swing.JSpinner$DefaultEditor"
- *   "java.security.KeyStore$Builder$FileBuilder$1"
- *   "java.net.URLClassLoader$3$1"
- * </pre></blockquote>
- *
- * @see      #resolveClass(Class)
- * @since 1.0
- */
-public abstract class ClassLoader {
-
-    @JavaScriptBody(args = {}, body = "")
-    private static native void registerNatives();
-    static {
-        registerNatives();
-    }
-
-    // The parent class loader for delegation
-    // Note: VM hardcoded the offset of this field, thus all new fields
-    // must be added *after* it.
-    private final ClassLoader parent;
-
-
-    /**
-     * Creates a new class loader using the specified parent class loader for
-     * delegation.
-     *
-     * <p> If there is a security manager, its {@link
-     * SecurityManager#checkCreateClassLoader()
-     * <tt>checkCreateClassLoader</tt>} method is invoked.  This may result in
-     * a security exception.  </p>
-     *
-     * @param  parent
-     *         The parent class loader
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          <tt>checkCreateClassLoader</tt> method doesn't allow creation
-     *          of a new class loader.
-     *
-     * @since  1.2
-     */
-    protected ClassLoader(ClassLoader parent) {
-        throw new SecurityException();
-    }
-
-    /**
-     * Creates a new class loader using the <tt>ClassLoader</tt> returned by
-     * the method {@link #getSystemClassLoader()
-     * <tt>getSystemClassLoader()</tt>} as the parent class loader.
-     *
-     * <p> If there is a security manager, its {@link
-     * SecurityManager#checkCreateClassLoader()
-     * <tt>checkCreateClassLoader</tt>} method is invoked.  This may result in
-     * a security exception.  </p>
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          <tt>checkCreateClassLoader</tt> method doesn't allow creation
-     *          of a new class loader.
-     */
-    protected ClassLoader() {
-        throw new SecurityException();
-    }
-
-    // -- Class --
-
-    /**
-     * Loads the class with the specified <a href="#name">binary name</a>.
-     * This method searches for classes in the same manner as the {@link
-     * #loadClass(String, boolean)} method.  It is invoked by the Java virtual
-     * machine to resolve class references.  Invoking this method is equivalent
-     * to invoking {@link #loadClass(String, boolean) <tt>loadClass(name,
-     * false)</tt>}.  </p>
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @return  The resulting <tt>Class</tt> object
-     *
-     * @throws  ClassNotFoundException
-     *          If the class was not found
-     */
-    public Class<?> loadClass(String name) throws ClassNotFoundException {
-        return loadClass(name, false);
-    }
-
-    /**
-     * Loads the class with the specified <a href="#name">binary name</a>.  The
-     * default implementation of this method searches for classes in the
-     * following order:
-     *
-     * <p><ol>
-     *
-     *   <li><p> Invoke {@link #findLoadedClass(String)} to check if the class
-     *   has already been loaded.  </p></li>
-     *
-     *   <li><p> Invoke the {@link #loadClass(String) <tt>loadClass</tt>} method
-     *   on the parent class loader.  If the parent is <tt>null</tt> the class
-     *   loader built-in to the virtual machine is used, instead.  </p></li>
-     *
-     *   <li><p> Invoke the {@link #findClass(String)} method to find the
-     *   class.  </p></li>
-     *
-     * </ol>
-     *
-     * <p> If the class was found using the above steps, and the
-     * <tt>resolve</tt> flag is true, this method will then invoke the {@link
-     * #resolveClass(Class)} method on the resulting <tt>Class</tt> object.
-     *
-     * <p> Subclasses of <tt>ClassLoader</tt> are encouraged to override {@link
-     * #findClass(String)}, rather than this method.  </p>
-     *
-     * <p> Unless overridden, this method synchronizes on the result of
-     * {@link #getClassLoadingLock <tt>getClassLoadingLock</tt>} method
-     * during the entire class loading process.
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @param  resolve
-     *         If <tt>true</tt> then resolve the class
-     *
-     * @return  The resulting <tt>Class</tt> object
-     *
-     * @throws  ClassNotFoundException
-     *          If the class could not be found
-     */
-    protected Class<?> loadClass(String name, boolean resolve)
-        throws ClassNotFoundException
-    {
-        synchronized (getClassLoadingLock(name)) {
-            // First, check if the class has already been loaded
-            Class c = findLoadedClass(name);
-            if (c == null) {
-                try {
-                    if (parent != null) {
-                        c = parent.loadClass(name, false);
-                    } else {
-                        c = findBootstrapClassOrNull(name);
-                    }
-                } catch (ClassNotFoundException e) {
-                    // ClassNotFoundException thrown if class not found
-                    // from the non-null parent class loader
-                }
-
-                if (c == null) {
-                    // If still not found, then invoke findClass in order
-                    // to find the class.
-                    c = findClass(name);
-
-//                    // this is the defining class loader; record the stats
-//                    sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0);
-//                    sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1);
-//                    sun.misc.PerfCounter.getFindClasses().increment();
-                }
-            }
-            if (resolve) {
-                resolveClass(c);
-            }
-            return c;
-        }
-    }
-
-    /**
-     * Returns the lock object for class loading operations.
-     * For backward compatibility, the default implementation of this method
-     * behaves as follows. If this ClassLoader object is registered as
-     * parallel capable, the method returns a dedicated object associated
-     * with the specified class name. Otherwise, the method returns this
-     * ClassLoader object. </p>
-     *
-     * @param  className
-     *         The name of the to-be-loaded class
-     *
-     * @return the lock for class loading operations
-     *
-     * @throws NullPointerException
-     *         If registered as parallel capable and <tt>className</tt> is null
-     *
-     * @see #loadClass(String, boolean)
-     *
-     * @since  1.7
-     */
-    protected Object getClassLoadingLock(String className) {
-        Object lock = this;
-        return lock;
-    }
-
-    /**
-     * Finds the class with the specified <a href="#name">binary name</a>.
-     * This method should be overridden by class loader implementations that
-     * follow the delegation model for loading classes, and will be invoked by
-     * the {@link #loadClass <tt>loadClass</tt>} method after checking the
-     * parent class loader for the requested class.  The default implementation
-     * throws a <tt>ClassNotFoundException</tt>.  </p>
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @return  The resulting <tt>Class</tt> object
-     *
-     * @throws  ClassNotFoundException
-     *          If the class could not be found
-     *
-     * @since  1.2
-     */
-    protected Class<?> findClass(String name) throws ClassNotFoundException {
-        throw new ClassNotFoundException(name);
-    }
-
-    /**
-     * Converts an array of bytes into an instance of class <tt>Class</tt>.
-     * Before the <tt>Class</tt> can be used it must be resolved.  This method
-     * is deprecated in favor of the version that takes a <a
-     * href="#name">binary name</a> as its first argument, and is more secure.
-     *
-     * @param  b
-     *         The bytes that make up the class data.  The bytes in positions
-     *         <tt>off</tt> through <tt>off+len-1</tt> should have the format
-     *         of a valid class file as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *
-     * @param  off
-     *         The start offset in <tt>b</tt> of the class data
-     *
-     * @param  len
-     *         The length of the class data
-     *
-     * @return  The <tt>Class</tt> object that was created from the specified
-     *          class data
-     *
-     * @throws  ClassFormatError
-     *          If the data did not contain a valid class
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If either <tt>off</tt> or <tt>len</tt> is negative, or if
-     *          <tt>off+len</tt> is greater than <tt>b.length</tt>.
-     *
-     * @throws  SecurityException
-     *          If an attempt is made to add this class to a package that
-     *          contains classes that were signed by a different set of
-     *          certificates than this class, or if an attempt is made
-     *          to define a class in a package with a fully-qualified name
-     *          that starts with "{@code java.}".
-     *
-     * @see  #loadClass(String, boolean)
-     * @see  #resolveClass(Class)
-     *
-     * @deprecated  Replaced by {@link #defineClass(String, byte[], int, int)
-     * defineClass(String, byte[], int, int)}
-     */
-    @Deprecated
-    protected final Class<?> defineClass(byte[] b, int off, int len)
-        throws ClassFormatError
-    {
-        throw new SecurityException();
-    }
-
-    /**
-     * Converts an array of bytes into an instance of class <tt>Class</tt>.
-     * Before the <tt>Class</tt> can be used it must be resolved.
-     *
-     * <p> This method assigns a default {@link java.security.ProtectionDomain
-     * <tt>ProtectionDomain</tt>} to the newly defined class.  The
-     * <tt>ProtectionDomain</tt> is effectively granted the same set of
-     * permissions returned when {@link
-     * java.security.Policy#getPermissions(java.security.CodeSource)
-     * <tt>Policy.getPolicy().getPermissions(new CodeSource(null, null))</tt>}
-     * is invoked.  The default domain is created on the first invocation of
-     * {@link #defineClass(String, byte[], int, int) <tt>defineClass</tt>},
-     * and re-used on subsequent invocations.
-     *
-     * <p> To assign a specific <tt>ProtectionDomain</tt> to the class, use
-     * the {@link #defineClass(String, byte[], int, int,
-     * java.security.ProtectionDomain) <tt>defineClass</tt>} method that takes a
-     * <tt>ProtectionDomain</tt> as one of its arguments.  </p>
-     *
-     * @param  name
-     *         The expected <a href="#name">binary name</a> of the class, or
-     *         <tt>null</tt> if not known
-     *
-     * @param  b
-     *         The bytes that make up the class data.  The bytes in positions
-     *         <tt>off</tt> through <tt>off+len-1</tt> should have the format
-     *         of a valid class file as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *
-     * @param  off
-     *         The start offset in <tt>b</tt> of the class data
-     *
-     * @param  len
-     *         The length of the class data
-     *
-     * @return  The <tt>Class</tt> object that was created from the specified
-     *          class data.
-     *
-     * @throws  ClassFormatError
-     *          If the data did not contain a valid class
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If either <tt>off</tt> or <tt>len</tt> is negative, or if
-     *          <tt>off+len</tt> is greater than <tt>b.length</tt>.
-     *
-     * @throws  SecurityException
-     *          If an attempt is made to add this class to a package that
-     *          contains classes that were signed by a different set of
-     *          certificates than this class (which is unsigned), or if
-     *          <tt>name</tt> begins with "<tt>java.</tt>".
-     *
-     * @see  #loadClass(String, boolean)
-     * @see  #resolveClass(Class)
-     * @see  java.security.CodeSource
-     * @see  java.security.SecureClassLoader
-     *
-     * @since  1.1
-     */
-    protected final Class<?> defineClass(String name, byte[] b, int off, int len)
-        throws ClassFormatError
-    {
-        throw new SecurityException();
-    }
-
-    /**
-     * Links the specified class.  This (misleadingly named) method may be
-     * used by a class loader to link a class.  If the class <tt>c</tt> has
-     * already been linked, then this method simply returns. Otherwise, the
-     * class is linked as described in the "Execution" chapter of
-     * <cite>The Java&trade; Language Specification</cite>.
-     * </p>
-     *
-     * @param  c
-     *         The class to link
-     *
-     * @throws  NullPointerException
-     *          If <tt>c</tt> is <tt>null</tt>.
-     *
-     * @see  #defineClass(String, byte[], int, int)
-     */
-    protected final void resolveClass(Class<?> c) {
-        resolveClass0(c);
-    }
-
-    private native void resolveClass0(Class c);
-
-
-    /**
-     * Returns the class with the given <a href="#name">binary name</a> if this
-     * loader has been recorded by the Java virtual machine as an initiating
-     * loader of a class with that <a href="#name">binary name</a>.  Otherwise
-     * <tt>null</tt> is returned.  </p>
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @return  The <tt>Class</tt> object, or <tt>null</tt> if the class has
-     *          not been loaded
-     *
-     * @since  1.1
-     */
-    protected final Class<?> findLoadedClass(String name) {
-        if (!checkName(name))
-            return null;
-        return findLoadedClass0(name);
-    }
-
-    private native final Class findLoadedClass0(String name);
-
-    /**
-     * Sets the signers of a class.  This should be invoked after defining a
-     * class.  </p>
-     *
-     * @param  c
-     *         The <tt>Class</tt> object
-     *
-     * @param  signers
-     *         The signers for the class
-     *
-     * @since  1.1
-     */
-    protected final void setSigners(Class<?> c, Object[] signers) {
-        //c.setSigners(signers);
-        throw new UnsupportedOperationException();
-    }
-
-
-    // -- Resource --
-
-    /**
-     * Finds the resource with the given name.  A resource is some data
-     * (images, audio, text, etc) that can be accessed by class code in a way
-     * that is independent of the location of the code.
-     *
-     * <p> The name of a resource is a '<tt>/</tt>'-separated path name that
-     * identifies the resource.
-     *
-     * <p> This method will first search the parent class loader for the
-     * resource; if the parent is <tt>null</tt> the path of the class loader
-     * built-in to the virtual machine is searched.  That failing, this method
-     * will invoke {@link #findResource(String)} to find the resource.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  A <tt>URL</tt> object for reading the resource, or
-     *          <tt>null</tt> if the resource could not be found or the invoker
-     *          doesn't have adequate  privileges to get the resource.
-     *
-     * @since  1.1
-     */
-    public URL getResource(String name) {
-        URL url;
-        if (parent != null) {
-            url = parent.getResource(name);
-        } else {
-            url = getBootstrapResource(name);
-        }
-        if (url == null) {
-            url = findResource(name);
-        }
-        return url;
-    }
-
-    /**
-     * Finds all the resources with the given name. A resource is some data
-     * (images, audio, text, etc) that can be accessed by class code in a way
-     * that is independent of the location of the code.
-     *
-     * <p>The name of a resource is a <tt>/</tt>-separated path name that
-     * identifies the resource.
-     *
-     * <p> The search order is described in the documentation for {@link
-     * #getResource(String)}.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An enumeration of {@link java.net.URL <tt>URL</tt>} objects for
-     *          the resource.  If no resources could  be found, the enumeration
-     *          will be empty.  Resources that the class loader doesn't have
-     *          access to will not be in the enumeration.
-     *
-     * @throws  IOException
-     *          If I/O errors occur
-     *
-     * @see  #findResources(String)
-     *
-     * @since  1.2
-     */
-    public Enumeration<URL> getResources(String name) throws IOException {
-        Enumeration[] tmp = new Enumeration[2];
-        if (parent != null) {
-            tmp[0] = parent.getResources(name);
-        } else {
-            tmp[0] = getBootstrapResources(name);
-        }
-        tmp[1] = findResources(name);
-
-        return new CompoundEnumeration(tmp);
-    }
-
-    /**
-     * Finds the resource with the given name. Class loader implementations
-     * should override this method to specify where to find resources.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  A <tt>URL</tt> object for reading the resource, or
-     *          <tt>null</tt> if the resource could not be found
-     *
-     * @since  1.2
-     */
-    protected URL findResource(String name) {
-        return null;
-    }
-
-    /**
-     * Returns an enumeration of {@link java.net.URL <tt>URL</tt>} objects
-     * representing all the resources with the given name. Class loader
-     * implementations should override this method to specify where to load
-     * resources from.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An enumeration of {@link java.net.URL <tt>URL</tt>} objects for
-     *          the resources
-     *
-     * @throws  IOException
-     *          If I/O errors occur
-     *
-     * @since  1.2
-     */
-    protected Enumeration<URL> findResources(String name) throws IOException {
-        return new CompoundEnumeration(new Enumeration[0]);
-    }
-
-    // index 0: java.lang.ClassLoader.class
-    // index 1: the immediate caller of index 0.
-    // index 2: the immediate caller of index 1.
-    private static native Class<? extends ClassLoader> getCaller(int index);
-
-    /**
-     * Registers the caller as parallel capable.</p>
-     * The registration succeeds if and only if all of the following
-     * conditions are met: <br>
-     * 1. no instance of the caller has been created</p>
-     * 2. all of the super classes (except class Object) of the caller are
-     * registered as parallel capable</p>
-     * Note that once a class loader is registered as parallel capable, there
-     * is no way to change it back. </p>
-     *
-     * @return  true if the caller is successfully registered as
-     *          parallel capable and false if otherwise.
-     *
-     * @since   1.7
-     */
-//    protected static boolean registerAsParallelCapable() {
-//        return false;
-//    }
-
-    /**
-     * Find a resource of the specified name from the search path used to load
-     * classes.  This method locates the resource through the system class
-     * loader (see {@link #getSystemClassLoader()}).  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  A {@link java.net.URL <tt>URL</tt>} object for reading the
-     *          resource, or <tt>null</tt> if the resource could not be found
-     *
-     * @since  1.1
-     */
-    public static URL getSystemResource(String name) {
-        ClassLoader system = getSystemClassLoader();
-        if (system == null) {
-            return getBootstrapResource(name);
-        }
-        return system.getResource(name);
-    }
-
-    /**
-     * Finds all resources of the specified name from the search path used to
-     * load classes.  The resources thus found are returned as an
-     * {@link java.util.Enumeration <tt>Enumeration</tt>} of {@link
-     * java.net.URL <tt>URL</tt>} objects.
-     *
-     * <p> The search order is described in the documentation for {@link
-     * #getSystemResource(String)}.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An enumeration of resource {@link java.net.URL <tt>URL</tt>}
-     *          objects
-     *
-     * @throws  IOException
-     *          If I/O errors occur
-
-     * @since  1.2
-     */
-    public static Enumeration<URL> getSystemResources(String name)
-        throws IOException
-    {
-        ClassLoader system = null; // getSystemClassLoader();
-        if (system == null) {
-            return getBootstrapResources(name);
-        }
-        return system.getResources(name);
-    }
-
-
-
-    /**
-     * Returns an input stream for reading the specified resource.
-     *
-     * <p> The search order is described in the documentation for {@link
-     * #getResource(String)}.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An input stream for reading the resource, or <tt>null</tt>
-     *          if the resource could not be found
-     *
-     * @since  1.1
-     */
-    public InputStream getResourceAsStream(String name) {
-        URL url = getResource(name);
-        try {
-            return url != null ? url.openStream() : null;
-        } catch (IOException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Open for reading, a resource of the specified name from the search path
-     * used to load classes.  This method locates the resource through the
-     * system class loader (see {@link #getSystemClassLoader()}).  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An input stream for reading the resource, or <tt>null</tt>
-     *          if the resource could not be found
-     *
-     * @since  1.1
-     */
-    public static InputStream getSystemResourceAsStream(String name) {
-        URL url = getSystemResource(name);
-        try {
-            return url != null ? url.openStream() : null;
-        } catch (IOException e) {
-            return null;
-        }
-    }
-
-
-    // -- Hierarchy --
-
-    /**
-     * Returns the parent class loader for delegation. Some implementations may
-     * use <tt>null</tt> to represent the bootstrap class loader. This method
-     * will return <tt>null</tt> in such implementations if this class loader's
-     * parent is the bootstrap class loader.
-     *
-     * <p> If a security manager is present, and the invoker's class loader is
-     * not <tt>null</tt> and is not an ancestor of this class loader, then this
-     * method invokes the security manager's {@link
-     * SecurityManager#checkPermission(java.security.Permission)
-     * <tt>checkPermission</tt>} method with a {@link
-     * RuntimePermission#RuntimePermission(String)
-     * <tt>RuntimePermission("getClassLoader")</tt>} permission to verify
-     * access to the parent class loader is permitted.  If not, a
-     * <tt>SecurityException</tt> will be thrown.  </p>
-     *
-     * @return  The parent <tt>ClassLoader</tt>
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its <tt>checkPermission</tt>
-     *          method doesn't allow access to this class loader's parent class
-     *          loader.
-     *
-     * @since  1.2
-     */
-    public final ClassLoader getParent() {
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns the system class loader for delegation.  This is the default
-     * delegation parent for new <tt>ClassLoader</tt> instances, and is
-     * typically the class loader used to start the application.
-     *
-     * <p> This method is first invoked early in the runtime's startup
-     * sequence, at which point it creates the system class loader and sets it
-     * as the context class loader of the invoking <tt>Thread</tt>.
-     *
-     * <p> The default system class loader is an implementation-dependent
-     * instance of this class.
-     *
-     * <p> If the system property "<tt>java.system.class.loader</tt>" is defined
-     * when this method is first invoked then the value of that property is
-     * taken to be the name of a class that will be returned as the system
-     * class loader.  The class is loaded using the default system class loader
-     * and must define a public constructor that takes a single parameter of
-     * type <tt>ClassLoader</tt> which is used as the delegation parent.  An
-     * instance is then created using this constructor with the default system
-     * class loader as the parameter.  The resulting class loader is defined
-     * to be the system class loader.
-     *
-     * <p> If a security manager is present, and the invoker's class loader is
-     * not <tt>null</tt> and the invoker's class loader is not the same as or
-     * an ancestor of the system class loader, then this method invokes the
-     * security manager's {@link
-     * SecurityManager#checkPermission(java.security.Permission)
-     * <tt>checkPermission</tt>} method with a {@link
-     * RuntimePermission#RuntimePermission(String)
-     * <tt>RuntimePermission("getClassLoader")</tt>} permission to verify
-     * access to the system class loader.  If not, a
-     * <tt>SecurityException</tt> will be thrown.  </p>
-     *
-     * @return  The system <tt>ClassLoader</tt> for delegation, or
-     *          <tt>null</tt> if none
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its <tt>checkPermission</tt>
-     *          method doesn't allow access to the system class loader.
-     *
-     * @throws  IllegalStateException
-     *          If invoked recursively during the construction of the class
-     *          loader specified by the "<tt>java.system.class.loader</tt>"
-     *          property.
-     *
-     * @throws  Error
-     *          If the system property "<tt>java.system.class.loader</tt>"
-     *          is defined but the named class could not be loaded, the
-     *          provider class does not define the required constructor, or an
-     *          exception is thrown by that constructor when it is invoked. The
-     *          underlying cause of the error can be retrieved via the
-     *          {@link Throwable#getCause()} method.
-     *
-     * @revised  1.4
-     */
-    public static ClassLoader getSystemClassLoader() {
-        throw new SecurityException();
-    }
-
-    // Returns true if the specified class loader can be found in this class
-    // loader's delegation chain.
-    boolean isAncestor(ClassLoader cl) {
-        ClassLoader acl = this;
-        do {
-            acl = acl.parent;
-            if (cl == acl) {
-                return true;
-            }
-        } while (acl != null);
-        return false;
-    }
-
-    private boolean checkName(String name) {
-        throw new UnsupportedOperationException(); 
-    }
-
-    private Class findBootstrapClassOrNull(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    private static URL getBootstrapResource(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    private static Enumeration<URL> getBootstrapResources(String name) {
-        URL u = Object.class.getResource("/" + name);
-        return new OneOrZeroEnum(u);
-    }
-    
-    private static class OneOrZeroEnum implements Enumeration<URL> {
-        private URL u;
-
-        public OneOrZeroEnum(URL u) {
-            this.u = u;
-        }
-
-        public boolean hasMoreElements() {
-            return u != null;
-        }
-
-        public URL nextElement() {
-            URL r = u;
-            if (r == null) {
-                throw new NoSuchElementException();
-            }
-            u = null;
-            return r;
-        }
-    }
-
-    private static class CompoundEnumeration implements Enumeration<URL> {
-        private URL next;
-        private int index;
-        private final Enumeration[] arr;
-
-        public CompoundEnumeration(Enumeration[] arr) {
-            this.arr = arr;
-            this.index = 0;
-        }
-
-        public boolean hasMoreElements() {
-            if (next == null) {
-                if (arr[index].hasMoreElements()) {
-                    next = (URL) arr[index].nextElement();
-                } else {
-                    if (index < arr.length) {
-                        index++;
-                        return hasMoreElements();
-                    }
-                }
-            }
-            return next != null;
-        }
-
-        public URL nextElement() {
-            if (!hasMoreElements()) {
-                throw new NoSuchElementException();
-            }
-            URL r = next;
-            next = null;
-            return r;
-        }
-        
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/ClassNotFoundException.java
--- a/emul/mini/src/main/java/java/lang/ClassNotFoundException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when an application tries to load in a class through its
- * string name using:
- * <ul>
- * <li>The <code>forName</code> method in class <code>Class</code>.
- * <li>The <code>findSystemClass</code> method in class
- *     <code>ClassLoader</code> .
- * <li>The <code>loadClass</code> method in class <code>ClassLoader</code>.
- * </ul>
- * <p>
- * but no definition for the class with the specified name could be found.
- *
- * <p>As of release 1.4, this exception has been retrofitted to conform to
- * the general purpose exception-chaining mechanism.  The "optional exception
- * that was raised while loading the class" that may be provided at
- * construction time and accessed via the {@link #getException()} method is
- * now known as the <i>cause</i>, and may be accessed via the {@link
- * Throwable#getCause()} method, as well as the aforementioned "legacy method."
- *
- * @author  unascribed
- * @see     java.lang.Class#forName(java.lang.String)
- * @see     java.lang.ClassLoader#findSystemClass(java.lang.String)
- * @see     java.lang.ClassLoader#loadClass(java.lang.String, boolean)
- * @since   JDK1.0
- */
-public class ClassNotFoundException extends ReflectiveOperationException {
-    /**
-     * use serialVersionUID from JDK 1.1.X for interoperability
-     */
-     private static final long serialVersionUID = 9176873029745254542L;
-
-    /**
-     * This field holds the exception ex if the
-     * ClassNotFoundException(String s, Throwable ex) constructor was
-     * used to instantiate the object
-     * @serial
-     * @since 1.2
-     */
-    private Throwable ex;
-
-    /**
-     * Constructs a <code>ClassNotFoundException</code> with no detail message.
-     */
-    public ClassNotFoundException() {
-        super((Throwable)null);  // Disallow initCause
-    }
-
-    /**
-     * Constructs a <code>ClassNotFoundException</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public ClassNotFoundException(String s) {
-        super(s, null);  //  Disallow initCause
-    }
-
-    /**
-     * Constructs a <code>ClassNotFoundException</code> with the
-     * specified detail message and optional exception that was
-     * raised while loading the class.
-     *
-     * @param s the detail message
-     * @param ex the exception that was raised while loading the class
-     * @since 1.2
-     */
-    public ClassNotFoundException(String s, Throwable ex) {
-        super(s, null);  //  Disallow initCause
-        this.ex = ex;
-    }
-
-    /**
-     * Returns the exception that was raised if an error occurred while
-     * attempting to load the class. Otherwise, returns <tt>null</tt>.
-     *
-     * <p>This method predates the general-purpose exception chaining facility.
-     * The {@link Throwable#getCause()} method is now the preferred means of
-     * obtaining this information.
-     *
-     * @return the <code>Exception</code> that was raised while loading a class
-     * @since 1.2
-     */
-    public Throwable getException() {
-        return ex;
-    }
-
-    /**
-     * Returns the cause of this exception (the exception that was raised
-     * if an error occurred while attempting to load the class; otherwise
-     * <tt>null</tt>).
-     *
-     * @return  the cause of this exception.
-     * @since   1.4
-     */
-    public Throwable getCause() {
-        return ex;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/CloneNotSupportedException.java
--- a/emul/mini/src/main/java/java/lang/CloneNotSupportedException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that the <code>clone</code> method in class
- * <code>Object</code> has been called to clone an object, but that
- * the object's class does not implement the <code>Cloneable</code>
- * interface.
- * <p>
- * Applications that override the <code>clone</code> method can also
- * throw this exception to indicate that an object could not or
- * should not be cloned.
- *
- * @author  unascribed
- * @see     java.lang.Cloneable
- * @see     java.lang.Object#clone()
- * @since   JDK1.0
- */
-
-public
-class CloneNotSupportedException extends Exception {
-    private static final long serialVersionUID = 5195511250079656443L;
-
-    /**
-     * Constructs a <code>CloneNotSupportedException</code> with no
-     * detail message.
-     */
-    public CloneNotSupportedException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>CloneNotSupportedException</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public CloneNotSupportedException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Cloneable.java
--- a/emul/mini/src/main/java/java/lang/Cloneable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * A class implements the <code>Cloneable</code> interface to
- * indicate to the {@link java.lang.Object#clone()} method that it
- * is legal for that method to make a
- * field-for-field copy of instances of that class.
- * <p>
- * Invoking Object's clone method on an instance that does not implement the
- * <code>Cloneable</code> interface results in the exception
- * <code>CloneNotSupportedException</code> being thrown.
- * <p>
- * By convention, classes that implement this interface should override
- * <tt>Object.clone</tt> (which is protected) with a public method.
- * See {@link java.lang.Object#clone()} for details on overriding this
- * method.
- * <p>
- * Note that this interface does <i>not</i> contain the <tt>clone</tt> method.
- * Therefore, it is not possible to clone an object merely by virtue of the
- * fact that it implements this interface.  Even if the clone method is invoked
- * reflectively, there is no guarantee that it will succeed.
- *
- * @author  unascribed
- * @see     java.lang.CloneNotSupportedException
- * @see     java.lang.Object#clone()
- * @since   JDK1.0
- */
-public interface Cloneable {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Comparable.java
--- a/emul/mini/src/main/java/java/lang/Comparable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * This interface imposes a total ordering on the objects of each class that
- * implements it.  This ordering is referred to as the class's <i>natural
- * ordering</i>, and the class's <tt>compareTo</tt> method is referred to as
- * its <i>natural comparison method</i>.<p>
- *
- * Lists (and arrays) of objects that implement this interface can be sorted
- * automatically by {@link Collections#sort(List) Collections.sort} (and
- * {@link Arrays#sort(Object[]) Arrays.sort}).  Objects that implement this
- * interface can be used as keys in a {@linkplain SortedMap sorted map} or as
- * elements in a {@linkplain SortedSet sorted set}, without the need to
- * specify a {@linkplain Comparator comparator}.<p>
- *
- * The natural ordering for a class <tt>C</tt> is said to be <i>consistent
- * with equals</i> if and only if <tt>e1.compareTo(e2) == 0</tt> has
- * the same boolean value as <tt>e1.equals(e2)</tt> for every
- * <tt>e1</tt> and <tt>e2</tt> of class <tt>C</tt>.  Note that <tt>null</tt>
- * is not an instance of any class, and <tt>e.compareTo(null)</tt> should
- * throw a <tt>NullPointerException</tt> even though <tt>e.equals(null)</tt>
- * returns <tt>false</tt>.<p>
- *
- * It is strongly recommended (though not required) that natural orderings be
- * consistent with equals.  This is so because sorted sets (and sorted maps)
- * without explicit comparators behave "strangely" when they are used with
- * elements (or keys) whose natural ordering is inconsistent with equals.  In
- * particular, such a sorted set (or sorted map) violates the general contract
- * for set (or map), which is defined in terms of the <tt>equals</tt>
- * method.<p>
- *
- * For example, if one adds two keys <tt>a</tt> and <tt>b</tt> such that
- * <tt>(!a.equals(b) && a.compareTo(b) == 0)</tt> to a sorted
- * set that does not use an explicit comparator, the second <tt>add</tt>
- * operation returns false (and the size of the sorted set does not increase)
- * because <tt>a</tt> and <tt>b</tt> are equivalent from the sorted set's
- * perspective.<p>
- *
- * Virtually all Java core classes that implement <tt>Comparable</tt> have natural
- * orderings that are consistent with equals.  One exception is
- * <tt>java.math.BigDecimal</tt>, whose natural ordering equates
- * <tt>BigDecimal</tt> objects with equal values and different precisions
- * (such as 4.0 and 4.00).<p>
- *
- * For the mathematically inclined, the <i>relation</i> that defines
- * the natural ordering on a given class C is:<pre>
- *       {(x, y) such that x.compareTo(y) &lt;= 0}.
- * </pre> The <i>quotient</i> for this total order is: <pre>
- *       {(x, y) such that x.compareTo(y) == 0}.
- * </pre>
- *
- * It follows immediately from the contract for <tt>compareTo</tt> that the
- * quotient is an <i>equivalence relation</i> on <tt>C</tt>, and that the
- * natural ordering is a <i>total order</i> on <tt>C</tt>.  When we say that a
- * class's natural ordering is <i>consistent with equals</i>, we mean that the
- * quotient for the natural ordering is the equivalence relation defined by
- * the class's {@link Object#equals(Object) equals(Object)} method:<pre>
- *     {(x, y) such that x.equals(y)}. </pre><p>
- *
- * This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <T> the type of objects that this object may be compared to
- *
- * @author  Josh Bloch
- * @see java.util.Comparator
- * @since 1.2
- */
-
-public interface Comparable<T> {
-    /**
-     * Compares this object with the specified object for order.  Returns a
-     * negative integer, zero, or a positive integer as this object is less
-     * than, equal to, or greater than the specified object.
-     *
-     * <p>The implementor must ensure <tt>sgn(x.compareTo(y)) ==
-     * -sgn(y.compareTo(x))</tt> for all <tt>x</tt> and <tt>y</tt>.  (This
-     * implies that <tt>x.compareTo(y)</tt> must throw an exception iff
-     * <tt>y.compareTo(x)</tt> throws an exception.)
-     *
-     * <p>The implementor must also ensure that the relation is transitive:
-     * <tt>(x.compareTo(y)&gt;0 &amp;&amp; y.compareTo(z)&gt;0)</tt> implies
-     * <tt>x.compareTo(z)&gt;0</tt>.
-     *
-     * <p>Finally, the implementor must ensure that <tt>x.compareTo(y)==0</tt>
-     * implies that <tt>sgn(x.compareTo(z)) == sgn(y.compareTo(z))</tt>, for
-     * all <tt>z</tt>.
-     *
-     * <p>It is strongly recommended, but <i>not</i> strictly required that
-     * <tt>(x.compareTo(y)==0) == (x.equals(y))</tt>.  Generally speaking, any
-     * class that implements the <tt>Comparable</tt> interface and violates
-     * this condition should clearly indicate this fact.  The recommended
-     * language is "Note: this class has a natural ordering that is
-     * inconsistent with equals."
-     *
-     * <p>In the foregoing description, the notation
-     * <tt>sgn(</tt><i>expression</i><tt>)</tt> designates the mathematical
-     * <i>signum</i> function, which is defined to return one of <tt>-1</tt>,
-     * <tt>0</tt>, or <tt>1</tt> according to whether the value of
-     * <i>expression</i> is negative, zero or positive.
-     *
-     * @param   o the object to be compared.
-     * @return  a negative integer, zero, or a positive integer as this object
-     *          is less than, equal to, or greater than the specified object.
-     *
-     * @throws NullPointerException if the specified object is null
-     * @throws ClassCastException if the specified object's type prevents it
-     *         from being compared to this object.
-     */
-    public int compareTo(T o);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Deprecated.java
--- a/emul/mini/src/main/java/java/lang/Deprecated.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.lang.annotation.*;
-import static java.lang.annotation.ElementType.*;
-
-/**
- * A program element annotated &#64;Deprecated is one that programmers
- * are discouraged from using, typically because it is dangerous,
- * or because a better alternative exists.  Compilers warn when a
- * deprecated program element is used or overridden in non-deprecated code.
- *
- * @author  Neal Gafter
- * @since 1.5
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value={CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})
-public @interface Deprecated {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Double.java
--- a/emul/mini/src/main/java/java/lang/Double.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,994 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- * The {@code Double} class wraps a value of the primitive type
- * {@code double} in an object. An object of type
- * {@code Double} contains a single field whose type is
- * {@code double}.
- *
- * <p>In addition, this class provides several methods for converting a
- * {@code double} to a {@code String} and a
- * {@code String} to a {@code double}, as well as other
- * constants and methods useful when dealing with a
- * {@code double}.
- *
- * @author  Lee Boynton
- * @author  Arthur van Hoff
- * @author  Joseph D. Darcy
- * @since JDK1.0
- */
-public final class Double extends Number implements Comparable<Double> {
-    /**
-     * A constant holding the positive infinity of type
-     * {@code double}. It is equal to the value returned by
-     * {@code Double.longBitsToDouble(0x7ff0000000000000L)}.
-     */
-    public static final double POSITIVE_INFINITY = 1.0 / 0.0;
-
-    /**
-     * A constant holding the negative infinity of type
-     * {@code double}. It is equal to the value returned by
-     * {@code Double.longBitsToDouble(0xfff0000000000000L)}.
-     */
-    public static final double NEGATIVE_INFINITY = -1.0 / 0.0;
-
-    /**
-     * A constant holding a Not-a-Number (NaN) value of type
-     * {@code double}. It is equivalent to the value returned by
-     * {@code Double.longBitsToDouble(0x7ff8000000000000L)}.
-     */
-    public static final double NaN = 0.0d / 0.0;
-
-    /**
-     * A constant holding the largest positive finite value of type
-     * {@code double},
-     * (2-2<sup>-52</sup>)&middot;2<sup>1023</sup>.  It is equal to
-     * the hexadecimal floating-point literal
-     * {@code 0x1.fffffffffffffP+1023} and also equal to
-     * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
-     */
-    public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
-
-    /**
-     * A constant holding the smallest positive normal value of type
-     * {@code double}, 2<sup>-1022</sup>.  It is equal to the
-     * hexadecimal floating-point literal {@code 0x1.0p-1022} and also
-     * equal to {@code Double.longBitsToDouble(0x0010000000000000L)}.
-     *
-     * @since 1.6
-     */
-    public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
-
-    /**
-     * A constant holding the smallest positive nonzero value of type
-     * {@code double}, 2<sup>-1074</sup>. It is equal to the
-     * hexadecimal floating-point literal
-     * {@code 0x0.0000000000001P-1022} and also equal to
-     * {@code Double.longBitsToDouble(0x1L)}.
-     */
-    public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
-
-    /**
-     * Maximum exponent a finite {@code double} variable may have.
-     * It is equal to the value returned by
-     * {@code Math.getExponent(Double.MAX_VALUE)}.
-     *
-     * @since 1.6
-     */
-    public static final int MAX_EXPONENT = 1023;
-
-    /**
-     * Minimum exponent a normalized {@code double} variable may
-     * have.  It is equal to the value returned by
-     * {@code Math.getExponent(Double.MIN_NORMAL)}.
-     *
-     * @since 1.6
-     */
-    public static final int MIN_EXPONENT = -1022;
-
-    /**
-     * The number of bits used to represent a {@code double} value.
-     *
-     * @since 1.5
-     */
-    public static final int SIZE = 64;
-
-    /**
-     * The {@code Class} instance representing the primitive type
-     * {@code double}.
-     *
-     * @since JDK1.1
-     */
-    public static final Class<Double>   TYPE = (Class<Double>) Class.getPrimitiveClass("double");
-
-    /**
-     * Returns a string representation of the {@code double}
-     * argument. All characters mentioned below are ASCII characters.
-     * <ul>
-     * <li>If the argument is NaN, the result is the string
-     *     "{@code NaN}".
-     * <li>Otherwise, the result is a string that represents the sign and
-     * magnitude (absolute value) of the argument. If the sign is negative,
-     * the first character of the result is '{@code -}'
-     * (<code>'&#92;u002D'</code>); if the sign is positive, no sign character
-     * appears in the result. As for the magnitude <i>m</i>:
-     * <ul>
-     * <li>If <i>m</i> is infinity, it is represented by the characters
-     * {@code "Infinity"}; thus, positive infinity produces the result
-     * {@code "Infinity"} and negative infinity produces the result
-     * {@code "-Infinity"}.
-     *
-     * <li>If <i>m</i> is zero, it is represented by the characters
-     * {@code "0.0"}; thus, negative zero produces the result
-     * {@code "-0.0"} and positive zero produces the result
-     * {@code "0.0"}.
-     *
-     * <li>If <i>m</i> is greater than or equal to 10<sup>-3</sup> but less
-     * than 10<sup>7</sup>, then it is represented as the integer part of
-     * <i>m</i>, in decimal form with no leading zeroes, followed by
-     * '{@code .}' (<code>'&#92;u002E'</code>), followed by one or
-     * more decimal digits representing the fractional part of <i>m</i>.
-     *
-     * <li>If <i>m</i> is less than 10<sup>-3</sup> or greater than or
-     * equal to 10<sup>7</sup>, then it is represented in so-called
-     * "computerized scientific notation." Let <i>n</i> be the unique
-     * integer such that 10<sup><i>n</i></sup> &le; <i>m</i> {@literal <}
-     * 10<sup><i>n</i>+1</sup>; then let <i>a</i> be the
-     * mathematically exact quotient of <i>m</i> and
-     * 10<sup><i>n</i></sup> so that 1 &le; <i>a</i> {@literal <} 10. The
-     * magnitude is then represented as the integer part of <i>a</i>,
-     * as a single decimal digit, followed by '{@code .}'
-     * (<code>'&#92;u002E'</code>), followed by decimal digits
-     * representing the fractional part of <i>a</i>, followed by the
-     * letter '{@code E}' (<code>'&#92;u0045'</code>), followed
-     * by a representation of <i>n</i> as a decimal integer, as
-     * produced by the method {@link Integer#toString(int)}.
-     * </ul>
-     * </ul>
-     * How many digits must be printed for the fractional part of
-     * <i>m</i> or <i>a</i>? There must be at least one digit to represent
-     * the fractional part, and beyond that as many, but only as many, more
-     * digits as are needed to uniquely distinguish the argument value from
-     * adjacent values of type {@code double}. That is, suppose that
-     * <i>x</i> is the exact mathematical value represented by the decimal
-     * representation produced by this method for a finite nonzero argument
-     * <i>d</i>. Then <i>d</i> must be the {@code double} value nearest
-     * to <i>x</i>; or if two {@code double} values are equally close
-     * to <i>x</i>, then <i>d</i> must be one of them and the least
-     * significant bit of the significand of <i>d</i> must be {@code 0}.
-     *
-     * <p>To create localized string representations of a floating-point
-     * value, use subclasses of {@link java.text.NumberFormat}.
-     *
-     * @param   d   the {@code double} to be converted.
-     * @return a string representation of the argument.
-     */
-    @JavaScriptBody(args="d", body="var r = d.toString();"
-        + "if (r.indexOf('.') === -1) r = r + '.0';"
-        + "return r;")
-    public static String toString(double d) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns a hexadecimal string representation of the
-     * {@code double} argument. All characters mentioned below
-     * are ASCII characters.
-     *
-     * <ul>
-     * <li>If the argument is NaN, the result is the string
-     *     "{@code NaN}".
-     * <li>Otherwise, the result is a string that represents the sign
-     * and magnitude of the argument. If the sign is negative, the
-     * first character of the result is '{@code -}'
-     * (<code>'&#92;u002D'</code>); if the sign is positive, no sign
-     * character appears in the result. As for the magnitude <i>m</i>:
-     *
-     * <ul>
-     * <li>If <i>m</i> is infinity, it is represented by the string
-     * {@code "Infinity"}; thus, positive infinity produces the
-     * result {@code "Infinity"} and negative infinity produces
-     * the result {@code "-Infinity"}.
-     *
-     * <li>If <i>m</i> is zero, it is represented by the string
-     * {@code "0x0.0p0"}; thus, negative zero produces the result
-     * {@code "-0x0.0p0"} and positive zero produces the result
-     * {@code "0x0.0p0"}.
-     *
-     * <li>If <i>m</i> is a {@code double} value with a
-     * normalized representation, substrings are used to represent the
-     * significand and exponent fields.  The significand is
-     * represented by the characters {@code "0x1."}
-     * followed by a lowercase hexadecimal representation of the rest
-     * of the significand as a fraction.  Trailing zeros in the
-     * hexadecimal representation are removed unless all the digits
-     * are zero, in which case a single zero is used. Next, the
-     * exponent is represented by {@code "p"} followed
-     * by a decimal string of the unbiased exponent as if produced by
-     * a call to {@link Integer#toString(int) Integer.toString} on the
-     * exponent value.
-     *
-     * <li>If <i>m</i> is a {@code double} value with a subnormal
-     * representation, the significand is represented by the
-     * characters {@code "0x0."} followed by a
-     * hexadecimal representation of the rest of the significand as a
-     * fraction.  Trailing zeros in the hexadecimal representation are
-     * removed. Next, the exponent is represented by
-     * {@code "p-1022"}.  Note that there must be at
-     * least one nonzero digit in a subnormal significand.
-     *
-     * </ul>
-     *
-     * </ul>
-     *
-     * <table border>
-     * <caption><h3>Examples</h3></caption>
-     * <tr><th>Floating-point Value</th><th>Hexadecimal String</th>
-     * <tr><td>{@code 1.0}</td> <td>{@code 0x1.0p0}</td>
-     * <tr><td>{@code -1.0}</td>        <td>{@code -0x1.0p0}</td>
-     * <tr><td>{@code 2.0}</td> <td>{@code 0x1.0p1}</td>
-     * <tr><td>{@code 3.0}</td> <td>{@code 0x1.8p1}</td>
-     * <tr><td>{@code 0.5}</td> <td>{@code 0x1.0p-1}</td>
-     * <tr><td>{@code 0.25}</td>        <td>{@code 0x1.0p-2}</td>
-     * <tr><td>{@code Double.MAX_VALUE}</td>
-     *     <td>{@code 0x1.fffffffffffffp1023}</td>
-     * <tr><td>{@code Minimum Normal Value}</td>
-     *     <td>{@code 0x1.0p-1022}</td>
-     * <tr><td>{@code Maximum Subnormal Value}</td>
-     *     <td>{@code 0x0.fffffffffffffp-1022}</td>
-     * <tr><td>{@code Double.MIN_VALUE}</td>
-     *     <td>{@code 0x0.0000000000001p-1022}</td>
-     * </table>
-     * @param   d   the {@code double} to be converted.
-     * @return a hex string representation of the argument.
-     * @since 1.5
-     * @author Joseph D. Darcy
-     */
-    public static String toHexString(double d) {
-        throw new UnsupportedOperationException();
-//        /*
-//         * Modeled after the "a" conversion specifier in C99, section
-//         * 7.19.6.1; however, the output of this method is more
-//         * tightly specified.
-//         */
-//        if (!FpUtils.isFinite(d) )
-//            // For infinity and NaN, use the decimal output.
-//            return Double.toString(d);
-//        else {
-//            // Initialized to maximum size of output.
-//            StringBuffer answer = new StringBuffer(24);
-//
-//            if (FpUtils.rawCopySign(1.0, d) == -1.0) // value is negative,
-//                answer.append("-");                  // so append sign info
-//
-//            answer.append("0x");
-//
-//            d = Math.abs(d);
-//
-//            if(d == 0.0) {
-//                answer.append("0.0p0");
-//            }
-//            else {
-//                boolean subnormal = (d < DoubleConsts.MIN_NORMAL);
-//
-//                // Isolate significand bits and OR in a high-order bit
-//                // so that the string representation has a known
-//                // length.
-//                long signifBits = (Double.doubleToLongBits(d)
-//                                   & DoubleConsts.SIGNIF_BIT_MASK) |
-//                    0x1000000000000000L;
-//
-//                // Subnormal values have a 0 implicit bit; normal
-//                // values have a 1 implicit bit.
-//                answer.append(subnormal ? "0." : "1.");
-//
-//                // Isolate the low-order 13 digits of the hex
-//                // representation.  If all the digits are zero,
-//                // replace with a single 0; otherwise, remove all
-//                // trailing zeros.
-//                String signif = Long.toHexString(signifBits).substring(3,16);
-//                answer.append(signif.equals("0000000000000") ? // 13 zeros
-//                              "0":
-//                              signif.replaceFirst("0{1,12}$", ""));
-//
-//                // If the value is subnormal, use the E_min exponent
-//                // value for double; otherwise, extract and report d's
-//                // exponent (the representation of a subnormal uses
-//                // E_min -1).
-//                answer.append("p" + (subnormal ?
-//                               DoubleConsts.MIN_EXPONENT:
-//                               FpUtils.getExponent(d) ));
-//            }
-//            return answer.toString();
-//        }
-    }
-
-    /**
-     * Returns a {@code Double} object holding the
-     * {@code double} value represented by the argument string
-     * {@code s}.
-     *
-     * <p>If {@code s} is {@code null}, then a
-     * {@code NullPointerException} is thrown.
-     *
-     * <p>Leading and trailing whitespace characters in {@code s}
-     * are ignored.  Whitespace is removed as if by the {@link
-     * String#trim} method; that is, both ASCII space and control
-     * characters are removed. The rest of {@code s} should
-     * constitute a <i>FloatValue</i> as described by the lexical
-     * syntax rules:
-     *
-     * <blockquote>
-     * <dl>
-     * <dt><i>FloatValue:</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code NaN}
-     * <dd><i>Sign<sub>opt</sub></i> {@code Infinity}
-     * <dd><i>Sign<sub>opt</sub> FloatingPointLiteral</i>
-     * <dd><i>Sign<sub>opt</sub> HexFloatingPointLiteral</i>
-     * <dd><i>SignedInteger</i>
-     * </dl>
-     *
-     * <p>
-     *
-     * <dl>
-     * <dt><i>HexFloatingPointLiteral</i>:
-     * <dd> <i>HexSignificand BinaryExponent FloatTypeSuffix<sub>opt</sub></i>
-     * </dl>
-     *
-     * <p>
-     *
-     * <dl>
-     * <dt><i>HexSignificand:</i>
-     * <dd><i>HexNumeral</i>
-     * <dd><i>HexNumeral</i> {@code .}
-     * <dd>{@code 0x} <i>HexDigits<sub>opt</sub>
-     *     </i>{@code .}<i> HexDigits</i>
-     * <dd>{@code 0X}<i> HexDigits<sub>opt</sub>
-     *     </i>{@code .} <i>HexDigits</i>
-     * </dl>
-     *
-     * <p>
-     *
-     * <dl>
-     * <dt><i>BinaryExponent:</i>
-     * <dd><i>BinaryExponentIndicator SignedInteger</i>
-     * </dl>
-     *
-     * <p>
-     *
-     * <dl>
-     * <dt><i>BinaryExponentIndicator:</i>
-     * <dd>{@code p}
-     * <dd>{@code P}
-     * </dl>
-     *
-     * </blockquote>
-     *
-     * where <i>Sign</i>, <i>FloatingPointLiteral</i>,
-     * <i>HexNumeral</i>, <i>HexDigits</i>, <i>SignedInteger</i> and
-     * <i>FloatTypeSuffix</i> are as defined in the lexical structure
-     * sections of
-     * <cite>The Java&trade; Language Specification</cite>,
-     * except that underscores are not accepted between digits.
-     * If {@code s} does not have the form of
-     * a <i>FloatValue</i>, then a {@code NumberFormatException}
-     * is thrown. Otherwise, {@code s} is regarded as
-     * representing an exact decimal value in the usual
-     * "computerized scientific notation" or as an exact
-     * hexadecimal value; this exact numerical value is then
-     * conceptually converted to an "infinitely precise"
-     * binary value that is then rounded to type {@code double}
-     * by the usual round-to-nearest rule of IEEE 754 floating-point
-     * arithmetic, which includes preserving the sign of a zero
-     * value.
-     *
-     * Note that the round-to-nearest rule also implies overflow and
-     * underflow behaviour; if the exact value of {@code s} is large
-     * enough in magnitude (greater than or equal to ({@link
-     * #MAX_VALUE} + {@link Math#ulp(double) ulp(MAX_VALUE)}/2),
-     * rounding to {@code double} will result in an infinity and if the
-     * exact value of {@code s} is small enough in magnitude (less
-     * than or equal to {@link #MIN_VALUE}/2), rounding to float will
-     * result in a zero.
-     *
-     * Finally, after rounding a {@code Double} object representing
-     * this {@code double} value is returned.
-     *
-     * <p> To interpret localized string representations of a
-     * floating-point value, use subclasses of {@link
-     * java.text.NumberFormat}.
-     *
-     * <p>Note that trailing format specifiers, specifiers that
-     * determine the type of a floating-point literal
-     * ({@code 1.0f} is a {@code float} value;
-     * {@code 1.0d} is a {@code double} value), do
-     * <em>not</em> influence the results of this method.  In other
-     * words, the numerical value of the input string is converted
-     * directly to the target floating-point type.  The two-step
-     * sequence of conversions, string to {@code float} followed
-     * by {@code float} to {@code double}, is <em>not</em>
-     * equivalent to converting a string directly to
-     * {@code double}. For example, the {@code float}
-     * literal {@code 0.1f} is equal to the {@code double}
-     * value {@code 0.10000000149011612}; the {@code float}
-     * literal {@code 0.1f} represents a different numerical
-     * value than the {@code double} literal
-     * {@code 0.1}. (The numerical value 0.1 cannot be exactly
-     * represented in a binary floating-point number.)
-     *
-     * <p>To avoid calling this method on an invalid string and having
-     * a {@code NumberFormatException} be thrown, the regular
-     * expression below can be used to screen the input string:
-     *
-     * <code>
-     * <pre>
-     *  final String Digits     = "(\\p{Digit}+)";
-     *  final String HexDigits  = "(\\p{XDigit}+)";
-     *  // an exponent is 'e' or 'E' followed by an optionally
-     *  // signed decimal integer.
-     *  final String Exp        = "[eE][+-]?"+Digits;
-     *  final String fpRegex    =
-     *      ("[\\x00-\\x20]*"+  // Optional leading "whitespace"
-     *       "[+-]?(" + // Optional sign character
-     *       "NaN|" +           // "NaN" string
-     *       "Infinity|" +      // "Infinity" string
-     *
-     *       // A decimal floating-point string representing a finite positive
-     *       // number without a leading sign has at most five basic pieces:
-     *       // Digits . Digits ExponentPart FloatTypeSuffix
-     *       //
-     *       // Since this method allows integer-only strings as input
-     *       // in addition to strings of floating-point literals, the
-     *       // two sub-patterns below are simplifications of the grammar
-     *       // productions from section 3.10.2 of
-     *       // <cite>The Java&trade; Language Specification</cite>.
-     *
-     *       // Digits ._opt Digits_opt ExponentPart_opt FloatTypeSuffix_opt
-     *       "((("+Digits+"(\\.)?("+Digits+"?)("+Exp+")?)|"+
-     *
-     *       // . Digits ExponentPart_opt FloatTypeSuffix_opt
-     *       "(\\.("+Digits+")("+Exp+")?)|"+
-     *
-     *       // Hexadecimal strings
-     *       "((" +
-     *        // 0[xX] HexDigits ._opt BinaryExponent FloatTypeSuffix_opt
-     *        "(0[xX]" + HexDigits + "(\\.)?)|" +
-     *
-     *        // 0[xX] HexDigits_opt . HexDigits BinaryExponent FloatTypeSuffix_opt
-     *        "(0[xX]" + HexDigits + "?(\\.)" + HexDigits + ")" +
-     *
-     *        ")[pP][+-]?" + Digits + "))" +
-     *       "[fFdD]?))" +
-     *       "[\\x00-\\x20]*");// Optional trailing "whitespace"
-     *
-     *  if (Pattern.matches(fpRegex, myString))
-     *      Double.valueOf(myString); // Will not throw NumberFormatException
-     *  else {
-     *      // Perform suitable alternative action
-     *  }
-     * </pre>
-     * </code>
-     *
-     * @param      s   the string to be parsed.
-     * @return     a {@code Double} object holding the value
-     *             represented by the {@code String} argument.
-     * @throws     NumberFormatException  if the string does not contain a
-     *             parsable number.
-     */
-    @JavaScriptBody(args="s", body="return parseFloat(s);")
-    public static Double valueOf(String s) throws NumberFormatException {
-        throw new UnsupportedOperationException();
-//        return new Double(FloatingDecimal.readJavaFormatString(s).doubleValue());
-    }
-
-    /**
-     * Returns a {@code Double} instance representing the specified
-     * {@code double} value.
-     * If a new {@code Double} instance is not required, this method
-     * should generally be used in preference to the constructor
-     * {@link #Double(double)}, as this method is likely to yield
-     * significantly better space and time performance by caching
-     * frequently requested values.
-     *
-     * @param  d a double value.
-     * @return a {@code Double} instance representing {@code d}.
-     * @since  1.5
-     */
-    public static Double valueOf(double d) {
-        return new Double(d);
-    }
-
-    /**
-     * Returns a new {@code double} initialized to the value
-     * represented by the specified {@code String}, as performed
-     * by the {@code valueOf} method of class
-     * {@code Double}.
-     *
-     * @param  s   the string to be parsed.
-     * @return the {@code double} value represented by the string
-     *         argument.
-     * @throws NullPointerException  if the string is null
-     * @throws NumberFormatException if the string does not contain
-     *         a parsable {@code double}.
-     * @see    java.lang.Double#valueOf(String)
-     * @since 1.2
-     */
-    @JavaScriptBody(args="s", body="return parseFloat(s);")
-    public static double parseDouble(String s) throws NumberFormatException {
-        throw new UnsupportedOperationException();
-//        return FloatingDecimal.readJavaFormatString(s).doubleValue();
-    }
-
-    /**
-     * Returns {@code true} if the specified number is a
-     * Not-a-Number (NaN) value, {@code false} otherwise.
-     *
-     * @param   v   the value to be tested.
-     * @return  {@code true} if the value of the argument is NaN;
-     *          {@code false} otherwise.
-     */
-    static public boolean isNaN(double v) {
-        return (v != v);
-    }
-
-    /**
-     * Returns {@code true} if the specified number is infinitely
-     * large in magnitude, {@code false} otherwise.
-     *
-     * @param   v   the value to be tested.
-     * @return  {@code true} if the value of the argument is positive
-     *          infinity or negative infinity; {@code false} otherwise.
-     */
-    static public boolean isInfinite(double v) {
-        return (v == POSITIVE_INFINITY) || (v == NEGATIVE_INFINITY);
-    }
-
-    /**
-     * The value of the Double.
-     *
-     * @serial
-     */
-    private final double value;
-
-    /**
-     * Constructs a newly allocated {@code Double} object that
-     * represents the primitive {@code double} argument.
-     *
-     * @param   value   the value to be represented by the {@code Double}.
-     */
-    public Double(double value) {
-        this.value = value;
-    }
-
-    /**
-     * Constructs a newly allocated {@code Double} object that
-     * represents the floating-point value of type {@code double}
-     * represented by the string. The string is converted to a
-     * {@code double} value as if by the {@code valueOf} method.
-     *
-     * @param  s  a string to be converted to a {@code Double}.
-     * @throws    NumberFormatException  if the string does not contain a
-     *            parsable number.
-     * @see       java.lang.Double#valueOf(java.lang.String)
-     */
-    public Double(String s) throws NumberFormatException {
-        // REMIND: this is inefficient
-        this(valueOf(s).doubleValue());
-    }
-
-    /**
-     * Returns {@code true} if this {@code Double} value is
-     * a Not-a-Number (NaN), {@code false} otherwise.
-     *
-     * @return  {@code true} if the value represented by this object is
-     *          NaN; {@code false} otherwise.
-     */
-    public boolean isNaN() {
-        return isNaN(value);
-    }
-
-    /**
-     * Returns {@code true} if this {@code Double} value is
-     * infinitely large in magnitude, {@code false} otherwise.
-     *
-     * @return  {@code true} if the value represented by this object is
-     *          positive infinity or negative infinity;
-     *          {@code false} otherwise.
-     */
-    public boolean isInfinite() {
-        return isInfinite(value);
-    }
-
-    /**
-     * Returns a string representation of this {@code Double} object.
-     * The primitive {@code double} value represented by this
-     * object is converted to a string exactly as if by the method
-     * {@code toString} of one argument.
-     *
-     * @return  a {@code String} representation of this object.
-     * @see java.lang.Double#toString(double)
-     */
-    public String toString() {
-        return toString(value);
-    }
-
-    /**
-     * Returns the value of this {@code Double} as a {@code byte} (by
-     * casting to a {@code byte}).
-     *
-     * @return  the {@code double} value represented by this object
-     *          converted to type {@code byte}
-     * @since JDK1.1
-     */
-    public byte byteValue() {
-        return (byte)value;
-    }
-
-    /**
-     * Returns the value of this {@code Double} as a
-     * {@code short} (by casting to a {@code short}).
-     *
-     * @return  the {@code double} value represented by this object
-     *          converted to type {@code short}
-     * @since JDK1.1
-     */
-    public short shortValue() {
-        return (short)value;
-    }
-
-    /**
-     * Returns the value of this {@code Double} as an
-     * {@code int} (by casting to type {@code int}).
-     *
-     * @return  the {@code double} value represented by this object
-     *          converted to type {@code int}
-     */
-    public int intValue() {
-        return (int)value;
-    }
-
-    /**
-     * Returns the value of this {@code Double} as a
-     * {@code long} (by casting to type {@code long}).
-     *
-     * @return  the {@code double} value represented by this object
-     *          converted to type {@code long}
-     */
-    public long longValue() {
-        return (long)value;
-    }
-
-    /**
-     * Returns the {@code float} value of this
-     * {@code Double} object.
-     *
-     * @return  the {@code double} value represented by this object
-     *          converted to type {@code float}
-     * @since JDK1.0
-     */
-    public float floatValue() {
-        return (float)value;
-    }
-
-    /**
-     * Returns the {@code double} value of this
-     * {@code Double} object.
-     *
-     * @return the {@code double} value represented by this object
-     */
-    public double doubleValue() {
-        return (double)value;
-    }
-
-    /**
-     * Returns a hash code for this {@code Double} object. The
-     * result is the exclusive OR of the two halves of the
-     * {@code long} integer bit representation, exactly as
-     * produced by the method {@link #doubleToLongBits(double)}, of
-     * the primitive {@code double} value represented by this
-     * {@code Double} object. That is, the hash code is the value
-     * of the expression:
-     *
-     * <blockquote>
-     *  {@code (int)(v^(v>>>32))}
-     * </blockquote>
-     *
-     * where {@code v} is defined by:
-     *
-     * <blockquote>
-     *  {@code long v = Double.doubleToLongBits(this.doubleValue());}
-     * </blockquote>
-     *
-     * @return  a {@code hash code} value for this object.
-     */
-    public int hashCode() {
-        long bits = doubleToLongBits(value);
-        return (int)(bits ^ (bits >>> 32));
-    }
-
-    /**
-     * Compares this object against the specified object.  The result
-     * is {@code true} if and only if the argument is not
-     * {@code null} and is a {@code Double} object that
-     * represents a {@code double} that has the same value as the
-     * {@code double} represented by this object. For this
-     * purpose, two {@code double} values are considered to be
-     * the same if and only if the method {@link
-     * #doubleToLongBits(double)} returns the identical
-     * {@code long} value when applied to each.
-     *
-     * <p>Note that in most cases, for two instances of class
-     * {@code Double}, {@code d1} and {@code d2}, the
-     * value of {@code d1.equals(d2)} is {@code true} if and
-     * only if
-     *
-     * <blockquote>
-     *  {@code d1.doubleValue() == d2.doubleValue()}
-     * </blockquote>
-     *
-     * <p>also has the value {@code true}. However, there are two
-     * exceptions:
-     * <ul>
-     * <li>If {@code d1} and {@code d2} both represent
-     *     {@code Double.NaN}, then the {@code equals} method
-     *     returns {@code true}, even though
-     *     {@code Double.NaN==Double.NaN} has the value
-     *     {@code false}.
-     * <li>If {@code d1} represents {@code +0.0} while
-     *     {@code d2} represents {@code -0.0}, or vice versa,
-     *     the {@code equal} test has the value {@code false},
-     *     even though {@code +0.0==-0.0} has the value {@code true}.
-     * </ul>
-     * This definition allows hash tables to operate properly.
-     * @param   obj   the object to compare with.
-     * @return  {@code true} if the objects are the same;
-     *          {@code false} otherwise.
-     * @see java.lang.Double#doubleToLongBits(double)
-     */
-    public boolean equals(Object obj) {
-        return (obj instanceof Double)
-               && (((Double)obj).value) == value;
-    }
-
-    /**
-     * Returns a representation of the specified floating-point value
-     * according to the IEEE 754 floating-point "double
-     * format" bit layout.
-     *
-     * <p>Bit 63 (the bit that is selected by the mask
-     * {@code 0x8000000000000000L}) represents the sign of the
-     * floating-point number. Bits
-     * 62-52 (the bits that are selected by the mask
-     * {@code 0x7ff0000000000000L}) represent the exponent. Bits 51-0
-     * (the bits that are selected by the mask
-     * {@code 0x000fffffffffffffL}) represent the significand
-     * (sometimes called the mantissa) of the floating-point number.
-     *
-     * <p>If the argument is positive infinity, the result is
-     * {@code 0x7ff0000000000000L}.
-     *
-     * <p>If the argument is negative infinity, the result is
-     * {@code 0xfff0000000000000L}.
-     *
-     * <p>If the argument is NaN, the result is
-     * {@code 0x7ff8000000000000L}.
-     *
-     * <p>In all cases, the result is a {@code long} integer that, when
-     * given to the {@link #longBitsToDouble(long)} method, will produce a
-     * floating-point value the same as the argument to
-     * {@code doubleToLongBits} (except all NaN values are
-     * collapsed to a single "canonical" NaN value).
-     *
-     * @param   value   a {@code double} precision floating-point number.
-     * @return the bits that represent the floating-point number.
-     */
-    public static long doubleToLongBits(double value) {
-        throw new UnsupportedOperationException();
-//        long result = doubleToRawLongBits(value);
-//        // Check for NaN based on values of bit fields, maximum
-//        // exponent and nonzero significand.
-//        if ( ((result & DoubleConsts.EXP_BIT_MASK) ==
-//              DoubleConsts.EXP_BIT_MASK) &&
-//             (result & DoubleConsts.SIGNIF_BIT_MASK) != 0L)
-//            result = 0x7ff8000000000000L;
-//        return result;
-    }
-
-    /**
-     * Returns a representation of the specified floating-point value
-     * according to the IEEE 754 floating-point "double
-     * format" bit layout, preserving Not-a-Number (NaN) values.
-     *
-     * <p>Bit 63 (the bit that is selected by the mask
-     * {@code 0x8000000000000000L}) represents the sign of the
-     * floating-point number. Bits
-     * 62-52 (the bits that are selected by the mask
-     * {@code 0x7ff0000000000000L}) represent the exponent. Bits 51-0
-     * (the bits that are selected by the mask
-     * {@code 0x000fffffffffffffL}) represent the significand
-     * (sometimes called the mantissa) of the floating-point number.
-     *
-     * <p>If the argument is positive infinity, the result is
-     * {@code 0x7ff0000000000000L}.
-     *
-     * <p>If the argument is negative infinity, the result is
-     * {@code 0xfff0000000000000L}.
-     *
-     * <p>If the argument is NaN, the result is the {@code long}
-     * integer representing the actual NaN value.  Unlike the
-     * {@code doubleToLongBits} method,
-     * {@code doubleToRawLongBits} does not collapse all the bit
-     * patterns encoding a NaN to a single "canonical" NaN
-     * value.
-     *
-     * <p>In all cases, the result is a {@code long} integer that,
-     * when given to the {@link #longBitsToDouble(long)} method, will
-     * produce a floating-point value the same as the argument to
-     * {@code doubleToRawLongBits}.
-     *
-     * @param   value   a {@code double} precision floating-point number.
-     * @return the bits that represent the floating-point number.
-     * @since 1.3
-     */
-    public static native long doubleToRawLongBits(double value);
-
-    /**
-     * Returns the {@code double} value corresponding to a given
-     * bit representation.
-     * The argument is considered to be a representation of a
-     * floating-point value according to the IEEE 754 floating-point
-     * "double format" bit layout.
-     *
-     * <p>If the argument is {@code 0x7ff0000000000000L}, the result
-     * is positive infinity.
-     *
-     * <p>If the argument is {@code 0xfff0000000000000L}, the result
-     * is negative infinity.
-     *
-     * <p>If the argument is any value in the range
-     * {@code 0x7ff0000000000001L} through
-     * {@code 0x7fffffffffffffffL} or in the range
-     * {@code 0xfff0000000000001L} through
-     * {@code 0xffffffffffffffffL}, the result is a NaN.  No IEEE
-     * 754 floating-point operation provided by Java can distinguish
-     * between two NaN values of the same type with different bit
-     * patterns.  Distinct values of NaN are only distinguishable by
-     * use of the {@code Double.doubleToRawLongBits} method.
-     *
-     * <p>In all other cases, let <i>s</i>, <i>e</i>, and <i>m</i> be three
-     * values that can be computed from the argument:
-     *
-     * <blockquote><pre>
-     * int s = ((bits &gt;&gt; 63) == 0) ? 1 : -1;
-     * int e = (int)((bits &gt;&gt; 52) & 0x7ffL);
-     * long m = (e == 0) ?
-     *                 (bits & 0xfffffffffffffL) &lt;&lt; 1 :
-     *                 (bits & 0xfffffffffffffL) | 0x10000000000000L;
-     * </pre></blockquote>
-     *
-     * Then the floating-point result equals the value of the mathematical
-     * expression <i>s</i>&middot;<i>m</i>&middot;2<sup><i>e</i>-1075</sup>.
-     *
-     * <p>Note that this method may not be able to return a
-     * {@code double} NaN with exactly same bit pattern as the
-     * {@code long} argument.  IEEE 754 distinguishes between two
-     * kinds of NaNs, quiet NaNs and <i>signaling NaNs</i>.  The
-     * differences between the two kinds of NaN are generally not
-     * visible in Java.  Arithmetic operations on signaling NaNs turn
-     * them into quiet NaNs with a different, but often similar, bit
-     * pattern.  However, on some processors merely copying a
-     * signaling NaN also performs that conversion.  In particular,
-     * copying a signaling NaN to return it to the calling method
-     * may perform this conversion.  So {@code longBitsToDouble}
-     * may not be able to return a {@code double} with a
-     * signaling NaN bit pattern.  Consequently, for some
-     * {@code long} values,
-     * {@code doubleToRawLongBits(longBitsToDouble(start))} may
-     * <i>not</i> equal {@code start}.  Moreover, which
-     * particular bit patterns represent signaling NaNs is platform
-     * dependent; although all NaN bit patterns, quiet or signaling,
-     * must be in the NaN range identified above.
-     *
-     * @param   bits   any {@code long} integer.
-     * @return  the {@code double} floating-point value with the same
-     *          bit pattern.
-     */
-    public static native double longBitsToDouble(long bits);
-
-    /**
-     * Compares two {@code Double} objects numerically.  There
-     * are two ways in which comparisons performed by this method
-     * differ from those performed by the Java language numerical
-     * comparison operators ({@code <, <=, ==, >=, >})
-     * when applied to primitive {@code double} values:
-     * <ul><li>
-     *          {@code Double.NaN} is considered by this method
-     *          to be equal to itself and greater than all other
-     *          {@code double} values (including
-     *          {@code Double.POSITIVE_INFINITY}).
-     * <li>
-     *          {@code 0.0d} is considered by this method to be greater
-     *          than {@code -0.0d}.
-     * </ul>
-     * This ensures that the <i>natural ordering</i> of
-     * {@code Double} objects imposed by this method is <i>consistent
-     * with equals</i>.
-     *
-     * @param   anotherDouble   the {@code Double} to be compared.
-     * @return  the value {@code 0} if {@code anotherDouble} is
-     *          numerically equal to this {@code Double}; a value
-     *          less than {@code 0} if this {@code Double}
-     *          is numerically less than {@code anotherDouble};
-     *          and a value greater than {@code 0} if this
-     *          {@code Double} is numerically greater than
-     *          {@code anotherDouble}.
-     *
-     * @since   1.2
-     */
-    public int compareTo(Double anotherDouble) {
-        return Double.compare(value, anotherDouble.value);
-    }
-
-    /**
-     * Compares the two specified {@code double} values. The sign
-     * of the integer value returned is the same as that of the
-     * integer that would be returned by the call:
-     * <pre>
-     *    new Double(d1).compareTo(new Double(d2))
-     * </pre>
-     *
-     * @param   d1        the first {@code double} to compare
-     * @param   d2        the second {@code double} to compare
-     * @return  the value {@code 0} if {@code d1} is
-     *          numerically equal to {@code d2}; a value less than
-     *          {@code 0} if {@code d1} is numerically less than
-     *          {@code d2}; and a value greater than {@code 0}
-     *          if {@code d1} is numerically greater than
-     *          {@code d2}.
-     * @since 1.4
-     */
-    public static int compare(double d1, double d2) {
-        if (d1 < d2)
-            return -1;           // Neither val is NaN, thisVal is smaller
-        if (d1 > d2)
-            return 1;            // Neither val is NaN, thisVal is larger
-
-        // Cannot use doubleToRawLongBits because of possibility of NaNs.
-        long thisBits    = Double.doubleToLongBits(d1);
-        long anotherBits = Double.doubleToLongBits(d2);
-
-        return (thisBits == anotherBits ?  0 : // Values are equal
-                (thisBits < anotherBits ? -1 : // (-0.0, 0.0) or (!NaN, NaN)
-                 1));                          // (0.0, -0.0) or (NaN, !NaN)
-    }
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = -9172774392245257468L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Enum.java
--- a/emul/mini/src/main/java/java/lang/Enum.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.io.Serializable;
-import java.io.IOException;
-
-/**
- * This is the common base class of all Java language enumeration types.
- *
- * More information about enums, including descriptions of the
- * implicitly declared methods synthesized by the compiler, can be
- * found in section 8.9 of
- * <cite>The Java&trade; Language Specification</cite>.
- *
- * <p> Note that when using an enumeration type as the type of a set
- * or as the type of the keys in a map, specialized and efficient
- * {@linkplain java.util.EnumSet set} and {@linkplain
- * java.util.EnumMap map} implementations are available.
- *
- * @param <E> The enum type subclass
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see     Class#getEnumConstants()
- * @see     java.util.EnumSet
- * @see     java.util.EnumMap
- * @since   1.5
- */
-public abstract class Enum<E extends Enum<E>>
-        implements Comparable<E>, Serializable {
-    /**
-     * The name of this enum constant, as declared in the enum declaration.
-     * Most programmers should use the {@link #toString} method rather than
-     * accessing this field.
-     */
-    private final String name;
-
-    /**
-     * Returns the name of this enum constant, exactly as declared in its
-     * enum declaration.
-     *
-     * <b>Most programmers should use the {@link #toString} method in
-     * preference to this one, as the toString method may return
-     * a more user-friendly name.</b>  This method is designed primarily for
-     * use in specialized situations where correctness depends on getting the
-     * exact name, which will not vary from release to release.
-     *
-     * @return the name of this enum constant
-     */
-    public final String name() {
-        return name;
-    }
-
-    /**
-     * The ordinal of this enumeration constant (its position
-     * in the enum declaration, where the initial constant is assigned
-     * an ordinal of zero).
-     *
-     * Most programmers will have no use for this field.  It is designed
-     * for use by sophisticated enum-based data structures, such as
-     * {@link java.util.EnumSet} and {@link java.util.EnumMap}.
-     */
-    private final int ordinal;
-
-    /**
-     * Returns the ordinal of this enumeration constant (its position
-     * in its enum declaration, where the initial constant is assigned
-     * an ordinal of zero).
-     *
-     * Most programmers will have no use for this method.  It is
-     * designed for use by sophisticated enum-based data structures, such
-     * as {@link java.util.EnumSet} and {@link java.util.EnumMap}.
-     *
-     * @return the ordinal of this enumeration constant
-     */
-    public final int ordinal() {
-        return ordinal;
-    }
-
-    /**
-     * Sole constructor.  Programmers cannot invoke this constructor.
-     * It is for use by code emitted by the compiler in response to
-     * enum type declarations.
-     *
-     * @param name - The name of this enum constant, which is the identifier
-     *               used to declare it.
-     * @param ordinal - The ordinal of this enumeration constant (its position
-     *         in the enum declaration, where the initial constant is assigned
-     *         an ordinal of zero).
-     */
-    protected Enum(String name, int ordinal) {
-        this.name = name;
-        this.ordinal = ordinal;
-    }
-
-    /**
-     * Returns the name of this enum constant, as contained in the
-     * declaration.  This method may be overridden, though it typically
-     * isn't necessary or desirable.  An enum type should override this
-     * method when a more "programmer-friendly" string form exists.
-     *
-     * @return the name of this enum constant
-     */
-    public String toString() {
-        return name;
-    }
-
-    /**
-     * Returns true if the specified object is equal to this
-     * enum constant.
-     *
-     * @param other the object to be compared for equality with this object.
-     * @return  true if the specified object is equal to this
-     *          enum constant.
-     */
-    public final boolean equals(Object other) {
-        return this==other;
-    }
-
-    /**
-     * Returns a hash code for this enum constant.
-     *
-     * @return a hash code for this enum constant.
-     */
-    public final int hashCode() {
-        return super.hashCode();
-    }
-
-    /**
-     * Throws CloneNotSupportedException.  This guarantees that enums
-     * are never cloned, which is necessary to preserve their "singleton"
-     * status.
-     *
-     * @return (never returns)
-     */
-    protected final Object clone() throws CloneNotSupportedException {
-        throw new CloneNotSupportedException();
-    }
-
-    /**
-     * Compares this enum with the specified object for order.  Returns a
-     * negative integer, zero, or a positive integer as this object is less
-     * than, equal to, or greater than the specified object.
-     *
-     * Enum constants are only comparable to other enum constants of the
-     * same enum type.  The natural order implemented by this
-     * method is the order in which the constants are declared.
-     */
-    public final int compareTo(E o) {
-        Enum other = (Enum)o;
-        Enum self = this;
-        if (self.getClass() != other.getClass() && // optimization
-            self.getDeclaringClass() != other.getDeclaringClass())
-            throw new ClassCastException();
-        return self.ordinal - other.ordinal;
-    }
-
-    /**
-     * Returns the Class object corresponding to this enum constant's
-     * enum type.  Two enum constants e1 and  e2 are of the
-     * same enum type if and only if
-     *   e1.getDeclaringClass() == e2.getDeclaringClass().
-     * (The value returned by this method may differ from the one returned
-     * by the {@link Object#getClass} method for enum constants with
-     * constant-specific class bodies.)
-     *
-     * @return the Class object corresponding to this enum constant's
-     *     enum type
-     */
-    public final Class<E> getDeclaringClass() {
-        Class clazz = getClass();
-        Class zuper = clazz.getSuperclass();
-        return (zuper == Enum.class) ? clazz : zuper;
-    }
-
-    /**
-     * Returns the enum constant of the specified enum type with the
-     * specified name.  The name must match exactly an identifier used
-     * to declare an enum constant in this type.  (Extraneous whitespace
-     * characters are not permitted.)
-     *
-     * <p>Note that for a particular enum type {@code T}, the
-     * implicitly declared {@code public static T valueOf(String)}
-     * method on that enum may be used instead of this method to map
-     * from a name to the corresponding enum constant.  All the
-     * constants of an enum type can be obtained by calling the
-     * implicit {@code public static T[] values()} method of that
-     * type.
-     *
-     * @param <T> The enum type whose constant is to be returned
-     * @param enumType the {@code Class} object of the enum type from which
-     *      to return a constant
-     * @param name the name of the constant to return
-     * @return the enum constant of the specified enum type with the
-     *      specified name
-     * @throws IllegalArgumentException if the specified enum type has
-     *         no constant with the specified name, or the specified
-     *         class object does not represent an enum type
-     * @throws NullPointerException if {@code enumType} or {@code name}
-     *         is null
-     * @since 1.5
-     */
-    public static <T extends Enum<T>> T valueOf(Class<T> enumType,
-                                                String name) {
-        throw new UnsupportedOperationException();
-//        T result = enumType.enumConstantDirectory().get(name);
-//        if (result != null)
-//            return result;
-//        if (name == null)
-//            throw new NullPointerException("Name is null");
-//        throw new IllegalArgumentException(
-//            "No enum constant " + enumType.getCanonicalName() + "." + name);
-    }
-
-    /**
-     * enum classes cannot have finalize methods.
-     */
-    protected final void finalize() { }
-
-    /**
-     * prevent default deserialization
-     */
-//    private void readObject(ObjectInputStream in) throws IOException,
-//        ClassNotFoundException {
-//        throw new InvalidObjectException("can't deserialize enum");
-//    }
-//
-//    private void readObjectNoData() throws ObjectStreamException {
-//        throw new InvalidObjectException("can't deserialize enum");
-//    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Error.java
--- a/emul/mini/src/main/java/java/lang/Error.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * An {@code Error} is a subclass of {@code Throwable}
- * that indicates serious problems that a reasonable application
- * should not try to catch. Most such errors are abnormal conditions.
- * The {@code ThreadDeath} error, though a "normal" condition,
- * is also a subclass of {@code Error} because most applications
- * should not try to catch it.
- * <p>
- * A method is not required to declare in its {@code throws}
- * clause any subclasses of {@code Error} that might be thrown
- * during the execution of the method but not caught, since these
- * errors are abnormal conditions that should never occur.
- *
- * That is, {@code Error} and its subclasses are regarded as unchecked
- * exceptions for the purposes of compile-time checking of exceptions.
- *
- * @author  Frank Yellin
- * @see     java.lang.ThreadDeath
- * @jls 11.2 Compile-Time Checking of Exceptions
- * @since   JDK1.0
- */
-public class Error extends Throwable {
-    static final long serialVersionUID = 4980196508277280342L;
-
-    /**
-     * Constructs a new error with {@code null} as its detail message.
-     * The cause is not initialized, and may subsequently be initialized by a
-     * call to {@link #initCause}.
-     */
-    public Error() {
-        super();
-    }
-
-    /**
-     * Constructs a new error with the specified detail message.  The
-     * cause is not initialized, and may subsequently be initialized by
-     * a call to {@link #initCause}.
-     *
-     * @param   message   the detail message. The detail message is saved for
-     *          later retrieval by the {@link #getMessage()} method.
-     */
-    public Error(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new error with the specified detail message and
-     * cause.  <p>Note that the detail message associated with
-     * {@code cause} is <i>not</i> automatically incorporated in
-     * this error's detail message.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link #getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A {@code null} value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.4
-     */
-    public Error(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new error with the specified cause and a detail
-     * message of {@code (cause==null ? null : cause.toString())} (which
-     * typically contains the class and detail message of {@code cause}).
-     * This constructor is useful for errors that are little more than
-     * wrappers for other throwables.
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A {@code null} value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.4
-     */
-    public Error(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Constructs a new error with the specified detail message,
-     * cause, suppression enabled or disabled, and writable stack
-     * trace enabled or disabled.
-     *
-     * @param  message the detail message.
-     * @param cause the cause.  (A {@code null} value is permitted,
-     * and indicates that the cause is nonexistent or unknown.)
-     * @param enableSuppression whether or not suppression is enabled
-     *                          or disabled
-     * @param writableStackTrace whether or not the stack trace should
-     *                           be writable
-     *
-     * @since 1.7
-     */
-    protected Error(String message, Throwable cause,
-                    boolean enableSuppression,
-                    boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Exception.java
--- a/emul/mini/src/main/java/java/lang/Exception.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * The class {@code Exception} and its subclasses are a form of
- * {@code Throwable} that indicates conditions that a reasonable
- * application might want to catch.
- *
- * <p>The class {@code Exception} and any subclasses that are not also
- * subclasses of {@link RuntimeException} are <em>checked
- * exceptions</em>.  Checked exceptions need to be declared in a
- * method or constructor's {@code throws} clause if they can be thrown
- * by the execution of the method or constructor and propagate outside
- * the method or constructor boundary.
- *
- * @author  Frank Yellin
- * @see     java.lang.Error
- * @jls 11.2 Compile-Time Checking of Exceptions
- * @since   JDK1.0
- */
-public class Exception extends Throwable {
-    static final long serialVersionUID = -3387516993124229948L;
-
-    /**
-     * Constructs a new exception with {@code null} as its detail message.
-     * The cause is not initialized, and may subsequently be initialized by a
-     * call to {@link #initCause}.
-     */
-    public Exception() {
-        super();
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message.  The
-     * cause is not initialized, and may subsequently be initialized by
-     * a call to {@link #initCause}.
-     *
-     * @param   message   the detail message. The detail message is saved for
-     *          later retrieval by the {@link #getMessage()} method.
-     */
-    public Exception(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and
-     * cause.  <p>Note that the detail message associated with
-     * {@code cause} is <i>not</i> automatically incorporated in
-     * this exception's detail message.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link #getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.4
-     */
-    public Exception(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail
-     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
-     * typically contains the class and detail message of <tt>cause</tt>).
-     * This constructor is useful for exceptions that are little more than
-     * wrappers for other throwables (for example, {@link
-     * java.security.PrivilegedActionException}).
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.4
-     */
-    public Exception(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message,
-     * cause, suppression enabled or disabled, and writable stack
-     * trace enabled or disabled.
-     *
-     * @param  message the detail message.
-     * @param cause the cause.  (A {@code null} value is permitted,
-     * and indicates that the cause is nonexistent or unknown.)
-     * @param enableSuppression whether or not suppression is enabled
-     *                          or disabled
-     * @param writableStackTrace whether or not the stack trace should
-     *                           be writable
-     * @since 1.7
-     */
-    protected Exception(String message, Throwable cause,
-                        boolean enableSuppression,
-                        boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Float.java
--- a/emul/mini/src/main/java/java/lang/Float.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,905 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- * The {@code Float} class wraps a value of primitive type
- * {@code float} in an object. An object of type
- * {@code Float} contains a single field whose type is
- * {@code float}.
- *
- * <p>In addition, this class provides several methods for converting a
- * {@code float} to a {@code String} and a
- * {@code String} to a {@code float}, as well as other
- * constants and methods useful when dealing with a
- * {@code float}.
- *
- * @author  Lee Boynton
- * @author  Arthur van Hoff
- * @author  Joseph D. Darcy
- * @since JDK1.0
- */
-public final class Float extends Number implements Comparable<Float> {
-    /**
-     * A constant holding the positive infinity of type
-     * {@code float}. It is equal to the value returned by
-     * {@code Float.intBitsToFloat(0x7f800000)}.
-     */
-    public static final float POSITIVE_INFINITY = 1.0f / 0.0f;
-
-    /**
-     * A constant holding the negative infinity of type
-     * {@code float}. It is equal to the value returned by
-     * {@code Float.intBitsToFloat(0xff800000)}.
-     */
-    public static final float NEGATIVE_INFINITY = -1.0f / 0.0f;
-
-    /**
-     * A constant holding a Not-a-Number (NaN) value of type
-     * {@code float}.  It is equivalent to the value returned by
-     * {@code Float.intBitsToFloat(0x7fc00000)}.
-     */
-    public static final float NaN = 0.0f / 0.0f;
-
-    /**
-     * A constant holding the largest positive finite value of type
-     * {@code float}, (2-2<sup>-23</sup>)&middot;2<sup>127</sup>.
-     * It is equal to the hexadecimal floating-point literal
-     * {@code 0x1.fffffeP+127f} and also equal to
-     * {@code Float.intBitsToFloat(0x7f7fffff)}.
-     */
-    public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
-
-    /**
-     * A constant holding the smallest positive normal value of type
-     * {@code float}, 2<sup>-126</sup>.  It is equal to the
-     * hexadecimal floating-point literal {@code 0x1.0p-126f} and also
-     * equal to {@code Float.intBitsToFloat(0x00800000)}.
-     *
-     * @since 1.6
-     */
-    public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
-
-    /**
-     * A constant holding the smallest positive nonzero value of type
-     * {@code float}, 2<sup>-149</sup>. It is equal to the
-     * hexadecimal floating-point literal {@code 0x0.000002P-126f}
-     * and also equal to {@code Float.intBitsToFloat(0x1)}.
-     */
-    public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
-
-    /**
-     * Maximum exponent a finite {@code float} variable may have.  It
-     * is equal to the value returned by {@code
-     * Math.getExponent(Float.MAX_VALUE)}.
-     *
-     * @since 1.6
-     */
-    public static final int MAX_EXPONENT = 127;
-
-    /**
-     * Minimum exponent a normalized {@code float} variable may have.
-     * It is equal to the value returned by {@code
-     * Math.getExponent(Float.MIN_NORMAL)}.
-     *
-     * @since 1.6
-     */
-    public static final int MIN_EXPONENT = -126;
-
-    /**
-     * The number of bits used to represent a {@code float} value.
-     *
-     * @since 1.5
-     */
-    public static final int SIZE = 32;
-
-    /**
-     * The {@code Class} instance representing the primitive type
-     * {@code float}.
-     *
-     * @since JDK1.1
-     */
-    public static final Class<Float> TYPE = Class.getPrimitiveClass("float");
-
-    /**
-     * Returns a string representation of the {@code float}
-     * argument. All characters mentioned below are ASCII characters.
-     * <ul>
-     * <li>If the argument is NaN, the result is the string
-     * "{@code NaN}".
-     * <li>Otherwise, the result is a string that represents the sign and
-     *     magnitude (absolute value) of the argument. If the sign is
-     *     negative, the first character of the result is
-     *     '{@code -}' (<code>'&#92;u002D'</code>); if the sign is
-     *     positive, no sign character appears in the result. As for
-     *     the magnitude <i>m</i>:
-     * <ul>
-     * <li>If <i>m</i> is infinity, it is represented by the characters
-     *     {@code "Infinity"}; thus, positive infinity produces
-     *     the result {@code "Infinity"} and negative infinity
-     *     produces the result {@code "-Infinity"}.
-     * <li>If <i>m</i> is zero, it is represented by the characters
-     *     {@code "0.0"}; thus, negative zero produces the result
-     *     {@code "-0.0"} and positive zero produces the result
-     *     {@code "0.0"}.
-     * <li> If <i>m</i> is greater than or equal to 10<sup>-3</sup> but
-     *      less than 10<sup>7</sup>, then it is represented as the
-     *      integer part of <i>m</i>, in decimal form with no leading
-     *      zeroes, followed by '{@code .}'
-     *      (<code>'&#92;u002E'</code>), followed by one or more
-     *      decimal digits representing the fractional part of
-     *      <i>m</i>.
-     * <li> If <i>m</i> is less than 10<sup>-3</sup> or greater than or
-     *      equal to 10<sup>7</sup>, then it is represented in
-     *      so-called "computerized scientific notation." Let <i>n</i>
-     *      be the unique integer such that 10<sup><i>n</i> </sup>&le;
-     *      <i>m</i> {@literal <} 10<sup><i>n</i>+1</sup>; then let <i>a</i>
-     *      be the mathematically exact quotient of <i>m</i> and
-     *      10<sup><i>n</i></sup> so that 1 &le; <i>a</i> {@literal <} 10.
-     *      The magnitude is then represented as the integer part of
-     *      <i>a</i>, as a single decimal digit, followed by
-     *      '{@code .}' (<code>'&#92;u002E'</code>), followed by
-     *      decimal digits representing the fractional part of
-     *      <i>a</i>, followed by the letter '{@code E}'
-     *      (<code>'&#92;u0045'</code>), followed by a representation
-     *      of <i>n</i> as a decimal integer, as produced by the
-     *      method {@link java.lang.Integer#toString(int)}.
-     *
-     * </ul>
-     * </ul>
-     * How many digits must be printed for the fractional part of
-     * <i>m</i> or <i>a</i>? There must be at least one digit
-     * to represent the fractional part, and beyond that as many, but
-     * only as many, more digits as are needed to uniquely distinguish
-     * the argument value from adjacent values of type
-     * {@code float}. That is, suppose that <i>x</i> is the
-     * exact mathematical value represented by the decimal
-     * representation produced by this method for a finite nonzero
-     * argument <i>f</i>. Then <i>f</i> must be the {@code float}
-     * value nearest to <i>x</i>; or, if two {@code float} values are
-     * equally close to <i>x</i>, then <i>f</i> must be one of
-     * them and the least significant bit of the significand of
-     * <i>f</i> must be {@code 0}.
-     *
-     * <p>To create localized string representations of a floating-point
-     * value, use subclasses of {@link java.text.NumberFormat}.
-     *
-     * @param   f   the float to be converted.
-     * @return a string representation of the argument.
-     */
-    public static String toString(float f) {
-        return Double.toString(f);
-    }
-
-    /**
-     * Returns a hexadecimal string representation of the
-     * {@code float} argument. All characters mentioned below are
-     * ASCII characters.
-     *
-     * <ul>
-     * <li>If the argument is NaN, the result is the string
-     *     "{@code NaN}".
-     * <li>Otherwise, the result is a string that represents the sign and
-     * magnitude (absolute value) of the argument. If the sign is negative,
-     * the first character of the result is '{@code -}'
-     * (<code>'&#92;u002D'</code>); if the sign is positive, no sign character
-     * appears in the result. As for the magnitude <i>m</i>:
-     *
-     * <ul>
-     * <li>If <i>m</i> is infinity, it is represented by the string
-     * {@code "Infinity"}; thus, positive infinity produces the
-     * result {@code "Infinity"} and negative infinity produces
-     * the result {@code "-Infinity"}.
-     *
-     * <li>If <i>m</i> is zero, it is represented by the string
-     * {@code "0x0.0p0"}; thus, negative zero produces the result
-     * {@code "-0x0.0p0"} and positive zero produces the result
-     * {@code "0x0.0p0"}.
-     *
-     * <li>If <i>m</i> is a {@code float} value with a
-     * normalized representation, substrings are used to represent the
-     * significand and exponent fields.  The significand is
-     * represented by the characters {@code "0x1."}
-     * followed by a lowercase hexadecimal representation of the rest
-     * of the significand as a fraction.  Trailing zeros in the
-     * hexadecimal representation are removed unless all the digits
-     * are zero, in which case a single zero is used. Next, the
-     * exponent is represented by {@code "p"} followed
-     * by a decimal string of the unbiased exponent as if produced by
-     * a call to {@link Integer#toString(int) Integer.toString} on the
-     * exponent value.
-     *
-     * <li>If <i>m</i> is a {@code float} value with a subnormal
-     * representation, the significand is represented by the
-     * characters {@code "0x0."} followed by a
-     * hexadecimal representation of the rest of the significand as a
-     * fraction.  Trailing zeros in the hexadecimal representation are
-     * removed. Next, the exponent is represented by
-     * {@code "p-126"}.  Note that there must be at
-     * least one nonzero digit in a subnormal significand.
-     *
-     * </ul>
-     *
-     * </ul>
-     *
-     * <table border>
-     * <caption><h3>Examples</h3></caption>
-     * <tr><th>Floating-point Value</th><th>Hexadecimal String</th>
-     * <tr><td>{@code 1.0}</td> <td>{@code 0x1.0p0}</td>
-     * <tr><td>{@code -1.0}</td>        <td>{@code -0x1.0p0}</td>
-     * <tr><td>{@code 2.0}</td> <td>{@code 0x1.0p1}</td>
-     * <tr><td>{@code 3.0}</td> <td>{@code 0x1.8p1}</td>
-     * <tr><td>{@code 0.5}</td> <td>{@code 0x1.0p-1}</td>
-     * <tr><td>{@code 0.25}</td>        <td>{@code 0x1.0p-2}</td>
-     * <tr><td>{@code Float.MAX_VALUE}</td>
-     *     <td>{@code 0x1.fffffep127}</td>
-     * <tr><td>{@code Minimum Normal Value}</td>
-     *     <td>{@code 0x1.0p-126}</td>
-     * <tr><td>{@code Maximum Subnormal Value}</td>
-     *     <td>{@code 0x0.fffffep-126}</td>
-     * <tr><td>{@code Float.MIN_VALUE}</td>
-     *     <td>{@code 0x0.000002p-126}</td>
-     * </table>
-     * @param   f   the {@code float} to be converted.
-     * @return a hex string representation of the argument.
-     * @since 1.5
-     * @author Joseph D. Darcy
-     */
-    public static String toHexString(float f) {
-        throw new UnsupportedOperationException();
-//        if (Math.abs(f) < FloatConsts.MIN_NORMAL
-//            &&  f != 0.0f ) {// float subnormal
-//            // Adjust exponent to create subnormal double, then
-//            // replace subnormal double exponent with subnormal float
-//            // exponent
-//            String s = Double.toHexString(FpUtils.scalb((double)f,
-//                                                        /* -1022+126 */
-//                                                        DoubleConsts.MIN_EXPONENT-
-//                                                        FloatConsts.MIN_EXPONENT));
-//            return s.replaceFirst("p-1022$", "p-126");
-//        }
-//        else // double string will be the same as float string
-//            return Double.toHexString(f);
-    }
-
-    /**
-     * Returns a {@code Float} object holding the
-     * {@code float} value represented by the argument string
-     * {@code s}.
-     *
-     * <p>If {@code s} is {@code null}, then a
-     * {@code NullPointerException} is thrown.
-     *
-     * <p>Leading and trailing whitespace characters in {@code s}
-     * are ignored.  Whitespace is removed as if by the {@link
-     * String#trim} method; that is, both ASCII space and control
-     * characters are removed. The rest of {@code s} should
-     * constitute a <i>FloatValue</i> as described by the lexical
-     * syntax rules:
-     *
-     * <blockquote>
-     * <dl>
-     * <dt><i>FloatValue:</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code NaN}
-     * <dd><i>Sign<sub>opt</sub></i> {@code Infinity}
-     * <dd><i>Sign<sub>opt</sub> FloatingPointLiteral</i>
-     * <dd><i>Sign<sub>opt</sub> HexFloatingPointLiteral</i>
-     * <dd><i>SignedInteger</i>
-     * </dl>
-     *
-     * <p>
-     *
-     * <dl>
-     * <dt><i>HexFloatingPointLiteral</i>:
-     * <dd> <i>HexSignificand BinaryExponent FloatTypeSuffix<sub>opt</sub></i>
-     * </dl>
-     *
-     * <p>
-     *
-     * <dl>
-     * <dt><i>HexSignificand:</i>
-     * <dd><i>HexNumeral</i>
-     * <dd><i>HexNumeral</i> {@code .}
-     * <dd>{@code 0x} <i>HexDigits<sub>opt</sub>
-     *     </i>{@code .}<i> HexDigits</i>
-     * <dd>{@code 0X}<i> HexDigits<sub>opt</sub>
-     *     </i>{@code .} <i>HexDigits</i>
-     * </dl>
-     *
-     * <p>
-     *
-     * <dl>
-     * <dt><i>BinaryExponent:</i>
-     * <dd><i>BinaryExponentIndicator SignedInteger</i>
-     * </dl>
-     *
-     * <p>
-     *
-     * <dl>
-     * <dt><i>BinaryExponentIndicator:</i>
-     * <dd>{@code p}
-     * <dd>{@code P}
-     * </dl>
-     *
-     * </blockquote>
-     *
-     * where <i>Sign</i>, <i>FloatingPointLiteral</i>,
-     * <i>HexNumeral</i>, <i>HexDigits</i>, <i>SignedInteger</i> and
-     * <i>FloatTypeSuffix</i> are as defined in the lexical structure
-     * sections of
-     * <cite>The Java&trade; Language Specification</cite>,
-     * except that underscores are not accepted between digits.
-     * If {@code s} does not have the form of
-     * a <i>FloatValue</i>, then a {@code NumberFormatException}
-     * is thrown. Otherwise, {@code s} is regarded as
-     * representing an exact decimal value in the usual
-     * "computerized scientific notation" or as an exact
-     * hexadecimal value; this exact numerical value is then
-     * conceptually converted to an "infinitely precise"
-     * binary value that is then rounded to type {@code float}
-     * by the usual round-to-nearest rule of IEEE 754 floating-point
-     * arithmetic, which includes preserving the sign of a zero
-     * value.
-     *
-     * Note that the round-to-nearest rule also implies overflow and
-     * underflow behaviour; if the exact value of {@code s} is large
-     * enough in magnitude (greater than or equal to ({@link
-     * #MAX_VALUE} + {@link Math#ulp(float) ulp(MAX_VALUE)}/2),
-     * rounding to {@code float} will result in an infinity and if the
-     * exact value of {@code s} is small enough in magnitude (less
-     * than or equal to {@link #MIN_VALUE}/2), rounding to float will
-     * result in a zero.
-     *
-     * Finally, after rounding a {@code Float} object representing
-     * this {@code float} value is returned.
-     *
-     * <p>To interpret localized string representations of a
-     * floating-point value, use subclasses of {@link
-     * java.text.NumberFormat}.
-     *
-     * <p>Note that trailing format specifiers, specifiers that
-     * determine the type of a floating-point literal
-     * ({@code 1.0f} is a {@code float} value;
-     * {@code 1.0d} is a {@code double} value), do
-     * <em>not</em> influence the results of this method.  In other
-     * words, the numerical value of the input string is converted
-     * directly to the target floating-point type.  In general, the
-     * two-step sequence of conversions, string to {@code double}
-     * followed by {@code double} to {@code float}, is
-     * <em>not</em> equivalent to converting a string directly to
-     * {@code float}.  For example, if first converted to an
-     * intermediate {@code double} and then to
-     * {@code float}, the string<br>
-     * {@code "1.00000017881393421514957253748434595763683319091796875001d"}<br>
-     * results in the {@code float} value
-     * {@code 1.0000002f}; if the string is converted directly to
-     * {@code float}, <code>1.000000<b>1</b>f</code> results.
-     *
-     * <p>To avoid calling this method on an invalid string and having
-     * a {@code NumberFormatException} be thrown, the documentation
-     * for {@link Double#valueOf Double.valueOf} lists a regular
-     * expression which can be used to screen the input.
-     *
-     * @param   s   the string to be parsed.
-     * @return  a {@code Float} object holding the value
-     *          represented by the {@code String} argument.
-     * @throws  NumberFormatException  if the string does not contain a
-     *          parsable number.
-     */
-    public static Float valueOf(String s) throws NumberFormatException {
-        throw new UnsupportedOperationException();
-//        return new Float(FloatingDecimal.readJavaFormatString(s).floatValue());
-    }
-
-    /**
-     * Returns a {@code Float} instance representing the specified
-     * {@code float} value.
-     * If a new {@code Float} instance is not required, this method
-     * should generally be used in preference to the constructor
-     * {@link #Float(float)}, as this method is likely to yield
-     * significantly better space and time performance by caching
-     * frequently requested values.
-     *
-     * @param  f a float value.
-     * @return a {@code Float} instance representing {@code f}.
-     * @since  1.5
-     */
-    public static Float valueOf(float f) {
-        return new Float(f);
-    }
-
-    /**
-     * Returns a new {@code float} initialized to the value
-     * represented by the specified {@code String}, as performed
-     * by the {@code valueOf} method of class {@code Float}.
-     *
-     * @param  s the string to be parsed.
-     * @return the {@code float} value represented by the string
-     *         argument.
-     * @throws NullPointerException  if the string is null
-     * @throws NumberFormatException if the string does not contain a
-     *               parsable {@code float}.
-     * @see    java.lang.Float#valueOf(String)
-     * @since 1.2
-     */
-    public static float parseFloat(String s) throws NumberFormatException {
-        throw new UnsupportedOperationException();
-//        return FloatingDecimal.readJavaFormatString(s).floatValue();
-    }
-
-    /**
-     * Returns {@code true} if the specified number is a
-     * Not-a-Number (NaN) value, {@code false} otherwise.
-     *
-     * @param   v   the value to be tested.
-     * @return  {@code true} if the argument is NaN;
-     *          {@code false} otherwise.
-     */
-    static public boolean isNaN(float v) {
-        return (v != v);
-    }
-
-    /**
-     * Returns {@code true} if the specified number is infinitely
-     * large in magnitude, {@code false} otherwise.
-     *
-     * @param   v   the value to be tested.
-     * @return  {@code true} if the argument is positive infinity or
-     *          negative infinity; {@code false} otherwise.
-     */
-    static public boolean isInfinite(float v) {
-        return (v == POSITIVE_INFINITY) || (v == NEGATIVE_INFINITY);
-    }
-
-    /**
-     * The value of the Float.
-     *
-     * @serial
-     */
-    private final float value;
-
-    /**
-     * Constructs a newly allocated {@code Float} object that
-     * represents the primitive {@code float} argument.
-     *
-     * @param   value   the value to be represented by the {@code Float}.
-     */
-    public Float(float value) {
-        this.value = value;
-    }
-
-    /**
-     * Constructs a newly allocated {@code Float} object that
-     * represents the argument converted to type {@code float}.
-     *
-     * @param   value   the value to be represented by the {@code Float}.
-     */
-    public Float(double value) {
-        this.value = (float)value;
-    }
-
-    /**
-     * Constructs a newly allocated {@code Float} object that
-     * represents the floating-point value of type {@code float}
-     * represented by the string. The string is converted to a
-     * {@code float} value as if by the {@code valueOf} method.
-     *
-     * @param      s   a string to be converted to a {@code Float}.
-     * @throws  NumberFormatException  if the string does not contain a
-     *               parsable number.
-     * @see        java.lang.Float#valueOf(java.lang.String)
-     */
-    public Float(String s) throws NumberFormatException {
-        // REMIND: this is inefficient
-        this(valueOf(s).floatValue());
-    }
-
-    /**
-     * Returns {@code true} if this {@code Float} value is a
-     * Not-a-Number (NaN), {@code false} otherwise.
-     *
-     * @return  {@code true} if the value represented by this object is
-     *          NaN; {@code false} otherwise.
-     */
-    public boolean isNaN() {
-        return isNaN(value);
-    }
-
-    /**
-     * Returns {@code true} if this {@code Float} value is
-     * infinitely large in magnitude, {@code false} otherwise.
-     *
-     * @return  {@code true} if the value represented by this object is
-     *          positive infinity or negative infinity;
-     *          {@code false} otherwise.
-     */
-    public boolean isInfinite() {
-        return isInfinite(value);
-    }
-
-    /**
-     * Returns a string representation of this {@code Float} object.
-     * The primitive {@code float} value represented by this object
-     * is converted to a {@code String} exactly as if by the method
-     * {@code toString} of one argument.
-     *
-     * @return  a {@code String} representation of this object.
-     * @see java.lang.Float#toString(float)
-     */
-    public String toString() {
-        return Float.toString(value);
-    }
-
-    /**
-     * Returns the value of this {@code Float} as a {@code byte} (by
-     * casting to a {@code byte}).
-     *
-     * @return  the {@code float} value represented by this object
-     *          converted to type {@code byte}
-     */
-    public byte byteValue() {
-        return (byte)value;
-    }
-
-    /**
-     * Returns the value of this {@code Float} as a {@code short} (by
-     * casting to a {@code short}).
-     *
-     * @return  the {@code float} value represented by this object
-     *          converted to type {@code short}
-     * @since JDK1.1
-     */
-    public short shortValue() {
-        return (short)value;
-    }
-
-    /**
-     * Returns the value of this {@code Float} as an {@code int} (by
-     * casting to type {@code int}).
-     *
-     * @return  the {@code float} value represented by this object
-     *          converted to type {@code int}
-     */
-    public int intValue() {
-        return (int)value;
-    }
-
-    /**
-     * Returns value of this {@code Float} as a {@code long} (by
-     * casting to type {@code long}).
-     *
-     * @return  the {@code float} value represented by this object
-     *          converted to type {@code long}
-     */
-    public long longValue() {
-        return (long)value;
-    }
-
-    /**
-     * Returns the {@code float} value of this {@code Float} object.
-     *
-     * @return the {@code float} value represented by this object
-     */
-    public float floatValue() {
-        return value;
-    }
-
-    /**
-     * Returns the {@code double} value of this {@code Float} object.
-     *
-     * @return the {@code float} value represented by this
-     *         object is converted to type {@code double} and the
-     *         result of the conversion is returned.
-     */
-    public double doubleValue() {
-        return (double)value;
-    }
-
-    /**
-     * Returns a hash code for this {@code Float} object. The
-     * result is the integer bit representation, exactly as produced
-     * by the method {@link #floatToIntBits(float)}, of the primitive
-     * {@code float} value represented by this {@code Float}
-     * object.
-     *
-     * @return a hash code value for this object.
-     */
-    public int hashCode() {
-        return floatToIntBits(value);
-    }
-
-    /**
-
-     * Compares this object against the specified object.  The result
-     * is {@code true} if and only if the argument is not
-     * {@code null} and is a {@code Float} object that
-     * represents a {@code float} with the same value as the
-     * {@code float} represented by this object. For this
-     * purpose, two {@code float} values are considered to be the
-     * same if and only if the method {@link #floatToIntBits(float)}
-     * returns the identical {@code int} value when applied to
-     * each.
-     *
-     * <p>Note that in most cases, for two instances of class
-     * {@code Float}, {@code f1} and {@code f2}, the value
-     * of {@code f1.equals(f2)} is {@code true} if and only if
-     *
-     * <blockquote><pre>
-     *   f1.floatValue() == f2.floatValue()
-     * </pre></blockquote>
-     *
-     * <p>also has the value {@code true}. However, there are two exceptions:
-     * <ul>
-     * <li>If {@code f1} and {@code f2} both represent
-     *     {@code Float.NaN}, then the {@code equals} method returns
-     *     {@code true}, even though {@code Float.NaN==Float.NaN}
-     *     has the value {@code false}.
-     * <li>If {@code f1} represents {@code +0.0f} while
-     *     {@code f2} represents {@code -0.0f}, or vice
-     *     versa, the {@code equal} test has the value
-     *     {@code false}, even though {@code 0.0f==-0.0f}
-     *     has the value {@code true}.
-     * </ul>
-     *
-     * This definition allows hash tables to operate properly.
-     *
-     * @param obj the object to be compared
-     * @return  {@code true} if the objects are the same;
-     *          {@code false} otherwise.
-     * @see java.lang.Float#floatToIntBits(float)
-     */
-    public boolean equals(Object obj) {
-        return (obj instanceof Float)
-               && (floatToIntBits(((Float)obj).value) == floatToIntBits(value));
-    }
-
-    /**
-     * Returns a representation of the specified floating-point value
-     * according to the IEEE 754 floating-point "single format" bit
-     * layout.
-     *
-     * <p>Bit 31 (the bit that is selected by the mask
-     * {@code 0x80000000}) represents the sign of the floating-point
-     * number.
-     * Bits 30-23 (the bits that are selected by the mask
-     * {@code 0x7f800000}) represent the exponent.
-     * Bits 22-0 (the bits that are selected by the mask
-     * {@code 0x007fffff}) represent the significand (sometimes called
-     * the mantissa) of the floating-point number.
-     *
-     * <p>If the argument is positive infinity, the result is
-     * {@code 0x7f800000}.
-     *
-     * <p>If the argument is negative infinity, the result is
-     * {@code 0xff800000}.
-     *
-     * <p>If the argument is NaN, the result is {@code 0x7fc00000}.
-     *
-     * <p>In all cases, the result is an integer that, when given to the
-     * {@link #intBitsToFloat(int)} method, will produce a floating-point
-     * value the same as the argument to {@code floatToIntBits}
-     * (except all NaN values are collapsed to a single
-     * "canonical" NaN value).
-     *
-     * @param   value   a floating-point number.
-     * @return the bits that represent the floating-point number.
-     */
-    public static int floatToIntBits(float value) {
-        throw new UnsupportedOperationException();
-//        int result = floatToRawIntBits(value);
-//        // Check for NaN based on values of bit fields, maximum
-//        // exponent and nonzero significand.
-//        if ( ((result & FloatConsts.EXP_BIT_MASK) ==
-//              FloatConsts.EXP_BIT_MASK) &&
-//             (result & FloatConsts.SIGNIF_BIT_MASK) != 0)
-//            result = 0x7fc00000;
-//        return result;
-    }
-
-    /**
-     * Returns a representation of the specified floating-point value
-     * according to the IEEE 754 floating-point "single format" bit
-     * layout, preserving Not-a-Number (NaN) values.
-     *
-     * <p>Bit 31 (the bit that is selected by the mask
-     * {@code 0x80000000}) represents the sign of the floating-point
-     * number.
-     * Bits 30-23 (the bits that are selected by the mask
-     * {@code 0x7f800000}) represent the exponent.
-     * Bits 22-0 (the bits that are selected by the mask
-     * {@code 0x007fffff}) represent the significand (sometimes called
-     * the mantissa) of the floating-point number.
-     *
-     * <p>If the argument is positive infinity, the result is
-     * {@code 0x7f800000}.
-     *
-     * <p>If the argument is negative infinity, the result is
-     * {@code 0xff800000}.
-     *
-     * <p>If the argument is NaN, the result is the integer representing
-     * the actual NaN value.  Unlike the {@code floatToIntBits}
-     * method, {@code floatToRawIntBits} does not collapse all the
-     * bit patterns encoding a NaN to a single "canonical"
-     * NaN value.
-     *
-     * <p>In all cases, the result is an integer that, when given to the
-     * {@link #intBitsToFloat(int)} method, will produce a
-     * floating-point value the same as the argument to
-     * {@code floatToRawIntBits}.
-     *
-     * @param   value   a floating-point number.
-     * @return the bits that represent the floating-point number.
-     * @since 1.3
-     */
-    public static native int floatToRawIntBits(float value);
-
-    /**
-     * Returns the {@code float} value corresponding to a given
-     * bit representation.
-     * The argument is considered to be a representation of a
-     * floating-point value according to the IEEE 754 floating-point
-     * "single format" bit layout.
-     *
-     * <p>If the argument is {@code 0x7f800000}, the result is positive
-     * infinity.
-     *
-     * <p>If the argument is {@code 0xff800000}, the result is negative
-     * infinity.
-     *
-     * <p>If the argument is any value in the range
-     * {@code 0x7f800001} through {@code 0x7fffffff} or in
-     * the range {@code 0xff800001} through
-     * {@code 0xffffffff}, the result is a NaN.  No IEEE 754
-     * floating-point operation provided by Java can distinguish
-     * between two NaN values of the same type with different bit
-     * patterns.  Distinct values of NaN are only distinguishable by
-     * use of the {@code Float.floatToRawIntBits} method.
-     *
-     * <p>In all other cases, let <i>s</i>, <i>e</i>, and <i>m</i> be three
-     * values that can be computed from the argument:
-     *
-     * <blockquote><pre>
-     * int s = ((bits &gt;&gt; 31) == 0) ? 1 : -1;
-     * int e = ((bits &gt;&gt; 23) & 0xff);
-     * int m = (e == 0) ?
-     *                 (bits & 0x7fffff) &lt;&lt; 1 :
-     *                 (bits & 0x7fffff) | 0x800000;
-     * </pre></blockquote>
-     *
-     * Then the floating-point result equals the value of the mathematical
-     * expression <i>s</i>&middot;<i>m</i>&middot;2<sup><i>e</i>-150</sup>.
-     *
-     * <p>Note that this method may not be able to return a
-     * {@code float} NaN with exactly same bit pattern as the
-     * {@code int} argument.  IEEE 754 distinguishes between two
-     * kinds of NaNs, quiet NaNs and <i>signaling NaNs</i>.  The
-     * differences between the two kinds of NaN are generally not
-     * visible in Java.  Arithmetic operations on signaling NaNs turn
-     * them into quiet NaNs with a different, but often similar, bit
-     * pattern.  However, on some processors merely copying a
-     * signaling NaN also performs that conversion.  In particular,
-     * copying a signaling NaN to return it to the calling method may
-     * perform this conversion.  So {@code intBitsToFloat} may
-     * not be able to return a {@code float} with a signaling NaN
-     * bit pattern.  Consequently, for some {@code int} values,
-     * {@code floatToRawIntBits(intBitsToFloat(start))} may
-     * <i>not</i> equal {@code start}.  Moreover, which
-     * particular bit patterns represent signaling NaNs is platform
-     * dependent; although all NaN bit patterns, quiet or signaling,
-     * must be in the NaN range identified above.
-     *
-     * @param   bits   an integer.
-     * @return  the {@code float} floating-point value with the same bit
-     *          pattern.
-     */
-    @JavaScriptBody(args = "bits",
-        body = 
-          "if (bits === 0x7f800000) return Number.POSITIVE_INFINITY;\n"
-        + "if (bits === 0xff800000) return Number.NEGATIVE_INFINITY;\n"
-        + "if (bits >= 0x7f800001 && bits <= 0xffffffff) return Number.NaN;\n"
-        + "var s = ((bits >> 31) == 0) ? 1 : -1;\n"
-        + "var e = ((bits >> 23) & 0xff);\n"
-        + "var m = (e == 0) ?\n"
-        + "  (bits & 0x7fffff) << 1 :\n"
-        + "  (bits & 0x7fffff) | 0x800000;\n"
-        + "return s * m * Math.pow(2.0, e - 150);\n"
-    )
-    public static native float intBitsToFloat(int bits);
-
-    /**
-     * Compares two {@code Float} objects numerically.  There are
-     * two ways in which comparisons performed by this method differ
-     * from those performed by the Java language numerical comparison
-     * operators ({@code <, <=, ==, >=, >}) when
-     * applied to primitive {@code float} values:
-     *
-     * <ul><li>
-     *          {@code Float.NaN} is considered by this method to
-     *          be equal to itself and greater than all other
-     *          {@code float} values
-     *          (including {@code Float.POSITIVE_INFINITY}).
-     * <li>
-     *          {@code 0.0f} is considered by this method to be greater
-     *          than {@code -0.0f}.
-     * </ul>
-     *
-     * This ensures that the <i>natural ordering</i> of {@code Float}
-     * objects imposed by this method is <i>consistent with equals</i>.
-     *
-     * @param   anotherFloat   the {@code Float} to be compared.
-     * @return  the value {@code 0} if {@code anotherFloat} is
-     *          numerically equal to this {@code Float}; a value
-     *          less than {@code 0} if this {@code Float}
-     *          is numerically less than {@code anotherFloat};
-     *          and a value greater than {@code 0} if this
-     *          {@code Float} is numerically greater than
-     *          {@code anotherFloat}.
-     *
-     * @since   1.2
-     * @see Comparable#compareTo(Object)
-     */
-    public int compareTo(Float anotherFloat) {
-        return Float.compare(value, anotherFloat.value);
-    }
-
-    /**
-     * Compares the two specified {@code float} values. The sign
-     * of the integer value returned is the same as that of the
-     * integer that would be returned by the call:
-     * <pre>
-     *    new Float(f1).compareTo(new Float(f2))
-     * </pre>
-     *
-     * @param   f1        the first {@code float} to compare.
-     * @param   f2        the second {@code float} to compare.
-     * @return  the value {@code 0} if {@code f1} is
-     *          numerically equal to {@code f2}; a value less than
-     *          {@code 0} if {@code f1} is numerically less than
-     *          {@code f2}; and a value greater than {@code 0}
-     *          if {@code f1} is numerically greater than
-     *          {@code f2}.
-     * @since 1.4
-     */
-    public static int compare(float f1, float f2) {
-        if (f1 < f2)
-            return -1;           // Neither val is NaN, thisVal is smaller
-        if (f1 > f2)
-            return 1;            // Neither val is NaN, thisVal is larger
-
-        // Cannot use floatToRawIntBits because of possibility of NaNs.
-        int thisBits    = Float.floatToIntBits(f1);
-        int anotherBits = Float.floatToIntBits(f2);
-
-        return (thisBits == anotherBits ?  0 : // Values are equal
-                (thisBits < anotherBits ? -1 : // (-0.0, 0.0) or (!NaN, NaN)
-                 1));                          // (0.0, -0.0) or (NaN, !NaN)
-    }
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = -2671257302660747028L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/IllegalAccessError.java
--- a/emul/mini/src/main/java/java/lang/IllegalAccessError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown if an application attempts to access or modify a field, or
- * to call a method that it does not have access to.
- * <p>
- * Normally, this error is caught by the compiler; this error can
- * only occur at run time if the definition of a class has
- * incompatibly changed.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public class IllegalAccessError extends IncompatibleClassChangeError {
-    private static final long serialVersionUID = -8988904074992417891L;
-
-    /**
-     * Constructs an <code>IllegalAccessError</code> with no detail message.
-     */
-    public IllegalAccessError() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>IllegalAccessError</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public IllegalAccessError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/IllegalAccessException.java
--- a/emul/mini/src/main/java/java/lang/IllegalAccessException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * An IllegalAccessException is thrown when an application tries
- * to reflectively create an instance (other than an array),
- * set or get a field, or invoke a method, but the currently
- * executing method does not have access to the definition of
- * the specified class, field, method or constructor.
- *
- * @author  unascribed
- * @see     Class#newInstance()
- * @see     java.lang.reflect.Field#set(Object, Object)
- * @see     java.lang.reflect.Field#setBoolean(Object, boolean)
- * @see     java.lang.reflect.Field#setByte(Object, byte)
- * @see     java.lang.reflect.Field#setShort(Object, short)
- * @see     java.lang.reflect.Field#setChar(Object, char)
- * @see     java.lang.reflect.Field#setInt(Object, int)
- * @see     java.lang.reflect.Field#setLong(Object, long)
- * @see     java.lang.reflect.Field#setFloat(Object, float)
- * @see     java.lang.reflect.Field#setDouble(Object, double)
- * @see     java.lang.reflect.Field#get(Object)
- * @see     java.lang.reflect.Field#getBoolean(Object)
- * @see     java.lang.reflect.Field#getByte(Object)
- * @see     java.lang.reflect.Field#getShort(Object)
- * @see     java.lang.reflect.Field#getChar(Object)
- * @see     java.lang.reflect.Field#getInt(Object)
- * @see     java.lang.reflect.Field#getLong(Object)
- * @see     java.lang.reflect.Field#getFloat(Object)
- * @see     java.lang.reflect.Field#getDouble(Object)
- * @see     java.lang.reflect.Method#invoke(Object, Object[])
- * @see     java.lang.reflect.Constructor#newInstance(Object[])
- * @since   JDK1.0
- */
-public class IllegalAccessException extends ReflectiveOperationException {
-    private static final long serialVersionUID = 6616958222490762034L;
-
-    /**
-     * Constructs an <code>IllegalAccessException</code> without a
-     * detail message.
-     */
-    public IllegalAccessException() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>IllegalAccessException</code> with a detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public IllegalAccessException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/IllegalArgumentException.java
--- a/emul/mini/src/main/java/java/lang/IllegalArgumentException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that a method has been passed an illegal or
- * inappropriate argument.
- *
- * @author  unascribed
- * @see     java.lang.Thread#setPriority(int)
- * @since   JDK1.0
- */
-public
-class IllegalArgumentException extends RuntimeException {
-    /**
-     * Constructs an <code>IllegalArgumentException</code> with no
-     * detail message.
-     */
-    public IllegalArgumentException() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>IllegalArgumentException</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public IllegalArgumentException(String s) {
-        super(s);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and
-     * cause.
-     *
-     * <p>Note that the detail message associated with <code>cause</code> is
-     * <i>not</i> automatically incorporated in this exception's detail
-     * message.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link Throwable#getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value
-     *         is permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since 1.5
-     */
-    public IllegalArgumentException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail
-     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
-     * typically contains the class and detail message of <tt>cause</tt>).
-     * This constructor is useful for exceptions that are little more than
-     * wrappers for other throwables (for example, {@link
-     * java.security.PrivilegedActionException}).
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.5
-     */
-    public IllegalArgumentException(Throwable cause) {
-        super(cause);
-    }
-
-    private static final long serialVersionUID = -5365630128856068164L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/IllegalStateException.java
--- a/emul/mini/src/main/java/java/lang/IllegalStateException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Signals that a method has been invoked at an illegal or
- * inappropriate time.  In other words, the Java environment or
- * Java application is not in an appropriate state for the requested
- * operation.
- *
- * @author  Jonni Kanerva
- * @since   JDK1.1
- */
-public
-class IllegalStateException extends RuntimeException {
-    /**
-     * Constructs an IllegalStateException with no detail message.
-     * A detail message is a String that describes this particular exception.
-     */
-    public IllegalStateException() {
-        super();
-    }
-
-    /**
-     * Constructs an IllegalStateException with the specified detail
-     * message.  A detail message is a String that describes this particular
-     * exception.
-     *
-     * @param s the String that contains a detailed message
-     */
-    public IllegalStateException(String s) {
-        super(s);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and
-     * cause.
-     *
-     * <p>Note that the detail message associated with <code>cause</code> is
-     * <i>not</i> automatically incorporated in this exception's detail
-     * message.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link Throwable#getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value
-     *         is permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since 1.5
-     */
-    public IllegalStateException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail
-     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
-     * typically contains the class and detail message of <tt>cause</tt>).
-     * This constructor is useful for exceptions that are little more than
-     * wrappers for other throwables (for example, {@link
-     * java.security.PrivilegedActionException}).
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.5
-     */
-    public IllegalStateException(Throwable cause) {
-        super(cause);
-    }
-
-    static final long serialVersionUID = -1848914673093119416L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/IncompatibleClassChangeError.java
--- a/emul/mini/src/main/java/java/lang/IncompatibleClassChangeError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when an incompatible class change has occurred to some class
- * definition. The definition of some class, on which the currently
- * executing method depends, has since changed.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class IncompatibleClassChangeError extends LinkageError {
-    private static final long serialVersionUID = -4914975503642802119L;
-
-    /**
-     * Constructs an <code>IncompatibleClassChangeError</code> with no
-     * detail message.
-     */
-    public IncompatibleClassChangeError () {
-        super();
-    }
-
-    /**
-     * Constructs an <code>IncompatibleClassChangeError</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public IncompatibleClassChangeError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/IndexOutOfBoundsException.java
--- a/emul/mini/src/main/java/java/lang/IndexOutOfBoundsException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that an index of some sort (such as to an array, to a
- * string, or to a vector) is out of range.
- * <p>
- * Applications can subclass this class to indicate similar exceptions.
- *
- * @author  Frank Yellin
- * @since   JDK1.0
- */
-public
-class IndexOutOfBoundsException extends RuntimeException {
-    private static final long serialVersionUID = 234122996006267687L;
-
-    /**
-     * Constructs an <code>IndexOutOfBoundsException</code> with no
-     * detail message.
-     */
-    public IndexOutOfBoundsException() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>IndexOutOfBoundsException</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public IndexOutOfBoundsException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/InstantiationException.java
--- a/emul/mini/src/main/java/java/lang/InstantiationException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when an application tries to create an instance of a class
- * using the {@code newInstance} method in class
- * {@code Class}, but the specified class object cannot be
- * instantiated.  The instantiation can fail for a variety of
- * reasons including but not limited to:
- *
- * <ul>
- * <li> the class object represents an abstract class, an interface,
- *      an array class, a primitive type, or {@code void}
- * <li> the class has no nullary constructor
- *</ul>
- *
- * @author  unascribed
- * @see     java.lang.Class#newInstance()
- * @since   JDK1.0
- */
-public
-class InstantiationException extends ReflectiveOperationException {
-    private static final long serialVersionUID = -8441929162975509110L;
-
-    /**
-     * Constructs an {@code InstantiationException} with no detail message.
-     */
-    public InstantiationException() {
-        super();
-    }
-
-    /**
-     * Constructs an {@code InstantiationException} with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public InstantiationException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Integer.java
--- a/emul/mini/src/main/java/java/lang/Integer.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1246 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- * The {@code Integer} class wraps a value of the primitive type
- * {@code int} in an object. An object of type {@code Integer}
- * contains a single field whose type is {@code int}.
- *
- * <p>In addition, this class provides several methods for converting
- * an {@code int} to a {@code String} and a {@code String} to an
- * {@code int}, as well as other constants and methods useful when
- * dealing with an {@code int}.
- *
- * <p>Implementation note: The implementations of the "bit twiddling"
- * methods (such as {@link #highestOneBit(int) highestOneBit} and
- * {@link #numberOfTrailingZeros(int) numberOfTrailingZeros}) are
- * based on material from Henry S. Warren, Jr.'s <i>Hacker's
- * Delight</i>, (Addison Wesley, 2002).
- *
- * @author  Lee Boynton
- * @author  Arthur van Hoff
- * @author  Josh Bloch
- * @author  Joseph D. Darcy
- * @since JDK1.0
- */
-public final class Integer extends Number implements Comparable<Integer> {
-    /**
-     * A constant holding the minimum value an {@code int} can
-     * have, -2<sup>31</sup>.
-     */
-    public static final int   MIN_VALUE = 0x80000000;
-
-    /**
-     * A constant holding the maximum value an {@code int} can
-     * have, 2<sup>31</sup>-1.
-     */
-    public static final int   MAX_VALUE = 0x7fffffff;
-
-    /**
-     * The {@code Class} instance representing the primitive type
-     * {@code int}.
-     *
-     * @since   JDK1.1
-     */
-    public static final Class<Integer>  TYPE = (Class<Integer>) Class.getPrimitiveClass("int");
-
-    /**
-     * All possible chars for representing a number as a String
-     */
-    final static char[] digits = {
-        '0' , '1' , '2' , '3' , '4' , '5' ,
-        '6' , '7' , '8' , '9' , 'a' , 'b' ,
-        'c' , 'd' , 'e' , 'f' , 'g' , 'h' ,
-        'i' , 'j' , 'k' , 'l' , 'm' , 'n' ,
-        'o' , 'p' , 'q' , 'r' , 's' , 't' ,
-        'u' , 'v' , 'w' , 'x' , 'y' , 'z'
-    };
-
-    /**
-     * Returns a string representation of the first argument in the
-     * radix specified by the second argument.
-     *
-     * <p>If the radix is smaller than {@code Character.MIN_RADIX}
-     * or larger than {@code Character.MAX_RADIX}, then the radix
-     * {@code 10} is used instead.
-     *
-     * <p>If the first argument is negative, the first element of the
-     * result is the ASCII minus character {@code '-'}
-     * (<code>'&#92;u002D'</code>). If the first argument is not
-     * negative, no sign character appears in the result.
-     *
-     * <p>The remaining characters of the result represent the magnitude
-     * of the first argument. If the magnitude is zero, it is
-     * represented by a single zero character {@code '0'}
-     * (<code>'&#92;u0030'</code>); otherwise, the first character of
-     * the representation of the magnitude will not be the zero
-     * character.  The following ASCII characters are used as digits:
-     *
-     * <blockquote>
-     *   {@code 0123456789abcdefghijklmnopqrstuvwxyz}
-     * </blockquote>
-     *
-     * These are <code>'&#92;u0030'</code> through
-     * <code>'&#92;u0039'</code> and <code>'&#92;u0061'</code> through
-     * <code>'&#92;u007A'</code>. If {@code radix} is
-     * <var>N</var>, then the first <var>N</var> of these characters
-     * are used as radix-<var>N</var> digits in the order shown. Thus,
-     * the digits for hexadecimal (radix 16) are
-     * {@code 0123456789abcdef}. If uppercase letters are
-     * desired, the {@link java.lang.String#toUpperCase()} method may
-     * be called on the result:
-     *
-     * <blockquote>
-     *  {@code Integer.toString(n, 16).toUpperCase()}
-     * </blockquote>
-     *
-     * @param   i       an integer to be converted to a string.
-     * @param   radix   the radix to use in the string representation.
-     * @return  a string representation of the argument in the specified radix.
-     * @see     java.lang.Character#MAX_RADIX
-     * @see     java.lang.Character#MIN_RADIX
-     */
-    public static String toString(int i, int radix) {
-
-        if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX)
-            radix = 10;
-
-        /* Use the faster version */
-        if (radix == 10) {
-            return toString(i);
-        }
-
-        char buf[] = new char[33];
-        boolean negative = (i < 0);
-        int charPos = 32;
-
-        if (!negative) {
-            i = -i;
-        }
-
-        while (i <= -radix) {
-            buf[charPos--] = digits[-(i % radix)];
-            i = i / radix;
-        }
-        buf[charPos] = digits[-i];
-
-        if (negative) {
-            buf[--charPos] = '-';
-        }
-
-        return new String(buf, charPos, (33 - charPos));
-    }
-
-    /**
-     * Returns a string representation of the integer argument as an
-     * unsigned integer in base&nbsp;16.
-     *
-     * <p>The unsigned integer value is the argument plus 2<sup>32</sup>
-     * if the argument is negative; otherwise, it is equal to the
-     * argument.  This value is converted to a string of ASCII digits
-     * in hexadecimal (base&nbsp;16) with no extra leading
-     * {@code 0}s. If the unsigned magnitude is zero, it is
-     * represented by a single zero character {@code '0'}
-     * (<code>'&#92;u0030'</code>); otherwise, the first character of
-     * the representation of the unsigned magnitude will not be the
-     * zero character. The following characters are used as
-     * hexadecimal digits:
-     *
-     * <blockquote>
-     *  {@code 0123456789abcdef}
-     * </blockquote>
-     *
-     * These are the characters <code>'&#92;u0030'</code> through
-     * <code>'&#92;u0039'</code> and <code>'&#92;u0061'</code> through
-     * <code>'&#92;u0066'</code>. If uppercase letters are
-     * desired, the {@link java.lang.String#toUpperCase()} method may
-     * be called on the result:
-     *
-     * <blockquote>
-     *  {@code Integer.toHexString(n).toUpperCase()}
-     * </blockquote>
-     *
-     * @param   i   an integer to be converted to a string.
-     * @return  the string representation of the unsigned integer value
-     *          represented by the argument in hexadecimal (base&nbsp;16).
-     * @since   JDK1.0.2
-     */
-    public static String toHexString(int i) {
-        return toUnsignedString(i, 4);
-    }
-
-    /**
-     * Returns a string representation of the integer argument as an
-     * unsigned integer in base&nbsp;8.
-     *
-     * <p>The unsigned integer value is the argument plus 2<sup>32</sup>
-     * if the argument is negative; otherwise, it is equal to the
-     * argument.  This value is converted to a string of ASCII digits
-     * in octal (base&nbsp;8) with no extra leading {@code 0}s.
-     *
-     * <p>If the unsigned magnitude is zero, it is represented by a
-     * single zero character {@code '0'}
-     * (<code>'&#92;u0030'</code>); otherwise, the first character of
-     * the representation of the unsigned magnitude will not be the
-     * zero character. The following characters are used as octal
-     * digits:
-     *
-     * <blockquote>
-     * {@code 01234567}
-     * </blockquote>
-     *
-     * These are the characters <code>'&#92;u0030'</code> through
-     * <code>'&#92;u0037'</code>.
-     *
-     * @param   i   an integer to be converted to a string.
-     * @return  the string representation of the unsigned integer value
-     *          represented by the argument in octal (base&nbsp;8).
-     * @since   JDK1.0.2
-     */
-    public static String toOctalString(int i) {
-        return toUnsignedString(i, 3);
-    }
-
-    /**
-     * Returns a string representation of the integer argument as an
-     * unsigned integer in base&nbsp;2.
-     *
-     * <p>The unsigned integer value is the argument plus 2<sup>32</sup>
-     * if the argument is negative; otherwise it is equal to the
-     * argument.  This value is converted to a string of ASCII digits
-     * in binary (base&nbsp;2) with no extra leading {@code 0}s.
-     * If the unsigned magnitude is zero, it is represented by a
-     * single zero character {@code '0'}
-     * (<code>'&#92;u0030'</code>); otherwise, the first character of
-     * the representation of the unsigned magnitude will not be the
-     * zero character. The characters {@code '0'}
-     * (<code>'&#92;u0030'</code>) and {@code '1'}
-     * (<code>'&#92;u0031'</code>) are used as binary digits.
-     *
-     * @param   i   an integer to be converted to a string.
-     * @return  the string representation of the unsigned integer value
-     *          represented by the argument in binary (base&nbsp;2).
-     * @since   JDK1.0.2
-     */
-    public static String toBinaryString(int i) {
-        return toUnsignedString(i, 1);
-    }
-
-    /**
-     * Convert the integer to an unsigned number.
-     */
-    private static String toUnsignedString(int i, int shift) {
-        char[] buf = new char[32];
-        int charPos = 32;
-        int radix = 1 << shift;
-        int mask = radix - 1;
-        do {
-            buf[--charPos] = digits[i & mask];
-            i >>>= shift;
-        } while (i != 0);
-
-        return new String(buf, charPos, (32 - charPos));
-    }
-
-
-    final static char [] DigitTens = {
-        '0', '0', '0', '0', '0', '0', '0', '0', '0', '0',
-        '1', '1', '1', '1', '1', '1', '1', '1', '1', '1',
-        '2', '2', '2', '2', '2', '2', '2', '2', '2', '2',
-        '3', '3', '3', '3', '3', '3', '3', '3', '3', '3',
-        '4', '4', '4', '4', '4', '4', '4', '4', '4', '4',
-        '5', '5', '5', '5', '5', '5', '5', '5', '5', '5',
-        '6', '6', '6', '6', '6', '6', '6', '6', '6', '6',
-        '7', '7', '7', '7', '7', '7', '7', '7', '7', '7',
-        '8', '8', '8', '8', '8', '8', '8', '8', '8', '8',
-        '9', '9', '9', '9', '9', '9', '9', '9', '9', '9',
-        } ;
-
-    final static char [] DigitOnes = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        } ;
-
-        // I use the "invariant division by multiplication" trick to
-        // accelerate Integer.toString.  In particular we want to
-        // avoid division by 10.
-        //
-        // The "trick" has roughly the same performance characteristics
-        // as the "classic" Integer.toString code on a non-JIT VM.
-        // The trick avoids .rem and .div calls but has a longer code
-        // path and is thus dominated by dispatch overhead.  In the
-        // JIT case the dispatch overhead doesn't exist and the
-        // "trick" is considerably faster than the classic code.
-        //
-        // TODO-FIXME: convert (x * 52429) into the equiv shift-add
-        // sequence.
-        //
-        // RE:  Division by Invariant Integers using Multiplication
-        //      T Gralund, P Montgomery
-        //      ACM PLDI 1994
-        //
-
-    /**
-     * Returns a {@code String} object representing the
-     * specified integer. The argument is converted to signed decimal
-     * representation and returned as a string, exactly as if the
-     * argument and radix 10 were given as arguments to the {@link
-     * #toString(int, int)} method.
-     *
-     * @param   i   an integer to be converted.
-     * @return  a string representation of the argument in base&nbsp;10.
-     */
-    @JavaScriptBody(args = "i", body = "return i.toString();")
-    public static String toString(int i) {
-        if (i == Integer.MIN_VALUE)
-            return "-2147483648";
-        int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i);
-        char[] buf = new char[size];
-        getChars(i, size, buf);
-        return new String(buf, 0, size);
-    }
-
-    /**
-     * Places characters representing the integer i into the
-     * character array buf. The characters are placed into
-     * the buffer backwards starting with the least significant
-     * digit at the specified index (exclusive), and working
-     * backwards from there.
-     *
-     * Will fail if i == Integer.MIN_VALUE
-     */
-    static void getChars(int i, int index, char[] buf) {
-        int q, r;
-        int charPos = index;
-        char sign = 0;
-
-        if (i < 0) {
-            sign = '-';
-            i = -i;
-        }
-
-        // Generate two digits per iteration
-        while (i >= 65536) {
-            q = i / 100;
-        // really: r = i - (q * 100);
-            r = i - ((q << 6) + (q << 5) + (q << 2));
-            i = q;
-            buf [--charPos] = DigitOnes[r];
-            buf [--charPos] = DigitTens[r];
-        }
-
-        // Fall thru to fast mode for smaller numbers
-        // assert(i <= 65536, i);
-        for (;;) {
-            q = (i * 52429) >>> (16+3);
-            r = i - ((q << 3) + (q << 1));  // r = i-(q*10) ...
-            buf [--charPos] = digits [r];
-            i = q;
-            if (i == 0) break;
-        }
-        if (sign != 0) {
-            buf [--charPos] = sign;
-        }
-    }
-
-    final static int [] sizeTable = { 9, 99, 999, 9999, 99999, 999999, 9999999,
-                                      99999999, 999999999, Integer.MAX_VALUE };
-
-    // Requires positive x
-    static int stringSize(int x) {
-        for (int i=0; ; i++)
-            if (x <= sizeTable[i])
-                return i+1;
-    }
-
-    /**
-     * Parses the string argument as a signed integer in the radix
-     * specified by the second argument. The characters in the string
-     * must all be digits of the specified radix (as determined by
-     * whether {@link java.lang.Character#digit(char, int)} returns a
-     * nonnegative value), except that the first character may be an
-     * ASCII minus sign {@code '-'} (<code>'&#92;u002D'</code>) to
-     * indicate a negative value or an ASCII plus sign {@code '+'}
-     * (<code>'&#92;u002B'</code>) to indicate a positive value. The
-     * resulting integer value is returned.
-     *
-     * <p>An exception of type {@code NumberFormatException} is
-     * thrown if any of the following situations occurs:
-     * <ul>
-     * <li>The first argument is {@code null} or is a string of
-     * length zero.
-     *
-     * <li>The radix is either smaller than
-     * {@link java.lang.Character#MIN_RADIX} or
-     * larger than {@link java.lang.Character#MAX_RADIX}.
-     *
-     * <li>Any character of the string is not a digit of the specified
-     * radix, except that the first character may be a minus sign
-     * {@code '-'} (<code>'&#92;u002D'</code>) or plus sign
-     * {@code '+'} (<code>'&#92;u002B'</code>) provided that the
-     * string is longer than length 1.
-     *
-     * <li>The value represented by the string is not a value of type
-     * {@code int}.
-     * </ul>
-     *
-     * <p>Examples:
-     * <blockquote><pre>
-     * parseInt("0", 10) returns 0
-     * parseInt("473", 10) returns 473
-     * parseInt("+42", 10) returns 42
-     * parseInt("-0", 10) returns 0
-     * parseInt("-FF", 16) returns -255
-     * parseInt("1100110", 2) returns 102
-     * parseInt("2147483647", 10) returns 2147483647
-     * parseInt("-2147483648", 10) returns -2147483648
-     * parseInt("2147483648", 10) throws a NumberFormatException
-     * parseInt("99", 8) throws a NumberFormatException
-     * parseInt("Kona", 10) throws a NumberFormatException
-     * parseInt("Kona", 27) returns 411787
-     * </pre></blockquote>
-     *
-     * @param      s   the {@code String} containing the integer
-     *                  representation to be parsed
-     * @param      radix   the radix to be used while parsing {@code s}.
-     * @return     the integer represented by the string argument in the
-     *             specified radix.
-     * @exception  NumberFormatException if the {@code String}
-     *             does not contain a parsable {@code int}.
-     */
-    @JavaScriptBody(args={"s", "radix"}, body="return parseInt(s,radix);")
-    public static int parseInt(String s, int radix)
-                throws NumberFormatException
-    {
-        /*
-         * WARNING: This method may be invoked early during VM initialization
-         * before IntegerCache is initialized. Care must be taken to not use
-         * the valueOf method.
-         */
-
-        if (s == null) {
-            throw new NumberFormatException("null");
-        }
-
-        if (radix < Character.MIN_RADIX) {
-            throw new NumberFormatException("radix " + radix +
-                                            " less than Character.MIN_RADIX");
-        }
-
-        if (radix > Character.MAX_RADIX) {
-            throw new NumberFormatException("radix " + radix +
-                                            " greater than Character.MAX_RADIX");
-        }
-
-        int result = 0;
-        boolean negative = false;
-        int i = 0, len = s.length();
-        int limit = -Integer.MAX_VALUE;
-        int multmin;
-        int digit;
-
-        if (len > 0) {
-            char firstChar = s.charAt(0);
-            if (firstChar < '0') { // Possible leading "+" or "-"
-                if (firstChar == '-') {
-                    negative = true;
-                    limit = Integer.MIN_VALUE;
-                } else if (firstChar != '+')
-                    throw NumberFormatException.forInputString(s);
-
-                if (len == 1) // Cannot have lone "+" or "-"
-                    throw NumberFormatException.forInputString(s);
-                i++;
-            }
-            multmin = limit / radix;
-            while (i < len) {
-                // Accumulating negatively avoids surprises near MAX_VALUE
-                digit = Character.digit(s.charAt(i++),radix);
-                if (digit < 0) {
-                    throw NumberFormatException.forInputString(s);
-                }
-                if (result < multmin) {
-                    throw NumberFormatException.forInputString(s);
-                }
-                result *= radix;
-                if (result < limit + digit) {
-                    throw NumberFormatException.forInputString(s);
-                }
-                result -= digit;
-            }
-        } else {
-            throw NumberFormatException.forInputString(s);
-        }
-        return negative ? result : -result;
-    }
-
-    /**
-     * Parses the string argument as a signed decimal integer. The
-     * characters in the string must all be decimal digits, except
-     * that the first character may be an ASCII minus sign {@code '-'}
-     * (<code>'&#92;u002D'</code>) to indicate a negative value or an
-     * ASCII plus sign {@code '+'} (<code>'&#92;u002B'</code>) to
-     * indicate a positive value. The resulting integer value is
-     * returned, exactly as if the argument and the radix 10 were
-     * given as arguments to the {@link #parseInt(java.lang.String,
-     * int)} method.
-     *
-     * @param s    a {@code String} containing the {@code int}
-     *             representation to be parsed
-     * @return     the integer value represented by the argument in decimal.
-     * @exception  NumberFormatException  if the string does not contain a
-     *               parsable integer.
-     */
-    public static int parseInt(String s) throws NumberFormatException {
-        return parseInt(s,10);
-    }
-
-    /**
-     * Returns an {@code Integer} object holding the value
-     * extracted from the specified {@code String} when parsed
-     * with the radix given by the second argument. The first argument
-     * is interpreted as representing a signed integer in the radix
-     * specified by the second argument, exactly as if the arguments
-     * were given to the {@link #parseInt(java.lang.String, int)}
-     * method. The result is an {@code Integer} object that
-     * represents the integer value specified by the string.
-     *
-     * <p>In other words, this method returns an {@code Integer}
-     * object equal to the value of:
-     *
-     * <blockquote>
-     *  {@code new Integer(Integer.parseInt(s, radix))}
-     * </blockquote>
-     *
-     * @param      s   the string to be parsed.
-     * @param      radix the radix to be used in interpreting {@code s}
-     * @return     an {@code Integer} object holding the value
-     *             represented by the string argument in the specified
-     *             radix.
-     * @exception NumberFormatException if the {@code String}
-     *            does not contain a parsable {@code int}.
-     */
-    public static Integer valueOf(String s, int radix) throws NumberFormatException {
-        return Integer.valueOf(parseInt(s,radix));
-    }
-
-    /**
-     * Returns an {@code Integer} object holding the
-     * value of the specified {@code String}. The argument is
-     * interpreted as representing a signed decimal integer, exactly
-     * as if the argument were given to the {@link
-     * #parseInt(java.lang.String)} method. The result is an
-     * {@code Integer} object that represents the integer value
-     * specified by the string.
-     *
-     * <p>In other words, this method returns an {@code Integer}
-     * object equal to the value of:
-     *
-     * <blockquote>
-     *  {@code new Integer(Integer.parseInt(s))}
-     * </blockquote>
-     *
-     * @param      s   the string to be parsed.
-     * @return     an {@code Integer} object holding the value
-     *             represented by the string argument.
-     * @exception  NumberFormatException  if the string cannot be parsed
-     *             as an integer.
-     */
-    public static Integer valueOf(String s) throws NumberFormatException {
-        return Integer.valueOf(parseInt(s, 10));
-    }
-
-    /**
-     * Cache to support the object identity semantics of autoboxing for values between
-     * -128 and 127 (inclusive) as required by JLS.
-     *
-     * The cache is initialized on first usage.  The size of the cache
-     * may be controlled by the -XX:AutoBoxCacheMax=<size> option.
-     * During VM initialization, java.lang.Integer.IntegerCache.high property
-     * may be set and saved in the private system properties in the
-     * sun.misc.VM class.
-     */
-
-    private static class IntegerCache {
-        static final int low = -128;
-        static final int high;
-        static final Integer cache[];
-
-        static {
-            // high value may be configured by property
-            int h = 127;
-            String integerCacheHighPropValue =
-                AbstractStringBuilder.getProperty("java.lang.Integer.IntegerCache.high");
-            if (integerCacheHighPropValue != null) {
-                int i = parseInt(integerCacheHighPropValue);
-                i = Math.max(i, 127);
-                // Maximum array size is Integer.MAX_VALUE
-                h = Math.min(i, Integer.MAX_VALUE - (-low));
-            }
-            high = h;
-
-            cache = new Integer[(high - low) + 1];
-            int j = low;
-            for(int k = 0; k < cache.length; k++)
-                cache[k] = new Integer(j++);
-        }
-
-        private IntegerCache() {}
-    }
-
-    /**
-     * Returns an {@code Integer} instance representing the specified
-     * {@code int} value.  If a new {@code Integer} instance is not
-     * required, this method should generally be used in preference to
-     * the constructor {@link #Integer(int)}, as this method is likely
-     * to yield significantly better space and time performance by
-     * caching frequently requested values.
-     *
-     * This method will always cache values in the range -128 to 127,
-     * inclusive, and may cache other values outside of this range.
-     *
-     * @param  i an {@code int} value.
-     * @return an {@code Integer} instance representing {@code i}.
-     * @since  1.5
-     */
-    public static Integer valueOf(int i) {
-        //assert IntegerCache.high >= 127;
-        if (i >= IntegerCache.low && i <= IntegerCache.high)
-            return IntegerCache.cache[i + (-IntegerCache.low)];
-        return new Integer(i);
-    }
-
-    /**
-     * The value of the {@code Integer}.
-     *
-     * @serial
-     */
-    private final int value;
-
-    /**
-     * Constructs a newly allocated {@code Integer} object that
-     * represents the specified {@code int} value.
-     *
-     * @param   value   the value to be represented by the
-     *                  {@code Integer} object.
-     */
-    public Integer(int value) {
-        this.value = value;
-    }
-
-    /**
-     * Constructs a newly allocated {@code Integer} object that
-     * represents the {@code int} value indicated by the
-     * {@code String} parameter. The string is converted to an
-     * {@code int} value in exactly the manner used by the
-     * {@code parseInt} method for radix 10.
-     *
-     * @param      s   the {@code String} to be converted to an
-     *                 {@code Integer}.
-     * @exception  NumberFormatException  if the {@code String} does not
-     *               contain a parsable integer.
-     * @see        java.lang.Integer#parseInt(java.lang.String, int)
-     */
-    public Integer(String s) throws NumberFormatException {
-        this.value = parseInt(s, 10);
-    }
-
-    /**
-     * Returns the value of this {@code Integer} as a
-     * {@code byte}.
-     */
-    public byte byteValue() {
-        return (byte)value;
-    }
-
-    /**
-     * Returns the value of this {@code Integer} as a
-     * {@code short}.
-     */
-    public short shortValue() {
-        return (short)value;
-    }
-
-    /**
-     * Returns the value of this {@code Integer} as an
-     * {@code int}.
-     */
-    public int intValue() {
-        return value;
-    }
-
-    /**
-     * Returns the value of this {@code Integer} as a
-     * {@code long}.
-     */
-    public long longValue() {
-        return (long)value;
-    }
-
-    /**
-     * Returns the value of this {@code Integer} as a
-     * {@code float}.
-     */
-    public float floatValue() {
-        return (float)value;
-    }
-
-    /**
-     * Returns the value of this {@code Integer} as a
-     * {@code double}.
-     */
-    public double doubleValue() {
-        return (double)value;
-    }
-
-    /**
-     * Returns a {@code String} object representing this
-     * {@code Integer}'s value. The value is converted to signed
-     * decimal representation and returned as a string, exactly as if
-     * the integer value were given as an argument to the {@link
-     * java.lang.Integer#toString(int)} method.
-     *
-     * @return  a string representation of the value of this object in
-     *          base&nbsp;10.
-     */
-    public String toString() {
-        return toString(value);
-    }
-
-    /**
-     * Returns a hash code for this {@code Integer}.
-     *
-     * @return  a hash code value for this object, equal to the
-     *          primitive {@code int} value represented by this
-     *          {@code Integer} object.
-     */
-    public int hashCode() {
-        return value;
-    }
-
-    /**
-     * Compares this object to the specified object.  The result is
-     * {@code true} if and only if the argument is not
-     * {@code null} and is an {@code Integer} object that
-     * contains the same {@code int} value as this object.
-     *
-     * @param   obj   the object to compare with.
-     * @return  {@code true} if the objects are the same;
-     *          {@code false} otherwise.
-     */
-    public boolean equals(Object obj) {
-        if (obj instanceof Integer) {
-            return value == ((Integer)obj).intValue();
-        }
-        return false;
-    }
-
-    /**
-     * Determines the integer value of the system property with the
-     * specified name.
-     *
-     * <p>The first argument is treated as the name of a system property.
-     * System properties are accessible through the
-     * {@link java.lang.System#getProperty(java.lang.String)} method. The
-     * string value of this property is then interpreted as an integer
-     * value and an {@code Integer} object representing this value is
-     * returned. Details of possible numeric formats can be found with
-     * the definition of {@code getProperty}.
-     *
-     * <p>If there is no property with the specified name, if the specified name
-     * is empty or {@code null}, or if the property does not have
-     * the correct numeric format, then {@code null} is returned.
-     *
-     * <p>In other words, this method returns an {@code Integer}
-     * object equal to the value of:
-     *
-     * <blockquote>
-     *  {@code getInteger(nm, null)}
-     * </blockquote>
-     *
-     * @param   nm   property name.
-     * @return  the {@code Integer} value of the property.
-     * @see     java.lang.System#getProperty(java.lang.String)
-     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
-     */
-    public static Integer getInteger(String nm) {
-        return getInteger(nm, null);
-    }
-
-    /**
-     * Determines the integer value of the system property with the
-     * specified name.
-     *
-     * <p>The first argument is treated as the name of a system property.
-     * System properties are accessible through the {@link
-     * java.lang.System#getProperty(java.lang.String)} method. The
-     * string value of this property is then interpreted as an integer
-     * value and an {@code Integer} object representing this value is
-     * returned. Details of possible numeric formats can be found with
-     * the definition of {@code getProperty}.
-     *
-     * <p>The second argument is the default value. An {@code Integer} object
-     * that represents the value of the second argument is returned if there
-     * is no property of the specified name, if the property does not have
-     * the correct numeric format, or if the specified name is empty or
-     * {@code null}.
-     *
-     * <p>In other words, this method returns an {@code Integer} object
-     * equal to the value of:
-     *
-     * <blockquote>
-     *  {@code getInteger(nm, new Integer(val))}
-     * </blockquote>
-     *
-     * but in practice it may be implemented in a manner such as:
-     *
-     * <blockquote><pre>
-     * Integer result = getInteger(nm, null);
-     * return (result == null) ? new Integer(val) : result;
-     * </pre></blockquote>
-     *
-     * to avoid the unnecessary allocation of an {@code Integer}
-     * object when the default value is not needed.
-     *
-     * @param   nm   property name.
-     * @param   val   default value.
-     * @return  the {@code Integer} value of the property.
-     * @see     java.lang.System#getProperty(java.lang.String)
-     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
-     */
-    public static Integer getInteger(String nm, int val) {
-        Integer result = getInteger(nm, null);
-        return (result == null) ? Integer.valueOf(val) : result;
-    }
-
-    /**
-     * Returns the integer value of the system property with the
-     * specified name.  The first argument is treated as the name of a
-     * system property.  System properties are accessible through the
-     * {@link java.lang.System#getProperty(java.lang.String)} method.
-     * The string value of this property is then interpreted as an
-     * integer value, as per the {@code Integer.decode} method,
-     * and an {@code Integer} object representing this value is
-     * returned.
-     *
-     * <ul><li>If the property value begins with the two ASCII characters
-     *         {@code 0x} or the ASCII character {@code #}, not
-     *      followed by a minus sign, then the rest of it is parsed as a
-     *      hexadecimal integer exactly as by the method
-     *      {@link #valueOf(java.lang.String, int)} with radix 16.
-     * <li>If the property value begins with the ASCII character
-     *     {@code 0} followed by another character, it is parsed as an
-     *     octal integer exactly as by the method
-     *     {@link #valueOf(java.lang.String, int)} with radix 8.
-     * <li>Otherwise, the property value is parsed as a decimal integer
-     * exactly as by the method {@link #valueOf(java.lang.String, int)}
-     * with radix 10.
-     * </ul>
-     *
-     * <p>The second argument is the default value. The default value is
-     * returned if there is no property of the specified name, if the
-     * property does not have the correct numeric format, or if the
-     * specified name is empty or {@code null}.
-     *
-     * @param   nm   property name.
-     * @param   val   default value.
-     * @return  the {@code Integer} value of the property.
-     * @see     java.lang.System#getProperty(java.lang.String)
-     * @see java.lang.System#getProperty(java.lang.String, java.lang.String)
-     * @see java.lang.Integer#decode
-     */
-    public static Integer getInteger(String nm, Integer val) {
-        String v = null;
-        try {
-            v = AbstractStringBuilder.getProperty(nm);
-        } catch (IllegalArgumentException e) {
-        } catch (NullPointerException e) {
-        }
-        if (v != null) {
-            try {
-                return Integer.decode(v);
-            } catch (NumberFormatException e) {
-            }
-        }
-        return val;
-    }
-
-    /**
-     * Decodes a {@code String} into an {@code Integer}.
-     * Accepts decimal, hexadecimal, and octal numbers given
-     * by the following grammar:
-     *
-     * <blockquote>
-     * <dl>
-     * <dt><i>DecodableString:</i>
-     * <dd><i>Sign<sub>opt</sub> DecimalNumeral</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0x} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i>
-     * <p>
-     * <dt><i>Sign:</i>
-     * <dd>{@code -}
-     * <dd>{@code +}
-     * </dl>
-     * </blockquote>
-     *
-     * <i>DecimalNumeral</i>, <i>HexDigits</i>, and <i>OctalDigits</i>
-     * are as defined in section 3.10.1 of
-     * <cite>The Java&trade; Language Specification</cite>,
-     * except that underscores are not accepted between digits.
-     *
-     * <p>The sequence of characters following an optional
-     * sign and/or radix specifier ("{@code 0x}", "{@code 0X}",
-     * "{@code #}", or leading zero) is parsed as by the {@code
-     * Integer.parseInt} method with the indicated radix (10, 16, or
-     * 8).  This sequence of characters must represent a positive
-     * value or a {@link NumberFormatException} will be thrown.  The
-     * result is negated if first character of the specified {@code
-     * String} is the minus sign.  No whitespace characters are
-     * permitted in the {@code String}.
-     *
-     * @param     nm the {@code String} to decode.
-     * @return    an {@code Integer} object holding the {@code int}
-     *             value represented by {@code nm}
-     * @exception NumberFormatException  if the {@code String} does not
-     *            contain a parsable integer.
-     * @see java.lang.Integer#parseInt(java.lang.String, int)
-     */
-    public static Integer decode(String nm) throws NumberFormatException {
-        int radix = 10;
-        int index = 0;
-        boolean negative = false;
-        Integer result;
-
-        if (nm.length() == 0)
-            throw new NumberFormatException("Zero length string");
-        char firstChar = nm.charAt(0);
-        // Handle sign, if present
-        if (firstChar == '-') {
-            negative = true;
-            index++;
-        } else if (firstChar == '+')
-            index++;
-
-        // Handle radix specifier, if present
-        if (nm.startsWith("0x", index) || nm.startsWith("0X", index)) {
-            index += 2;
-            radix = 16;
-        }
-        else if (nm.startsWith("#", index)) {
-            index ++;
-            radix = 16;
-        }
-        else if (nm.startsWith("0", index) && nm.length() > 1 + index) {
-            index ++;
-            radix = 8;
-        }
-
-        if (nm.startsWith("-", index) || nm.startsWith("+", index))
-            throw new NumberFormatException("Sign character in wrong position");
-
-        try {
-            result = Integer.valueOf(nm.substring(index), radix);
-            result = negative ? Integer.valueOf(-result.intValue()) : result;
-        } catch (NumberFormatException e) {
-            // If number is Integer.MIN_VALUE, we'll end up here. The next line
-            // handles this case, and causes any genuine format error to be
-            // rethrown.
-            String constant = negative ? ("-" + nm.substring(index))
-                                       : nm.substring(index);
-            result = Integer.valueOf(constant, radix);
-        }
-        return result;
-    }
-
-    /**
-     * Compares two {@code Integer} objects numerically.
-     *
-     * @param   anotherInteger   the {@code Integer} to be compared.
-     * @return  the value {@code 0} if this {@code Integer} is
-     *          equal to the argument {@code Integer}; a value less than
-     *          {@code 0} if this {@code Integer} is numerically less
-     *          than the argument {@code Integer}; and a value greater
-     *          than {@code 0} if this {@code Integer} is numerically
-     *           greater than the argument {@code Integer} (signed
-     *           comparison).
-     * @since   1.2
-     */
-    public int compareTo(Integer anotherInteger) {
-        return compare(this.value, anotherInteger.value);
-    }
-
-    /**
-     * Compares two {@code int} values numerically.
-     * The value returned is identical to what would be returned by:
-     * <pre>
-     *    Integer.valueOf(x).compareTo(Integer.valueOf(y))
-     * </pre>
-     *
-     * @param  x the first {@code int} to compare
-     * @param  y the second {@code int} to compare
-     * @return the value {@code 0} if {@code x == y};
-     *         a value less than {@code 0} if {@code x < y}; and
-     *         a value greater than {@code 0} if {@code x > y}
-     * @since 1.7
-     */
-    public static int compare(int x, int y) {
-        return (x < y) ? -1 : ((x == y) ? 0 : 1);
-    }
-
-
-    // Bit twiddling
-
-    /**
-     * The number of bits used to represent an {@code int} value in two's
-     * complement binary form.
-     *
-     * @since 1.5
-     */
-    public static final int SIZE = 32;
-
-    /**
-     * Returns an {@code int} value with at most a single one-bit, in the
-     * position of the highest-order ("leftmost") one-bit in the specified
-     * {@code int} value.  Returns zero if the specified value has no
-     * one-bits in its two's complement binary representation, that is, if it
-     * is equal to zero.
-     *
-     * @return an {@code int} value with a single one-bit, in the position
-     *     of the highest-order one-bit in the specified value, or zero if
-     *     the specified value is itself equal to zero.
-     * @since 1.5
-     */
-    public static int highestOneBit(int i) {
-        // HD, Figure 3-1
-        i |= (i >>  1);
-        i |= (i >>  2);
-        i |= (i >>  4);
-        i |= (i >>  8);
-        i |= (i >> 16);
-        return i - (i >>> 1);
-    }
-
-    /**
-     * Returns an {@code int} value with at most a single one-bit, in the
-     * position of the lowest-order ("rightmost") one-bit in the specified
-     * {@code int} value.  Returns zero if the specified value has no
-     * one-bits in its two's complement binary representation, that is, if it
-     * is equal to zero.
-     *
-     * @return an {@code int} value with a single one-bit, in the position
-     *     of the lowest-order one-bit in the specified value, or zero if
-     *     the specified value is itself equal to zero.
-     * @since 1.5
-     */
-    public static int lowestOneBit(int i) {
-        // HD, Section 2-1
-        return i & -i;
-    }
-
-    /**
-     * Returns the number of zero bits preceding the highest-order
-     * ("leftmost") one-bit in the two's complement binary representation
-     * of the specified {@code int} value.  Returns 32 if the
-     * specified value has no one-bits in its two's complement representation,
-     * in other words if it is equal to zero.
-     *
-     * <p>Note that this method is closely related to the logarithm base 2.
-     * For all positive {@code int} values x:
-     * <ul>
-     * <li>floor(log<sub>2</sub>(x)) = {@code 31 - numberOfLeadingZeros(x)}
-     * <li>ceil(log<sub>2</sub>(x)) = {@code 32 - numberOfLeadingZeros(x - 1)}
-     * </ul>
-     *
-     * @return the number of zero bits preceding the highest-order
-     *     ("leftmost") one-bit in the two's complement binary representation
-     *     of the specified {@code int} value, or 32 if the value
-     *     is equal to zero.
-     * @since 1.5
-     */
-    public static int numberOfLeadingZeros(int i) {
-        // HD, Figure 5-6
-        if (i == 0)
-            return 32;
-        int n = 1;
-        if (i >>> 16 == 0) { n += 16; i <<= 16; }
-        if (i >>> 24 == 0) { n +=  8; i <<=  8; }
-        if (i >>> 28 == 0) { n +=  4; i <<=  4; }
-        if (i >>> 30 == 0) { n +=  2; i <<=  2; }
-        n -= i >>> 31;
-        return n;
-    }
-
-    /**
-     * Returns the number of zero bits following the lowest-order ("rightmost")
-     * one-bit in the two's complement binary representation of the specified
-     * {@code int} value.  Returns 32 if the specified value has no
-     * one-bits in its two's complement representation, in other words if it is
-     * equal to zero.
-     *
-     * @return the number of zero bits following the lowest-order ("rightmost")
-     *     one-bit in the two's complement binary representation of the
-     *     specified {@code int} value, or 32 if the value is equal
-     *     to zero.
-     * @since 1.5
-     */
-    public static int numberOfTrailingZeros(int i) {
-        // HD, Figure 5-14
-        int y;
-        if (i == 0) return 32;
-        int n = 31;
-        y = i <<16; if (y != 0) { n = n -16; i = y; }
-        y = i << 8; if (y != 0) { n = n - 8; i = y; }
-        y = i << 4; if (y != 0) { n = n - 4; i = y; }
-        y = i << 2; if (y != 0) { n = n - 2; i = y; }
-        return n - ((i << 1) >>> 31);
-    }
-
-    /**
-     * Returns the number of one-bits in the two's complement binary
-     * representation of the specified {@code int} value.  This function is
-     * sometimes referred to as the <i>population count</i>.
-     *
-     * @return the number of one-bits in the two's complement binary
-     *     representation of the specified {@code int} value.
-     * @since 1.5
-     */
-    public static int bitCount(int i) {
-        // HD, Figure 5-2
-        i = i - ((i >>> 1) & 0x55555555);
-        i = (i & 0x33333333) + ((i >>> 2) & 0x33333333);
-        i = (i + (i >>> 4)) & 0x0f0f0f0f;
-        i = i + (i >>> 8);
-        i = i + (i >>> 16);
-        return i & 0x3f;
-    }
-
-    /**
-     * Returns the value obtained by rotating the two's complement binary
-     * representation of the specified {@code int} value left by the
-     * specified number of bits.  (Bits shifted out of the left hand, or
-     * high-order, side reenter on the right, or low-order.)
-     *
-     * <p>Note that left rotation with a negative distance is equivalent to
-     * right rotation: {@code rotateLeft(val, -distance) == rotateRight(val,
-     * distance)}.  Note also that rotation by any multiple of 32 is a
-     * no-op, so all but the last five bits of the rotation distance can be
-     * ignored, even if the distance is negative: {@code rotateLeft(val,
-     * distance) == rotateLeft(val, distance & 0x1F)}.
-     *
-     * @return the value obtained by rotating the two's complement binary
-     *     representation of the specified {@code int} value left by the
-     *     specified number of bits.
-     * @since 1.5
-     */
-    public static int rotateLeft(int i, int distance) {
-        return (i << distance) | (i >>> -distance);
-    }
-
-    /**
-     * Returns the value obtained by rotating the two's complement binary
-     * representation of the specified {@code int} value right by the
-     * specified number of bits.  (Bits shifted out of the right hand, or
-     * low-order, side reenter on the left, or high-order.)
-     *
-     * <p>Note that right rotation with a negative distance is equivalent to
-     * left rotation: {@code rotateRight(val, -distance) == rotateLeft(val,
-     * distance)}.  Note also that rotation by any multiple of 32 is a
-     * no-op, so all but the last five bits of the rotation distance can be
-     * ignored, even if the distance is negative: {@code rotateRight(val,
-     * distance) == rotateRight(val, distance & 0x1F)}.
-     *
-     * @return the value obtained by rotating the two's complement binary
-     *     representation of the specified {@code int} value right by the
-     *     specified number of bits.
-     * @since 1.5
-     */
-    public static int rotateRight(int i, int distance) {
-        return (i >>> distance) | (i << -distance);
-    }
-
-    /**
-     * Returns the value obtained by reversing the order of the bits in the
-     * two's complement binary representation of the specified {@code int}
-     * value.
-     *
-     * @return the value obtained by reversing order of the bits in the
-     *     specified {@code int} value.
-     * @since 1.5
-     */
-    public static int reverse(int i) {
-        // HD, Figure 7-1
-        i = (i & 0x55555555) << 1 | (i >>> 1) & 0x55555555;
-        i = (i & 0x33333333) << 2 | (i >>> 2) & 0x33333333;
-        i = (i & 0x0f0f0f0f) << 4 | (i >>> 4) & 0x0f0f0f0f;
-        i = (i << 24) | ((i & 0xff00) << 8) |
-            ((i >>> 8) & 0xff00) | (i >>> 24);
-        return i;
-    }
-
-    /**
-     * Returns the signum function of the specified {@code int} value.  (The
-     * return value is -1 if the specified value is negative; 0 if the
-     * specified value is zero; and 1 if the specified value is positive.)
-     *
-     * @return the signum function of the specified {@code int} value.
-     * @since 1.5
-     */
-    public static int signum(int i) {
-        // HD, Section 2-7
-        return (i >> 31) | (-i >>> 31);
-    }
-
-    /**
-     * Returns the value obtained by reversing the order of the bytes in the
-     * two's complement representation of the specified {@code int} value.
-     *
-     * @return the value obtained by reversing the bytes in the specified
-     *     {@code int} value.
-     * @since 1.5
-     */
-    public static int reverseBytes(int i) {
-        return ((i >>> 24)           ) |
-               ((i >>   8) &   0xFF00) |
-               ((i <<   8) & 0xFF0000) |
-               ((i << 24));
-    }
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = 1360826667806852920L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/InterruptedException.java
--- a/emul/mini/src/main/java/java/lang/InterruptedException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when a thread is waiting, sleeping, or otherwise occupied,
- * and the thread is interrupted, either before or during the activity.
- * Occasionally a method may wish to test whether the current
- * thread has been interrupted, and if so, to immediately throw
- * this exception.  The following code can be used to achieve
- * this effect:
- * <pre>
- *  if (Thread.interrupted())  // Clears interrupted status!
- *      throw new InterruptedException();
- * </pre>
- *
- * @author  Frank Yellin
- * @see     java.lang.Object#wait()
- * @see     java.lang.Object#wait(long)
- * @see     java.lang.Object#wait(long, int)
- * @see     java.lang.Thread#sleep(long)
- * @see     java.lang.Thread#interrupt()
- * @see     java.lang.Thread#interrupted()
- * @since   JDK1.0
- */
-public
-class InterruptedException extends Exception {
-    private static final long serialVersionUID = 6700697376100628473L;
-
-    /**
-     * Constructs an <code>InterruptedException</code> with no detail  message.
-     */
-    public InterruptedException() {
-        super();
-    }
-
-    /**
-     * Constructs an <code>InterruptedException</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public InterruptedException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/LinkageError.java
--- a/emul/mini/src/main/java/java/lang/LinkageError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Subclasses of {@code LinkageError} indicate that a class has
- * some dependency on another class; however, the latter class has
- * incompatibly changed after the compilation of the former class.
- *
- *
- * @author  Frank Yellin
- * @since   JDK1.0
- */
-public
-class LinkageError extends Error {
-    private static final long serialVersionUID = 3579600108157160122L;
-
-    /**
-     * Constructs a {@code LinkageError} with no detail message.
-     */
-    public LinkageError() {
-        super();
-    }
-
-    /**
-     * Constructs a {@code LinkageError} with the specified detail
-     * message.
-     *
-     * @param   s   the detail message.
-     */
-    public LinkageError(String s) {
-        super(s);
-    }
-
-    /**
-     * Constructs a {@code LinkageError} with the specified detail
-     * message and cause.
-     *
-     * @param s     the detail message.
-     * @param cause the cause, may be {@code null}
-     * @since 1.7
-     */
-    public LinkageError(String s, Throwable cause) {
-        super(s, cause);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Long.java
--- a/emul/mini/src/main/java/java/lang/Long.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1202 +0,0 @@
-/*
- * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- * The {@code Long} class wraps a value of the primitive type {@code
- * long} in an object. An object of type {@code Long} contains a
- * single field whose type is {@code long}.
- *
- * <p> In addition, this class provides several methods for converting
- * a {@code long} to a {@code String} and a {@code String} to a {@code
- * long}, as well as other constants and methods useful when dealing
- * with a {@code long}.
- *
- * <p>Implementation note: The implementations of the "bit twiddling"
- * methods (such as {@link #highestOneBit(long) highestOneBit} and
- * {@link #numberOfTrailingZeros(long) numberOfTrailingZeros}) are
- * based on material from Henry S. Warren, Jr.'s <i>Hacker's
- * Delight</i>, (Addison Wesley, 2002).
- *
- * @author  Lee Boynton
- * @author  Arthur van Hoff
- * @author  Josh Bloch
- * @author  Joseph D. Darcy
- * @since   JDK1.0
- */
-public final class Long extends Number implements Comparable<Long> {
-    /**
-     * A constant holding the minimum value a {@code long} can
-     * have, -2<sup>63</sup>.
-     */
-    public static final long MIN_VALUE = 0x8000000000000000L;
-
-    /**
-     * A constant holding the maximum value a {@code long} can
-     * have, 2<sup>63</sup>-1.
-     */
-    public static final long MAX_VALUE = 0x7fffffffffffffffL;
-
-    /**
-     * The {@code Class} instance representing the primitive type
-     * {@code long}.
-     *
-     * @since   JDK1.1
-     */
-    public static final Class<Long>     TYPE = (Class<Long>) Class.getPrimitiveClass("long");
-
-    /**
-     * Returns a string representation of the first argument in the
-     * radix specified by the second argument.
-     *
-     * <p>If the radix is smaller than {@code Character.MIN_RADIX}
-     * or larger than {@code Character.MAX_RADIX}, then the radix
-     * {@code 10} is used instead.
-     *
-     * <p>If the first argument is negative, the first element of the
-     * result is the ASCII minus sign {@code '-'}
-     * (<code>'&#92;u002d'</code>). If the first argument is not
-     * negative, no sign character appears in the result.
-     *
-     * <p>The remaining characters of the result represent the magnitude
-     * of the first argument. If the magnitude is zero, it is
-     * represented by a single zero character {@code '0'}
-     * (<code>'&#92;u0030'</code>); otherwise, the first character of
-     * the representation of the magnitude will not be the zero
-     * character.  The following ASCII characters are used as digits:
-     *
-     * <blockquote>
-     *   {@code 0123456789abcdefghijklmnopqrstuvwxyz}
-     * </blockquote>
-     *
-     * These are <code>'&#92;u0030'</code> through
-     * <code>'&#92;u0039'</code> and <code>'&#92;u0061'</code> through
-     * <code>'&#92;u007a'</code>. If {@code radix} is
-     * <var>N</var>, then the first <var>N</var> of these characters
-     * are used as radix-<var>N</var> digits in the order shown. Thus,
-     * the digits for hexadecimal (radix 16) are
-     * {@code 0123456789abcdef}. If uppercase letters are
-     * desired, the {@link java.lang.String#toUpperCase()} method may
-     * be called on the result:
-     *
-     * <blockquote>
-     *  {@code Long.toString(n, 16).toUpperCase()}
-     * </blockquote>
-     *
-     * @param   i       a {@code long} to be converted to a string.
-     * @param   radix   the radix to use in the string representation.
-     * @return  a string representation of the argument in the specified radix.
-     * @see     java.lang.Character#MAX_RADIX
-     * @see     java.lang.Character#MIN_RADIX
-     */
-    public static String toString(long i, int radix) {
-        if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX)
-            radix = 10;
-        if (radix == 10)
-            return toString(i);
-        char[] buf = new char[65];
-        int charPos = 64;
-        boolean negative = (i < 0);
-
-        if (!negative) {
-            i = -i;
-        }
-
-        while (i <= -radix) {
-            buf[charPos--] = Integer.digits[(int)(-(i % radix))];
-            i = i / radix;
-        }
-        buf[charPos] = Integer.digits[(int)(-i)];
-
-        if (negative) {
-            buf[--charPos] = '-';
-        }
-
-        return new String(buf, charPos, (65 - charPos));
-    }
-
-    /**
-     * Returns a string representation of the {@code long}
-     * argument as an unsigned integer in base&nbsp;16.
-     *
-     * <p>The unsigned {@code long} value is the argument plus
-     * 2<sup>64</sup> if the argument is negative; otherwise, it is
-     * equal to the argument.  This value is converted to a string of
-     * ASCII digits in hexadecimal (base&nbsp;16) with no extra
-     * leading {@code 0}s.  If the unsigned magnitude is zero, it
-     * is represented by a single zero character {@code '0'}
-     * (<code>'&#92;u0030'</code>); otherwise, the first character of
-     * the representation of the unsigned magnitude will not be the
-     * zero character. The following characters are used as
-     * hexadecimal digits:
-     *
-     * <blockquote>
-     *  {@code 0123456789abcdef}
-     * </blockquote>
-     *
-     * These are the characters <code>'&#92;u0030'</code> through
-     * <code>'&#92;u0039'</code> and  <code>'&#92;u0061'</code> through
-     * <code>'&#92;u0066'</code>.  If uppercase letters are desired,
-     * the {@link java.lang.String#toUpperCase()} method may be called
-     * on the result:
-     *
-     * <blockquote>
-     *  {@code Long.toHexString(n).toUpperCase()}
-     * </blockquote>
-     *
-     * @param   i   a {@code long} to be converted to a string.
-     * @return  the string representation of the unsigned {@code long}
-     *          value represented by the argument in hexadecimal
-     *          (base&nbsp;16).
-     * @since   JDK 1.0.2
-     */
-    public static String toHexString(long i) {
-        return toUnsignedString(i, 4);
-    }
-
-    /**
-     * Returns a string representation of the {@code long}
-     * argument as an unsigned integer in base&nbsp;8.
-     *
-     * <p>The unsigned {@code long} value is the argument plus
-     * 2<sup>64</sup> if the argument is negative; otherwise, it is
-     * equal to the argument.  This value is converted to a string of
-     * ASCII digits in octal (base&nbsp;8) with no extra leading
-     * {@code 0}s.
-     *
-     * <p>If the unsigned magnitude is zero, it is represented by a
-     * single zero character {@code '0'}
-     * (<code>'&#92;u0030'</code>); otherwise, the first character of
-     * the representation of the unsigned magnitude will not be the
-     * zero character. The following characters are used as octal
-     * digits:
-     *
-     * <blockquote>
-     *  {@code 01234567}
-     * </blockquote>
-     *
-     * These are the characters <code>'&#92;u0030'</code> through
-     * <code>'&#92;u0037'</code>.
-     *
-     * @param   i   a {@code long} to be converted to a string.
-     * @return  the string representation of the unsigned {@code long}
-     *          value represented by the argument in octal (base&nbsp;8).
-     * @since   JDK 1.0.2
-     */
-    public static String toOctalString(long i) {
-        return toUnsignedString(i, 3);
-    }
-
-    /**
-     * Returns a string representation of the {@code long}
-     * argument as an unsigned integer in base&nbsp;2.
-     *
-     * <p>The unsigned {@code long} value is the argument plus
-     * 2<sup>64</sup> if the argument is negative; otherwise, it is
-     * equal to the argument.  This value is converted to a string of
-     * ASCII digits in binary (base&nbsp;2) with no extra leading
-     * {@code 0}s.  If the unsigned magnitude is zero, it is
-     * represented by a single zero character {@code '0'}
-     * (<code>'&#92;u0030'</code>); otherwise, the first character of
-     * the representation of the unsigned magnitude will not be the
-     * zero character. The characters {@code '0'}
-     * (<code>'&#92;u0030'</code>) and {@code '1'}
-     * (<code>'&#92;u0031'</code>) are used as binary digits.
-     *
-     * @param   i   a {@code long} to be converted to a string.
-     * @return  the string representation of the unsigned {@code long}
-     *          value represented by the argument in binary (base&nbsp;2).
-     * @since   JDK 1.0.2
-     */
-    public static String toBinaryString(long i) {
-        return toUnsignedString(i, 1);
-    }
-
-    /**
-     * Convert the integer to an unsigned number.
-     */
-    private static String toUnsignedString(long i, int shift) {
-        char[] buf = new char[64];
-        int charPos = 64;
-        int radix = 1 << shift;
-        long mask = radix - 1;
-        do {
-            buf[--charPos] = Integer.digits[(int)(i & mask)];
-            i >>>= shift;
-        } while (i != 0);
-        return new String(buf, charPos, (64 - charPos));
-    }
-
-    /**
-     * Returns a {@code String} object representing the specified
-     * {@code long}.  The argument is converted to signed decimal
-     * representation and returned as a string, exactly as if the
-     * argument and the radix 10 were given as arguments to the {@link
-     * #toString(long, int)} method.
-     *
-     * @param   i   a {@code long} to be converted.
-     * @return  a string representation of the argument in base&nbsp;10.
-     */
-    @JavaScriptBody(args = "i", body = "return i.toExactString();")
-    public static String toString(long i) {
-        if (i == Long.MIN_VALUE)
-            return "-9223372036854775808";
-        int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i);
-        char[] buf = new char[size];
-        getChars(i, size, buf);
-        return new String(buf, 0, size);
-    }
-
-    /**
-     * Places characters representing the integer i into the
-     * character array buf. The characters are placed into
-     * the buffer backwards starting with the least significant
-     * digit at the specified index (exclusive), and working
-     * backwards from there.
-     *
-     * Will fail if i == Long.MIN_VALUE
-     */
-    static void getChars(long i, int index, char[] buf) {
-        long q;
-        int r;
-        int charPos = index;
-        char sign = 0;
-
-        if (i < 0) {
-            sign = '-';
-            i = -i;
-        }
-
-        // Get 2 digits/iteration using longs until quotient fits into an int
-        while (i > Integer.MAX_VALUE) {
-            q = i / 100;
-            // really: r = i - (q * 100);
-            r = (int)(i - ((q << 6) + (q << 5) + (q << 2)));
-            i = q;
-            buf[--charPos] = Integer.DigitOnes[r];
-            buf[--charPos] = Integer.DigitTens[r];
-        }
-
-        // Get 2 digits/iteration using ints
-        int q2;
-        int i2 = (int)i;
-        while (i2 >= 65536) {
-            q2 = i2 / 100;
-            // really: r = i2 - (q * 100);
-            r = i2 - ((q2 << 6) + (q2 << 5) + (q2 << 2));
-            i2 = q2;
-            buf[--charPos] = Integer.DigitOnes[r];
-            buf[--charPos] = Integer.DigitTens[r];
-        }
-
-        // Fall thru to fast mode for smaller numbers
-        // assert(i2 <= 65536, i2);
-        for (;;) {
-            q2 = (i2 * 52429) >>> (16+3);
-            r = i2 - ((q2 << 3) + (q2 << 1));  // r = i2-(q2*10) ...
-            buf[--charPos] = Integer.digits[r];
-            i2 = q2;
-            if (i2 == 0) break;
-        }
-        if (sign != 0) {
-            buf[--charPos] = sign;
-        }
-    }
-
-    // Requires positive x
-    static int stringSize(long x) {
-        long p = 10;
-        for (int i=1; i<19; i++) {
-            if (x < p)
-                return i;
-            p = 10*p;
-        }
-        return 19;
-    }
-
-    /**
-     * Parses the string argument as a signed {@code long} in the
-     * radix specified by the second argument. The characters in the
-     * string must all be digits of the specified radix (as determined
-     * by whether {@link java.lang.Character#digit(char, int)} returns
-     * a nonnegative value), except that the first character may be an
-     * ASCII minus sign {@code '-'} (<code>'&#92;u002D'</code>) to
-     * indicate a negative value or an ASCII plus sign {@code '+'}
-     * (<code>'&#92;u002B'</code>) to indicate a positive value. The
-     * resulting {@code long} value is returned.
-     *
-     * <p>Note that neither the character {@code L}
-     * (<code>'&#92;u004C'</code>) nor {@code l}
-     * (<code>'&#92;u006C'</code>) is permitted to appear at the end
-     * of the string as a type indicator, as would be permitted in
-     * Java programming language source code - except that either
-     * {@code L} or {@code l} may appear as a digit for a
-     * radix greater than 22.
-     *
-     * <p>An exception of type {@code NumberFormatException} is
-     * thrown if any of the following situations occurs:
-     * <ul>
-     *
-     * <li>The first argument is {@code null} or is a string of
-     * length zero.
-     *
-     * <li>The {@code radix} is either smaller than {@link
-     * java.lang.Character#MIN_RADIX} or larger than {@link
-     * java.lang.Character#MAX_RADIX}.
-     *
-     * <li>Any character of the string is not a digit of the specified
-     * radix, except that the first character may be a minus sign
-     * {@code '-'} (<code>'&#92;u002d'</code>) or plus sign {@code
-     * '+'} (<code>'&#92;u002B'</code>) provided that the string is
-     * longer than length 1.
-     *
-     * <li>The value represented by the string is not a value of type
-     *      {@code long}.
-     * </ul>
-     *
-     * <p>Examples:
-     * <blockquote><pre>
-     * parseLong("0", 10) returns 0L
-     * parseLong("473", 10) returns 473L
-     * parseLong("+42", 10) returns 42L
-     * parseLong("-0", 10) returns 0L
-     * parseLong("-FF", 16) returns -255L
-     * parseLong("1100110", 2) returns 102L
-     * parseLong("99", 8) throws a NumberFormatException
-     * parseLong("Hazelnut", 10) throws a NumberFormatException
-     * parseLong("Hazelnut", 36) returns 1356099454469L
-     * </pre></blockquote>
-     *
-     * @param      s       the {@code String} containing the
-     *                     {@code long} representation to be parsed.
-     * @param      radix   the radix to be used while parsing {@code s}.
-     * @return     the {@code long} represented by the string argument in
-     *             the specified radix.
-     * @throws     NumberFormatException  if the string does not contain a
-     *             parsable {@code long}.
-     */
-    public static long parseLong(String s, int radix)
-              throws NumberFormatException
-    {
-        if (s == null) {
-            throw new NumberFormatException("null");
-        }
-
-        if (radix < Character.MIN_RADIX) {
-            throw new NumberFormatException("radix " + radix +
-                                            " less than Character.MIN_RADIX");
-        }
-        if (radix > Character.MAX_RADIX) {
-            throw new NumberFormatException("radix " + radix +
-                                            " greater than Character.MAX_RADIX");
-        }
-
-        long result = 0;
-        boolean negative = false;
-        int i = 0, len = s.length();
-        long limit = -Long.MAX_VALUE;
-        long multmin;
-        int digit;
-
-        if (len > 0) {
-            char firstChar = s.charAt(0);
-            if (firstChar < '0') { // Possible leading "+" or "-"
-                if (firstChar == '-') {
-                    negative = true;
-                    limit = Long.MIN_VALUE;
-                } else if (firstChar != '+')
-                    throw NumberFormatException.forInputString(s);
-
-                if (len == 1) // Cannot have lone "+" or "-"
-                    throw NumberFormatException.forInputString(s);
-                i++;
-            }
-            multmin = limit / radix;
-            while (i < len) {
-                // Accumulating negatively avoids surprises near MAX_VALUE
-                digit = Character.digit(s.charAt(i++),radix);
-                if (digit < 0) {
-                    throw NumberFormatException.forInputString(s);
-                }
-                if (result < multmin) {
-                    throw NumberFormatException.forInputString(s);
-                }
-                result *= radix;
-                if (result < limit + digit) {
-                    throw NumberFormatException.forInputString(s);
-                }
-                result -= digit;
-            }
-        } else {
-            throw NumberFormatException.forInputString(s);
-        }
-        return negative ? result : -result;
-    }
-
-    /**
-     * Parses the string argument as a signed decimal {@code long}.
-     * The characters in the string must all be decimal digits, except
-     * that the first character may be an ASCII minus sign {@code '-'}
-     * (<code>&#92;u002D'</code>) to indicate a negative value or an
-     * ASCII plus sign {@code '+'} (<code>'&#92;u002B'</code>) to
-     * indicate a positive value. The resulting {@code long} value is
-     * returned, exactly as if the argument and the radix {@code 10}
-     * were given as arguments to the {@link
-     * #parseLong(java.lang.String, int)} method.
-     *
-     * <p>Note that neither the character {@code L}
-     * (<code>'&#92;u004C'</code>) nor {@code l}
-     * (<code>'&#92;u006C'</code>) is permitted to appear at the end
-     * of the string as a type indicator, as would be permitted in
-     * Java programming language source code.
-     *
-     * @param      s   a {@code String} containing the {@code long}
-     *             representation to be parsed
-     * @return     the {@code long} represented by the argument in
-     *             decimal.
-     * @throws     NumberFormatException  if the string does not contain a
-     *             parsable {@code long}.
-     */
-    public static long parseLong(String s) throws NumberFormatException {
-        return parseLong(s, 10);
-    }
-
-    /**
-     * Returns a {@code Long} object holding the value
-     * extracted from the specified {@code String} when parsed
-     * with the radix given by the second argument.  The first
-     * argument is interpreted as representing a signed
-     * {@code long} in the radix specified by the second
-     * argument, exactly as if the arguments were given to the {@link
-     * #parseLong(java.lang.String, int)} method. The result is a
-     * {@code Long} object that represents the {@code long}
-     * value specified by the string.
-     *
-     * <p>In other words, this method returns a {@code Long} object equal
-     * to the value of:
-     *
-     * <blockquote>
-     *  {@code new Long(Long.parseLong(s, radix))}
-     * </blockquote>
-     *
-     * @param      s       the string to be parsed
-     * @param      radix   the radix to be used in interpreting {@code s}
-     * @return     a {@code Long} object holding the value
-     *             represented by the string argument in the specified
-     *             radix.
-     * @throws     NumberFormatException  If the {@code String} does not
-     *             contain a parsable {@code long}.
-     */
-    public static Long valueOf(String s, int radix) throws NumberFormatException {
-        return Long.valueOf(parseLong(s, radix));
-    }
-
-    /**
-     * Returns a {@code Long} object holding the value
-     * of the specified {@code String}. The argument is
-     * interpreted as representing a signed decimal {@code long},
-     * exactly as if the argument were given to the {@link
-     * #parseLong(java.lang.String)} method. The result is a
-     * {@code Long} object that represents the integer value
-     * specified by the string.
-     *
-     * <p>In other words, this method returns a {@code Long} object
-     * equal to the value of:
-     *
-     * <blockquote>
-     *  {@code new Long(Long.parseLong(s))}
-     * </blockquote>
-     *
-     * @param      s   the string to be parsed.
-     * @return     a {@code Long} object holding the value
-     *             represented by the string argument.
-     * @throws     NumberFormatException  If the string cannot be parsed
-     *             as a {@code long}.
-     */
-    public static Long valueOf(String s) throws NumberFormatException
-    {
-        return Long.valueOf(parseLong(s, 10));
-    }
-
-    private static class LongCache {
-        private LongCache(){}
-
-        static final Long cache[] = new Long[-(-128) + 127 + 1];
-
-        static {
-            for(int i = 0; i < cache.length; i++)
-                cache[i] = new Long(i - 128);
-        }
-    }
-
-    /**
-     * Returns a {@code Long} instance representing the specified
-     * {@code long} value.
-     * If a new {@code Long} instance is not required, this method
-     * should generally be used in preference to the constructor
-     * {@link #Long(long)}, as this method is likely to yield
-     * significantly better space and time performance by caching
-     * frequently requested values.
-     *
-     * Note that unlike the {@linkplain Integer#valueOf(int)
-     * corresponding method} in the {@code Integer} class, this method
-     * is <em>not</em> required to cache values within a particular
-     * range.
-     *
-     * @param  l a long value.
-     * @return a {@code Long} instance representing {@code l}.
-     * @since  1.5
-     */
-    public static Long valueOf(long l) {
-        final int offset = 128;
-        if (l >= -128 && l <= 127) { // will cache
-            return LongCache.cache[(int)l + offset];
-        }
-        return new Long(l);
-    }
-
-    /**
-     * Decodes a {@code String} into a {@code Long}.
-     * Accepts decimal, hexadecimal, and octal numbers given by the
-     * following grammar:
-     *
-     * <blockquote>
-     * <dl>
-     * <dt><i>DecodableString:</i>
-     * <dd><i>Sign<sub>opt</sub> DecimalNumeral</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0x} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i>
-     * <p>
-     * <dt><i>Sign:</i>
-     * <dd>{@code -}
-     * <dd>{@code +}
-     * </dl>
-     * </blockquote>
-     *
-     * <i>DecimalNumeral</i>, <i>HexDigits</i>, and <i>OctalDigits</i>
-     * are as defined in section 3.10.1 of
-     * <cite>The Java&trade; Language Specification</cite>,
-     * except that underscores are not accepted between digits.
-     *
-     * <p>The sequence of characters following an optional
-     * sign and/or radix specifier ("{@code 0x}", "{@code 0X}",
-     * "{@code #}", or leading zero) is parsed as by the {@code
-     * Long.parseLong} method with the indicated radix (10, 16, or 8).
-     * This sequence of characters must represent a positive value or
-     * a {@link NumberFormatException} will be thrown.  The result is
-     * negated if first character of the specified {@code String} is
-     * the minus sign.  No whitespace characters are permitted in the
-     * {@code String}.
-     *
-     * @param     nm the {@code String} to decode.
-     * @return    a {@code Long} object holding the {@code long}
-     *            value represented by {@code nm}
-     * @throws    NumberFormatException  if the {@code String} does not
-     *            contain a parsable {@code long}.
-     * @see java.lang.Long#parseLong(String, int)
-     * @since 1.2
-     */
-    public static Long decode(String nm) throws NumberFormatException {
-        int radix = 10;
-        int index = 0;
-        boolean negative = false;
-        Long result;
-
-        if (nm.length() == 0)
-            throw new NumberFormatException("Zero length string");
-        char firstChar = nm.charAt(0);
-        // Handle sign, if present
-        if (firstChar == '-') {
-            negative = true;
-            index++;
-        } else if (firstChar == '+')
-            index++;
-
-        // Handle radix specifier, if present
-        if (nm.startsWith("0x", index) || nm.startsWith("0X", index)) {
-            index += 2;
-            radix = 16;
-        }
-        else if (nm.startsWith("#", index)) {
-            index ++;
-            radix = 16;
-        }
-        else if (nm.startsWith("0", index) && nm.length() > 1 + index) {
-            index ++;
-            radix = 8;
-        }
-
-        if (nm.startsWith("-", index) || nm.startsWith("+", index))
-            throw new NumberFormatException("Sign character in wrong position");
-
-        try {
-            result = Long.valueOf(nm.substring(index), radix);
-            result = negative ? Long.valueOf(-result.longValue()) : result;
-        } catch (NumberFormatException e) {
-            // If number is Long.MIN_VALUE, we'll end up here. The next line
-            // handles this case, and causes any genuine format error to be
-            // rethrown.
-            String constant = negative ? ("-" + nm.substring(index))
-                                       : nm.substring(index);
-            result = Long.valueOf(constant, radix);
-        }
-        return result;
-    }
-
-    /**
-     * The value of the {@code Long}.
-     *
-     * @serial
-     */
-    private final long value;
-
-    /**
-     * Constructs a newly allocated {@code Long} object that
-     * represents the specified {@code long} argument.
-     *
-     * @param   value   the value to be represented by the
-     *          {@code Long} object.
-     */
-    public Long(long value) {
-        this.value = value;
-    }
-
-    /**
-     * Constructs a newly allocated {@code Long} object that
-     * represents the {@code long} value indicated by the
-     * {@code String} parameter. The string is converted to a
-     * {@code long} value in exactly the manner used by the
-     * {@code parseLong} method for radix 10.
-     *
-     * @param      s   the {@code String} to be converted to a
-     *             {@code Long}.
-     * @throws     NumberFormatException  if the {@code String} does not
-     *             contain a parsable {@code long}.
-     * @see        java.lang.Long#parseLong(java.lang.String, int)
-     */
-    public Long(String s) throws NumberFormatException {
-        this.value = parseLong(s, 10);
-    }
-
-    /**
-     * Returns the value of this {@code Long} as a
-     * {@code byte}.
-     */
-    public byte byteValue() {
-        return (byte)value;
-    }
-
-    /**
-     * Returns the value of this {@code Long} as a
-     * {@code short}.
-     */
-    public short shortValue() {
-        return (short)value;
-    }
-
-    /**
-     * Returns the value of this {@code Long} as an
-     * {@code int}.
-     */
-    public int intValue() {
-        return (int)value;
-    }
-
-    /**
-     * Returns the value of this {@code Long} as a
-     * {@code long} value.
-     */
-    public long longValue() {
-        return (long)value;
-    }
-
-    /**
-     * Returns the value of this {@code Long} as a
-     * {@code float}.
-     */
-    public float floatValue() {
-        return (float)value;
-    }
-
-    /**
-     * Returns the value of this {@code Long} as a
-     * {@code double}.
-     */
-    public double doubleValue() {
-        return (double)value;
-    }
-
-    /**
-     * Returns a {@code String} object representing this
-     * {@code Long}'s value.  The value is converted to signed
-     * decimal representation and returned as a string, exactly as if
-     * the {@code long} value were given as an argument to the
-     * {@link java.lang.Long#toString(long)} method.
-     *
-     * @return  a string representation of the value of this object in
-     *          base&nbsp;10.
-     */
-    public String toString() {
-        return toString(value);
-    }
-
-    /**
-     * Returns a hash code for this {@code Long}. The result is
-     * the exclusive OR of the two halves of the primitive
-     * {@code long} value held by this {@code Long}
-     * object. That is, the hashcode is the value of the expression:
-     *
-     * <blockquote>
-     *  {@code (int)(this.longValue()^(this.longValue()>>>32))}
-     * </blockquote>
-     *
-     * @return  a hash code value for this object.
-     */
-    public int hashCode() {
-        return (int)(value ^ (value >>> 32));
-    }
-
-    /**
-     * Compares this object to the specified object.  The result is
-     * {@code true} if and only if the argument is not
-     * {@code null} and is a {@code Long} object that
-     * contains the same {@code long} value as this object.
-     *
-     * @param   obj   the object to compare with.
-     * @return  {@code true} if the objects are the same;
-     *          {@code false} otherwise.
-     */
-    public boolean equals(Object obj) {
-        if (obj instanceof Long) {
-            return value == ((Long)obj).longValue();
-        }
-        return false;
-    }
-
-    /**
-     * Determines the {@code long} value of the system property
-     * with the specified name.
-     *
-     * <p>The first argument is treated as the name of a system property.
-     * System properties are accessible through the {@link
-     * java.lang.System#getProperty(java.lang.String)} method. The
-     * string value of this property is then interpreted as a
-     * {@code long} value and a {@code Long} object
-     * representing this value is returned.  Details of possible
-     * numeric formats can be found with the definition of
-     * {@code getProperty}.
-     *
-     * <p>If there is no property with the specified name, if the
-     * specified name is empty or {@code null}, or if the
-     * property does not have the correct numeric format, then
-     * {@code null} is returned.
-     *
-     * <p>In other words, this method returns a {@code Long} object equal to
-     * the value of:
-     *
-     * <blockquote>
-     *  {@code getLong(nm, null)}
-     * </blockquote>
-     *
-     * @param   nm   property name.
-     * @return  the {@code Long} value of the property.
-     * @see     java.lang.System#getProperty(java.lang.String)
-     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
-     */
-    public static Long getLong(String nm) {
-        return getLong(nm, null);
-    }
-
-    /**
-     * Determines the {@code long} value of the system property
-     * with the specified name.
-     *
-     * <p>The first argument is treated as the name of a system property.
-     * System properties are accessible through the {@link
-     * java.lang.System#getProperty(java.lang.String)} method. The
-     * string value of this property is then interpreted as a
-     * {@code long} value and a {@code Long} object
-     * representing this value is returned.  Details of possible
-     * numeric formats can be found with the definition of
-     * {@code getProperty}.
-     *
-     * <p>The second argument is the default value. A {@code Long} object
-     * that represents the value of the second argument is returned if there
-     * is no property of the specified name, if the property does not have
-     * the correct numeric format, or if the specified name is empty or null.
-     *
-     * <p>In other words, this method returns a {@code Long} object equal
-     * to the value of:
-     *
-     * <blockquote>
-     *  {@code getLong(nm, new Long(val))}
-     * </blockquote>
-     *
-     * but in practice it may be implemented in a manner such as:
-     *
-     * <blockquote><pre>
-     * Long result = getLong(nm, null);
-     * return (result == null) ? new Long(val) : result;
-     * </pre></blockquote>
-     *
-     * to avoid the unnecessary allocation of a {@code Long} object when
-     * the default value is not needed.
-     *
-     * @param   nm    property name.
-     * @param   val   default value.
-     * @return  the {@code Long} value of the property.
-     * @see     java.lang.System#getProperty(java.lang.String)
-     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
-     */
-    public static Long getLong(String nm, long val) {
-        Long result = Long.getLong(nm, null);
-        return (result == null) ? Long.valueOf(val) : result;
-    }
-
-    /**
-     * Returns the {@code long} value of the system property with
-     * the specified name.  The first argument is treated as the name
-     * of a system property.  System properties are accessible through
-     * the {@link java.lang.System#getProperty(java.lang.String)}
-     * method. The string value of this property is then interpreted
-     * as a {@code long} value, as per the
-     * {@code Long.decode} method, and a {@code Long} object
-     * representing this value is returned.
-     *
-     * <ul>
-     * <li>If the property value begins with the two ASCII characters
-     * {@code 0x} or the ASCII character {@code #}, not followed by
-     * a minus sign, then the rest of it is parsed as a hexadecimal integer
-     * exactly as for the method {@link #valueOf(java.lang.String, int)}
-     * with radix 16.
-     * <li>If the property value begins with the ASCII character
-     * {@code 0} followed by another character, it is parsed as
-     * an octal integer exactly as by the method {@link
-     * #valueOf(java.lang.String, int)} with radix 8.
-     * <li>Otherwise the property value is parsed as a decimal
-     * integer exactly as by the method
-     * {@link #valueOf(java.lang.String, int)} with radix 10.
-     * </ul>
-     *
-     * <p>Note that, in every case, neither {@code L}
-     * (<code>'&#92;u004C'</code>) nor {@code l}
-     * (<code>'&#92;u006C'</code>) is permitted to appear at the end
-     * of the property value as a type indicator, as would be
-     * permitted in Java programming language source code.
-     *
-     * <p>The second argument is the default value. The default value is
-     * returned if there is no property of the specified name, if the
-     * property does not have the correct numeric format, or if the
-     * specified name is empty or {@code null}.
-     *
-     * @param   nm   property name.
-     * @param   val   default value.
-     * @return  the {@code Long} value of the property.
-     * @see     java.lang.System#getProperty(java.lang.String)
-     * @see java.lang.System#getProperty(java.lang.String, java.lang.String)
-     * @see java.lang.Long#decode
-     */
-    public static Long getLong(String nm, Long val) {
-        String v = null;
-        try {
-            v = AbstractStringBuilder.getProperty(nm);
-        } catch (IllegalArgumentException e) {
-        } catch (NullPointerException e) {
-        }
-        if (v != null) {
-            try {
-                return Long.decode(v);
-            } catch (NumberFormatException e) {
-            }
-        }
-        return val;
-    }
-
-    /**
-     * Compares two {@code Long} objects numerically.
-     *
-     * @param   anotherLong   the {@code Long} to be compared.
-     * @return  the value {@code 0} if this {@code Long} is
-     *          equal to the argument {@code Long}; a value less than
-     *          {@code 0} if this {@code Long} is numerically less
-     *          than the argument {@code Long}; and a value greater
-     *          than {@code 0} if this {@code Long} is numerically
-     *           greater than the argument {@code Long} (signed
-     *           comparison).
-     * @since   1.2
-     */
-    public int compareTo(Long anotherLong) {
-        return compare(this.value, anotherLong.value);
-    }
-
-    /**
-     * Compares two {@code long} values numerically.
-     * The value returned is identical to what would be returned by:
-     * <pre>
-     *    Long.valueOf(x).compareTo(Long.valueOf(y))
-     * </pre>
-     *
-     * @param  x the first {@code long} to compare
-     * @param  y the second {@code long} to compare
-     * @return the value {@code 0} if {@code x == y};
-     *         a value less than {@code 0} if {@code x < y}; and
-     *         a value greater than {@code 0} if {@code x > y}
-     * @since 1.7
-     */
-    public static int compare(long x, long y) {
-        return (x < y) ? -1 : ((x == y) ? 0 : 1);
-    }
-
-
-    // Bit Twiddling
-
-    /**
-     * The number of bits used to represent a {@code long} value in two's
-     * complement binary form.
-     *
-     * @since 1.5
-     */
-    public static final int SIZE = 64;
-
-    /**
-     * Returns a {@code long} value with at most a single one-bit, in the
-     * position of the highest-order ("leftmost") one-bit in the specified
-     * {@code long} value.  Returns zero if the specified value has no
-     * one-bits in its two's complement binary representation, that is, if it
-     * is equal to zero.
-     *
-     * @return a {@code long} value with a single one-bit, in the position
-     *     of the highest-order one-bit in the specified value, or zero if
-     *     the specified value is itself equal to zero.
-     * @since 1.5
-     */
-    public static long highestOneBit(long i) {
-        // HD, Figure 3-1
-        i |= (i >>  1);
-        i |= (i >>  2);
-        i |= (i >>  4);
-        i |= (i >>  8);
-        i |= (i >> 16);
-        i |= (i >> 32);
-        return i - (i >>> 1);
-    }
-
-    /**
-     * Returns a {@code long} value with at most a single one-bit, in the
-     * position of the lowest-order ("rightmost") one-bit in the specified
-     * {@code long} value.  Returns zero if the specified value has no
-     * one-bits in its two's complement binary representation, that is, if it
-     * is equal to zero.
-     *
-     * @return a {@code long} value with a single one-bit, in the position
-     *     of the lowest-order one-bit in the specified value, or zero if
-     *     the specified value is itself equal to zero.
-     * @since 1.5
-     */
-    public static long lowestOneBit(long i) {
-        // HD, Section 2-1
-        return i & -i;
-    }
-
-    /**
-     * Returns the number of zero bits preceding the highest-order
-     * ("leftmost") one-bit in the two's complement binary representation
-     * of the specified {@code long} value.  Returns 64 if the
-     * specified value has no one-bits in its two's complement representation,
-     * in other words if it is equal to zero.
-     *
-     * <p>Note that this method is closely related to the logarithm base 2.
-     * For all positive {@code long} values x:
-     * <ul>
-     * <li>floor(log<sub>2</sub>(x)) = {@code 63 - numberOfLeadingZeros(x)}
-     * <li>ceil(log<sub>2</sub>(x)) = {@code 64 - numberOfLeadingZeros(x - 1)}
-     * </ul>
-     *
-     * @return the number of zero bits preceding the highest-order
-     *     ("leftmost") one-bit in the two's complement binary representation
-     *     of the specified {@code long} value, or 64 if the value
-     *     is equal to zero.
-     * @since 1.5
-     */
-    public static int numberOfLeadingZeros(long i) {
-        // HD, Figure 5-6
-         if (i == 0)
-            return 64;
-        int n = 1;
-        int x = (int)(i >>> 32);
-        if (x == 0) { n += 32; x = (int)i; }
-        if (x >>> 16 == 0) { n += 16; x <<= 16; }
-        if (x >>> 24 == 0) { n +=  8; x <<=  8; }
-        if (x >>> 28 == 0) { n +=  4; x <<=  4; }
-        if (x >>> 30 == 0) { n +=  2; x <<=  2; }
-        n -= x >>> 31;
-        return n;
-    }
-
-    /**
-     * Returns the number of zero bits following the lowest-order ("rightmost")
-     * one-bit in the two's complement binary representation of the specified
-     * {@code long} value.  Returns 64 if the specified value has no
-     * one-bits in its two's complement representation, in other words if it is
-     * equal to zero.
-     *
-     * @return the number of zero bits following the lowest-order ("rightmost")
-     *     one-bit in the two's complement binary representation of the
-     *     specified {@code long} value, or 64 if the value is equal
-     *     to zero.
-     * @since 1.5
-     */
-    public static int numberOfTrailingZeros(long i) {
-        // HD, Figure 5-14
-        int x, y;
-        if (i == 0) return 64;
-        int n = 63;
-        y = (int)i; if (y != 0) { n = n -32; x = y; } else x = (int)(i>>>32);
-        y = x <<16; if (y != 0) { n = n -16; x = y; }
-        y = x << 8; if (y != 0) { n = n - 8; x = y; }
-        y = x << 4; if (y != 0) { n = n - 4; x = y; }
-        y = x << 2; if (y != 0) { n = n - 2; x = y; }
-        return n - ((x << 1) >>> 31);
-    }
-
-    /**
-     * Returns the number of one-bits in the two's complement binary
-     * representation of the specified {@code long} value.  This function is
-     * sometimes referred to as the <i>population count</i>.
-     *
-     * @return the number of one-bits in the two's complement binary
-     *     representation of the specified {@code long} value.
-     * @since 1.5
-     */
-     public static int bitCount(long i) {
-        // HD, Figure 5-14
-        i = i - ((i >>> 1) & 0x5555555555555555L);
-        i = (i & 0x3333333333333333L) + ((i >>> 2) & 0x3333333333333333L);
-        i = (i + (i >>> 4)) & 0x0f0f0f0f0f0f0f0fL;
-        i = i + (i >>> 8);
-        i = i + (i >>> 16);
-        i = i + (i >>> 32);
-        return (int)i & 0x7f;
-     }
-
-    /**
-     * Returns the value obtained by rotating the two's complement binary
-     * representation of the specified {@code long} value left by the
-     * specified number of bits.  (Bits shifted out of the left hand, or
-     * high-order, side reenter on the right, or low-order.)
-     *
-     * <p>Note that left rotation with a negative distance is equivalent to
-     * right rotation: {@code rotateLeft(val, -distance) == rotateRight(val,
-     * distance)}.  Note also that rotation by any multiple of 64 is a
-     * no-op, so all but the last six bits of the rotation distance can be
-     * ignored, even if the distance is negative: {@code rotateLeft(val,
-     * distance) == rotateLeft(val, distance & 0x3F)}.
-     *
-     * @return the value obtained by rotating the two's complement binary
-     *     representation of the specified {@code long} value left by the
-     *     specified number of bits.
-     * @since 1.5
-     */
-    public static long rotateLeft(long i, int distance) {
-        return (i << distance) | (i >>> -distance);
-    }
-
-    /**
-     * Returns the value obtained by rotating the two's complement binary
-     * representation of the specified {@code long} value right by the
-     * specified number of bits.  (Bits shifted out of the right hand, or
-     * low-order, side reenter on the left, or high-order.)
-     *
-     * <p>Note that right rotation with a negative distance is equivalent to
-     * left rotation: {@code rotateRight(val, -distance) == rotateLeft(val,
-     * distance)}.  Note also that rotation by any multiple of 64 is a
-     * no-op, so all but the last six bits of the rotation distance can be
-     * ignored, even if the distance is negative: {@code rotateRight(val,
-     * distance) == rotateRight(val, distance & 0x3F)}.
-     *
-     * @return the value obtained by rotating the two's complement binary
-     *     representation of the specified {@code long} value right by the
-     *     specified number of bits.
-     * @since 1.5
-     */
-    public static long rotateRight(long i, int distance) {
-        return (i >>> distance) | (i << -distance);
-    }
-
-    /**
-     * Returns the value obtained by reversing the order of the bits in the
-     * two's complement binary representation of the specified {@code long}
-     * value.
-     *
-     * @return the value obtained by reversing order of the bits in the
-     *     specified {@code long} value.
-     * @since 1.5
-     */
-    public static long reverse(long i) {
-        // HD, Figure 7-1
-        i = (i & 0x5555555555555555L) << 1 | (i >>> 1) & 0x5555555555555555L;
-        i = (i & 0x3333333333333333L) << 2 | (i >>> 2) & 0x3333333333333333L;
-        i = (i & 0x0f0f0f0f0f0f0f0fL) << 4 | (i >>> 4) & 0x0f0f0f0f0f0f0f0fL;
-        i = (i & 0x00ff00ff00ff00ffL) << 8 | (i >>> 8) & 0x00ff00ff00ff00ffL;
-        i = (i << 48) | ((i & 0xffff0000L) << 16) |
-            ((i >>> 16) & 0xffff0000L) | (i >>> 48);
-        return i;
-    }
-
-    /**
-     * Returns the signum function of the specified {@code long} value.  (The
-     * return value is -1 if the specified value is negative; 0 if the
-     * specified value is zero; and 1 if the specified value is positive.)
-     *
-     * @return the signum function of the specified {@code long} value.
-     * @since 1.5
-     */
-    public static int signum(long i) {
-        // HD, Section 2-7
-        return (int) ((i >> 63) | (-i >>> 63));
-    }
-
-    /**
-     * Returns the value obtained by reversing the order of the bytes in the
-     * two's complement representation of the specified {@code long} value.
-     *
-     * @return the value obtained by reversing the bytes in the specified
-     *     {@code long} value.
-     * @since 1.5
-     */
-    public static long reverseBytes(long i) {
-        i = (i & 0x00ff00ff00ff00ffL) << 8 | (i >>> 8) & 0x00ff00ff00ff00ffL;
-        return (i << 48) | ((i & 0xffff0000L) << 16) |
-            ((i >>> 16) & 0xffff0000L) | (i >>> 48);
-    }
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = 4290774380558885855L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Math.java
--- a/emul/mini/src/main/java/java/lang/Math.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1310 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-
-/**
- * The class {@code Math} contains methods for performing basic
- * numeric operations such as the elementary exponential, logarithm,
- * square root, and trigonometric functions.
- *
- * <p>Unlike some of the numeric methods of class
- * {@code StrictMath}, all implementations of the equivalent
- * functions of class {@code Math} are not defined to return the
- * bit-for-bit same results.  This relaxation permits
- * better-performing implementations where strict reproducibility is
- * not required.
- *
- * <p>By default many of the {@code Math} methods simply call
- * the equivalent method in {@code StrictMath} for their
- * implementation.  Code generators are encouraged to use
- * platform-specific native libraries or microprocessor instructions,
- * where available, to provide higher-performance implementations of
- * {@code Math} methods.  Such higher-performance
- * implementations still must conform to the specification for
- * {@code Math}.
- *
- * <p>The quality of implementation specifications concern two
- * properties, accuracy of the returned result and monotonicity of the
- * method.  Accuracy of the floating-point {@code Math} methods
- * is measured in terms of <i>ulps</i>, units in the last place.  For
- * a given floating-point format, an ulp of a specific real number
- * value is the distance between the two floating-point values
- * bracketing that numerical value.  When discussing the accuracy of a
- * method as a whole rather than at a specific argument, the number of
- * ulps cited is for the worst-case error at any argument.  If a
- * method always has an error less than 0.5 ulps, the method always
- * returns the floating-point number nearest the exact result; such a
- * method is <i>correctly rounded</i>.  A correctly rounded method is
- * generally the best a floating-point approximation can be; however,
- * it is impractical for many floating-point methods to be correctly
- * rounded.  Instead, for the {@code Math} class, a larger error
- * bound of 1 or 2 ulps is allowed for certain methods.  Informally,
- * with a 1 ulp error bound, when the exact result is a representable
- * number, the exact result should be returned as the computed result;
- * otherwise, either of the two floating-point values which bracket
- * the exact result may be returned.  For exact results large in
- * magnitude, one of the endpoints of the bracket may be infinite.
- * Besides accuracy at individual arguments, maintaining proper
- * relations between the method at different arguments is also
- * important.  Therefore, most methods with more than 0.5 ulp errors
- * are required to be <i>semi-monotonic</i>: whenever the mathematical
- * function is non-decreasing, so is the floating-point approximation,
- * likewise, whenever the mathematical function is non-increasing, so
- * is the floating-point approximation.  Not all approximations that
- * have 1 ulp accuracy will automatically meet the monotonicity
- * requirements.
- *
- * @author  unascribed
- * @author  Joseph D. Darcy
- * @since   JDK1.0
- */
-
-public final class Math {
-
-    /**
-     * Don't let anyone instantiate this class.
-     */
-    private Math() {}
-
-    /**
-     * The {@code double} value that is closer than any other to
-     * <i>e</i>, the base of the natural logarithms.
-     */
-    public static final double E = 2.7182818284590452354;
-
-    /**
-     * The {@code double} value that is closer than any other to
-     * <i>pi</i>, the ratio of the circumference of a circle to its
-     * diameter.
-     */
-    public static final double PI = 3.14159265358979323846;
-
-    /**
-     * Returns the trigonometric sine of an angle.  Special cases:
-     * <ul><li>If the argument is NaN or an infinity, then the
-     * result is NaN.
-     * <li>If the argument is zero, then the result is a zero with the
-     * same sign as the argument.</ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   an angle, in radians.
-     * @return  the sine of the argument.
-     */
-    @JavaScriptBody(args="a", body="return Math.sin(a);")
-    public static double sin(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the trigonometric cosine of an angle. Special cases:
-     * <ul><li>If the argument is NaN or an infinity, then the
-     * result is NaN.</ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   an angle, in radians.
-     * @return  the cosine of the argument.
-     */
-    @JavaScriptBody(args="a", body="return Math.cos(a);")
-    public static double cos(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the trigonometric tangent of an angle.  Special cases:
-     * <ul><li>If the argument is NaN or an infinity, then the result
-     * is NaN.
-     * <li>If the argument is zero, then the result is a zero with the
-     * same sign as the argument.</ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   an angle, in radians.
-     * @return  the tangent of the argument.
-     */
-    @JavaScriptBody(args="a", body="return Math.tan(a);")
-    public static double tan(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the arc sine of a value; the returned angle is in the
-     * range -<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
-     * <ul><li>If the argument is NaN or its absolute value is greater
-     * than 1, then the result is NaN.
-     * <li>If the argument is zero, then the result is a zero with the
-     * same sign as the argument.</ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   the value whose arc sine is to be returned.
-     * @return  the arc sine of the argument.
-     */
-    @JavaScriptBody(args="a", body="return Math.asin(a);")
-    public static double asin(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the arc cosine of a value; the returned angle is in the
-     * range 0.0 through <i>pi</i>.  Special case:
-     * <ul><li>If the argument is NaN or its absolute value is greater
-     * than 1, then the result is NaN.</ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   the value whose arc cosine is to be returned.
-     * @return  the arc cosine of the argument.
-     */
-    @JavaScriptBody(args="a", body="return Math.acos(a);")
-    public static double acos(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the arc tangent of a value; the returned angle is in the
-     * range -<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
-     * <ul><li>If the argument is NaN, then the result is NaN.
-     * <li>If the argument is zero, then the result is a zero with the
-     * same sign as the argument.</ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   the value whose arc tangent is to be returned.
-     * @return  the arc tangent of the argument.
-     */
-    @JavaScriptBody(args="a", body="return Math.atan(a);")
-    public static double atan(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Converts an angle measured in degrees to an approximately
-     * equivalent angle measured in radians.  The conversion from
-     * degrees to radians is generally inexact.
-     *
-     * @param   angdeg   an angle, in degrees
-     * @return  the measurement of the angle {@code angdeg}
-     *          in radians.
-     * @since   1.2
-     */
-    public static double toRadians(double angdeg) {
-        return angdeg / 180.0 * PI;
-    }
-
-    /**
-     * Converts an angle measured in radians to an approximately
-     * equivalent angle measured in degrees.  The conversion from
-     * radians to degrees is generally inexact; users should
-     * <i>not</i> expect {@code cos(toRadians(90.0))} to exactly
-     * equal {@code 0.0}.
-     *
-     * @param   angrad   an angle, in radians
-     * @return  the measurement of the angle {@code angrad}
-     *          in degrees.
-     * @since   1.2
-     */
-    public static double toDegrees(double angrad) {
-        return angrad * 180.0 / PI;
-    }
-
-    /**
-     * Returns Euler's number <i>e</i> raised to the power of a
-     * {@code double} value.  Special cases:
-     * <ul><li>If the argument is NaN, the result is NaN.
-     * <li>If the argument is positive infinity, then the result is
-     * positive infinity.
-     * <li>If the argument is negative infinity, then the result is
-     * positive zero.</ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   the exponent to raise <i>e</i> to.
-     * @return  the value <i>e</i><sup>{@code a}</sup>,
-     *          where <i>e</i> is the base of the natural logarithms.
-     */
-    @JavaScriptBody(args="a", body="return Math.exp(a);")
-    public static double exp(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the natural logarithm (base <i>e</i>) of a {@code double}
-     * value.  Special cases:
-     * <ul><li>If the argument is NaN or less than zero, then the result
-     * is NaN.
-     * <li>If the argument is positive infinity, then the result is
-     * positive infinity.
-     * <li>If the argument is positive zero or negative zero, then the
-     * result is negative infinity.</ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   a value
-     * @return  the value ln&nbsp;{@code a}, the natural logarithm of
-     *          {@code a}.
-     */
-    @JavaScriptBody(args="a", body="return Math.log(a);")
-    public static double log(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the base 10 logarithm of a {@code double} value.
-     * Special cases:
-     *
-     * <ul><li>If the argument is NaN or less than zero, then the result
-     * is NaN.
-     * <li>If the argument is positive infinity, then the result is
-     * positive infinity.
-     * <li>If the argument is positive zero or negative zero, then the
-     * result is negative infinity.
-     * <li> If the argument is equal to 10<sup><i>n</i></sup> for
-     * integer <i>n</i>, then the result is <i>n</i>.
-     * </ul>
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   a value
-     * @return  the base 10 logarithm of  {@code a}.
-     * @since 1.5
-     */
-    @JavaScriptBody(args="a", body="return Math.log(a) / Math.LN10;")
-    public static double log10(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the correctly rounded positive square root of a
-     * {@code double} value.
-     * Special cases:
-     * <ul><li>If the argument is NaN or less than zero, then the result
-     * is NaN.
-     * <li>If the argument is positive infinity, then the result is positive
-     * infinity.
-     * <li>If the argument is positive zero or negative zero, then the
-     * result is the same as the argument.</ul>
-     * Otherwise, the result is the {@code double} value closest to
-     * the true mathematical square root of the argument value.
-     *
-     * @param   a   a value.
-     * @return  the positive square root of {@code a}.
-     *          If the argument is NaN or less than zero, the result is NaN.
-     */
-    @JavaScriptBody(args="a", body="return Math.sqrt(a);")
-    public static double sqrt(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the smallest (closest to negative infinity)
-     * {@code double} value that is greater than or equal to the
-     * argument and is equal to a mathematical integer. Special cases:
-     * <ul><li>If the argument value is already equal to a
-     * mathematical integer, then the result is the same as the
-     * argument.  <li>If the argument is NaN or an infinity or
-     * positive zero or negative zero, then the result is the same as
-     * the argument.  <li>If the argument value is less than zero but
-     * greater than -1.0, then the result is negative zero.</ul> Note
-     * that the value of {@code Math.ceil(x)} is exactly the
-     * value of {@code -Math.floor(-x)}.
-     *
-     *
-     * @param   a   a value.
-     * @return  the smallest (closest to negative infinity)
-     *          floating-point value that is greater than or equal to
-     *          the argument and is equal to a mathematical integer.
-     */
-    @JavaScriptBody(args="a", body="return Math.ceil(a);")
-    public static double ceil(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the largest (closest to positive infinity)
-     * {@code double} value that is less than or equal to the
-     * argument and is equal to a mathematical integer. Special cases:
-     * <ul><li>If the argument value is already equal to a
-     * mathematical integer, then the result is the same as the
-     * argument.  <li>If the argument is NaN or an infinity or
-     * positive zero or negative zero, then the result is the same as
-     * the argument.</ul>
-     *
-     * @param   a   a value.
-     * @return  the largest (closest to positive infinity)
-     *          floating-point value that less than or equal to the argument
-     *          and is equal to a mathematical integer.
-     */
-    @JavaScriptBody(args="a", body="return Math.floor(a);")
-    public static double floor(double a) {
-        throw new UnsupportedOperationException();
-    }
-    /**
-     * Computes the remainder operation on two arguments as prescribed
-     * by the IEEE 754 standard.
-     * The remainder value is mathematically equal to
-     * <code>f1&nbsp;-&nbsp;f2</code>&nbsp;&times;&nbsp;<i>n</i>,
-     * where <i>n</i> is the mathematical integer closest to the exact
-     * mathematical value of the quotient {@code f1/f2}, and if two
-     * mathematical integers are equally close to {@code f1/f2},
-     * then <i>n</i> is the integer that is even. If the remainder is
-     * zero, its sign is the same as the sign of the first argument.
-     * Special cases:
-     * <ul><li>If either argument is NaN, or the first argument is infinite,
-     * or the second argument is positive zero or negative zero, then the
-     * result is NaN.
-     * <li>If the first argument is finite and the second argument is
-     * infinite, then the result is the same as the first argument.</ul>
-     *
-     * @param   f1   the dividend.
-     * @param   f2   the divisor.
-     * @return  the remainder when {@code f1} is divided by
-     *          {@code f2}.
-     */
-    public static double IEEEremainder(double f1, double f2) {
-        return f1 - (f2 * Math.round(f1 / f2));
-    }
-
-    /**
-     * Returns the {@code double} value that is closest in value
-     * to the argument and is equal to a mathematical integer. If two
-     * {@code double} values that are mathematical integers are
-     * equally close, the result is the integer value that is
-     * even. Special cases:
-     * <ul><li>If the argument value is already equal to a mathematical
-     * integer, then the result is the same as the argument.
-     * <li>If the argument is NaN or an infinity or positive zero or negative
-     * zero, then the result is the same as the argument.</ul>
-     *
-     * @param   a   a {@code double} value.
-     * @return  the closest floating-point value to {@code a} that is
-     *          equal to a mathematical integer.
-     */
-    public static double rint(double a) {
-        double ceil = ceil(a);
-        double floor = floor(a);
-        
-        double dc = ceil - a;
-        double df = a - floor;
-        
-        if (dc < df) {
-            return ceil;
-        } else if (dc > df) {
-            return floor;
-        }
-        
-        int tenC = (int) (ceil % 10.0);
-        
-        if (tenC % 2 == 0) {
-            return ceil;
-        } else {
-            return floor;
-        }
-    }
-
-    /**
-     * Returns the angle <i>theta</i> from the conversion of rectangular
-     * coordinates ({@code x},&nbsp;{@code y}) to polar
-     * coordinates (r,&nbsp;<i>theta</i>).
-     * This method computes the phase <i>theta</i> by computing an arc tangent
-     * of {@code y/x} in the range of -<i>pi</i> to <i>pi</i>. Special
-     * cases:
-     * <ul><li>If either argument is NaN, then the result is NaN.
-     * <li>If the first argument is positive zero and the second argument
-     * is positive, or the first argument is positive and finite and the
-     * second argument is positive infinity, then the result is positive
-     * zero.
-     * <li>If the first argument is negative zero and the second argument
-     * is positive, or the first argument is negative and finite and the
-     * second argument is positive infinity, then the result is negative zero.
-     * <li>If the first argument is positive zero and the second argument
-     * is negative, or the first argument is positive and finite and the
-     * second argument is negative infinity, then the result is the
-     * {@code double} value closest to <i>pi</i>.
-     * <li>If the first argument is negative zero and the second argument
-     * is negative, or the first argument is negative and finite and the
-     * second argument is negative infinity, then the result is the
-     * {@code double} value closest to -<i>pi</i>.
-     * <li>If the first argument is positive and the second argument is
-     * positive zero or negative zero, or the first argument is positive
-     * infinity and the second argument is finite, then the result is the
-     * {@code double} value closest to <i>pi</i>/2.
-     * <li>If the first argument is negative and the second argument is
-     * positive zero or negative zero, or the first argument is negative
-     * infinity and the second argument is finite, then the result is the
-     * {@code double} value closest to -<i>pi</i>/2.
-     * <li>If both arguments are positive infinity, then the result is the
-     * {@code double} value closest to <i>pi</i>/4.
-     * <li>If the first argument is positive infinity and the second argument
-     * is negative infinity, then the result is the {@code double}
-     * value closest to 3*<i>pi</i>/4.
-     * <li>If the first argument is negative infinity and the second argument
-     * is positive infinity, then the result is the {@code double} value
-     * closest to -<i>pi</i>/4.
-     * <li>If both arguments are negative infinity, then the result is the
-     * {@code double} value closest to -3*<i>pi</i>/4.</ul>
-     *
-     * <p>The computed result must be within 2 ulps of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   y   the ordinate coordinate
-     * @param   x   the abscissa coordinate
-     * @return  the <i>theta</i> component of the point
-     *          (<i>r</i>,&nbsp;<i>theta</i>)
-     *          in polar coordinates that corresponds to the point
-     *          (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates.
-     */
-    @JavaScriptBody(args={"y", "x"}, body="return Math.atan2(y, x);")
-    public static double atan2(double y, double x) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the value of the first argument raised to the power of the
-     * second argument. Special cases:
-     *
-     * <ul><li>If the second argument is positive or negative zero, then the
-     * result is 1.0.
-     * <li>If the second argument is 1.0, then the result is the same as the
-     * first argument.
-     * <li>If the second argument is NaN, then the result is NaN.
-     * <li>If the first argument is NaN and the second argument is nonzero,
-     * then the result is NaN.
-     *
-     * <li>If
-     * <ul>
-     * <li>the absolute value of the first argument is greater than 1
-     * and the second argument is positive infinity, or
-     * <li>the absolute value of the first argument is less than 1 and
-     * the second argument is negative infinity,
-     * </ul>
-     * then the result is positive infinity.
-     *
-     * <li>If
-     * <ul>
-     * <li>the absolute value of the first argument is greater than 1 and
-     * the second argument is negative infinity, or
-     * <li>the absolute value of the
-     * first argument is less than 1 and the second argument is positive
-     * infinity,
-     * </ul>
-     * then the result is positive zero.
-     *
-     * <li>If the absolute value of the first argument equals 1 and the
-     * second argument is infinite, then the result is NaN.
-     *
-     * <li>If
-     * <ul>
-     * <li>the first argument is positive zero and the second argument
-     * is greater than zero, or
-     * <li>the first argument is positive infinity and the second
-     * argument is less than zero,
-     * </ul>
-     * then the result is positive zero.
-     *
-     * <li>If
-     * <ul>
-     * <li>the first argument is positive zero and the second argument
-     * is less than zero, or
-     * <li>the first argument is positive infinity and the second
-     * argument is greater than zero,
-     * </ul>
-     * then the result is positive infinity.
-     *
-     * <li>If
-     * <ul>
-     * <li>the first argument is negative zero and the second argument
-     * is greater than zero but not a finite odd integer, or
-     * <li>the first argument is negative infinity and the second
-     * argument is less than zero but not a finite odd integer,
-     * </ul>
-     * then the result is positive zero.
-     *
-     * <li>If
-     * <ul>
-     * <li>the first argument is negative zero and the second argument
-     * is a positive finite odd integer, or
-     * <li>the first argument is negative infinity and the second
-     * argument is a negative finite odd integer,
-     * </ul>
-     * then the result is negative zero.
-     *
-     * <li>If
-     * <ul>
-     * <li>the first argument is negative zero and the second argument
-     * is less than zero but not a finite odd integer, or
-     * <li>the first argument is negative infinity and the second
-     * argument is greater than zero but not a finite odd integer,
-     * </ul>
-     * then the result is positive infinity.
-     *
-     * <li>If
-     * <ul>
-     * <li>the first argument is negative zero and the second argument
-     * is a negative finite odd integer, or
-     * <li>the first argument is negative infinity and the second
-     * argument is a positive finite odd integer,
-     * </ul>
-     * then the result is negative infinity.
-     *
-     * <li>If the first argument is finite and less than zero
-     * <ul>
-     * <li> if the second argument is a finite even integer, the
-     * result is equal to the result of raising the absolute value of
-     * the first argument to the power of the second argument
-     *
-     * <li>if the second argument is a finite odd integer, the result
-     * is equal to the negative of the result of raising the absolute
-     * value of the first argument to the power of the second
-     * argument
-     *
-     * <li>if the second argument is finite and not an integer, then
-     * the result is NaN.
-     * </ul>
-     *
-     * <li>If both arguments are integers, then the result is exactly equal
-     * to the mathematical result of raising the first argument to the power
-     * of the second argument if that result can in fact be represented
-     * exactly as a {@code double} value.</ul>
-     *
-     * <p>(In the foregoing descriptions, a floating-point value is
-     * considered to be an integer if and only if it is finite and a
-     * fixed point of the method {@link #ceil ceil} or,
-     * equivalently, a fixed point of the method {@link #floor
-     * floor}. A value is a fixed point of a one-argument
-     * method if and only if the result of applying the method to the
-     * value is equal to the value.)
-     *
-     * <p>The computed result must be within 1 ulp of the exact result.
-     * Results must be semi-monotonic.
-     *
-     * @param   a   the base.
-     * @param   b   the exponent.
-     * @return  the value {@code a}<sup>{@code b}</sup>.
-     */
-    @JavaScriptBody(args={"a", "b"}, body="return Math.pow(a, b);")
-    public static double pow(double a, double b) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the closest {@code int} to the argument, with ties
-     * rounding up.
-     *
-     * <p>
-     * Special cases:
-     * <ul><li>If the argument is NaN, the result is 0.
-     * <li>If the argument is negative infinity or any value less than or
-     * equal to the value of {@code Integer.MIN_VALUE}, the result is
-     * equal to the value of {@code Integer.MIN_VALUE}.
-     * <li>If the argument is positive infinity or any value greater than or
-     * equal to the value of {@code Integer.MAX_VALUE}, the result is
-     * equal to the value of {@code Integer.MAX_VALUE}.</ul>
-     *
-     * @param   a   a floating-point value to be rounded to an integer.
-     * @return  the value of the argument rounded to the nearest
-     *          {@code int} value.
-     * @see     java.lang.Integer#MAX_VALUE
-     * @see     java.lang.Integer#MIN_VALUE
-     */
-    @JavaScriptBody(args="a", body="return Math.round(a);")
-    public static int round(float a) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the closest {@code long} to the argument, with ties
-     * rounding up.
-     *
-     * <p>Special cases:
-     * <ul><li>If the argument is NaN, the result is 0.
-     * <li>If the argument is negative infinity or any value less than or
-     * equal to the value of {@code Long.MIN_VALUE}, the result is
-     * equal to the value of {@code Long.MIN_VALUE}.
-     * <li>If the argument is positive infinity or any value greater than or
-     * equal to the value of {@code Long.MAX_VALUE}, the result is
-     * equal to the value of {@code Long.MAX_VALUE}.</ul>
-     *
-     * @param   a   a floating-point value to be rounded to a
-     *          {@code long}.
-     * @return  the value of the argument rounded to the nearest
-     *          {@code long} value.
-     * @see     java.lang.Long#MAX_VALUE
-     * @see     java.lang.Long#MIN_VALUE
-     */
-    @JavaScriptBody(args="a", body="return Math.round(a);")
-    public static long round(double a) {
-        throw new UnsupportedOperationException();
-    }
-
-//    private static Random randomNumberGenerator;
-//
-//    private static synchronized Random initRNG() {
-//        Random rnd = randomNumberGenerator;
-//        return (rnd == null) ? (randomNumberGenerator = new Random()) : rnd;
-//    }
-
-    /**
-     * Returns a {@code double} value with a positive sign, greater
-     * than or equal to {@code 0.0} and less than {@code 1.0}.
-     * Returned values are chosen pseudorandomly with (approximately)
-     * uniform distribution from that range.
-     *
-     * <p>When this method is first called, it creates a single new
-     * pseudorandom-number generator, exactly as if by the expression
-     *
-     * <blockquote>{@code new java.util.Random()}</blockquote>
-     *
-     * This new pseudorandom-number generator is used thereafter for
-     * all calls to this method and is used nowhere else.
-     *
-     * <p>This method is properly synchronized to allow correct use by
-     * more than one thread. However, if many threads need to generate
-     * pseudorandom numbers at a great rate, it may reduce contention
-     * for each thread to have its own pseudorandom-number generator.
-     *
-     * @return  a pseudorandom {@code double} greater than or equal
-     * to {@code 0.0} and less than {@code 1.0}.
-     * @see Random#nextDouble()
-     */
-    @JavaScriptBody(args={}, body="return Math.random();")
-    public static double random() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the absolute value of an {@code int} value.
-     * If the argument is not negative, the argument is returned.
-     * If the argument is negative, the negation of the argument is returned.
-     *
-     * <p>Note that if the argument is equal to the value of
-     * {@link Integer#MIN_VALUE}, the most negative representable
-     * {@code int} value, the result is that same value, which is
-     * negative.
-     *
-     * @param   a   the argument whose absolute value is to be determined
-     * @return  the absolute value of the argument.
-     */
-    public static int abs(int a) {
-        return (a < 0) ? -a : a;
-    }
-
-    /**
-     * Returns the absolute value of a {@code long} value.
-     * If the argument is not negative, the argument is returned.
-     * If the argument is negative, the negation of the argument is returned.
-     *
-     * <p>Note that if the argument is equal to the value of
-     * {@link Long#MIN_VALUE}, the most negative representable
-     * {@code long} value, the result is that same value, which
-     * is negative.
-     *
-     * @param   a   the argument whose absolute value is to be determined
-     * @return  the absolute value of the argument.
-     */
-    public static long abs(long a) {
-        return (a < 0) ? -a : a;
-    }
-
-    /**
-     * Returns the absolute value of a {@code float} value.
-     * If the argument is not negative, the argument is returned.
-     * If the argument is negative, the negation of the argument is returned.
-     * Special cases:
-     * <ul><li>If the argument is positive zero or negative zero, the
-     * result is positive zero.
-     * <li>If the argument is infinite, the result is positive infinity.
-     * <li>If the argument is NaN, the result is NaN.</ul>
-     * In other words, the result is the same as the value of the expression:
-     * <p>{@code Float.intBitsToFloat(0x7fffffff & Float.floatToIntBits(a))}
-     *
-     * @param   a   the argument whose absolute value is to be determined
-     * @return  the absolute value of the argument.
-     */
-    public static float abs(float a) {
-        return (a <= 0.0F) ? 0.0F - a : a;
-    }
-
-    /**
-     * Returns the absolute value of a {@code double} value.
-     * If the argument is not negative, the argument is returned.
-     * If the argument is negative, the negation of the argument is returned.
-     * Special cases:
-     * <ul><li>If the argument is positive zero or negative zero, the result
-     * is positive zero.
-     * <li>If the argument is infinite, the result is positive infinity.
-     * <li>If the argument is NaN, the result is NaN.</ul>
-     * In other words, the result is the same as the value of the expression:
-     * <p>{@code Double.longBitsToDouble((Double.doubleToLongBits(a)<<1)>>>1)}
-     *
-     * @param   a   the argument whose absolute value is to be determined
-     * @return  the absolute value of the argument.
-     */
-    public static double abs(double a) {
-        return (a <= 0.0D) ? 0.0D - a : a;
-    }
-
-    /**
-     * Returns the greater of two {@code int} values. That is, the
-     * result is the argument closer to the value of
-     * {@link Integer#MAX_VALUE}. If the arguments have the same value,
-     * the result is that same value.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @return  the larger of {@code a} and {@code b}.
-     */
-    public static int max(int a, int b) {
-        return (a >= b) ? a : b;
-    }
-
-    /**
-     * Returns the greater of two {@code long} values. That is, the
-     * result is the argument closer to the value of
-     * {@link Long#MAX_VALUE}. If the arguments have the same value,
-     * the result is that same value.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @return  the larger of {@code a} and {@code b}.
-     */
-    public static long max(long a, long b) {
-        return (a >= b) ? a : b;
-    }
-
-    /**
-     * Returns the greater of two {@code float} values.  That is,
-     * the result is the argument closer to positive infinity. If the
-     * arguments have the same value, the result is that same
-     * value. If either value is NaN, then the result is NaN.  Unlike
-     * the numerical comparison operators, this method considers
-     * negative zero to be strictly smaller than positive zero. If one
-     * argument is positive zero and the other negative zero, the
-     * result is positive zero.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @return  the larger of {@code a} and {@code b}.
-     */
-    @JavaScriptBody(args={"a", "b"},
-        body="return Math.max(a,b);"
-    )
-    public static float max(float a, float b) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the greater of two {@code double} values.  That
-     * is, the result is the argument closer to positive infinity. If
-     * the arguments have the same value, the result is that same
-     * value. If either value is NaN, then the result is NaN.  Unlike
-     * the numerical comparison operators, this method considers
-     * negative zero to be strictly smaller than positive zero. If one
-     * argument is positive zero and the other negative zero, the
-     * result is positive zero.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @return  the larger of {@code a} and {@code b}.
-     */
-    @JavaScriptBody(args={"a", "b"},
-        body="return Math.max(a,b);"
-    )
-    public static double max(double a, double b) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the smaller of two {@code int} values. That is,
-     * the result the argument closer to the value of
-     * {@link Integer#MIN_VALUE}.  If the arguments have the same
-     * value, the result is that same value.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @return  the smaller of {@code a} and {@code b}.
-     */
-    public static int min(int a, int b) {
-        return (a <= b) ? a : b;
-    }
-
-    /**
-     * Returns the smaller of two {@code long} values. That is,
-     * the result is the argument closer to the value of
-     * {@link Long#MIN_VALUE}. If the arguments have the same
-     * value, the result is that same value.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @return  the smaller of {@code a} and {@code b}.
-     */
-    public static long min(long a, long b) {
-        return (a <= b) ? a : b;
-    }
-
-    /**
-     * Returns the smaller of two {@code float} values.  That is,
-     * the result is the value closer to negative infinity. If the
-     * arguments have the same value, the result is that same
-     * value. If either value is NaN, then the result is NaN.  Unlike
-     * the numerical comparison operators, this method considers
-     * negative zero to be strictly smaller than positive zero.  If
-     * one argument is positive zero and the other is negative zero,
-     * the result is negative zero.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @return  the smaller of {@code a} and {@code b}.
-     */
-    @JavaScriptBody(args={"a", "b"},
-        body="return Math.min(a,b);"
-    )
-    public static float min(float a, float b) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the smaller of two {@code double} values.  That
-     * is, the result is the value closer to negative infinity. If the
-     * arguments have the same value, the result is that same
-     * value. If either value is NaN, then the result is NaN.  Unlike
-     * the numerical comparison operators, this method considers
-     * negative zero to be strictly smaller than positive zero. If one
-     * argument is positive zero and the other is negative zero, the
-     * result is negative zero.
-     *
-     * @param   a   an argument.
-     * @param   b   another argument.
-     * @return  the smaller of {@code a} and {@code b}.
-     */
-    @JavaScriptBody(args={"a", "b"},
-        body="return Math.min(a,b);"
-    )
-    public static double min(double a, double b) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the size of an ulp of the argument.  An ulp of a
-     * {@code double} value is the positive distance between this
-     * floating-point value and the {@code double} value next
-     * larger in magnitude.  Note that for non-NaN <i>x</i>,
-     * <code>ulp(-<i>x</i>) == ulp(<i>x</i>)</code>.
-     *
-     * <p>Special Cases:
-     * <ul>
-     * <li> If the argument is NaN, then the result is NaN.
-     * <li> If the argument is positive or negative infinity, then the
-     * result is positive infinity.
-     * <li> If the argument is positive or negative zero, then the result is
-     * {@code Double.MIN_VALUE}.
-     * <li> If the argument is &plusmn;{@code Double.MAX_VALUE}, then
-     * the result is equal to 2<sup>971</sup>.
-     * </ul>
-     *
-     * @param d the floating-point value whose ulp is to be returned
-     * @return the size of an ulp of the argument
-     * @author Joseph D. Darcy
-     * @since 1.5
-     */
-//    public static double ulp(double d) {
-//        return sun.misc.FpUtils.ulp(d);
-//    }
-
-    /**
-     * Returns the size of an ulp of the argument.  An ulp of a
-     * {@code float} value is the positive distance between this
-     * floating-point value and the {@code float} value next
-     * larger in magnitude.  Note that for non-NaN <i>x</i>,
-     * <code>ulp(-<i>x</i>) == ulp(<i>x</i>)</code>.
-     *
-     * <p>Special Cases:
-     * <ul>
-     * <li> If the argument is NaN, then the result is NaN.
-     * <li> If the argument is positive or negative infinity, then the
-     * result is positive infinity.
-     * <li> If the argument is positive or negative zero, then the result is
-     * {@code Float.MIN_VALUE}.
-     * <li> If the argument is &plusmn;{@code Float.MAX_VALUE}, then
-     * the result is equal to 2<sup>104</sup>.
-     * </ul>
-     *
-     * @param f the floating-point value whose ulp is to be returned
-     * @return the size of an ulp of the argument
-     * @author Joseph D. Darcy
-     * @since 1.5
-     */
-//    public static float ulp(float f) {
-//        return sun.misc.FpUtils.ulp(f);
-//    }
-
-    /**
-     * Returns the signum function of the argument; zero if the argument
-     * is zero, 1.0 if the argument is greater than zero, -1.0 if the
-     * argument is less than zero.
-     *
-     * <p>Special Cases:
-     * <ul>
-     * <li> If the argument is NaN, then the result is NaN.
-     * <li> If the argument is positive zero or negative zero, then the
-     *      result is the same as the argument.
-     * </ul>
-     *
-     * @param d the floating-point value whose signum is to be returned
-     * @return the signum function of the argument
-     * @author Joseph D. Darcy
-     * @since 1.5
-     */
-    public static double signum(double d) {
-        if (d < 0.0) { return -1.0; }
-        if (d > 0.0) { return 1.0; }
-        return d;
-    }
-
-    /**
-     * Returns the signum function of the argument; zero if the argument
-     * is zero, 1.0f if the argument is greater than zero, -1.0f if the
-     * argument is less than zero.
-     *
-     * <p>Special Cases:
-     * <ul>
-     * <li> If the argument is NaN, then the result is NaN.
-     * <li> If the argument is positive zero or negative zero, then the
-     *      result is the same as the argument.
-     * </ul>
-     *
-     * @param f the floating-point value whose signum is to be returned
-     * @return the signum function of the argument
-     * @author Joseph D. Darcy
-     * @since 1.5
-     */
-    public static float signum(float f) {
-        if (f < 0.0f) { return -1.0f; }
-        if (f > 0.0f) { return 1.0f; }
-        return f;
-    }
-
-    /**
-     * Returns the first floating-point argument with the sign of the
-     * second floating-point argument.  Note that unlike the {@link
-     * StrictMath#copySign(double, double) StrictMath.copySign}
-     * method, this method does not require NaN {@code sign}
-     * arguments to be treated as positive values; implementations are
-     * permitted to treat some NaN arguments as positive and other NaN
-     * arguments as negative to allow greater performance.
-     *
-     * @param magnitude  the parameter providing the magnitude of the result
-     * @param sign   the parameter providing the sign of the result
-     * @return a value with the magnitude of {@code magnitude}
-     * and the sign of {@code sign}.
-     * @since 1.6
-     */
-//    public static double copySign(double magnitude, double sign) {
-//        return sun.misc.FpUtils.rawCopySign(magnitude, sign);
-//    }
-
-    /**
-     * Returns the first floating-point argument with the sign of the
-     * second floating-point argument.  Note that unlike the {@link
-     * StrictMath#copySign(float, float) StrictMath.copySign}
-     * method, this method does not require NaN {@code sign}
-     * arguments to be treated as positive values; implementations are
-     * permitted to treat some NaN arguments as positive and other NaN
-     * arguments as negative to allow greater performance.
-     *
-     * @param magnitude  the parameter providing the magnitude of the result
-     * @param sign   the parameter providing the sign of the result
-     * @return a value with the magnitude of {@code magnitude}
-     * and the sign of {@code sign}.
-     * @since 1.6
-     */
-//    public static float copySign(float magnitude, float sign) {
-//        return sun.misc.FpUtils.rawCopySign(magnitude, sign);
-//    }
-
-    /**
-     * Returns the unbiased exponent used in the representation of a
-     * {@code float}.  Special cases:
-     *
-     * <ul>
-     * <li>If the argument is NaN or infinite, then the result is
-     * {@link Float#MAX_EXPONENT} + 1.
-     * <li>If the argument is zero or subnormal, then the result is
-     * {@link Float#MIN_EXPONENT} -1.
-     * </ul>
-     * @param f a {@code float} value
-     * @return the unbiased exponent of the argument
-     * @since 1.6
-     */
-//    public static int getExponent(float f) {
-//        return sun.misc.FpUtils.getExponent(f);
-//    }
-
-    /**
-     * Returns the unbiased exponent used in the representation of a
-     * {@code double}.  Special cases:
-     *
-     * <ul>
-     * <li>If the argument is NaN or infinite, then the result is
-     * {@link Double#MAX_EXPONENT} + 1.
-     * <li>If the argument is zero or subnormal, then the result is
-     * {@link Double#MIN_EXPONENT} -1.
-     * </ul>
-     * @param d a {@code double} value
-     * @return the unbiased exponent of the argument
-     * @since 1.6
-     */
-//    public static int getExponent(double d) {
-//        return sun.misc.FpUtils.getExponent(d);
-//    }
-
-    /**
-     * Returns the floating-point number adjacent to the first
-     * argument in the direction of the second argument.  If both
-     * arguments compare as equal the second argument is returned.
-     *
-     * <p>
-     * Special cases:
-     * <ul>
-     * <li> If either argument is a NaN, then NaN is returned.
-     *
-     * <li> If both arguments are signed zeros, {@code direction}
-     * is returned unchanged (as implied by the requirement of
-     * returning the second argument if the arguments compare as
-     * equal).
-     *
-     * <li> If {@code start} is
-     * &plusmn;{@link Double#MIN_VALUE} and {@code direction}
-     * has a value such that the result should have a smaller
-     * magnitude, then a zero with the same sign as {@code start}
-     * is returned.
-     *
-     * <li> If {@code start} is infinite and
-     * {@code direction} has a value such that the result should
-     * have a smaller magnitude, {@link Double#MAX_VALUE} with the
-     * same sign as {@code start} is returned.
-     *
-     * <li> If {@code start} is equal to &plusmn;
-     * {@link Double#MAX_VALUE} and {@code direction} has a
-     * value such that the result should have a larger magnitude, an
-     * infinity with same sign as {@code start} is returned.
-     * </ul>
-     *
-     * @param start  starting floating-point value
-     * @param direction value indicating which of
-     * {@code start}'s neighbors or {@code start} should
-     * be returned
-     * @return The floating-point number adjacent to {@code start} in the
-     * direction of {@code direction}.
-     * @since 1.6
-     */
-//    public static double nextAfter(double start, double direction) {
-//        return sun.misc.FpUtils.nextAfter(start, direction);
-//    }
-
-    /**
-     * Returns the floating-point number adjacent to the first
-     * argument in the direction of the second argument.  If both
-     * arguments compare as equal a value equivalent to the second argument
-     * is returned.
-     *
-     * <p>
-     * Special cases:
-     * <ul>
-     * <li> If either argument is a NaN, then NaN is returned.
-     *
-     * <li> If both arguments are signed zeros, a value equivalent
-     * to {@code direction} is returned.
-     *
-     * <li> If {@code start} is
-     * &plusmn;{@link Float#MIN_VALUE} and {@code direction}
-     * has a value such that the result should have a smaller
-     * magnitude, then a zero with the same sign as {@code start}
-     * is returned.
-     *
-     * <li> If {@code start} is infinite and
-     * {@code direction} has a value such that the result should
-     * have a smaller magnitude, {@link Float#MAX_VALUE} with the
-     * same sign as {@code start} is returned.
-     *
-     * <li> If {@code start} is equal to &plusmn;
-     * {@link Float#MAX_VALUE} and {@code direction} has a
-     * value such that the result should have a larger magnitude, an
-     * infinity with same sign as {@code start} is returned.
-     * </ul>
-     *
-     * @param start  starting floating-point value
-     * @param direction value indicating which of
-     * {@code start}'s neighbors or {@code start} should
-     * be returned
-     * @return The floating-point number adjacent to {@code start} in the
-     * direction of {@code direction}.
-     * @since 1.6
-     */
-//    public static float nextAfter(float start, double direction) {
-//        return sun.misc.FpUtils.nextAfter(start, direction);
-//    }
-
-    /**
-     * Returns the floating-point value adjacent to {@code d} in
-     * the direction of positive infinity.  This method is
-     * semantically equivalent to {@code nextAfter(d,
-     * Double.POSITIVE_INFINITY)}; however, a {@code nextUp}
-     * implementation may run faster than its equivalent
-     * {@code nextAfter} call.
-     *
-     * <p>Special Cases:
-     * <ul>
-     * <li> If the argument is NaN, the result is NaN.
-     *
-     * <li> If the argument is positive infinity, the result is
-     * positive infinity.
-     *
-     * <li> If the argument is zero, the result is
-     * {@link Double#MIN_VALUE}
-     *
-     * </ul>
-     *
-     * @param d starting floating-point value
-     * @return The adjacent floating-point value closer to positive
-     * infinity.
-     * @since 1.6
-     */
-//    public static double nextUp(double d) {
-//        return sun.misc.FpUtils.nextUp(d);
-//    }
-
-    /**
-     * Returns the floating-point value adjacent to {@code f} in
-     * the direction of positive infinity.  This method is
-     * semantically equivalent to {@code nextAfter(f,
-     * Float.POSITIVE_INFINITY)}; however, a {@code nextUp}
-     * implementation may run faster than its equivalent
-     * {@code nextAfter} call.
-     *
-     * <p>Special Cases:
-     * <ul>
-     * <li> If the argument is NaN, the result is NaN.
-     *
-     * <li> If the argument is positive infinity, the result is
-     * positive infinity.
-     *
-     * <li> If the argument is zero, the result is
-     * {@link Float#MIN_VALUE}
-     *
-     * </ul>
-     *
-     * @param f starting floating-point value
-     * @return The adjacent floating-point value closer to positive
-     * infinity.
-     * @since 1.6
-     */
-//    public static float nextUp(float f) {
-//        return sun.misc.FpUtils.nextUp(f);
-//    }
-
-
-    /**
-     * Return {@code d} &times;
-     * 2<sup>{@code scaleFactor}</sup> rounded as if performed
-     * by a single correctly rounded floating-point multiply to a
-     * member of the double value set.  See the Java
-     * Language Specification for a discussion of floating-point
-     * value sets.  If the exponent of the result is between {@link
-     * Double#MIN_EXPONENT} and {@link Double#MAX_EXPONENT}, the
-     * answer is calculated exactly.  If the exponent of the result
-     * would be larger than {@code Double.MAX_EXPONENT}, an
-     * infinity is returned.  Note that if the result is subnormal,
-     * precision may be lost; that is, when {@code scalb(x, n)}
-     * is subnormal, {@code scalb(scalb(x, n), -n)} may not equal
-     * <i>x</i>.  When the result is non-NaN, the result has the same
-     * sign as {@code d}.
-     *
-     * <p>Special cases:
-     * <ul>
-     * <li> If the first argument is NaN, NaN is returned.
-     * <li> If the first argument is infinite, then an infinity of the
-     * same sign is returned.
-     * <li> If the first argument is zero, then a zero of the same
-     * sign is returned.
-     * </ul>
-     *
-     * @param d number to be scaled by a power of two.
-     * @param scaleFactor power of 2 used to scale {@code d}
-     * @return {@code d} &times; 2<sup>{@code scaleFactor}</sup>
-     * @since 1.6
-     */
-//    public static double scalb(double d, int scaleFactor) {
-//        return sun.misc.FpUtils.scalb(d, scaleFactor);
-//    }
-
-    /**
-     * Return {@code f} &times;
-     * 2<sup>{@code scaleFactor}</sup> rounded as if performed
-     * by a single correctly rounded floating-point multiply to a
-     * member of the float value set.  See the Java
-     * Language Specification for a discussion of floating-point
-     * value sets.  If the exponent of the result is between {@link
-     * Float#MIN_EXPONENT} and {@link Float#MAX_EXPONENT}, the
-     * answer is calculated exactly.  If the exponent of the result
-     * would be larger than {@code Float.MAX_EXPONENT}, an
-     * infinity is returned.  Note that if the result is subnormal,
-     * precision may be lost; that is, when {@code scalb(x, n)}
-     * is subnormal, {@code scalb(scalb(x, n), -n)} may not equal
-     * <i>x</i>.  When the result is non-NaN, the result has the same
-     * sign as {@code f}.
-     *
-     * <p>Special cases:
-     * <ul>
-     * <li> If the first argument is NaN, NaN is returned.
-     * <li> If the first argument is infinite, then an infinity of the
-     * same sign is returned.
-     * <li> If the first argument is zero, then a zero of the same
-     * sign is returned.
-     * </ul>
-     *
-     * @param f number to be scaled by a power of two.
-     * @param scaleFactor power of 2 used to scale {@code f}
-     * @return {@code f} &times; 2<sup>{@code scaleFactor}</sup>
-     * @since 1.6
-     */
-//    public static float scalb(float f, int scaleFactor) {
-//        return sun.misc.FpUtils.scalb(f, scaleFactor);
-//    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/NegativeArraySizeException.java
--- a/emul/mini/src/main/java/java/lang/NegativeArraySizeException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown if an application tries to create an array with negative size.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class NegativeArraySizeException extends RuntimeException {
-    private static final long serialVersionUID = -8960118058596991861L;
-
-    /**
-     * Constructs a <code>NegativeArraySizeException</code> with no
-     * detail message.
-     */
-    public NegativeArraySizeException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>NegativeArraySizeException</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public NegativeArraySizeException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/NoSuchMethodException.java
--- a/emul/mini/src/main/java/java/lang/NoSuchMethodException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when a particular method cannot be found.
- *
- * @author     unascribed
- * @since      JDK1.0
- */
-public
-class NoSuchMethodException extends ReflectiveOperationException {
-    private static final long serialVersionUID = 5034388446362600923L;
-
-    /**
-     * Constructs a <code>NoSuchMethodException</code> without a detail message.
-     */
-    public NoSuchMethodException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>NoSuchMethodException</code> with a detail message.
-     *
-     * @param      s   the detail message.
-     */
-    public NoSuchMethodException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/NullPointerException.java
--- a/emul/mini/src/main/java/java/lang/NullPointerException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when an application attempts to use {@code null} in a
- * case where an object is required. These include:
- * <ul>
- * <li>Calling the instance method of a {@code null} object.
- * <li>Accessing or modifying the field of a {@code null} object.
- * <li>Taking the length of {@code null} as if it were an array.
- * <li>Accessing or modifying the slots of {@code null} as if it
- *     were an array.
- * <li>Throwing {@code null} as if it were a {@code Throwable}
- *     value.
- * </ul>
- * <p>
- * Applications should throw instances of this class to indicate
- * other illegal uses of the {@code null} object.
- *
- * {@code NullPointerException} objects may be constructed by the
- * virtual machine as if {@linkplain Throwable#Throwable(String,
- * Throwable, boolean, boolean) suppression were disabled and/or the
- * stack trace was not writable}.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public
-class NullPointerException extends RuntimeException {
-    private static final long serialVersionUID = 5162710183389028792L;
-
-    /**
-     * Constructs a {@code NullPointerException} with no detail message.
-     */
-    public NullPointerException() {
-        super();
-    }
-
-    /**
-     * Constructs a {@code NullPointerException} with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public NullPointerException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Number.java
--- a/emul/mini/src/main/java/java/lang/Number.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 1994, 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import org.apidesign.bck2brwsr.core.ExtraJavaScript;
-
-/**
- * The abstract class <code>Number</code> is the superclass of classes
- * <code>BigDecimal</code>, <code>BigInteger</code>,
- * <code>Byte</code>, <code>Double</code>, <code>Float</code>,
- * <code>Integer</code>, <code>Long</code>, and <code>Short</code>.
- * <p>
- * Subclasses of <code>Number</code> must provide methods to convert
- * the represented numeric value to <code>byte</code>, <code>double</code>,
- * <code>float</code>, <code>int</code>, <code>long</code>, and
- * <code>short</code>.
- *
- * @author      Lee Boynton
- * @author      Arthur van Hoff
- * @see     java.lang.Byte
- * @see     java.lang.Double
- * @see     java.lang.Float
- * @see     java.lang.Integer
- * @see     java.lang.Long
- * @see     java.lang.Short
- * @since   JDK1.0
- */
-@ExtraJavaScript(
-    resource="/org/apidesign/vm4brwsr/emul/lang/java_lang_Number.js",
-    processByteCode=true
-)
-public abstract class Number implements java.io.Serializable {
-    /**
-     * Returns the value of the specified number as an <code>int</code>.
-     * This may involve rounding or truncation.
-     *
-     * @return  the numeric value represented by this object after conversion
-     *          to type <code>int</code>.
-     */
-    public abstract int intValue();
-
-    /**
-     * Returns the value of the specified number as a <code>long</code>.
-     * This may involve rounding or truncation.
-     *
-     * @return  the numeric value represented by this object after conversion
-     *          to type <code>long</code>.
-     */
-    public abstract long longValue();
-
-    /**
-     * Returns the value of the specified number as a <code>float</code>.
-     * This may involve rounding.
-     *
-     * @return  the numeric value represented by this object after conversion
-     *          to type <code>float</code>.
-     */
-    public abstract float floatValue();
-
-    /**
-     * Returns the value of the specified number as a <code>double</code>.
-     * This may involve rounding.
-     *
-     * @return  the numeric value represented by this object after conversion
-     *          to type <code>double</code>.
-     */
-    public abstract double doubleValue();
-
-    /**
-     * Returns the value of the specified number as a <code>byte</code>.
-     * This may involve rounding or truncation.
-     *
-     * @return  the numeric value represented by this object after conversion
-     *          to type <code>byte</code>.
-     * @since   JDK1.1
-     */
-    public byte byteValue() {
-        return (byte)intValue();
-    }
-
-    /**
-     * Returns the value of the specified number as a <code>short</code>.
-     * This may involve rounding or truncation.
-     *
-     * @return  the numeric value represented by this object after conversion
-     *          to type <code>short</code>.
-     * @since   JDK1.1
-     */
-    public short shortValue() {
-        return (short)intValue();
-    }
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = -8742448824652078965L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/NumberFormatException.java
--- a/emul/mini/src/main/java/java/lang/NumberFormatException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1994, 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that the application has attempted to convert
- * a string to one of the numeric types, but that the string does not
- * have the appropriate format.
- *
- * @author  unascribed
- * @see     java.lang.Integer#toString()
- * @since   JDK1.0
- */
-public
-class NumberFormatException extends IllegalArgumentException {
-    static final long serialVersionUID = -2848938806368998894L;
-
-    /**
-     * Constructs a <code>NumberFormatException</code> with no detail message.
-     */
-    public NumberFormatException () {
-        super();
-    }
-
-    /**
-     * Constructs a <code>NumberFormatException</code> with the
-     * specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public NumberFormatException (String s) {
-        super (s);
-    }
-
-    /**
-     * Factory method for making a <code>NumberFormatException</code>
-     * given the specified input which caused the error.
-     *
-     * @param   s   the input causing the error
-     */
-    static NumberFormatException forInputString(String s) {
-        return new NumberFormatException("For input string: \"" + s + "\"");
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Object.java
--- a/emul/mini/src/main/java/java/lang/Object.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.lang.reflect.Array;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
-
-/**
- * Class {@code Object} is the root of the class hierarchy.
- * Every class has {@code Object} as a superclass. All objects,
- * including arrays, implement the methods of this class.
- *
- * @author  unascribed
- * @see     java.lang.Class
- * @since   JDK1.0
- */
-@JavaScriptPrototype(container = "Object.prototype", prototype = "new Object")
-public class Object {
-
-    private static void registerNatives() {
-        try {
-            Array.get(null, 0);
-        } catch (Throwable ex) {
-            // ignore
-        }
-    }
-    static {
-        registerNatives();
-    }
-
-    /**
-     * Returns the runtime class of this {@code Object}. The returned
-     * {@code Class} object is the object that is locked by {@code
-     * static synchronized} methods of the represented class.
-     *
-     * <p><b>The actual result type is {@code Class<? extends |X|>}
-     * where {@code |X|} is the erasure of the static type of the
-     * expression on which {@code getClass} is called.</b> For
-     * example, no cast is required in this code fragment:</p>
-     *
-     * <p>
-     * {@code Number n = 0;                             }<br>
-     * {@code Class<? extends Number> c = n.getClass(); }
-     * </p>
-     *
-     * @return The {@code Class} object that represents the runtime
-     *         class of this object.
-     * @see    Class Literals, section 15.8.2 of
-     *         <cite>The Java&trade; Language Specification</cite>.
-     */
-    @JavaScriptBody(args={}, body="return this.constructor.$class;")
-    public final native Class<?> getClass();
-
-    /**
-     * Returns a hash code value for the object. This method is
-     * supported for the benefit of hash tables such as those provided by
-     * {@link java.util.HashMap}.
-     * <p>
-     * The general contract of {@code hashCode} is:
-     * <ul>
-     * <li>Whenever it is invoked on the same object more than once during
-     *     an execution of a Java application, the {@code hashCode} method
-     *     must consistently return the same integer, provided no information
-     *     used in {@code equals} comparisons on the object is modified.
-     *     This integer need not remain consistent from one execution of an
-     *     application to another execution of the same application.
-     * <li>If two objects are equal according to the {@code equals(Object)}
-     *     method, then calling the {@code hashCode} method on each of
-     *     the two objects must produce the same integer result.
-     * <li>It is <em>not</em> required that if two objects are unequal
-     *     according to the {@link java.lang.Object#equals(java.lang.Object)}
-     *     method, then calling the {@code hashCode} method on each of the
-     *     two objects must produce distinct integer results.  However, the
-     *     programmer should be aware that producing distinct integer results
-     *     for unequal objects may improve the performance of hash tables.
-     * </ul>
-     * <p>
-     * As much as is reasonably practical, the hashCode method defined by
-     * class {@code Object} does return distinct integers for distinct
-     * objects. (This is typically implemented by converting the internal
-     * address of the object into an integer, but this implementation
-     * technique is not required by the
-     * Java<font size="-2"><sup>TM</sup></font> programming language.)
-     *
-     * @return  a hash code value for this object.
-     * @see     java.lang.Object#equals(java.lang.Object)
-     * @see     java.lang.System#identityHashCode
-     */
-    @JavaScriptBody(args = {}, body = 
-        "if (this.$hashCode) return this.$hashCode;\n"
-        + "var h = this.computeHashCode__I();\n"
-        + "return this.$hashCode = h & h;"
-    )
-    public native int hashCode();
-
-    @JavaScriptBody(args = {}, body = "return Math.random() * Math.pow(2, 32);")
-    native int computeHashCode();
-    
-    /**
-     * Indicates whether some other object is "equal to" this one.
-     * <p>
-     * The {@code equals} method implements an equivalence relation
-     * on non-null object references:
-     * <ul>
-     * <li>It is <i>reflexive</i>: for any non-null reference value
-     *     {@code x}, {@code x.equals(x)} should return
-     *     {@code true}.
-     * <li>It is <i>symmetric</i>: for any non-null reference values
-     *     {@code x} and {@code y}, {@code x.equals(y)}
-     *     should return {@code true} if and only if
-     *     {@code y.equals(x)} returns {@code true}.
-     * <li>It is <i>transitive</i>: for any non-null reference values
-     *     {@code x}, {@code y}, and {@code z}, if
-     *     {@code x.equals(y)} returns {@code true} and
-     *     {@code y.equals(z)} returns {@code true}, then
-     *     {@code x.equals(z)} should return {@code true}.
-     * <li>It is <i>consistent</i>: for any non-null reference values
-     *     {@code x} and {@code y}, multiple invocations of
-     *     {@code x.equals(y)} consistently return {@code true}
-     *     or consistently return {@code false}, provided no
-     *     information used in {@code equals} comparisons on the
-     *     objects is modified.
-     * <li>For any non-null reference value {@code x},
-     *     {@code x.equals(null)} should return {@code false}.
-     * </ul>
-     * <p>
-     * The {@code equals} method for class {@code Object} implements
-     * the most discriminating possible equivalence relation on objects;
-     * that is, for any non-null reference values {@code x} and
-     * {@code y}, this method returns {@code true} if and only
-     * if {@code x} and {@code y} refer to the same object
-     * ({@code x == y} has the value {@code true}).
-     * <p>
-     * Note that it is generally necessary to override the {@code hashCode}
-     * method whenever this method is overridden, so as to maintain the
-     * general contract for the {@code hashCode} method, which states
-     * that equal objects must have equal hash codes.
-     *
-     * @param   obj   the reference object with which to compare.
-     * @return  {@code true} if this object is the same as the obj
-     *          argument; {@code false} otherwise.
-     * @see     #hashCode()
-     * @see     java.util.HashMap
-     */
-    public boolean equals(Object obj) {
-        return (this == obj);
-    }
-
-    /**
-     * Creates and returns a copy of this object.  The precise meaning
-     * of "copy" may depend on the class of the object. The general
-     * intent is that, for any object {@code x}, the expression:
-     * <blockquote>
-     * <pre>
-     * x.clone() != x</pre></blockquote>
-     * will be true, and that the expression:
-     * <blockquote>
-     * <pre>
-     * x.clone().getClass() == x.getClass()</pre></blockquote>
-     * will be {@code true}, but these are not absolute requirements.
-     * While it is typically the case that:
-     * <blockquote>
-     * <pre>
-     * x.clone().equals(x)</pre></blockquote>
-     * will be {@code true}, this is not an absolute requirement.
-     * <p>
-     * By convention, the returned object should be obtained by calling
-     * {@code super.clone}.  If a class and all of its superclasses (except
-     * {@code Object}) obey this convention, it will be the case that
-     * {@code x.clone().getClass() == x.getClass()}.
-     * <p>
-     * By convention, the object returned by this method should be independent
-     * of this object (which is being cloned).  To achieve this independence,
-     * it may be necessary to modify one or more fields of the object returned
-     * by {@code super.clone} before returning it.  Typically, this means
-     * copying any mutable objects that comprise the internal "deep structure"
-     * of the object being cloned and replacing the references to these
-     * objects with references to the copies.  If a class contains only
-     * primitive fields or references to immutable objects, then it is usually
-     * the case that no fields in the object returned by {@code super.clone}
-     * need to be modified.
-     * <p>
-     * The method {@code clone} for class {@code Object} performs a
-     * specific cloning operation. First, if the class of this object does
-     * not implement the interface {@code Cloneable}, then a
-     * {@code CloneNotSupportedException} is thrown. Note that all arrays
-     * are considered to implement the interface {@code Cloneable} and that
-     * the return type of the {@code clone} method of an array type {@code T[]}
-     * is {@code T[]} where T is any reference or primitive type.
-     * Otherwise, this method creates a new instance of the class of this
-     * object and initializes all its fields with exactly the contents of
-     * the corresponding fields of this object, as if by assignment; the
-     * contents of the fields are not themselves cloned. Thus, this method
-     * performs a "shallow copy" of this object, not a "deep copy" operation.
-     * <p>
-     * The class {@code Object} does not itself implement the interface
-     * {@code Cloneable}, so calling the {@code clone} method on an object
-     * whose class is {@code Object} will result in throwing an
-     * exception at run time.
-     *
-     * @return     a clone of this instance.
-     * @exception  CloneNotSupportedException  if the object's class does not
-     *               support the {@code Cloneable} interface. Subclasses
-     *               that override the {@code clone} method can also
-     *               throw this exception to indicate that an instance cannot
-     *               be cloned.
-     * @see java.lang.Cloneable
-     */
-    protected Object clone() throws CloneNotSupportedException {
-        Object ret = clone(this);
-        if (ret == null) {
-            throw new CloneNotSupportedException(getClass().getName());
-        }
-        return ret;
-    }
-
-    @JavaScriptBody(args = "self", body = 
-          "\nif (!self.$instOf_java_lang_Cloneable) {"
-        + "\n  return null;"
-        + "\n} else {"
-        + "\n  var clone = self.constructor(true);"
-        + "\n  var props = Object.getOwnPropertyNames(self);"
-        + "\n  for (var i = 0; i < props.length; i++) {"
-        + "\n    var p = props[i];"
-        + "\n    clone[p] = self[p];"
-        + "\n  };"
-        + "\n  return clone;"
-        + "\n}"
-    )
-    private static native Object clone(Object self) throws CloneNotSupportedException;
-
-    /**
-     * Returns a string representation of the object. In general, the
-     * {@code toString} method returns a string that
-     * "textually represents" this object. The result should
-     * be a concise but informative representation that is easy for a
-     * person to read.
-     * It is recommended that all subclasses override this method.
-     * <p>
-     * The {@code toString} method for class {@code Object}
-     * returns a string consisting of the name of the class of which the
-     * object is an instance, the at-sign character `{@code @}', and
-     * the unsigned hexadecimal representation of the hash code of the
-     * object. In other words, this method returns a string equal to the
-     * value of:
-     * <blockquote>
-     * <pre>
-     * getClass().getName() + '@' + Integer.toHexString(hashCode())
-     * </pre></blockquote>
-     *
-     * @return  a string representation of the object.
-     */
-    public String toString() {
-        return getClass().getName() + "@" + Integer.toHexString(hashCode());
-    }
-
-    /**
-     * Wakes up a single thread that is waiting on this object's
-     * monitor. If any threads are waiting on this object, one of them
-     * is chosen to be awakened. The choice is arbitrary and occurs at
-     * the discretion of the implementation. A thread waits on an object's
-     * monitor by calling one of the {@code wait} methods.
-     * <p>
-     * The awakened thread will not be able to proceed until the current
-     * thread relinquishes the lock on this object. The awakened thread will
-     * compete in the usual manner with any other threads that might be
-     * actively competing to synchronize on this object; for example, the
-     * awakened thread enjoys no reliable privilege or disadvantage in being
-     * the next thread to lock this object.
-     * <p>
-     * This method should only be called by a thread that is the owner
-     * of this object's monitor. A thread becomes the owner of the
-     * object's monitor in one of three ways:
-     * <ul>
-     * <li>By executing a synchronized instance method of that object.
-     * <li>By executing the body of a {@code synchronized} statement
-     *     that synchronizes on the object.
-     * <li>For objects of type {@code Class,} by executing a
-     *     synchronized static method of that class.
-     * </ul>
-     * <p>
-     * Only one thread at a time can own an object's monitor.
-     *
-     * @exception  IllegalMonitorStateException  if the current thread is not
-     *               the owner of this object's monitor.
-     * @see        java.lang.Object#notifyAll()
-     * @see        java.lang.Object#wait()
-     */
-    public final native void notify();
-
-    /**
-     * Wakes up all threads that are waiting on this object's monitor. A
-     * thread waits on an object's monitor by calling one of the
-     * {@code wait} methods.
-     * <p>
-     * The awakened threads will not be able to proceed until the current
-     * thread relinquishes the lock on this object. The awakened threads
-     * will compete in the usual manner with any other threads that might
-     * be actively competing to synchronize on this object; for example,
-     * the awakened threads enjoy no reliable privilege or disadvantage in
-     * being the next thread to lock this object.
-     * <p>
-     * This method should only be called by a thread that is the owner
-     * of this object's monitor. See the {@code notify} method for a
-     * description of the ways in which a thread can become the owner of
-     * a monitor.
-     *
-     * @exception  IllegalMonitorStateException  if the current thread is not
-     *               the owner of this object's monitor.
-     * @see        java.lang.Object#notify()
-     * @see        java.lang.Object#wait()
-     */
-    public final native void notifyAll();
-
-    /**
-     * Causes the current thread to wait until either another thread invokes the
-     * {@link java.lang.Object#notify()} method or the
-     * {@link java.lang.Object#notifyAll()} method for this object, or a
-     * specified amount of time has elapsed.
-     * <p>
-     * The current thread must own this object's monitor.
-     * <p>
-     * This method causes the current thread (call it <var>T</var>) to
-     * place itself in the wait set for this object and then to relinquish
-     * any and all synchronization claims on this object. Thread <var>T</var>
-     * becomes disabled for thread scheduling purposes and lies dormant
-     * until one of four things happens:
-     * <ul>
-     * <li>Some other thread invokes the {@code notify} method for this
-     * object and thread <var>T</var> happens to be arbitrarily chosen as
-     * the thread to be awakened.
-     * <li>Some other thread invokes the {@code notifyAll} method for this
-     * object.
-     * <li>Some other thread {@linkplain Thread#interrupt() interrupts}
-     * thread <var>T</var>.
-     * <li>The specified amount of real time has elapsed, more or less.  If
-     * {@code timeout} is zero, however, then real time is not taken into
-     * consideration and the thread simply waits until notified.
-     * </ul>
-     * The thread <var>T</var> is then removed from the wait set for this
-     * object and re-enabled for thread scheduling. It then competes in the
-     * usual manner with other threads for the right to synchronize on the
-     * object; once it has gained control of the object, all its
-     * synchronization claims on the object are restored to the status quo
-     * ante - that is, to the situation as of the time that the {@code wait}
-     * method was invoked. Thread <var>T</var> then returns from the
-     * invocation of the {@code wait} method. Thus, on return from the
-     * {@code wait} method, the synchronization state of the object and of
-     * thread {@code T} is exactly as it was when the {@code wait} method
-     * was invoked.
-     * <p>
-     * A thread can also wake up without being notified, interrupted, or
-     * timing out, a so-called <i>spurious wakeup</i>.  While this will rarely
-     * occur in practice, applications must guard against it by testing for
-     * the condition that should have caused the thread to be awakened, and
-     * continuing to wait if the condition is not satisfied.  In other words,
-     * waits should always occur in loops, like this one:
-     * <pre>
-     *     synchronized (obj) {
-     *         while (&lt;condition does not hold&gt;)
-     *             obj.wait(timeout);
-     *         ... // Perform action appropriate to condition
-     *     }
-     * </pre>
-     * (For more information on this topic, see Section 3.2.3 in Doug Lea's
-     * "Concurrent Programming in Java (Second Edition)" (Addison-Wesley,
-     * 2000), or Item 50 in Joshua Bloch's "Effective Java Programming
-     * Language Guide" (Addison-Wesley, 2001).
-     *
-     * <p>If the current thread is {@linkplain java.lang.Thread#interrupt()
-     * interrupted} by any thread before or while it is waiting, then an
-     * {@code InterruptedException} is thrown.  This exception is not
-     * thrown until the lock status of this object has been restored as
-     * described above.
-     *
-     * <p>
-     * Note that the {@code wait} method, as it places the current thread
-     * into the wait set for this object, unlocks only this object; any
-     * other objects on which the current thread may be synchronized remain
-     * locked while the thread waits.
-     * <p>
-     * This method should only be called by a thread that is the owner
-     * of this object's monitor. See the {@code notify} method for a
-     * description of the ways in which a thread can become the owner of
-     * a monitor.
-     *
-     * @param      timeout   the maximum time to wait in milliseconds.
-     * @exception  IllegalArgumentException      if the value of timeout is
-     *               negative.
-     * @exception  IllegalMonitorStateException  if the current thread is not
-     *               the owner of the object's monitor.
-     * @exception  InterruptedException if any thread interrupted the
-     *             current thread before or while the current thread
-     *             was waiting for a notification.  The <i>interrupted
-     *             status</i> of the current thread is cleared when
-     *             this exception is thrown.
-     * @see        java.lang.Object#notify()
-     * @see        java.lang.Object#notifyAll()
-     */
-    public final native void wait(long timeout) throws InterruptedException;
-
-    /**
-     * Causes the current thread to wait until another thread invokes the
-     * {@link java.lang.Object#notify()} method or the
-     * {@link java.lang.Object#notifyAll()} method for this object, or
-     * some other thread interrupts the current thread, or a certain
-     * amount of real time has elapsed.
-     * <p>
-     * This method is similar to the {@code wait} method of one
-     * argument, but it allows finer control over the amount of time to
-     * wait for a notification before giving up. The amount of real time,
-     * measured in nanoseconds, is given by:
-     * <blockquote>
-     * <pre>
-     * 1000000*timeout+nanos</pre></blockquote>
-     * <p>
-     * In all other respects, this method does the same thing as the
-     * method {@link #wait(long)} of one argument. In particular,
-     * {@code wait(0, 0)} means the same thing as {@code wait(0)}.
-     * <p>
-     * The current thread must own this object's monitor. The thread
-     * releases ownership of this monitor and waits until either of the
-     * following two conditions has occurred:
-     * <ul>
-     * <li>Another thread notifies threads waiting on this object's monitor
-     *     to wake up either through a call to the {@code notify} method
-     *     or the {@code notifyAll} method.
-     * <li>The timeout period, specified by {@code timeout}
-     *     milliseconds plus {@code nanos} nanoseconds arguments, has
-     *     elapsed.
-     * </ul>
-     * <p>
-     * The thread then waits until it can re-obtain ownership of the
-     * monitor and resumes execution.
-     * <p>
-     * As in the one argument version, interrupts and spurious wakeups are
-     * possible, and this method should always be used in a loop:
-     * <pre>
-     *     synchronized (obj) {
-     *         while (&lt;condition does not hold&gt;)
-     *             obj.wait(timeout, nanos);
-     *         ... // Perform action appropriate to condition
-     *     }
-     * </pre>
-     * This method should only be called by a thread that is the owner
-     * of this object's monitor. See the {@code notify} method for a
-     * description of the ways in which a thread can become the owner of
-     * a monitor.
-     *
-     * @param      timeout   the maximum time to wait in milliseconds.
-     * @param      nanos      additional time, in nanoseconds range
-     *                       0-999999.
-     * @exception  IllegalArgumentException      if the value of timeout is
-     *                      negative or the value of nanos is
-     *                      not in the range 0-999999.
-     * @exception  IllegalMonitorStateException  if the current thread is not
-     *               the owner of this object's monitor.
-     * @exception  InterruptedException if any thread interrupted the
-     *             current thread before or while the current thread
-     *             was waiting for a notification.  The <i>interrupted
-     *             status</i> of the current thread is cleared when
-     *             this exception is thrown.
-     */
-    public final void wait(long timeout, int nanos) throws InterruptedException {
-        if (timeout < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
-        }
-
-        if (nanos < 0 || nanos > 999999) {
-            throw new IllegalArgumentException(
-                                "nanosecond timeout value out of range");
-        }
-
-        if (nanos >= 500000 || (nanos != 0 && timeout == 0)) {
-            timeout++;
-        }
-
-        wait(timeout);
-    }
-
-    /**
-     * Causes the current thread to wait until another thread invokes the
-     * {@link java.lang.Object#notify()} method or the
-     * {@link java.lang.Object#notifyAll()} method for this object.
-     * In other words, this method behaves exactly as if it simply
-     * performs the call {@code wait(0)}.
-     * <p>
-     * The current thread must own this object's monitor. The thread
-     * releases ownership of this monitor and waits until another thread
-     * notifies threads waiting on this object's monitor to wake up
-     * either through a call to the {@code notify} method or the
-     * {@code notifyAll} method. The thread then waits until it can
-     * re-obtain ownership of the monitor and resumes execution.
-     * <p>
-     * As in the one argument version, interrupts and spurious wakeups are
-     * possible, and this method should always be used in a loop:
-     * <pre>
-     *     synchronized (obj) {
-     *         while (&lt;condition does not hold&gt;)
-     *             obj.wait();
-     *         ... // Perform action appropriate to condition
-     *     }
-     * </pre>
-     * This method should only be called by a thread that is the owner
-     * of this object's monitor. See the {@code notify} method for a
-     * description of the ways in which a thread can become the owner of
-     * a monitor.
-     *
-     * @exception  IllegalMonitorStateException  if the current thread is not
-     *               the owner of the object's monitor.
-     * @exception  InterruptedException if any thread interrupted the
-     *             current thread before or while the current thread
-     *             was waiting for a notification.  The <i>interrupted
-     *             status</i> of the current thread is cleared when
-     *             this exception is thrown.
-     * @see        java.lang.Object#notify()
-     * @see        java.lang.Object#notifyAll()
-     */
-    public final void wait() throws InterruptedException {
-        wait(0);
-    }
-
-    /**
-     * Called by the garbage collector on an object when garbage collection
-     * determines that there are no more references to the object.
-     * A subclass overrides the {@code finalize} method to dispose of
-     * system resources or to perform other cleanup.
-     * <p>
-     * The general contract of {@code finalize} is that it is invoked
-     * if and when the Java<font size="-2"><sup>TM</sup></font> virtual
-     * machine has determined that there is no longer any
-     * means by which this object can be accessed by any thread that has
-     * not yet died, except as a result of an action taken by the
-     * finalization of some other object or class which is ready to be
-     * finalized. The {@code finalize} method may take any action, including
-     * making this object available again to other threads; the usual purpose
-     * of {@code finalize}, however, is to perform cleanup actions before
-     * the object is irrevocably discarded. For example, the finalize method
-     * for an object that represents an input/output connection might perform
-     * explicit I/O transactions to break the connection before the object is
-     * permanently discarded.
-     * <p>
-     * The {@code finalize} method of class {@code Object} performs no
-     * special action; it simply returns normally. Subclasses of
-     * {@code Object} may override this definition.
-     * <p>
-     * The Java programming language does not guarantee which thread will
-     * invoke the {@code finalize} method for any given object. It is
-     * guaranteed, however, that the thread that invokes finalize will not
-     * be holding any user-visible synchronization locks when finalize is
-     * invoked. If an uncaught exception is thrown by the finalize method,
-     * the exception is ignored and finalization of that object terminates.
-     * <p>
-     * After the {@code finalize} method has been invoked for an object, no
-     * further action is taken until the Java virtual machine has again
-     * determined that there is no longer any means by which this object can
-     * be accessed by any thread that has not yet died, including possible
-     * actions by other objects or classes which are ready to be finalized,
-     * at which point the object may be discarded.
-     * <p>
-     * The {@code finalize} method is never invoked more than once by a Java
-     * virtual machine for any given object.
-     * <p>
-     * Any exception thrown by the {@code finalize} method causes
-     * the finalization of this object to be halted, but is otherwise
-     * ignored.
-     *
-     * @throws Throwable the {@code Exception} raised by this method
-     */
-    protected void finalize() throws Throwable { }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/OutOfMemoryError.java
--- a/emul/mini/src/main/java/java/lang/OutOfMemoryError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown when the Java Virtual Machine cannot allocate an object
- * because it is out of memory, and no more memory could be made
- * available by the garbage collector.
- *
- * {@code OutOfMemoryError} objects may be constructed by the virtual
- * machine as if {@linkplain Throwable#Throwable(String, Throwable,
- * boolean, boolean) suppression were disabled and/or the stack trace was not
- * writable}.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public class OutOfMemoryError extends VirtualMachineError {
-    private static final long serialVersionUID = 8228564086184010517L;
-
-    /**
-     * Constructs an {@code OutOfMemoryError} with no detail message.
-     */
-    public OutOfMemoryError() {
-        super();
-    }
-
-    /**
-     * Constructs an {@code OutOfMemoryError} with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public OutOfMemoryError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Override.java
--- a/emul/mini/src/main/java/java/lang/Override.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.lang.annotation.*;
-
-/**
- * Indicates that a method declaration is intended to override a
- * method declaration in a supertype. If a method is annotated with
- * this annotation type compilers are required to generate an error
- * message unless at least one of the following conditions hold:
- *
- * <ul><li>
- * The method does override or implement a method declared in a
- * supertype.
- * </li><li>
- * The method has a signature that is override-equivalent to that of
- * any public method declared in {@linkplain Object}.
- * </li></ul>
- *
- * @author  Peter von der Ah&eacute;
- * @author  Joshua Bloch
- * @jls 9.6.1.4 Override
- * @since 1.5
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface Override {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/ReflectiveOperationException.java
--- a/emul/mini/src/main/java/java/lang/ReflectiveOperationException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Common superclass of exceptions thrown by reflective operations in
- * core reflection.
- *
- * @see LinkageError
- * @since 1.7
- */
-public class ReflectiveOperationException extends Exception {
-    static final long serialVersionUID = 123456789L;
-
-    /**
-     * Constructs a new exception with {@code null} as its detail
-     * message.  The cause is not initialized, and may subsequently be
-     * initialized by a call to {@link #initCause}.
-     */
-    public ReflectiveOperationException() {
-        super();
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message.
-     * The cause is not initialized, and may subsequently be
-     * initialized by a call to {@link #initCause}.
-     *
-     * @param   message   the detail message. The detail message is saved for
-     *          later retrieval by the {@link #getMessage()} method.
-     */
-    public ReflectiveOperationException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message
-     * and cause.
-     *
-     * <p>Note that the detail message associated with
-     * {@code cause} is <em>not</em> automatically incorporated in
-     * this exception's detail message.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link #getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A {@code null} value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     */
-    public ReflectiveOperationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail
-     * message of {@code (cause==null ? null : cause.toString())} (which
-     * typically contains the class and detail message of {@code cause}).
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A {@code null} value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     */
-    public ReflectiveOperationException(Throwable cause) {
-        super(cause);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Runnable.java
--- a/emul/mini/src/main/java/java/lang/Runnable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1994, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * The <code>Runnable</code> interface should be implemented by any
- * class whose instances are intended to be executed by a thread. The
- * class must define a method of no arguments called <code>run</code>.
- * <p>
- * This interface is designed to provide a common protocol for objects that
- * wish to execute code while they are active. For example,
- * <code>Runnable</code> is implemented by class <code>Thread</code>.
- * Being active simply means that a thread has been started and has not
- * yet been stopped.
- * <p>
- * In addition, <code>Runnable</code> provides the means for a class to be
- * active while not subclassing <code>Thread</code>. A class that implements
- * <code>Runnable</code> can run without subclassing <code>Thread</code>
- * by instantiating a <code>Thread</code> instance and passing itself in
- * as the target.  In most cases, the <code>Runnable</code> interface should
- * be used if you are only planning to override the <code>run()</code>
- * method and no other <code>Thread</code> methods.
- * This is important because classes should not be subclassed
- * unless the programmer intends on modifying or enhancing the fundamental
- * behavior of the class.
- *
- * @author  Arthur van Hoff
- * @see     java.lang.Thread
- * @see     java.util.concurrent.Callable
- * @since   JDK1.0
- */
-public
-interface Runnable {
-    /**
-     * When an object implementing interface <code>Runnable</code> is used
-     * to create a thread, starting the thread causes the object's
-     * <code>run</code> method to be called in that separately executing
-     * thread.
-     * <p>
-     * The general contract of the method <code>run</code> is that it may
-     * take any action whatsoever.
-     *
-     * @see     java.lang.Thread#run()
-     */
-    public abstract void run();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/RuntimeException.java
--- a/emul/mini/src/main/java/java/lang/RuntimeException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * {@code RuntimeException} is the superclass of those
- * exceptions that can be thrown during the normal operation of the
- * Java Virtual Machine.
- *
- * <p>{@code RuntimeException} and its subclasses are <em>unchecked
- * exceptions</em>.  Unchecked exceptions do <em>not</em> need to be
- * declared in a method or constructor's {@code throws} clause if they
- * can be thrown by the execution of the method or constructor and
- * propagate outside the method or constructor boundary.
- *
- * @author  Frank Yellin
- * @jls 11.2 Compile-Time Checking of Exceptions
- * @since   JDK1.0
- */
-public class RuntimeException extends Exception {
-    static final long serialVersionUID = -7034897190745766939L;
-
-    /** Constructs a new runtime exception with {@code null} as its
-     * detail message.  The cause is not initialized, and may subsequently be
-     * initialized by a call to {@link #initCause}.
-     */
-    public RuntimeException() {
-        super();
-    }
-
-    /** Constructs a new runtime exception with the specified detail message.
-     * The cause is not initialized, and may subsequently be initialized by a
-     * call to {@link #initCause}.
-     *
-     * @param   message   the detail message. The detail message is saved for
-     *          later retrieval by the {@link #getMessage()} method.
-     */
-    public RuntimeException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new runtime exception with the specified detail message and
-     * cause.  <p>Note that the detail message associated with
-     * {@code cause} is <i>not</i> automatically incorporated in
-     * this runtime exception's detail message.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link #getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.4
-     */
-    public RuntimeException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /** Constructs a new runtime exception with the specified cause and a
-     * detail message of <tt>(cause==null ? null : cause.toString())</tt>
-     * (which typically contains the class and detail message of
-     * <tt>cause</tt>).  This constructor is useful for runtime exceptions
-     * that are little more than wrappers for other throwables.
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.4
-     */
-    public RuntimeException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Constructs a new runtime exception with the specified detail
-     * message, cause, suppression enabled or disabled, and writable
-     * stack trace enabled or disabled.
-     *
-     * @param  message the detail message.
-     * @param cause the cause.  (A {@code null} value is permitted,
-     * and indicates that the cause is nonexistent or unknown.)
-     * @param enableSuppression whether or not suppression is enabled
-     *                          or disabled
-     * @param writableStackTrace whether or not the stack trace should
-     *                           be writable
-     *
-     * @since 1.7
-     */
-    protected RuntimeException(String message, Throwable cause,
-                               boolean enableSuppression,
-                               boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/SecurityException.java
--- a/emul/mini/src/main/java/java/lang/SecurityException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.lang;
-
-/**
- * Thrown by the security manager to indicate a security violation.
- *
- * @author  unascribed
- * @see     java.lang.SecurityManager
- * @since   JDK1.0
- */
-public class SecurityException extends RuntimeException {
-
-    private static final long serialVersionUID = 6878364983674394167L;
-
-    /**
-     * Constructs a <code>SecurityException</code> with no detail  message.
-     */
-    public SecurityException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>SecurityException</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public SecurityException(String s) {
-        super(s);
-    }
-
-    /**
-     * Creates a <code>SecurityException</code> with the specified
-     * detail message and cause.
-     *
-     * @param message the detail message (which is saved for later retrieval
-     *        by the {@link #getMessage()} method).
-     * @param cause the cause (which is saved for later retrieval by the
-     *        {@link #getCause()} method).  (A <tt>null</tt> value is permitted,
-     *        and indicates that the cause is nonexistent or unknown.)
-     * @since 1.5
-     */
-    public SecurityException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Creates a <code>SecurityException</code> with the specified cause
-     * and a detail message of <tt>(cause==null ? null : cause.toString())</tt>
-     * (which typically contains the class and detail message of
-     * <tt>cause</tt>).
-     *
-     * @param cause the cause (which is saved for later retrieval by the
-     *        {@link #getCause()} method).  (A <tt>null</tt> value is permitted,
-     *        and indicates that the cause is nonexistent or unknown.)
-     * @since 1.5
-     */
-    public SecurityException(Throwable cause) {
-        super(cause);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Short.java
--- a/emul/mini/src/main/java/java/lang/Short.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,468 +0,0 @@
-/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * The {@code Short} class wraps a value of primitive type {@code
- * short} in an object.  An object of type {@code Short} contains a
- * single field whose type is {@code short}.
- *
- * <p>In addition, this class provides several methods for converting
- * a {@code short} to a {@code String} and a {@code String} to a
- * {@code short}, as well as other constants and methods useful when
- * dealing with a {@code short}.
- *
- * @author  Nakul Saraiya
- * @author  Joseph D. Darcy
- * @see     java.lang.Number
- * @since   JDK1.1
- */
-public final class Short extends Number implements Comparable<Short> {
-
-    /**
-     * A constant holding the minimum value a {@code short} can
-     * have, -2<sup>15</sup>.
-     */
-    public static final short   MIN_VALUE = -32768;
-
-    /**
-     * A constant holding the maximum value a {@code short} can
-     * have, 2<sup>15</sup>-1.
-     */
-    public static final short   MAX_VALUE = 32767;
-
-    /**
-     * The {@code Class} instance representing the primitive type
-     * {@code short}.
-     */
-    public static final Class<Short>    TYPE = (Class<Short>) Class.getPrimitiveClass("short");
-
-    /**
-     * Returns a new {@code String} object representing the
-     * specified {@code short}. The radix is assumed to be 10.
-     *
-     * @param s the {@code short} to be converted
-     * @return the string representation of the specified {@code short}
-     * @see java.lang.Integer#toString(int)
-     */
-    public static String toString(short s) {
-        return Integer.toString((int)s, 10);
-    }
-
-    /**
-     * Parses the string argument as a signed {@code short} in the
-     * radix specified by the second argument. The characters in the
-     * string must all be digits, of the specified radix (as
-     * determined by whether {@link java.lang.Character#digit(char,
-     * int)} returns a nonnegative value) except that the first
-     * character may be an ASCII minus sign {@code '-'}
-     * (<code>'&#92;u002D'</code>) to indicate a negative value or an
-     * ASCII plus sign {@code '+'} (<code>'&#92;u002B'</code>) to
-     * indicate a positive value.  The resulting {@code short} value
-     * is returned.
-     *
-     * <p>An exception of type {@code NumberFormatException} is
-     * thrown if any of the following situations occurs:
-     * <ul>
-     * <li> The first argument is {@code null} or is a string of
-     * length zero.
-     *
-     * <li> The radix is either smaller than {@link
-     * java.lang.Character#MIN_RADIX} or larger than {@link
-     * java.lang.Character#MAX_RADIX}.
-     *
-     * <li> Any character of the string is not a digit of the
-     * specified radix, except that the first character may be a minus
-     * sign {@code '-'} (<code>'&#92;u002D'</code>) or plus sign
-     * {@code '+'} (<code>'&#92;u002B'</code>) provided that the
-     * string is longer than length 1.
-     *
-     * <li> The value represented by the string is not a value of type
-     * {@code short}.
-     * </ul>
-     *
-     * @param s         the {@code String} containing the
-     *                  {@code short} representation to be parsed
-     * @param radix     the radix to be used while parsing {@code s}
-     * @return          the {@code short} represented by the string
-     *                  argument in the specified radix.
-     * @throws          NumberFormatException If the {@code String}
-     *                  does not contain a parsable {@code short}.
-     */
-    public static short parseShort(String s, int radix)
-        throws NumberFormatException {
-        int i = Integer.parseInt(s, radix);
-        if (i < MIN_VALUE || i > MAX_VALUE)
-            throw new NumberFormatException(
-                "Value out of range. Value:\"" + s + "\" Radix:" + radix);
-        return (short)i;
-    }
-
-    /**
-     * Parses the string argument as a signed decimal {@code
-     * short}. The characters in the string must all be decimal
-     * digits, except that the first character may be an ASCII minus
-     * sign {@code '-'} (<code>'&#92;u002D'</code>) to indicate a
-     * negative value or an ASCII plus sign {@code '+'}
-     * (<code>'&#92;u002B'</code>) to indicate a positive value.  The
-     * resulting {@code short} value is returned, exactly as if the
-     * argument and the radix 10 were given as arguments to the {@link
-     * #parseShort(java.lang.String, int)} method.
-     *
-     * @param s a {@code String} containing the {@code short}
-     *          representation to be parsed
-     * @return  the {@code short} value represented by the
-     *          argument in decimal.
-     * @throws  NumberFormatException If the string does not
-     *          contain a parsable {@code short}.
-     */
-    public static short parseShort(String s) throws NumberFormatException {
-        return parseShort(s, 10);
-    }
-
-    /**
-     * Returns a {@code Short} object holding the value
-     * extracted from the specified {@code String} when parsed
-     * with the radix given by the second argument. The first argument
-     * is interpreted as representing a signed {@code short} in
-     * the radix specified by the second argument, exactly as if the
-     * argument were given to the {@link #parseShort(java.lang.String,
-     * int)} method. The result is a {@code Short} object that
-     * represents the {@code short} value specified by the string.
-     *
-     * <p>In other words, this method returns a {@code Short} object
-     * equal to the value of:
-     *
-     * <blockquote>
-     *  {@code new Short(Short.parseShort(s, radix))}
-     * </blockquote>
-     *
-     * @param s         the string to be parsed
-     * @param radix     the radix to be used in interpreting {@code s}
-     * @return          a {@code Short} object holding the value
-     *                  represented by the string argument in the
-     *                  specified radix.
-     * @throws          NumberFormatException If the {@code String} does
-     *                  not contain a parsable {@code short}.
-     */
-    public static Short valueOf(String s, int radix)
-        throws NumberFormatException {
-        return valueOf(parseShort(s, radix));
-    }
-
-    /**
-     * Returns a {@code Short} object holding the
-     * value given by the specified {@code String}. The argument
-     * is interpreted as representing a signed decimal
-     * {@code short}, exactly as if the argument were given to
-     * the {@link #parseShort(java.lang.String)} method. The result is
-     * a {@code Short} object that represents the
-     * {@code short} value specified by the string.
-     *
-     * <p>In other words, this method returns a {@code Short} object
-     * equal to the value of:
-     *
-     * <blockquote>
-     *  {@code new Short(Short.parseShort(s))}
-     * </blockquote>
-     *
-     * @param s the string to be parsed
-     * @return  a {@code Short} object holding the value
-     *          represented by the string argument
-     * @throws  NumberFormatException If the {@code String} does
-     *          not contain a parsable {@code short}.
-     */
-    public static Short valueOf(String s) throws NumberFormatException {
-        return valueOf(s, 10);
-    }
-
-    private static class ShortCache {
-        private ShortCache(){}
-
-        static final Short cache[] = new Short[-(-128) + 127 + 1];
-
-        static {
-            for(int i = 0; i < cache.length; i++)
-                cache[i] = new Short((short)(i - 128));
-        }
-    }
-
-    /**
-     * Returns a {@code Short} instance representing the specified
-     * {@code short} value.
-     * If a new {@code Short} instance is not required, this method
-     * should generally be used in preference to the constructor
-     * {@link #Short(short)}, as this method is likely to yield
-     * significantly better space and time performance by caching
-     * frequently requested values.
-     *
-     * This method will always cache values in the range -128 to 127,
-     * inclusive, and may cache other values outside of this range.
-     *
-     * @param  s a short value.
-     * @return a {@code Short} instance representing {@code s}.
-     * @since  1.5
-     */
-    public static Short valueOf(short s) {
-        final int offset = 128;
-        int sAsInt = s;
-        if (sAsInt >= -128 && sAsInt <= 127) { // must cache
-            return ShortCache.cache[sAsInt + offset];
-        }
-        return new Short(s);
-    }
-
-    /**
-     * Decodes a {@code String} into a {@code Short}.
-     * Accepts decimal, hexadecimal, and octal numbers given by
-     * the following grammar:
-     *
-     * <blockquote>
-     * <dl>
-     * <dt><i>DecodableString:</i>
-     * <dd><i>Sign<sub>opt</sub> DecimalNumeral</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0x} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i>
-     * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i>
-     * <p>
-     * <dt><i>Sign:</i>
-     * <dd>{@code -}
-     * <dd>{@code +}
-     * </dl>
-     * </blockquote>
-     *
-     * <i>DecimalNumeral</i>, <i>HexDigits</i>, and <i>OctalDigits</i>
-     * are as defined in section 3.10.1 of
-     * <cite>The Java&trade; Language Specification</cite>,
-     * except that underscores are not accepted between digits.
-     *
-     * <p>The sequence of characters following an optional
-     * sign and/or radix specifier ("{@code 0x}", "{@code 0X}",
-     * "{@code #}", or leading zero) is parsed as by the {@code
-     * Short.parseShort} method with the indicated radix (10, 16, or
-     * 8).  This sequence of characters must represent a positive
-     * value or a {@link NumberFormatException} will be thrown.  The
-     * result is negated if first character of the specified {@code
-     * String} is the minus sign.  No whitespace characters are
-     * permitted in the {@code String}.
-     *
-     * @param     nm the {@code String} to decode.
-     * @return    a {@code Short} object holding the {@code short}
-     *            value represented by {@code nm}
-     * @throws    NumberFormatException  if the {@code String} does not
-     *            contain a parsable {@code short}.
-     * @see java.lang.Short#parseShort(java.lang.String, int)
-     */
-    public static Short decode(String nm) throws NumberFormatException {
-        int i = Integer.decode(nm);
-        if (i < MIN_VALUE || i > MAX_VALUE)
-            throw new NumberFormatException(
-                    "Value " + i + " out of range from input " + nm);
-        return valueOf((short)i);
-    }
-
-    /**
-     * The value of the {@code Short}.
-     *
-     * @serial
-     */
-    private final short value;
-
-    /**
-     * Constructs a newly allocated {@code Short} object that
-     * represents the specified {@code short} value.
-     *
-     * @param value     the value to be represented by the
-     *                  {@code Short}.
-     */
-    public Short(short value) {
-        this.value = value;
-    }
-
-    /**
-     * Constructs a newly allocated {@code Short} object that
-     * represents the {@code short} value indicated by the
-     * {@code String} parameter. The string is converted to a
-     * {@code short} value in exactly the manner used by the
-     * {@code parseShort} method for radix 10.
-     *
-     * @param s the {@code String} to be converted to a
-     *          {@code Short}
-     * @throws  NumberFormatException If the {@code String}
-     *          does not contain a parsable {@code short}.
-     * @see     java.lang.Short#parseShort(java.lang.String, int)
-     */
-    public Short(String s) throws NumberFormatException {
-        this.value = parseShort(s, 10);
-    }
-
-    /**
-     * Returns the value of this {@code Short} as a
-     * {@code byte}.
-     */
-    public byte byteValue() {
-        return (byte)value;
-    }
-
-    /**
-     * Returns the value of this {@code Short} as a
-     * {@code short}.
-     */
-    public short shortValue() {
-        return value;
-    }
-
-    /**
-     * Returns the value of this {@code Short} as an
-     * {@code int}.
-     */
-    public int intValue() {
-        return (int)value;
-    }
-
-    /**
-     * Returns the value of this {@code Short} as a
-     * {@code long}.
-     */
-    public long longValue() {
-        return (long)value;
-    }
-
-    /**
-     * Returns the value of this {@code Short} as a
-     * {@code float}.
-     */
-    public float floatValue() {
-        return (float)value;
-    }
-
-    /**
-     * Returns the value of this {@code Short} as a
-     * {@code double}.
-     */
-    public double doubleValue() {
-        return (double)value;
-    }
-
-    /**
-     * Returns a {@code String} object representing this
-     * {@code Short}'s value.  The value is converted to signed
-     * decimal representation and returned as a string, exactly as if
-     * the {@code short} value were given as an argument to the
-     * {@link java.lang.Short#toString(short)} method.
-     *
-     * @return  a string representation of the value of this object in
-     *          base&nbsp;10.
-     */
-    public String toString() {
-        return Integer.toString((int)value);
-    }
-
-    /**
-     * Returns a hash code for this {@code Short}; equal to the result
-     * of invoking {@code intValue()}.
-     *
-     * @return a hash code value for this {@code Short}
-     */
-    public int hashCode() {
-        return (int)value;
-    }
-
-    /**
-     * Compares this object to the specified object.  The result is
-     * {@code true} if and only if the argument is not
-     * {@code null} and is a {@code Short} object that
-     * contains the same {@code short} value as this object.
-     *
-     * @param obj       the object to compare with
-     * @return          {@code true} if the objects are the same;
-     *                  {@code false} otherwise.
-     */
-    public boolean equals(Object obj) {
-        if (obj instanceof Short) {
-            return value == ((Short)obj).shortValue();
-        }
-        return false;
-    }
-
-    /**
-     * Compares two {@code Short} objects numerically.
-     *
-     * @param   anotherShort   the {@code Short} to be compared.
-     * @return  the value {@code 0} if this {@code Short} is
-     *          equal to the argument {@code Short}; a value less than
-     *          {@code 0} if this {@code Short} is numerically less
-     *          than the argument {@code Short}; and a value greater than
-     *           {@code 0} if this {@code Short} is numerically
-     *           greater than the argument {@code Short} (signed
-     *           comparison).
-     * @since   1.2
-     */
-    public int compareTo(Short anotherShort) {
-        return compare(this.value, anotherShort.value);
-    }
-
-    /**
-     * Compares two {@code short} values numerically.
-     * The value returned is identical to what would be returned by:
-     * <pre>
-     *    Short.valueOf(x).compareTo(Short.valueOf(y))
-     * </pre>
-     *
-     * @param  x the first {@code short} to compare
-     * @param  y the second {@code short} to compare
-     * @return the value {@code 0} if {@code x == y};
-     *         a value less than {@code 0} if {@code x < y}; and
-     *         a value greater than {@code 0} if {@code x > y}
-     * @since 1.7
-     */
-    public static int compare(short x, short y) {
-        return x - y;
-    }
-
-    /**
-     * The number of bits used to represent a {@code short} value in two's
-     * complement binary form.
-     * @since 1.5
-     */
-    public static final int SIZE = 16;
-
-    /**
-     * Returns the value obtained by reversing the order of the bytes in the
-     * two's complement representation of the specified {@code short} value.
-     *
-     * @return the value obtained by reversing (or, equivalently, swapping)
-     *     the bytes in the specified {@code short} value.
-     * @since 1.5
-     */
-    public static short reverseBytes(short i) {
-        return (short) (((i & 0xFF00) >> 8) | (i << 8));
-    }
-
-    /** use serialVersionUID from JDK 1.1. for interoperability */
-    private static final long serialVersionUID = 7515723908773894738L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/StackTraceElement.java
--- a/emul/mini/src/main/java/java/lang/StackTraceElement.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * An element in a stack trace, as returned by {@link
- * Throwable#getStackTrace()}.  Each element represents a single stack frame.
- * All stack frames except for the one at the top of the stack represent
- * a method invocation.  The frame at the top of the stack represents the
- * execution point at which the stack trace was generated.  Typically,
- * this is the point at which the throwable corresponding to the stack trace
- * was created.
- *
- * @since  1.4
- * @author Josh Bloch
- */
-public final class StackTraceElement implements java.io.Serializable {
-    // Normally initialized by VM (public constructor added in 1.5)
-    private String declaringClass;
-    private String methodName;
-    private String fileName;
-    private int    lineNumber;
-
-    /**
-     * Creates a stack trace element representing the specified execution
-     * point.
-     *
-     * @param declaringClass the fully qualified name of the class containing
-     *        the execution point represented by the stack trace element
-     * @param methodName the name of the method containing the execution point
-     *        represented by the stack trace element
-     * @param fileName the name of the file containing the execution point
-     *         represented by the stack trace element, or {@code null} if
-     *         this information is unavailable
-     * @param lineNumber the line number of the source line containing the
-     *         execution point represented by this stack trace element, or
-     *         a negative number if this information is unavailable. A value
-     *         of -2 indicates that the method containing the execution point
-     *         is a native method
-     * @throws NullPointerException if {@code declaringClass} or
-     *         {@code methodName} is null
-     * @since 1.5
-     */
-    public StackTraceElement(String declaringClass, String methodName,
-                             String fileName, int lineNumber) {
-        this.declaringClass = declaringClass;
-        this.methodName     = methodName;
-        this.fileName       = fileName;
-        this.lineNumber     = lineNumber;
-    }
-
-    /**
-     * Returns the name of the source file containing the execution point
-     * represented by this stack trace element.  Generally, this corresponds
-     * to the {@code SourceFile} attribute of the relevant {@code class}
-     * file (as per <i>The Java Virtual Machine Specification</i>, Section
-     * 4.7.7).  In some systems, the name may refer to some source code unit
-     * other than a file, such as an entry in source repository.
-     *
-     * @return the name of the file containing the execution point
-     *         represented by this stack trace element, or {@code null} if
-     *         this information is unavailable.
-     */
-    public String getFileName() {
-        return fileName;
-    }
-
-    /**
-     * Returns the line number of the source line containing the execution
-     * point represented by this stack trace element.  Generally, this is
-     * derived from the {@code LineNumberTable} attribute of the relevant
-     * {@code class} file (as per <i>The Java Virtual Machine
-     * Specification</i>, Section 4.7.8).
-     *
-     * @return the line number of the source line containing the execution
-     *         point represented by this stack trace element, or a negative
-     *         number if this information is unavailable.
-     */
-    public int getLineNumber() {
-        return lineNumber;
-    }
-
-    /**
-     * Returns the fully qualified name of the class containing the
-     * execution point represented by this stack trace element.
-     *
-     * @return the fully qualified name of the {@code Class} containing
-     *         the execution point represented by this stack trace element.
-     */
-    public String getClassName() {
-        return declaringClass;
-    }
-
-    /**
-     * Returns the name of the method containing the execution point
-     * represented by this stack trace element.  If the execution point is
-     * contained in an instance or class initializer, this method will return
-     * the appropriate <i>special method name</i>, {@code <init>} or
-     * {@code <clinit>}, as per Section 3.9 of <i>The Java Virtual
-     * Machine Specification</i>.
-     *
-     * @return the name of the method containing the execution point
-     *         represented by this stack trace element.
-     */
-    public String getMethodName() {
-        return methodName;
-    }
-
-    /**
-     * Returns true if the method containing the execution point
-     * represented by this stack trace element is a native method.
-     *
-     * @return {@code true} if the method containing the execution point
-     *         represented by this stack trace element is a native method.
-     */
-    public boolean isNativeMethod() {
-        return lineNumber == -2;
-    }
-
-    /**
-     * Returns a string representation of this stack trace element.  The
-     * format of this string depends on the implementation, but the following
-     * examples may be regarded as typical:
-     * <ul>
-     * <li>
-     *   {@code "MyClass.mash(MyClass.java:9)"} - Here, {@code "MyClass"}
-     *   is the <i>fully-qualified name</i> of the class containing the
-     *   execution point represented by this stack trace element,
-     *   {@code "mash"} is the name of the method containing the execution
-     *   point, {@code "MyClass.java"} is the source file containing the
-     *   execution point, and {@code "9"} is the line number of the source
-     *   line containing the execution point.
-     * <li>
-     *   {@code "MyClass.mash(MyClass.java)"} - As above, but the line
-     *   number is unavailable.
-     * <li>
-     *   {@code "MyClass.mash(Unknown Source)"} - As above, but neither
-     *   the file name nor the line  number are available.
-     * <li>
-     *   {@code "MyClass.mash(Native Method)"} - As above, but neither
-     *   the file name nor the line  number are available, and the method
-     *   containing the execution point is known to be a native method.
-     * </ul>
-     * @see    Throwable#printStackTrace()
-     */
-    public String toString() {
-        return getClassName() + "." + methodName +
-            (isNativeMethod() ? "(Native Method)" :
-             (fileName != null && lineNumber >= 0 ?
-              "(" + fileName + ":" + lineNumber + ")" :
-              (fileName != null ?  "("+fileName+")" : "(Unknown Source)")));
-    }
-
-    /**
-     * Returns true if the specified object is another
-     * {@code StackTraceElement} instance representing the same execution
-     * point as this instance.  Two stack trace elements {@code a} and
-     * {@code b} are equal if and only if:
-     * <pre>
-     *     equals(a.getFileName(), b.getFileName()) &&
-     *     a.getLineNumber() == b.getLineNumber()) &&
-     *     equals(a.getClassName(), b.getClassName()) &&
-     *     equals(a.getMethodName(), b.getMethodName())
-     * </pre>
-     * where {@code equals} has the semantics of {@link
-     * java.util.Objects#equals(Object, Object) Objects.equals}.
-     *
-     * @param  obj the object to be compared with this stack trace element.
-     * @return true if the specified object is another
-     *         {@code StackTraceElement} instance representing the same
-     *         execution point as this instance.
-     */
-    public boolean equals(Object obj) {
-        if (obj==this)
-            return true;
-        if (!(obj instanceof StackTraceElement))
-            return false;
-        StackTraceElement e = (StackTraceElement)obj;
-        return e.declaringClass.equals(declaringClass) &&
-            e.lineNumber == lineNumber &&
-            equals(methodName, e.methodName) &&
-            equals(fileName, e.fileName);
-    }
-
-    /**
-     * Returns a hash code value for this stack trace element.
-     */
-    public int hashCode() {
-        int result = 31*declaringClass.hashCode() + methodName.hashCode();
-        result = 31*result + (fileName == null ? 0 : fileName.hashCode());
-        result = 31*result + lineNumber;
-        return result;
-    }
-    
-    private static boolean equals(Object a, Object b) {
-        return (a == b) || (a != null && a.equals(b));
-    }
-
-    private static final long serialVersionUID = 6992337162326171013L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/String.java
--- a/emul/mini/src/main/java/java/lang/String.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3079 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Comparator;
-import org.apidesign.bck2brwsr.core.ExtraJavaScript;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.core.JavaScriptOnly;
-import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * The <code>String</code> class represents character strings. All
- * string literals in Java programs, such as <code>"abc"</code>, are
- * implemented as instances of this class.
- * <p>
- * Strings are constant; their values cannot be changed after they
- * are created. String buffers support mutable strings.
- * Because String objects are immutable they can be shared. For example:
- * <p><blockquote><pre>
- *     String str = "abc";
- * </pre></blockquote><p>
- * is equivalent to:
- * <p><blockquote><pre>
- *     char data[] = {'a', 'b', 'c'};
- *     String str = new String(data);
- * </pre></blockquote><p>
- * Here are some more examples of how strings can be used:
- * <p><blockquote><pre>
- *     System.out.println("abc");
- *     String cde = "cde";
- *     System.out.println("abc" + cde);
- *     String c = "abc".substring(2,3);
- *     String d = cde.substring(1, 2);
- * </pre></blockquote>
- * <p>
- * The class <code>String</code> includes methods for examining
- * individual characters of the sequence, for comparing strings, for
- * searching strings, for extracting substrings, and for creating a
- * copy of a string with all characters translated to uppercase or to
- * lowercase. Case mapping is based on the Unicode Standard version
- * specified by the {@link java.lang.Character Character} class.
- * <p>
- * The Java language provides special support for the string
- * concatenation operator (&nbsp;+&nbsp;), and for conversion of
- * other objects to strings. String concatenation is implemented
- * through the <code>StringBuilder</code>(or <code>StringBuffer</code>)
- * class and its <code>append</code> method.
- * String conversions are implemented through the method
- * <code>toString</code>, defined by <code>Object</code> and
- * inherited by all classes in Java. For additional information on
- * string concatenation and conversion, see Gosling, Joy, and Steele,
- * <i>The Java Language Specification</i>.
- *
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a constructor
- * or method in this class will cause a {@link NullPointerException} to be
- * thrown.
- *
- * <p>A <code>String</code> represents a string in the UTF-16 format
- * in which <em>supplementary characters</em> are represented by <em>surrogate
- * pairs</em> (see the section <a href="Character.html#unicode">Unicode
- * Character Representations</a> in the <code>Character</code> class for
- * more information).
- * Index values refer to <code>char</code> code units, so a supplementary
- * character uses two positions in a <code>String</code>.
- * <p>The <code>String</code> class provides methods for dealing with
- * Unicode code points (i.e., characters), in addition to those for
- * dealing with Unicode code units (i.e., <code>char</code> values).
- *
- * @author  Lee Boynton
- * @author  Arthur van Hoff
- * @author  Martin Buchholz
- * @author  Ulf Zibis
- * @see     java.lang.Object#toString()
- * @see     java.lang.StringBuffer
- * @see     java.lang.StringBuilder
- * @see     java.nio.charset.Charset
- * @since   JDK1.0
- */
-
-@ExtraJavaScript(
-    resource="/org/apidesign/vm4brwsr/emul/lang/java_lang_String.js",
-    processByteCode=true
-)
-@JavaScriptPrototype(container = "String.prototype", prototype = "new String")
-public final class String
-    implements java.io.Serializable, Comparable<String>, CharSequence
-{
-    /** real string to delegate to */
-    private Object r;
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = -6849794470754667710L;
-    
-    @JavaScriptOnly(name="toString", value="String.prototype._r")
-    private static void jsToString() {
-    }
-    
-    @JavaScriptOnly(name="valueOf", value="function() { return this.toString().valueOf(); }")
-    private static void jsValudOf() {
-    }
-
-    /**
-     * Class String is special cased within the Serialization Stream Protocol.
-     *
-     * A String instance is written initially into an ObjectOutputStream in the
-     * following format:
-     * <pre>
-     *      <code>TC_STRING</code> (utf String)
-     * </pre>
-     * The String is written by method <code>DataOutput.writeUTF</code>.
-     * A new handle is generated to  refer to all future references to the
-     * string instance within the stream.
-     */
-//    private static final ObjectStreamField[] serialPersistentFields =
-//        new ObjectStreamField[0];
-
-    /**
-     * Initializes a newly created {@code String} object so that it represents
-     * an empty character sequence.  Note that use of this constructor is
-     * unnecessary since Strings are immutable.
-     */
-    public String() {
-        this.r = "";
-    }
-
-    /**
-     * Initializes a newly created {@code String} object so that it represents
-     * the same sequence of characters as the argument; in other words, the
-     * newly created string is a copy of the argument string. Unless an
-     * explicit copy of {@code original} is needed, use of this constructor is
-     * unnecessary since Strings are immutable.
-     *
-     * @param  original
-     *         A {@code String}
-     */
-    public String(String original) {
-        this.r = original.toString();
-    }
-
-    /**
-     * Allocates a new {@code String} so that it represents the sequence of
-     * characters currently contained in the character array argument. The
-     * contents of the character array are copied; subsequent modification of
-     * the character array does not affect the newly created string.
-     *
-     * @param  value
-     *         The initial value of the string
-     */
-    @JavaScriptBody(args = { "charArr" }, body=
-        "for (var i = 0; i < charArr.length; i++) {\n"
-      + "  if (typeof charArr[i] === 'number') charArr[i] = String.fromCharCode(charArr[i]);\n"
-      + "}\n"
-      + "this._r(charArr.join(''));\n"
-    )
-    public String(char value[]) {
-    }
-
-    /**
-     * Allocates a new {@code String} that contains characters from a subarray
-     * of the character array argument. The {@code offset} argument is the
-     * index of the first character of the subarray and the {@code count}
-     * argument specifies the length of the subarray. The contents of the
-     * subarray are copied; subsequent modification of the character array does
-     * not affect the newly created string.
-     *
-     * @param  value
-     *         Array that is the source of characters
-     *
-     * @param  offset
-     *         The initial offset
-     *
-     * @param  count
-     *         The length
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and {@code count} arguments index
-     *          characters outside the bounds of the {@code value} array
-     */
-    public String(char value[], int offset, int count) {
-        initFromCharArray(value, offset, count);
-    }
-    
-    @JavaScriptBody(args = { "charArr", "off", "cnt" }, body =
-        "var up = off + cnt;\n" +
-        "for (var i = off; i < up; i++) {\n" +
-        "  if (typeof charArr[i] === 'number') charArr[i] = String.fromCharCode(charArr[i]);\n" +
-        "}\n" +
-        "this._r(charArr.slice(off, up).join(\"\"));\n"
-    )
-    private native void initFromCharArray(char value[], int offset, int count);
-
-    /**
-     * Allocates a new {@code String} that contains characters from a subarray
-     * of the <a href="Character.html#unicode">Unicode code point</a> array
-     * argument.  The {@code offset} argument is the index of the first code
-     * point of the subarray and the {@code count} argument specifies the
-     * length of the subarray.  The contents of the subarray are converted to
-     * {@code char}s; subsequent modification of the {@code int} array does not
-     * affect the newly created string.
-     *
-     * @param  codePoints
-     *         Array that is the source of Unicode code points
-     *
-     * @param  offset
-     *         The initial offset
-     *
-     * @param  count
-     *         The length
-     *
-     * @throws  IllegalArgumentException
-     *          If any invalid Unicode code point is found in {@code
-     *          codePoints}
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and {@code count} arguments index
-     *          characters outside the bounds of the {@code codePoints} array
-     *
-     * @since  1.5
-     */
-    public String(int[] codePoints, int offset, int count) {
-        if (offset < 0) {
-            throw new StringIndexOutOfBoundsException(offset);
-        }
-        if (count < 0) {
-            throw new StringIndexOutOfBoundsException(count);
-        }
-        // Note: offset or count might be near -1>>>1.
-        if (offset > codePoints.length - count) {
-            throw new StringIndexOutOfBoundsException(offset + count);
-        }
-
-        final int end = offset + count;
-
-        // Pass 1: Compute precise size of char[]
-        int n = count;
-        for (int i = offset; i < end; i++) {
-            int c = codePoints[i];
-            if (Character.isBmpCodePoint(c))
-                continue;
-            else if (Character.isValidCodePoint(c))
-                n++;
-            else throw new IllegalArgumentException(Integer.toString(c));
-        }
-
-        // Pass 2: Allocate and fill in char[]
-        final char[] v = new char[n];
-
-        for (int i = offset, j = 0; i < end; i++, j++) {
-            int c = codePoints[i];
-            if (Character.isBmpCodePoint(c))
-                v[j] = (char) c;
-            else
-                Character.toSurrogates(c, v, j++);
-        }
-
-        this.r = new String(v, 0, n);
-    }
-
-    /**
-     * Allocates a new {@code String} constructed from a subarray of an array
-     * of 8-bit integer values.
-     *
-     * <p> The {@code offset} argument is the index of the first byte of the
-     * subarray, and the {@code count} argument specifies the length of the
-     * subarray.
-     *
-     * <p> Each {@code byte} in the subarray is converted to a {@code char} as
-     * specified in the method above.
-     *
-     * @deprecated This method does not properly convert bytes into characters.
-     * As of JDK&nbsp;1.1, the preferred way to do this is via the
-     * {@code String} constructors that take a {@link
-     * java.nio.charset.Charset}, charset name, or that use the platform's
-     * default charset.
-     *
-     * @param  ascii
-     *         The bytes to be converted to characters
-     *
-     * @param  hibyte
-     *         The top 8 bits of each 16-bit Unicode code unit
-     *
-     * @param  offset
-     *         The initial offset
-     * @param  count
-     *         The length
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} or {@code count} argument is invalid
-     *
-     * @see  #String(byte[], int)
-     * @see  #String(byte[], int, int, java.lang.String)
-     * @see  #String(byte[], int, int, java.nio.charset.Charset)
-     * @see  #String(byte[], int, int)
-     * @see  #String(byte[], java.lang.String)
-     * @see  #String(byte[], java.nio.charset.Charset)
-     * @see  #String(byte[])
-     */
-    @Deprecated
-    public String(byte ascii[], int hibyte, int offset, int count) {
-        checkBounds(ascii, offset, count);
-        char value[] = new char[count];
-
-        if (hibyte == 0) {
-            for (int i = count ; i-- > 0 ;) {
-                value[i] = (char) (ascii[i + offset] & 0xff);
-            }
-        } else {
-            hibyte <<= 8;
-            for (int i = count ; i-- > 0 ;) {
-                value[i] = (char) (hibyte | (ascii[i + offset] & 0xff));
-            }
-        }
-        initFromCharArray(value, offset, count);
-    }
-
-    /**
-     * Allocates a new {@code String} containing characters constructed from
-     * an array of 8-bit integer values. Each character <i>c</i>in the
-     * resulting string is constructed from the corresponding component
-     * <i>b</i> in the byte array such that:
-     *
-     * <blockquote><pre>
-     *     <b><i>c</i></b> == (char)(((hibyte &amp; 0xff) &lt;&lt; 8)
-     *                         | (<b><i>b</i></b> &amp; 0xff))
-     * </pre></blockquote>
-     *
-     * @deprecated  This method does not properly convert bytes into
-     * characters.  As of JDK&nbsp;1.1, the preferred way to do this is via the
-     * {@code String} constructors that take a {@link
-     * java.nio.charset.Charset}, charset name, or that use the platform's
-     * default charset.
-     *
-     * @param  ascii
-     *         The bytes to be converted to characters
-     *
-     * @param  hibyte
-     *         The top 8 bits of each 16-bit Unicode code unit
-     *
-     * @see  #String(byte[], int, int, java.lang.String)
-     * @see  #String(byte[], int, int, java.nio.charset.Charset)
-     * @see  #String(byte[], int, int)
-     * @see  #String(byte[], java.lang.String)
-     * @see  #String(byte[], java.nio.charset.Charset)
-     * @see  #String(byte[])
-     */
-    @Deprecated
-    public String(byte ascii[], int hibyte) {
-        this(ascii, hibyte, 0, ascii.length);
-    }
-
-    /* Common private utility method used to bounds check the byte array
-     * and requested offset & length values used by the String(byte[],..)
-     * constructors.
-     */
-    private static void checkBounds(byte[] bytes, int offset, int length) {
-        if (length < 0)
-            throw new StringIndexOutOfBoundsException(length);
-        if (offset < 0)
-            throw new StringIndexOutOfBoundsException(offset);
-        if (offset > bytes.length - length)
-            throw new StringIndexOutOfBoundsException(offset + length);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified subarray of
-     * bytes using the specified charset.  The length of the new {@code String}
-     * is a function of the charset, and hence may not be equal to the length
-     * of the subarray.
-     *
-     * <p> The behavior of this constructor when the given bytes are not valid
-     * in the given charset is unspecified.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  offset
-     *         The index of the first byte to decode
-     *
-     * @param  length
-     *         The number of bytes to decode
-
-     * @param  charsetName
-     *         The name of a supported {@linkplain java.nio.charset.Charset
-     *         charset}
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named charset is not supported
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and {@code length} arguments index
-     *          characters outside the bounds of the {@code bytes} array
-     *
-     * @since  JDK1.1
-     */
-    public String(byte bytes[], int offset, int length, String charsetName)
-        throws UnsupportedEncodingException
-    {
-        this(checkUTF8(bytes, charsetName), offset, length);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified subarray of
-     * bytes using the specified {@linkplain java.nio.charset.Charset charset}.
-     * The length of the new {@code String} is a function of the charset, and
-     * hence may not be equal to the length of the subarray.
-     *
-     * <p> This method always replaces malformed-input and unmappable-character
-     * sequences with this charset's default replacement string.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  offset
-     *         The index of the first byte to decode
-     *
-     * @param  length
-     *         The number of bytes to decode
-     *
-     * @param  charset
-     *         The {@linkplain java.nio.charset.Charset charset} to be used to
-     *         decode the {@code bytes}
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and {@code length} arguments index
-     *          characters outside the bounds of the {@code bytes} array
-     *
-     * @since  1.6
-     */
-    /* don't want dependnecy on Charset
-    public String(byte bytes[], int offset, int length, Charset charset) {
-        if (charset == null)
-            throw new NullPointerException("charset");
-        checkBounds(bytes, offset, length);
-        char[] v = StringCoding.decode(charset, bytes, offset, length);
-        this.offset = 0;
-        this.count = v.length;
-        this.value = v;
-    }
-    */
-
-    /**
-     * Constructs a new {@code String} by decoding the specified array of bytes
-     * using the specified {@linkplain java.nio.charset.Charset charset}.  The
-     * length of the new {@code String} is a function of the charset, and hence
-     * may not be equal to the length of the byte array.
-     *
-     * <p> The behavior of this constructor when the given bytes are not valid
-     * in the given charset is unspecified.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  charsetName
-     *         The name of a supported {@linkplain java.nio.charset.Charset
-     *         charset}
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named charset is not supported
-     *
-     * @since  JDK1.1
-     */
-    public String(byte bytes[], String charsetName)
-        throws UnsupportedEncodingException
-    {
-        this(bytes, 0, bytes.length, charsetName);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified array of
-     * bytes using the specified {@linkplain java.nio.charset.Charset charset}.
-     * The length of the new {@code String} is a function of the charset, and
-     * hence may not be equal to the length of the byte array.
-     *
-     * <p> This method always replaces malformed-input and unmappable-character
-     * sequences with this charset's default replacement string.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  charset
-     *         The {@linkplain java.nio.charset.Charset charset} to be used to
-     *         decode the {@code bytes}
-     *
-     * @since  1.6
-     */
-    /* don't want dep on Charset
-    public String(byte bytes[], Charset charset) {
-        this(bytes, 0, bytes.length, charset);
-    }
-    */
-
-    /**
-     * Constructs a new {@code String} by decoding the specified subarray of
-     * bytes using the platform's default charset.  The length of the new
-     * {@code String} is a function of the charset, and hence may not be equal
-     * to the length of the subarray.
-     *
-     * <p> The behavior of this constructor when the given bytes are not valid
-     * in the default charset is unspecified.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  offset
-     *         The index of the first byte to decode
-     *
-     * @param  length
-     *         The number of bytes to decode
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and the {@code length} arguments index
-     *          characters outside the bounds of the {@code bytes} array
-     *
-     * @since  JDK1.1
-     */
-    public String(byte bytes[], int offset, int length) {
-        checkBounds(bytes, offset, length);
-        char[] v  = new char[length];
-        int[] at = { offset };
-        int end = offset + length;
-        int chlen = 0;
-        while (at[0] < end) {
-            int ch = nextChar(bytes, at);
-            v[chlen++] = (char)ch;
-        }
-        initFromCharArray(v, 0, chlen);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified array of bytes
-     * using the platform's default charset.  The length of the new {@code
-     * String} is a function of the charset, and hence may not be equal to the
-     * length of the byte array.
-     *
-     * <p> The behavior of this constructor when the given bytes are not valid
-     * in the default charset is unspecified.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @since  JDK1.1
-     */
-    public String(byte bytes[]) {
-        this(bytes, 0, bytes.length);
-    }
-
-    /**
-     * Allocates a new string that contains the sequence of characters
-     * currently contained in the string buffer argument. The contents of the
-     * string buffer are copied; subsequent modification of the string buffer
-     * does not affect the newly created string.
-     *
-     * @param  buffer
-     *         A {@code StringBuffer}
-     */
-    public String(StringBuffer buffer) {
-        this.r = buffer.toString();
-    }
-
-    /**
-     * Allocates a new string that contains the sequence of characters
-     * currently contained in the string builder argument. The contents of the
-     * string builder are copied; subsequent modification of the string builder
-     * does not affect the newly created string.
-     *
-     * <p> This constructor is provided to ease migration to {@code
-     * StringBuilder}. Obtaining a string from a string builder via the {@code
-     * toString} method is likely to run faster and is generally preferred.
-     *
-     * @param   builder
-     *          A {@code StringBuilder}
-     *
-     * @since  1.5
-     */
-    public String(StringBuilder builder) {
-        this.r = builder.toString();
-    }
-
-    /**
-     * Returns the length of this string.
-     * The length is equal to the number of <a href="Character.html#unicode">Unicode
-     * code units</a> in the string.
-     *
-     * @return  the length of the sequence of characters represented by this
-     *          object.
-     */
-    @JavaScriptBody(args = {}, body = "return this.toString().length;")
-    public int length() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns <tt>true</tt> if, and only if, {@link #length()} is <tt>0</tt>.
-     *
-     * @return <tt>true</tt> if {@link #length()} is <tt>0</tt>, otherwise
-     * <tt>false</tt>
-     *
-     * @since 1.6
-     */
-    @JavaScriptBody(args = {}, body="return this.toString().length === 0;")
-    public boolean isEmpty() {
-        return length() == 0;
-    }
-
-    /**
-     * Returns the <code>char</code> value at the
-     * specified index. An index ranges from <code>0</code> to
-     * <code>length() - 1</code>. The first <code>char</code> value of the sequence
-     * is at index <code>0</code>, the next at index <code>1</code>,
-     * and so on, as for array indexing.
-     *
-     * <p>If the <code>char</code> value specified by the index is a
-     * <a href="Character.html#unicode">surrogate</a>, the surrogate
-     * value is returned.
-     *
-     * @param      index   the index of the <code>char</code> value.
-     * @return     the <code>char</code> value at the specified index of this string.
-     *             The first <code>char</code> value is at index <code>0</code>.
-     * @exception  IndexOutOfBoundsException  if the <code>index</code>
-     *             argument is negative or not less than the length of this
-     *             string.
-     */
-    @JavaScriptBody(args = { "index" }, 
-        body = "return this.toString().charCodeAt(index);"
-    )
-    public char charAt(int index) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the character (Unicode code point) at the specified
-     * index. The index refers to <code>char</code> values
-     * (Unicode code units) and ranges from <code>0</code> to
-     * {@link #length()}<code> - 1</code>.
-     *
-     * <p> If the <code>char</code> value specified at the given index
-     * is in the high-surrogate range, the following index is less
-     * than the length of this <code>String</code>, and the
-     * <code>char</code> value at the following index is in the
-     * low-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the <code>char</code> value at the given index is returned.
-     *
-     * @param      index the index to the <code>char</code> values
-     * @return     the code point value of the character at the
-     *             <code>index</code>
-     * @exception  IndexOutOfBoundsException  if the <code>index</code>
-     *             argument is negative or not less than the length of this
-     *             string.
-     * @since      1.5
-     */
-    public int codePointAt(int index) {
-        if ((index < 0) || (index >= length())) {
-            throw new StringIndexOutOfBoundsException(index);
-        }
-        return Character.codePointAtImpl(toCharArray(), offset() + index, offset() + length());
-    }
-
-    /**
-     * Returns the character (Unicode code point) before the specified
-     * index. The index refers to <code>char</code> values
-     * (Unicode code units) and ranges from <code>1</code> to {@link
-     * CharSequence#length() length}.
-     *
-     * <p> If the <code>char</code> value at <code>(index - 1)</code>
-     * is in the low-surrogate range, <code>(index - 2)</code> is not
-     * negative, and the <code>char</code> value at <code>(index -
-     * 2)</code> is in the high-surrogate range, then the
-     * supplementary code point value of the surrogate pair is
-     * returned. If the <code>char</code> value at <code>index -
-     * 1</code> is an unpaired low-surrogate or a high-surrogate, the
-     * surrogate value is returned.
-     *
-     * @param     index the index following the code point that should be returned
-     * @return    the Unicode code point value before the given index.
-     * @exception IndexOutOfBoundsException if the <code>index</code>
-     *            argument is less than 1 or greater than the length
-     *            of this string.
-     * @since     1.5
-     */
-    public int codePointBefore(int index) {
-        int i = index - 1;
-        if ((i < 0) || (i >= length())) {
-            throw new StringIndexOutOfBoundsException(index);
-        }
-        return Character.codePointBeforeImpl(toCharArray(), offset() + index, offset());
-    }
-
-    /**
-     * Returns the number of Unicode code points in the specified text
-     * range of this <code>String</code>. The text range begins at the
-     * specified <code>beginIndex</code> and extends to the
-     * <code>char</code> at index <code>endIndex - 1</code>. Thus the
-     * length (in <code>char</code>s) of the text range is
-     * <code>endIndex-beginIndex</code>. Unpaired surrogates within
-     * the text range count as one code point each.
-     *
-     * @param beginIndex the index to the first <code>char</code> of
-     * the text range.
-     * @param endIndex the index after the last <code>char</code> of
-     * the text range.
-     * @return the number of Unicode code points in the specified text
-     * range
-     * @exception IndexOutOfBoundsException if the
-     * <code>beginIndex</code> is negative, or <code>endIndex</code>
-     * is larger than the length of this <code>String</code>, or
-     * <code>beginIndex</code> is larger than <code>endIndex</code>.
-     * @since  1.5
-     */
-    public int codePointCount(int beginIndex, int endIndex) {
-        if (beginIndex < 0 || endIndex > length() || beginIndex > endIndex) {
-            throw new IndexOutOfBoundsException();
-        }
-        return Character.codePointCountImpl(toCharArray(), offset()+beginIndex, endIndex-beginIndex);
-    }
-
-    /**
-     * Returns the index within this <code>String</code> that is
-     * offset from the given <code>index</code> by
-     * <code>codePointOffset</code> code points. Unpaired surrogates
-     * within the text range given by <code>index</code> and
-     * <code>codePointOffset</code> count as one code point each.
-     *
-     * @param index the index to be offset
-     * @param codePointOffset the offset in code points
-     * @return the index within this <code>String</code>
-     * @exception IndexOutOfBoundsException if <code>index</code>
-     *   is negative or larger then the length of this
-     *   <code>String</code>, or if <code>codePointOffset</code> is positive
-     *   and the substring starting with <code>index</code> has fewer
-     *   than <code>codePointOffset</code> code points,
-     *   or if <code>codePointOffset</code> is negative and the substring
-     *   before <code>index</code> has fewer than the absolute value
-     *   of <code>codePointOffset</code> code points.
-     * @since 1.5
-     */
-    public int offsetByCodePoints(int index, int codePointOffset) {
-        if (index < 0 || index > length()) {
-            throw new IndexOutOfBoundsException();
-        }
-        return Character.offsetByCodePointsImpl(toCharArray(), offset(), length(),
-                                                offset()+index, codePointOffset) - offset();
-    }
-
-    /**
-     * Copy characters from this string into dst starting at dstBegin.
-     * This method doesn't perform any range checking.
-     */
-    @JavaScriptBody(args = { "arr", "to" }, body = 
-        "var s = this.toString();\n" +
-        "for (var i = 0; i < s.length; i++) {\n" +
-        "   arr[to++] = s[i];\n" +
-        "}"
-    )
-    void getChars(char dst[], int dstBegin) {
-        System.arraycopy(toCharArray(), offset(), dst, dstBegin, length());
-    }
-
-    /**
-     * Copies characters from this string into the destination character
-     * array.
-     * <p>
-     * The first character to be copied is at index <code>srcBegin</code>;
-     * the last character to be copied is at index <code>srcEnd-1</code>
-     * (thus the total number of characters to be copied is
-     * <code>srcEnd-srcBegin</code>). The characters are copied into the
-     * subarray of <code>dst</code> starting at index <code>dstBegin</code>
-     * and ending at index:
-     * <p><blockquote><pre>
-     *     dstbegin + (srcEnd-srcBegin) - 1
-     * </pre></blockquote>
-     *
-     * @param      srcBegin   index of the first character in the string
-     *                        to copy.
-     * @param      srcEnd     index after the last character in the string
-     *                        to copy.
-     * @param      dst        the destination array.
-     * @param      dstBegin   the start offset in the destination array.
-     * @exception IndexOutOfBoundsException If any of the following
-     *            is true:
-     *            <ul><li><code>srcBegin</code> is negative.
-     *            <li><code>srcBegin</code> is greater than <code>srcEnd</code>
-     *            <li><code>srcEnd</code> is greater than the length of this
-     *                string
-     *            <li><code>dstBegin</code> is negative
-     *            <li><code>dstBegin+(srcEnd-srcBegin)</code> is larger than
-     *                <code>dst.length</code></ul>
-     */
-    @JavaScriptBody(args = { "beg", "end", "arr", "dst" }, body=
-        "var s = this.toString();\n" +
-        "while (beg < end) {\n" +
-        "  arr[dst++] = s.charCodeAt(beg++);\n" +
-        "}\n"
-    )
-    public void getChars(int srcBegin, int srcEnd, char dst[], int dstBegin) {
-        if (srcBegin < 0) {
-            throw new StringIndexOutOfBoundsException(srcBegin);
-        }
-        if (srcEnd > length()) {
-            throw new StringIndexOutOfBoundsException(srcEnd);
-        }
-        if (srcBegin > srcEnd) {
-            throw new StringIndexOutOfBoundsException(srcEnd - srcBegin);
-        }
-        System.arraycopy(toCharArray(), offset() + srcBegin, dst, dstBegin,
-             srcEnd - srcBegin);
-    }
-
-    /**
-     * Copies characters from this string into the destination byte array. Each
-     * byte receives the 8 low-order bits of the corresponding character. The
-     * eight high-order bits of each character are not copied and do not
-     * participate in the transfer in any way.
-     *
-     * <p> The first character to be copied is at index {@code srcBegin}; the
-     * last character to be copied is at index {@code srcEnd-1}.  The total
-     * number of characters to be copied is {@code srcEnd-srcBegin}. The
-     * characters, converted to bytes, are copied into the subarray of {@code
-     * dst} starting at index {@code dstBegin} and ending at index:
-     *
-     * <blockquote><pre>
-     *     dstbegin + (srcEnd-srcBegin) - 1
-     * </pre></blockquote>
-     *
-     * @deprecated  This method does not properly convert characters into
-     * bytes.  As of JDK&nbsp;1.1, the preferred way to do this is via the
-     * {@link #getBytes()} method, which uses the platform's default charset.
-     *
-     * @param  srcBegin
-     *         Index of the first character in the string to copy
-     *
-     * @param  srcEnd
-     *         Index after the last character in the string to copy
-     *
-     * @param  dst
-     *         The destination array
-     *
-     * @param  dstBegin
-     *         The start offset in the destination array
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If any of the following is true:
-     *          <ul>
-     *            <li> {@code srcBegin} is negative
-     *            <li> {@code srcBegin} is greater than {@code srcEnd}
-     *            <li> {@code srcEnd} is greater than the length of this String
-     *            <li> {@code dstBegin} is negative
-     *            <li> {@code dstBegin+(srcEnd-srcBegin)} is larger than {@code
-     *                 dst.length}
-     *          </ul>
-     */
-    @Deprecated
-    public void getBytes(int srcBegin, int srcEnd, byte dst[], int dstBegin) {
-        if (srcBegin < 0) {
-            throw new StringIndexOutOfBoundsException(srcBegin);
-        }
-        if (srcEnd > length()) {
-            throw new StringIndexOutOfBoundsException(srcEnd);
-        }
-        if (srcBegin > srcEnd) {
-            throw new StringIndexOutOfBoundsException(srcEnd - srcBegin);
-        }
-        int j = dstBegin;
-        int n = offset() + srcEnd;
-        int i = offset() + srcBegin;
-        char[] val = toCharArray();   /* avoid getfield opcode */
-
-        while (i < n) {
-            dst[j++] = (byte)val[i++];
-        }
-    }
-
-    /**
-     * Encodes this {@code String} into a sequence of bytes using the named
-     * charset, storing the result into a new byte array.
-     *
-     * <p> The behavior of this method when this string cannot be encoded in
-     * the given charset is unspecified.  The {@link
-     * java.nio.charset.CharsetEncoder} class should be used when more control
-     * over the encoding process is required.
-     *
-     * @param  charsetName
-     *         The name of a supported {@linkplain java.nio.charset.Charset
-     *         charset}
-     *
-     * @return  The resultant byte array
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named charset is not supported
-     *
-     * @since  JDK1.1
-     */
-    public byte[] getBytes(String charsetName)
-        throws UnsupportedEncodingException
-    {
-        checkUTF8(null, charsetName);
-        return getBytes();
-    }
-
-    /**
-     * Encodes this {@code String} into a sequence of bytes using the given
-     * {@linkplain java.nio.charset.Charset charset}, storing the result into a
-     * new byte array.
-     *
-     * <p> This method always replaces malformed-input and unmappable-character
-     * sequences with this charset's default replacement byte array.  The
-     * {@link java.nio.charset.CharsetEncoder} class should be used when more
-     * control over the encoding process is required.
-     *
-     * @param  charset
-     *         The {@linkplain java.nio.charset.Charset} to be used to encode
-     *         the {@code String}
-     *
-     * @return  The resultant byte array
-     *
-     * @since  1.6
-     */
-    /* don't want dep on Charset
-    public byte[] getBytes(Charset charset) {
-        if (charset == null) throw new NullPointerException();
-        return StringCoding.encode(charset, value, offset, count);
-    }
-    */
-
-    /**
-     * Encodes this {@code String} into a sequence of bytes using the
-     * platform's default charset, storing the result into a new byte array.
-     *
-     * <p> The behavior of this method when this string cannot be encoded in
-     * the default charset is unspecified.  The {@link
-     * java.nio.charset.CharsetEncoder} class should be used when more control
-     * over the encoding process is required.
-     *
-     * @return  The resultant byte array
-     *
-     * @since      JDK1.1
-     */
-    public byte[] getBytes() {
-        int len = length();
-        byte[] arr = new byte[len];
-        for (int i = 0, j = 0; j < len; j++) {
-            final int v = charAt(j);
-            if (v < 128) {
-                arr[i++] = (byte) v;
-                continue;
-            }
-            if (v < 0x0800) {
-                arr = System.expandArray(arr, i + 1);
-                arr[i++] = (byte) (0xC0 | (v >> 6));
-                arr[i++] = (byte) (0x80 | (0x3F & v));
-                continue;
-            }
-            arr = System.expandArray(arr, i + 2);
-            arr[i++] = (byte) (0xE0 | (v >> 12));
-            arr[i++] = (byte) (0x80 | ((v >> 6) & 0x7F));
-            arr[i++] = (byte) (0x80 | (0x3F & v));
-        }
-        return arr;
-    }
-
-    /**
-     * Compares this string to the specified object.  The result is {@code
-     * true} if and only if the argument is not {@code null} and is a {@code
-     * String} object that represents the same sequence of characters as this
-     * object.
-     *
-     * @param  anObject
-     *         The object to compare this {@code String} against
-     *
-     * @return  {@code true} if the given object represents a {@code String}
-     *          equivalent to this string, {@code false} otherwise
-     *
-     * @see  #compareTo(String)
-     * @see  #equalsIgnoreCase(String)
-     */
-    @JavaScriptBody(args = { "obj" }, body = 
-        "return obj != null && obj.$instOf_java_lang_String && "
-        + "this.toString() === obj.toString();"
-    )
-    public boolean equals(Object anObject) {
-        if (this == anObject) {
-            return true;
-        }
-        if (anObject instanceof String) {
-            String anotherString = (String)anObject;
-            int n = length();
-            if (n == anotherString.length()) {
-                char v1[] = toCharArray();
-                char v2[] = anotherString.toCharArray();
-                int i = offset();
-                int j = anotherString.offset();
-                while (n-- != 0) {
-                    if (v1[i++] != v2[j++])
-                        return false;
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Compares this string to the specified {@code StringBuffer}.  The result
-     * is {@code true} if and only if this {@code String} represents the same
-     * sequence of characters as the specified {@code StringBuffer}.
-     *
-     * @param  sb
-     *         The {@code StringBuffer} to compare this {@code String} against
-     *
-     * @return  {@code true} if this {@code String} represents the same
-     *          sequence of characters as the specified {@code StringBuffer},
-     *          {@code false} otherwise
-     *
-     * @since  1.4
-     */
-    public boolean contentEquals(StringBuffer sb) {
-        synchronized(sb) {
-            return contentEquals((CharSequence)sb);
-        }
-    }
-
-    /**
-     * Compares this string to the specified {@code CharSequence}.  The result
-     * is {@code true} if and only if this {@code String} represents the same
-     * sequence of char values as the specified sequence.
-     *
-     * @param  cs
-     *         The sequence to compare this {@code String} against
-     *
-     * @return  {@code true} if this {@code String} represents the same
-     *          sequence of char values as the specified sequence, {@code
-     *          false} otherwise
-     *
-     * @since  1.5
-     */
-    public boolean contentEquals(CharSequence cs) {
-        if (length() != cs.length())
-            return false;
-        // Argument is a StringBuffer, StringBuilder
-        if (cs instanceof AbstractStringBuilder) {
-            char v1[] = toCharArray();
-            char v2[] = ((AbstractStringBuilder)cs).getValue();
-            int i = offset();
-            int j = 0;
-            int n = length();
-            while (n-- != 0) {
-                if (v1[i++] != v2[j++])
-                    return false;
-            }
-            return true;
-        }
-        // Argument is a String
-        if (cs.equals(this))
-            return true;
-        // Argument is a generic CharSequence
-        char v1[] = toCharArray();
-        int i = offset();
-        int j = 0;
-        int n = length();
-        while (n-- != 0) {
-            if (v1[i++] != cs.charAt(j++))
-                return false;
-        }
-        return true;
-    }
-
-    /**
-     * Compares this {@code String} to another {@code String}, ignoring case
-     * considerations.  Two strings are considered equal ignoring case if they
-     * are of the same length and corresponding characters in the two strings
-     * are equal ignoring case.
-     *
-     * <p> Two characters {@code c1} and {@code c2} are considered the same
-     * ignoring case if at least one of the following is true:
-     * <ul>
-     *   <li> The two characters are the same (as compared by the
-     *        {@code ==} operator)
-     *   <li> Applying the method {@link
-     *        java.lang.Character#toUpperCase(char)} to each character
-     *        produces the same result
-     *   <li> Applying the method {@link
-     *        java.lang.Character#toLowerCase(char)} to each character
-     *        produces the same result
-     * </ul>
-     *
-     * @param  anotherString
-     *         The {@code String} to compare this {@code String} against
-     *
-     * @return  {@code true} if the argument is not {@code null} and it
-     *          represents an equivalent {@code String} ignoring case; {@code
-     *          false} otherwise
-     *
-     * @see  #equals(Object)
-     */
-    public boolean equalsIgnoreCase(String anotherString) {
-        return (this == anotherString) ? true :
-               (anotherString != null) && (anotherString.length() == length()) &&
-               regionMatches(true, 0, anotherString, 0, length());
-    }
-
-    /**
-     * Compares two strings lexicographically.
-     * The comparison is based on the Unicode value of each character in
-     * the strings. The character sequence represented by this
-     * <code>String</code> object is compared lexicographically to the
-     * character sequence represented by the argument string. The result is
-     * a negative integer if this <code>String</code> object
-     * lexicographically precedes the argument string. The result is a
-     * positive integer if this <code>String</code> object lexicographically
-     * follows the argument string. The result is zero if the strings
-     * are equal; <code>compareTo</code> returns <code>0</code> exactly when
-     * the {@link #equals(Object)} method would return <code>true</code>.
-     * <p>
-     * This is the definition of lexicographic ordering. If two strings are
-     * different, then either they have different characters at some index
-     * that is a valid index for both strings, or their lengths are different,
-     * or both. If they have different characters at one or more index
-     * positions, let <i>k</i> be the smallest such index; then the string
-     * whose character at position <i>k</i> has the smaller value, as
-     * determined by using the &lt; operator, lexicographically precedes the
-     * other string. In this case, <code>compareTo</code> returns the
-     * difference of the two character values at position <code>k</code> in
-     * the two string -- that is, the value:
-     * <blockquote><pre>
-     * this.charAt(k)-anotherString.charAt(k)
-     * </pre></blockquote>
-     * If there is no index position at which they differ, then the shorter
-     * string lexicographically precedes the longer string. In this case,
-     * <code>compareTo</code> returns the difference of the lengths of the
-     * strings -- that is, the value:
-     * <blockquote><pre>
-     * this.length()-anotherString.length()
-     * </pre></blockquote>
-     *
-     * @param   anotherString   the <code>String</code> to be compared.
-     * @return  the value <code>0</code> if the argument string is equal to
-     *          this string; a value less than <code>0</code> if this string
-     *          is lexicographically less than the string argument; and a
-     *          value greater than <code>0</code> if this string is
-     *          lexicographically greater than the string argument.
-     */
-    public int compareTo(String anotherString) {
-        int len1 = length();
-        int len2 = anotherString.length();
-        int n = Math.min(len1, len2);
-        char v1[] = toCharArray();
-        char v2[] = anotherString.toCharArray();
-        int i = offset();
-        int j = anotherString.offset();
-
-        if (i == j) {
-            int k = i;
-            int lim = n + i;
-            while (k < lim) {
-                char c1 = v1[k];
-                char c2 = v2[k];
-                if (c1 != c2) {
-                    return c1 - c2;
-                }
-                k++;
-            }
-        } else {
-            while (n-- != 0) {
-                char c1 = v1[i++];
-                char c2 = v2[j++];
-                if (c1 != c2) {
-                    return c1 - c2;
-                }
-            }
-        }
-        return len1 - len2;
-    }
-
-    /**
-     * A Comparator that orders <code>String</code> objects as by
-     * <code>compareToIgnoreCase</code>. This comparator is serializable.
-     * <p>
-     * Note that this Comparator does <em>not</em> take locale into account,
-     * and will result in an unsatisfactory ordering for certain locales.
-     * The java.text package provides <em>Collators</em> to allow
-     * locale-sensitive ordering.
-     *
-     * @see     java.text.Collator#compare(String, String)
-     * @since   1.2
-     */
-    public static final Comparator<String> CASE_INSENSITIVE_ORDER
-                                         = new CaseInsensitiveComparator();
-
-    private static int offset() {
-        return 0;
-    }
-
-    private static class CaseInsensitiveComparator
-                         implements Comparator<String>, java.io.Serializable {
-        // use serialVersionUID from JDK 1.2.2 for interoperability
-        private static final long serialVersionUID = 8575799808933029326L;
-
-        public int compare(String s1, String s2) {
-            int n1 = s1.length();
-            int n2 = s2.length();
-            int min = Math.min(n1, n2);
-            for (int i = 0; i < min; i++) {
-                char c1 = s1.charAt(i);
-                char c2 = s2.charAt(i);
-                if (c1 != c2) {
-                    c1 = Character.toUpperCase(c1);
-                    c2 = Character.toUpperCase(c2);
-                    if (c1 != c2) {
-                        c1 = Character.toLowerCase(c1);
-                        c2 = Character.toLowerCase(c2);
-                        if (c1 != c2) {
-                            // No overflow because of numeric promotion
-                            return c1 - c2;
-                        }
-                    }
-                }
-            }
-            return n1 - n2;
-        }
-    }
-
-    /**
-     * Compares two strings lexicographically, ignoring case
-     * differences. This method returns an integer whose sign is that of
-     * calling <code>compareTo</code> with normalized versions of the strings
-     * where case differences have been eliminated by calling
-     * <code>Character.toLowerCase(Character.toUpperCase(character))</code> on
-     * each character.
-     * <p>
-     * Note that this method does <em>not</em> take locale into account,
-     * and will result in an unsatisfactory ordering for certain locales.
-     * The java.text package provides <em>collators</em> to allow
-     * locale-sensitive ordering.
-     *
-     * @param   str   the <code>String</code> to be compared.
-     * @return  a negative integer, zero, or a positive integer as the
-     *          specified String is greater than, equal to, or less
-     *          than this String, ignoring case considerations.
-     * @see     java.text.Collator#compare(String, String)
-     * @since   1.2
-     */
-    public int compareToIgnoreCase(String str) {
-        return CASE_INSENSITIVE_ORDER.compare(this, str);
-    }
-
-    /**
-     * Tests if two string regions are equal.
-     * <p>
-     * A substring of this <tt>String</tt> object is compared to a substring
-     * of the argument other. The result is true if these substrings
-     * represent identical character sequences. The substring of this
-     * <tt>String</tt> object to be compared begins at index <tt>toffset</tt>
-     * and has length <tt>len</tt>. The substring of other to be compared
-     * begins at index <tt>ooffset</tt> and has length <tt>len</tt>. The
-     * result is <tt>false</tt> if and only if at least one of the following
-     * is true:
-     * <ul><li><tt>toffset</tt> is negative.
-     * <li><tt>ooffset</tt> is negative.
-     * <li><tt>toffset+len</tt> is greater than the length of this
-     * <tt>String</tt> object.
-     * <li><tt>ooffset+len</tt> is greater than the length of the other
-     * argument.
-     * <li>There is some nonnegative integer <i>k</i> less than <tt>len</tt>
-     * such that:
-     * <tt>this.charAt(toffset+<i>k</i>)&nbsp;!=&nbsp;other.charAt(ooffset+<i>k</i>)</tt>
-     * </ul>
-     *
-     * @param   toffset   the starting offset of the subregion in this string.
-     * @param   other     the string argument.
-     * @param   ooffset   the starting offset of the subregion in the string
-     *                    argument.
-     * @param   len       the number of characters to compare.
-     * @return  <code>true</code> if the specified subregion of this string
-     *          exactly matches the specified subregion of the string argument;
-     *          <code>false</code> otherwise.
-     */
-    public boolean regionMatches(int toffset, String other, int ooffset,
-                                 int len) {
-        char ta[] = toCharArray();
-        int to = offset() + toffset;
-        char pa[] = other.toCharArray();
-        int po = other.offset() + ooffset;
-        // Note: toffset, ooffset, or len might be near -1>>>1.
-        if ((ooffset < 0) || (toffset < 0) || (toffset > (long)length() - len)
-            || (ooffset > (long)other.length() - len)) {
-            return false;
-        }
-        while (len-- > 0) {
-            if (ta[to++] != pa[po++]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Tests if two string regions are equal.
-     * <p>
-     * A substring of this <tt>String</tt> object is compared to a substring
-     * of the argument <tt>other</tt>. The result is <tt>true</tt> if these
-     * substrings represent character sequences that are the same, ignoring
-     * case if and only if <tt>ignoreCase</tt> is true. The substring of
-     * this <tt>String</tt> object to be compared begins at index
-     * <tt>toffset</tt> and has length <tt>len</tt>. The substring of
-     * <tt>other</tt> to be compared begins at index <tt>ooffset</tt> and
-     * has length <tt>len</tt>. The result is <tt>false</tt> if and only if
-     * at least one of the following is true:
-     * <ul><li><tt>toffset</tt> is negative.
-     * <li><tt>ooffset</tt> is negative.
-     * <li><tt>toffset+len</tt> is greater than the length of this
-     * <tt>String</tt> object.
-     * <li><tt>ooffset+len</tt> is greater than the length of the other
-     * argument.
-     * <li><tt>ignoreCase</tt> is <tt>false</tt> and there is some nonnegative
-     * integer <i>k</i> less than <tt>len</tt> such that:
-     * <blockquote><pre>
-     * this.charAt(toffset+k) != other.charAt(ooffset+k)
-     * </pre></blockquote>
-     * <li><tt>ignoreCase</tt> is <tt>true</tt> and there is some nonnegative
-     * integer <i>k</i> less than <tt>len</tt> such that:
-     * <blockquote><pre>
-     * Character.toLowerCase(this.charAt(toffset+k)) !=
-               Character.toLowerCase(other.charAt(ooffset+k))
-     * </pre></blockquote>
-     * and:
-     * <blockquote><pre>
-     * Character.toUpperCase(this.charAt(toffset+k)) !=
-     *         Character.toUpperCase(other.charAt(ooffset+k))
-     * </pre></blockquote>
-     * </ul>
-     *
-     * @param   ignoreCase   if <code>true</code>, ignore case when comparing
-     *                       characters.
-     * @param   toffset      the starting offset of the subregion in this
-     *                       string.
-     * @param   other        the string argument.
-     * @param   ooffset      the starting offset of the subregion in the string
-     *                       argument.
-     * @param   len          the number of characters to compare.
-     * @return  <code>true</code> if the specified subregion of this string
-     *          matches the specified subregion of the string argument;
-     *          <code>false</code> otherwise. Whether the matching is exact
-     *          or case insensitive depends on the <code>ignoreCase</code>
-     *          argument.
-     */
-    public boolean regionMatches(boolean ignoreCase, int toffset,
-                           String other, int ooffset, int len) {
-        char ta[] = toCharArray();
-        int to = offset() + toffset;
-        char pa[] = other.toCharArray();
-        int po = other.offset() + ooffset;
-        // Note: toffset, ooffset, or len might be near -1>>>1.
-        if ((ooffset < 0) || (toffset < 0) || (toffset > (long)length() - len) ||
-                (ooffset > (long)other.length() - len)) {
-            return false;
-        }
-        while (len-- > 0) {
-            char c1 = ta[to++];
-            char c2 = pa[po++];
-            if (c1 == c2) {
-                continue;
-            }
-            if (ignoreCase) {
-                // If characters don't match but case may be ignored,
-                // try converting both characters to uppercase.
-                // If the results match, then the comparison scan should
-                // continue.
-                char u1 = Character.toUpperCase(c1);
-                char u2 = Character.toUpperCase(c2);
-                if (u1 == u2) {
-                    continue;
-                }
-                // Unfortunately, conversion to uppercase does not work properly
-                // for the Georgian alphabet, which has strange rules about case
-                // conversion.  So we need to make one last check before
-                // exiting.
-                if (Character.toLowerCase(u1) == Character.toLowerCase(u2)) {
-                    continue;
-                }
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Tests if the substring of this string beginning at the
-     * specified index starts with the specified prefix.
-     *
-     * @param   prefix    the prefix.
-     * @param   toffset   where to begin looking in this string.
-     * @return  <code>true</code> if the character sequence represented by the
-     *          argument is a prefix of the substring of this object starting
-     *          at index <code>toffset</code>; <code>false</code> otherwise.
-     *          The result is <code>false</code> if <code>toffset</code> is
-     *          negative or greater than the length of this
-     *          <code>String</code> object; otherwise the result is the same
-     *          as the result of the expression
-     *          <pre>
-     *          this.substring(toffset).startsWith(prefix)
-     *          </pre>
-     */
-    @JavaScriptBody(args = { "find", "from" }, body=
-        "find = find.toString();\n" +
-        "return this.toString().substring(from, from + find.length) === find;\n"
-    )
-    public boolean startsWith(String prefix, int toffset) {
-        char ta[] = toCharArray();
-        int to = offset() + toffset;
-        char pa[] = prefix.toCharArray();
-        int po = prefix.offset();
-        int pc = prefix.length();
-        // Note: toffset might be near -1>>>1.
-        if ((toffset < 0) || (toffset > length() - pc)) {
-            return false;
-        }
-        while (--pc >= 0) {
-            if (ta[to++] != pa[po++]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Tests if this string starts with the specified prefix.
-     *
-     * @param   prefix   the prefix.
-     * @return  <code>true</code> if the character sequence represented by the
-     *          argument is a prefix of the character sequence represented by
-     *          this string; <code>false</code> otherwise.
-     *          Note also that <code>true</code> will be returned if the
-     *          argument is an empty string or is equal to this
-     *          <code>String</code> object as determined by the
-     *          {@link #equals(Object)} method.
-     * @since   1. 0
-     */
-    public boolean startsWith(String prefix) {
-        return startsWith(prefix, 0);
-    }
-
-    /**
-     * Tests if this string ends with the specified suffix.
-     *
-     * @param   suffix   the suffix.
-     * @return  <code>true</code> if the character sequence represented by the
-     *          argument is a suffix of the character sequence represented by
-     *          this object; <code>false</code> otherwise. Note that the
-     *          result will be <code>true</code> if the argument is the
-     *          empty string or is equal to this <code>String</code> object
-     *          as determined by the {@link #equals(Object)} method.
-     */
-    public boolean endsWith(String suffix) {
-        return startsWith(suffix, length() - suffix.length());
-    }
-
-    /**
-     * Returns a hash code for this string. The hash code for a
-     * <code>String</code> object is computed as
-     * <blockquote><pre>
-     * s[0]*31^(n-1) + s[1]*31^(n-2) + ... + s[n-1]
-     * </pre></blockquote>
-     * using <code>int</code> arithmetic, where <code>s[i]</code> is the
-     * <i>i</i>th character of the string, <code>n</code> is the length of
-     * the string, and <code>^</code> indicates exponentiation.
-     * (The hash value of the empty string is zero.)
-     *
-     * @return  a hash code value for this object.
-     */
-    public int hashCode() {
-        return super.hashCode();
-    }
-    int computeHashCode() {
-        int h = 0;
-        if (h == 0 && length() > 0) {
-            int off = offset();
-            int len = length();
-
-            for (int i = 0; i < len; i++) {
-                h = 31*h + charAt(off++);
-            }
-        }
-        return h;
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of
-     * the specified character. If a character with value
-     * <code>ch</code> occurs in the character sequence represented by
-     * this <code>String</code> object, then the index (in Unicode
-     * code units) of the first such occurrence is returned. For
-     * values of <code>ch</code> in the range from 0 to 0xFFFF
-     * (inclusive), this is the smallest value <i>k</i> such that:
-     * <blockquote><pre>
-     * this.charAt(<i>k</i>) == ch
-     * </pre></blockquote>
-     * is true. For other values of <code>ch</code>, it is the
-     * smallest value <i>k</i> such that:
-     * <blockquote><pre>
-     * this.codePointAt(<i>k</i>) == ch
-     * </pre></blockquote>
-     * is true. In either case, if no such character occurs in this
-     * string, then <code>-1</code> is returned.
-     *
-     * @param   ch   a character (Unicode code point).
-     * @return  the index of the first occurrence of the character in the
-     *          character sequence represented by this object, or
-     *          <code>-1</code> if the character does not occur.
-     */
-    public int indexOf(int ch) {
-        return indexOf(ch, 0);
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of the
-     * specified character, starting the search at the specified index.
-     * <p>
-     * If a character with value <code>ch</code> occurs in the
-     * character sequence represented by this <code>String</code>
-     * object at an index no smaller than <code>fromIndex</code>, then
-     * the index of the first such occurrence is returned. For values
-     * of <code>ch</code> in the range from 0 to 0xFFFF (inclusive),
-     * this is the smallest value <i>k</i> such that:
-     * <blockquote><pre>
-     * (this.charAt(<i>k</i>) == ch) && (<i>k</i> &gt;= fromIndex)
-     * </pre></blockquote>
-     * is true. For other values of <code>ch</code>, it is the
-     * smallest value <i>k</i> such that:
-     * <blockquote><pre>
-     * (this.codePointAt(<i>k</i>) == ch) && (<i>k</i> &gt;= fromIndex)
-     * </pre></blockquote>
-     * is true. In either case, if no such character occurs in this
-     * string at or after position <code>fromIndex</code>, then
-     * <code>-1</code> is returned.
-     *
-     * <p>
-     * There is no restriction on the value of <code>fromIndex</code>. If it
-     * is negative, it has the same effect as if it were zero: this entire
-     * string may be searched. If it is greater than the length of this
-     * string, it has the same effect as if it were equal to the length of
-     * this string: <code>-1</code> is returned.
-     *
-     * <p>All indices are specified in <code>char</code> values
-     * (Unicode code units).
-     *
-     * @param   ch          a character (Unicode code point).
-     * @param   fromIndex   the index to start the search from.
-     * @return  the index of the first occurrence of the character in the
-     *          character sequence represented by this object that is greater
-     *          than or equal to <code>fromIndex</code>, or <code>-1</code>
-     *          if the character does not occur.
-     */
-    @JavaScriptBody(args = { "ch", "from" }, body = 
-        "if (typeof ch === 'number') ch = String.fromCharCode(ch);\n" +
-        "return this.toString().indexOf(ch, from);\n"
-    )
-    public int indexOf(int ch, int fromIndex) {
-        if (fromIndex < 0) {
-            fromIndex = 0;
-        } else if (fromIndex >= length()) {
-            // Note: fromIndex might be near -1>>>1.
-            return -1;
-        }
-
-        if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) {
-            // handle most cases here (ch is a BMP code point or a
-            // negative value (invalid code point))
-            final char[] value = this.toCharArray();
-            final int offset = this.offset();
-            final int max = offset + length();
-            for (int i = offset + fromIndex; i < max ; i++) {
-                if (value[i] == ch) {
-                    return i - offset;
-                }
-            }
-            return -1;
-        } else {
-            return indexOfSupplementary(ch, fromIndex);
-        }
-    }
-
-    /**
-     * Handles (rare) calls of indexOf with a supplementary character.
-     */
-    private int indexOfSupplementary(int ch, int fromIndex) {
-        if (Character.isValidCodePoint(ch)) {
-            final char[] value = this.toCharArray();
-            final int offset = this.offset();
-            final char hi = Character.highSurrogate(ch);
-            final char lo = Character.lowSurrogate(ch);
-            final int max = offset + length() - 1;
-            for (int i = offset + fromIndex; i < max; i++) {
-                if (value[i] == hi && value[i+1] == lo) {
-                    return i - offset;
-                }
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index within this string of the last occurrence of
-     * the specified character. For values of <code>ch</code> in the
-     * range from 0 to 0xFFFF (inclusive), the index (in Unicode code
-     * units) returned is the largest value <i>k</i> such that:
-     * <blockquote><pre>
-     * this.charAt(<i>k</i>) == ch
-     * </pre></blockquote>
-     * is true. For other values of <code>ch</code>, it is the
-     * largest value <i>k</i> such that:
-     * <blockquote><pre>
-     * this.codePointAt(<i>k</i>) == ch
-     * </pre></blockquote>
-     * is true.  In either case, if no such character occurs in this
-     * string, then <code>-1</code> is returned.  The
-     * <code>String</code> is searched backwards starting at the last
-     * character.
-     *
-     * @param   ch   a character (Unicode code point).
-     * @return  the index of the last occurrence of the character in the
-     *          character sequence represented by this object, or
-     *          <code>-1</code> if the character does not occur.
-     */
-    public int lastIndexOf(int ch) {
-        return lastIndexOf(ch, length() - 1);
-    }
-
-    /**
-     * Returns the index within this string of the last occurrence of
-     * the specified character, searching backward starting at the
-     * specified index. For values of <code>ch</code> in the range
-     * from 0 to 0xFFFF (inclusive), the index returned is the largest
-     * value <i>k</i> such that:
-     * <blockquote><pre>
-     * (this.charAt(<i>k</i>) == ch) && (<i>k</i> &lt;= fromIndex)
-     * </pre></blockquote>
-     * is true. For other values of <code>ch</code>, it is the
-     * largest value <i>k</i> such that:
-     * <blockquote><pre>
-     * (this.codePointAt(<i>k</i>) == ch) && (<i>k</i> &lt;= fromIndex)
-     * </pre></blockquote>
-     * is true. In either case, if no such character occurs in this
-     * string at or before position <code>fromIndex</code>, then
-     * <code>-1</code> is returned.
-     *
-     * <p>All indices are specified in <code>char</code> values
-     * (Unicode code units).
-     *
-     * @param   ch          a character (Unicode code point).
-     * @param   fromIndex   the index to start the search from. There is no
-     *          restriction on the value of <code>fromIndex</code>. If it is
-     *          greater than or equal to the length of this string, it has
-     *          the same effect as if it were equal to one less than the
-     *          length of this string: this entire string may be searched.
-     *          If it is negative, it has the same effect as if it were -1:
-     *          -1 is returned.
-     * @return  the index of the last occurrence of the character in the
-     *          character sequence represented by this object that is less
-     *          than or equal to <code>fromIndex</code>, or <code>-1</code>
-     *          if the character does not occur before that point.
-     */
-    @JavaScriptBody(args = { "ch", "from" }, body = 
-        "if (typeof ch === 'number') ch = String.fromCharCode(ch);\n" +
-        "return this.toString().lastIndexOf(ch, from);"
-    )
-    public int lastIndexOf(int ch, int fromIndex) {
-        if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) {
-            // handle most cases here (ch is a BMP code point or a
-            // negative value (invalid code point))
-            final char[] value = this.toCharArray();
-            final int offset = this.offset();
-            int i = offset + Math.min(fromIndex, length() - 1);
-            for (; i >= offset ; i--) {
-                if (value[i] == ch) {
-                    return i - offset;
-                }
-            }
-            return -1;
-        } else {
-            return lastIndexOfSupplementary(ch, fromIndex);
-        }
-    }
-
-    /**
-     * Handles (rare) calls of lastIndexOf with a supplementary character.
-     */
-    private int lastIndexOfSupplementary(int ch, int fromIndex) {
-        if (Character.isValidCodePoint(ch)) {
-            final char[] value = this.toCharArray();
-            final int offset = this.offset();
-            char hi = Character.highSurrogate(ch);
-            char lo = Character.lowSurrogate(ch);
-            int i = offset + Math.min(fromIndex, length() - 2);
-            for (; i >= offset; i--) {
-                if (value[i] == hi && value[i+1] == lo) {
-                    return i - offset;
-                }
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of the
-     * specified substring.
-     *
-     * <p>The returned index is the smallest value <i>k</i> for which:
-     * <blockquote><pre>
-     * this.startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then {@code -1} is returned.
-     *
-     * @param   str   the substring to search for.
-     * @return  the index of the first occurrence of the specified substring,
-     *          or {@code -1} if there is no such occurrence.
-     */
-    public int indexOf(String str) {
-        return indexOf(str, 0);
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of the
-     * specified substring, starting at the specified index.
-     *
-     * <p>The returned index is the smallest value <i>k</i> for which:
-     * <blockquote><pre>
-     * <i>k</i> &gt;= fromIndex && this.startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then {@code -1} is returned.
-     *
-     * @param   str         the substring to search for.
-     * @param   fromIndex   the index from which to start the search.
-     * @return  the index of the first occurrence of the specified substring,
-     *          starting at the specified index,
-     *          or {@code -1} if there is no such occurrence.
-     */
-    @JavaScriptBody(args = { "str", "fromIndex" }, body =
-        "return this.toString().indexOf(str.toString(), fromIndex);"
-    )
-    public native int indexOf(String str, int fromIndex);
-
-    /**
-     * Returns the index within this string of the last occurrence of the
-     * specified substring.  The last occurrence of the empty string ""
-     * is considered to occur at the index value {@code this.length()}.
-     *
-     * <p>The returned index is the largest value <i>k</i> for which:
-     * <blockquote><pre>
-     * this.startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then {@code -1} is returned.
-     *
-     * @param   str   the substring to search for.
-     * @return  the index of the last occurrence of the specified substring,
-     *          or {@code -1} if there is no such occurrence.
-     */
-    public int lastIndexOf(String str) {
-        return lastIndexOf(str, length());
-    }
-
-    /**
-     * Returns the index within this string of the last occurrence of the
-     * specified substring, searching backward starting at the specified index.
-     *
-     * <p>The returned index is the largest value <i>k</i> for which:
-     * <blockquote><pre>
-     * <i>k</i> &lt;= fromIndex && this.startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then {@code -1} is returned.
-     *
-     * @param   str         the substring to search for.
-     * @param   fromIndex   the index to start the search from.
-     * @return  the index of the last occurrence of the specified substring,
-     *          searching backward from the specified index,
-     *          or {@code -1} if there is no such occurrence.
-     */
-    @JavaScriptBody(args = { "s", "from" }, body = 
-        "return this.toString().lastIndexOf(s.toString(), from);"
-    )
-    public int lastIndexOf(String str, int fromIndex) {
-        return lastIndexOf(toCharArray(), offset(), length(), str.toCharArray(), str.offset(), str.length(), fromIndex);
-    }
-
-    /**
-     * Code shared by String and StringBuffer to do searches. The
-     * source is the character array being searched, and the target
-     * is the string being searched for.
-     *
-     * @param   source       the characters being searched.
-     * @param   sourceOffset offset of the source string.
-     * @param   sourceCount  count of the source string.
-     * @param   target       the characters being searched for.
-     * @param   targetOffset offset of the target string.
-     * @param   targetCount  count of the target string.
-     * @param   fromIndex    the index to begin searching from.
-     */
-    static int lastIndexOf(char[] source, int sourceOffset, int sourceCount,
-                           char[] target, int targetOffset, int targetCount,
-                           int fromIndex) {
-        /*
-         * Check arguments; return immediately where possible. For
-         * consistency, don't check for null str.
-         */
-        int rightIndex = sourceCount - targetCount;
-        if (fromIndex < 0) {
-            return -1;
-        }
-        if (fromIndex > rightIndex) {
-            fromIndex = rightIndex;
-        }
-        /* Empty string always matches. */
-        if (targetCount == 0) {
-            return fromIndex;
-        }
-
-        int strLastIndex = targetOffset + targetCount - 1;
-        char strLastChar = target[strLastIndex];
-        int min = sourceOffset + targetCount - 1;
-        int i = min + fromIndex;
-
-    startSearchForLastChar:
-        while (true) {
-            while (i >= min && source[i] != strLastChar) {
-                i--;
-            }
-            if (i < min) {
-                return -1;
-            }
-            int j = i - 1;
-            int start = j - (targetCount - 1);
-            int k = strLastIndex - 1;
-
-            while (j > start) {
-                if (source[j--] != target[k--]) {
-                    i--;
-                    continue startSearchForLastChar;
-                }
-            }
-            return start - sourceOffset + 1;
-        }
-    }
-
-    /**
-     * Returns a new string that is a substring of this string. The
-     * substring begins with the character at the specified index and
-     * extends to the end of this string. <p>
-     * Examples:
-     * <blockquote><pre>
-     * "unhappy".substring(2) returns "happy"
-     * "Harbison".substring(3) returns "bison"
-     * "emptiness".substring(9) returns "" (an empty string)
-     * </pre></blockquote>
-     *
-     * @param      beginIndex   the beginning index, inclusive.
-     * @return     the specified substring.
-     * @exception  IndexOutOfBoundsException  if
-     *             <code>beginIndex</code> is negative or larger than the
-     *             length of this <code>String</code> object.
-     */
-    public String substring(int beginIndex) {
-        return substring(beginIndex, length());
-    }
-
-    /**
-     * Returns a new string that is a substring of this string. The
-     * substring begins at the specified <code>beginIndex</code> and
-     * extends to the character at index <code>endIndex - 1</code>.
-     * Thus the length of the substring is <code>endIndex-beginIndex</code>.
-     * <p>
-     * Examples:
-     * <blockquote><pre>
-     * "hamburger".substring(4, 8) returns "urge"
-     * "smiles".substring(1, 5) returns "mile"
-     * </pre></blockquote>
-     *
-     * @param      beginIndex   the beginning index, inclusive.
-     * @param      endIndex     the ending index, exclusive.
-     * @return     the specified substring.
-     * @exception  IndexOutOfBoundsException  if the
-     *             <code>beginIndex</code> is negative, or
-     *             <code>endIndex</code> is larger than the length of
-     *             this <code>String</code> object, or
-     *             <code>beginIndex</code> is larger than
-     *             <code>endIndex</code>.
-     */
-    @JavaScriptBody(args = { "beginIndex", "endIndex" }, body = 
-        "return this.toString().substring(beginIndex, endIndex);"
-    )
-    public String substring(int beginIndex, int endIndex) {
-        if (beginIndex < 0) {
-            throw new StringIndexOutOfBoundsException(beginIndex);
-        }
-        if (endIndex > length()) {
-            throw new StringIndexOutOfBoundsException(endIndex);
-        }
-        if (beginIndex > endIndex) {
-            throw new StringIndexOutOfBoundsException(endIndex - beginIndex);
-        }
-        return ((beginIndex == 0) && (endIndex == length())) ? this :
-            new String(toCharArray(), offset() + beginIndex, endIndex - beginIndex);
-    }
-
-    /**
-     * Returns a new character sequence that is a subsequence of this sequence.
-     *
-     * <p> An invocation of this method of the form
-     *
-     * <blockquote><pre>
-     * str.subSequence(begin,&nbsp;end)</pre></blockquote>
-     *
-     * behaves in exactly the same way as the invocation
-     *
-     * <blockquote><pre>
-     * str.substring(begin,&nbsp;end)</pre></blockquote>
-     *
-     * This method is defined so that the <tt>String</tt> class can implement
-     * the {@link CharSequence} interface. </p>
-     *
-     * @param      beginIndex   the begin index, inclusive.
-     * @param      endIndex     the end index, exclusive.
-     * @return     the specified subsequence.
-     *
-     * @throws  IndexOutOfBoundsException
-     *          if <tt>beginIndex</tt> or <tt>endIndex</tt> are negative,
-     *          if <tt>endIndex</tt> is greater than <tt>length()</tt>,
-     *          or if <tt>beginIndex</tt> is greater than <tt>startIndex</tt>
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public CharSequence subSequence(int beginIndex, int endIndex) {
-        return this.substring(beginIndex, endIndex);
-    }
-
-    /**
-     * Concatenates the specified string to the end of this string.
-     * <p>
-     * If the length of the argument string is <code>0</code>, then this
-     * <code>String</code> object is returned. Otherwise, a new
-     * <code>String</code> object is created, representing a character
-     * sequence that is the concatenation of the character sequence
-     * represented by this <code>String</code> object and the character
-     * sequence represented by the argument string.<p>
-     * Examples:
-     * <blockquote><pre>
-     * "cares".concat("s") returns "caress"
-     * "to".concat("get").concat("her") returns "together"
-     * </pre></blockquote>
-     *
-     * @param   str   the <code>String</code> that is concatenated to the end
-     *                of this <code>String</code>.
-     * @return  a string that represents the concatenation of this object's
-     *          characters followed by the string argument's characters.
-     */
-    public String concat(String str) {
-        int otherLen = str.length();
-        if (otherLen == 0) {
-            return this;
-        }
-        char buf[] = new char[length() + otherLen];
-        getChars(0, length(), buf, 0);
-        str.getChars(0, otherLen, buf, length());
-        return new String(buf, 0, length() + otherLen);
-    }
-
-    /**
-     * Returns a new string resulting from replacing all occurrences of
-     * <code>oldChar</code> in this string with <code>newChar</code>.
-     * <p>
-     * If the character <code>oldChar</code> does not occur in the
-     * character sequence represented by this <code>String</code> object,
-     * then a reference to this <code>String</code> object is returned.
-     * Otherwise, a new <code>String</code> object is created that
-     * represents a character sequence identical to the character sequence
-     * represented by this <code>String</code> object, except that every
-     * occurrence of <code>oldChar</code> is replaced by an occurrence
-     * of <code>newChar</code>.
-     * <p>
-     * Examples:
-     * <blockquote><pre>
-     * "mesquite in your cellar".replace('e', 'o')
-     *         returns "mosquito in your collar"
-     * "the war of baronets".replace('r', 'y')
-     *         returns "the way of bayonets"
-     * "sparring with a purple porpoise".replace('p', 't')
-     *         returns "starring with a turtle tortoise"
-     * "JonL".replace('q', 'x') returns "JonL" (no change)
-     * </pre></blockquote>
-     *
-     * @param   oldChar   the old character.
-     * @param   newChar   the new character.
-     * @return  a string derived from this string by replacing every
-     *          occurrence of <code>oldChar</code> with <code>newChar</code>.
-     */
-    @JavaScriptBody(args = { "arg1", "arg2" }, body =
-        "if (typeof arg1 === 'number') arg1 = String.fromCharCode(arg1);\n" +
-        "if (typeof arg2 === 'number') arg2 = String.fromCharCode(arg2);\n" +
-        "var s = this.toString();\n" +
-        "for (;;) {\n" +
-        "  var ret = s.replace(arg1, arg2);\n" +
-        "  if (ret === s) {\n" +
-        "    return ret;\n" +
-        "  }\n" +
-        "  s = ret;\n" +
-        "}"
-    )
-    public String replace(char oldChar, char newChar) {
-        if (oldChar != newChar) {
-            int len = length();
-            int i = -1;
-            char[] val = toCharArray(); /* avoid getfield opcode */
-            int off = offset();   /* avoid getfield opcode */
-
-            while (++i < len) {
-                if (val[off + i] == oldChar) {
-                    break;
-                }
-            }
-            if (i < len) {
-                char buf[] = new char[len];
-                for (int j = 0 ; j < i ; j++) {
-                    buf[j] = val[off+j];
-                }
-                while (i < len) {
-                    char c = val[off + i];
-                    buf[i] = (c == oldChar) ? newChar : c;
-                    i++;
-                }
-                return new String(buf, 0, len);
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Tells whether or not this string matches the given <a
-     * href="../util/regex/Pattern.html#sum">regular expression</a>.
-     *
-     * <p> An invocation of this method of the form
-     * <i>str</i><tt>.matches(</tt><i>regex</i><tt>)</tt> yields exactly the
-     * same result as the expression
-     *
-     * <blockquote><tt> {@link java.util.regex.Pattern}.{@link
-     * java.util.regex.Pattern#matches(String,CharSequence)
-     * matches}(</tt><i>regex</i><tt>,</tt> <i>str</i><tt>)</tt></blockquote>
-     *
-     * @param   regex
-     *          the regular expression to which this string is to be matched
-     *
-     * @return  <tt>true</tt> if, and only if, this string matches the
-     *          given regular expression
-     *
-     * @throws  PatternSyntaxException
-     *          if the regular expression's syntax is invalid
-     *
-     * @see java.util.regex.Pattern
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    @JavaScriptBody(args = { "regex" }, body = 
-          "var self = this.toString();\n"
-        + "var re = new RegExp(regex.toString());\n"
-        + "var r = re.exec(self);\n"
-        + "return r != null && r.length > 0 && self.length == r[0].length;"
-    )
-    public boolean matches(String regex) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns true if and only if this string contains the specified
-     * sequence of char values.
-     *
-     * @param s the sequence to search for
-     * @return true if this string contains <code>s</code>, false otherwise
-     * @throws NullPointerException if <code>s</code> is <code>null</code>
-     * @since 1.5
-     */
-    public boolean contains(CharSequence s) {
-        return indexOf(s.toString()) > -1;
-    }
-
-    /**
-     * Replaces the first substring of this string that matches the given <a
-     * href="../util/regex/Pattern.html#sum">regular expression</a> with the
-     * given replacement.
-     *
-     * <p> An invocation of this method of the form
-     * <i>str</i><tt>.replaceFirst(</tt><i>regex</i><tt>,</tt> <i>repl</i><tt>)</tt>
-     * yields exactly the same result as the expression
-     *
-     * <blockquote><tt>
-     * {@link java.util.regex.Pattern}.{@link java.util.regex.Pattern#compile
-     * compile}(</tt><i>regex</i><tt>).{@link
-     * java.util.regex.Pattern#matcher(java.lang.CharSequence)
-     * matcher}(</tt><i>str</i><tt>).{@link java.util.regex.Matcher#replaceFirst
-     * replaceFirst}(</tt><i>repl</i><tt>)</tt></blockquote>
-     *
-     *<p>
-     * Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in the
-     * replacement string may cause the results to be different than if it were
-     * being treated as a literal replacement string; see
-     * {@link java.util.regex.Matcher#replaceFirst}.
-     * Use {@link java.util.regex.Matcher#quoteReplacement} to suppress the special
-     * meaning of these characters, if desired.
-     *
-     * @param   regex
-     *          the regular expression to which this string is to be matched
-     * @param   replacement
-     *          the string to be substituted for the first match
-     *
-     * @return  The resulting <tt>String</tt>
-     *
-     * @throws  PatternSyntaxException
-     *          if the regular expression's syntax is invalid
-     *
-     * @see java.util.regex.Pattern
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public String replaceFirst(String regex, String replacement) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Replaces each substring of this string that matches the given <a
-     * href="../util/regex/Pattern.html#sum">regular expression</a> with the
-     * given replacement.
-     *
-     * <p> An invocation of this method of the form
-     * <i>str</i><tt>.replaceAll(</tt><i>regex</i><tt>,</tt> <i>repl</i><tt>)</tt>
-     * yields exactly the same result as the expression
-     *
-     * <blockquote><tt>
-     * {@link java.util.regex.Pattern}.{@link java.util.regex.Pattern#compile
-     * compile}(</tt><i>regex</i><tt>).{@link
-     * java.util.regex.Pattern#matcher(java.lang.CharSequence)
-     * matcher}(</tt><i>str</i><tt>).{@link java.util.regex.Matcher#replaceAll
-     * replaceAll}(</tt><i>repl</i><tt>)</tt></blockquote>
-     *
-     *<p>
-     * Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in the
-     * replacement string may cause the results to be different than if it were
-     * being treated as a literal replacement string; see
-     * {@link java.util.regex.Matcher#replaceAll Matcher.replaceAll}.
-     * Use {@link java.util.regex.Matcher#quoteReplacement} to suppress the special
-     * meaning of these characters, if desired.
-     *
-     * @param   regex
-     *          the regular expression to which this string is to be matched
-     * @param   replacement
-     *          the string to be substituted for each match
-     *
-     * @return  The resulting <tt>String</tt>
-     *
-     * @throws  PatternSyntaxException
-     *          if the regular expression's syntax is invalid
-     *
-     * @see java.util.regex.Pattern
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public String replaceAll(String regex, String replacement) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Replaces each substring of this string that matches the literal target
-     * sequence with the specified literal replacement sequence. The
-     * replacement proceeds from the beginning of the string to the end, for
-     * example, replacing "aa" with "b" in the string "aaa" will result in
-     * "ba" rather than "ab".
-     *
-     * @param  target The sequence of char values to be replaced
-     * @param  replacement The replacement sequence of char values
-     * @return  The resulting string
-     * @throws NullPointerException if <code>target</code> or
-     *         <code>replacement</code> is <code>null</code>.
-     * @since 1.5
-     */
-    public String replace(CharSequence target, CharSequence replacement) {
-        throw new UnsupportedOperationException("This one should be supported, but without dep on rest of regexp");
-    }
-
-    /**
-     * Splits this string around matches of the given
-     * <a href="../util/regex/Pattern.html#sum">regular expression</a>.
-     *
-     * <p> The array returned by this method contains each substring of this
-     * string that is terminated by another substring that matches the given
-     * expression or is terminated by the end of the string.  The substrings in
-     * the array are in the order in which they occur in this string.  If the
-     * expression does not match any part of the input then the resulting array
-     * has just one element, namely this string.
-     *
-     * <p> The <tt>limit</tt> parameter controls the number of times the
-     * pattern is applied and therefore affects the length of the resulting
-     * array.  If the limit <i>n</i> is greater than zero then the pattern
-     * will be applied at most <i>n</i>&nbsp;-&nbsp;1 times, the array's
-     * length will be no greater than <i>n</i>, and the array's last entry
-     * will contain all input beyond the last matched delimiter.  If <i>n</i>
-     * is non-positive then the pattern will be applied as many times as
-     * possible and the array can have any length.  If <i>n</i> is zero then
-     * the pattern will be applied as many times as possible, the array can
-     * have any length, and trailing empty strings will be discarded.
-     *
-     * <p> The string <tt>"boo:and:foo"</tt>, for example, yields the
-     * following results with these parameters:
-     *
-     * <blockquote><table cellpadding=1 cellspacing=0 summary="Split example showing regex, limit, and result">
-     * <tr>
-     *     <th>Regex</th>
-     *     <th>Limit</th>
-     *     <th>Result</th>
-     * </tr>
-     * <tr><td align=center>:</td>
-     *     <td align=center>2</td>
-     *     <td><tt>{ "boo", "and:foo" }</tt></td></tr>
-     * <tr><td align=center>:</td>
-     *     <td align=center>5</td>
-     *     <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
-     * <tr><td align=center>:</td>
-     *     <td align=center>-2</td>
-     *     <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
-     * <tr><td align=center>o</td>
-     *     <td align=center>5</td>
-     *     <td><tt>{ "b", "", ":and:f", "", "" }</tt></td></tr>
-     * <tr><td align=center>o</td>
-     *     <td align=center>-2</td>
-     *     <td><tt>{ "b", "", ":and:f", "", "" }</tt></td></tr>
-     * <tr><td align=center>o</td>
-     *     <td align=center>0</td>
-     *     <td><tt>{ "b", "", ":and:f" }</tt></td></tr>
-     * </table></blockquote>
-     *
-     * <p> An invocation of this method of the form
-     * <i>str.</i><tt>split(</tt><i>regex</i><tt>,</tt>&nbsp;<i>n</i><tt>)</tt>
-     * yields the same result as the expression
-     *
-     * <blockquote>
-     * {@link java.util.regex.Pattern}.{@link java.util.regex.Pattern#compile
-     * compile}<tt>(</tt><i>regex</i><tt>)</tt>.{@link
-     * java.util.regex.Pattern#split(java.lang.CharSequence,int)
-     * split}<tt>(</tt><i>str</i><tt>,</tt>&nbsp;<i>n</i><tt>)</tt>
-     * </blockquote>
-     *
-     *
-     * @param  regex
-     *         the delimiting regular expression
-     *
-     * @param  limit
-     *         the result threshold, as described above
-     *
-     * @return  the array of strings computed by splitting this string
-     *          around matches of the given regular expression
-     *
-     * @throws  PatternSyntaxException
-     *          if the regular expression's syntax is invalid
-     *
-     * @see java.util.regex.Pattern
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public String[] split(String regex, int limit) {
-        throw new UnsupportedOperationException("Needs regexp");
-    }
-
-    /**
-     * Splits this string around matches of the given <a
-     * href="../util/regex/Pattern.html#sum">regular expression</a>.
-     *
-     * <p> This method works as if by invoking the two-argument {@link
-     * #split(String, int) split} method with the given expression and a limit
-     * argument of zero.  Trailing empty strings are therefore not included in
-     * the resulting array.
-     *
-     * <p> The string <tt>"boo:and:foo"</tt>, for example, yields the following
-     * results with these expressions:
-     *
-     * <blockquote><table cellpadding=1 cellspacing=0 summary="Split examples showing regex and result">
-     * <tr>
-     *  <th>Regex</th>
-     *  <th>Result</th>
-     * </tr>
-     * <tr><td align=center>:</td>
-     *     <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
-     * <tr><td align=center>o</td>
-     *     <td><tt>{ "b", "", ":and:f" }</tt></td></tr>
-     * </table></blockquote>
-     *
-     *
-     * @param  regex
-     *         the delimiting regular expression
-     *
-     * @return  the array of strings computed by splitting this string
-     *          around matches of the given regular expression
-     *
-     * @throws  PatternSyntaxException
-     *          if the regular expression's syntax is invalid
-     *
-     * @see java.util.regex.Pattern
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public String[] split(String regex) {
-        return split(regex, 0);
-    }
-
-    /**
-     * Converts all of the characters in this <code>String</code> to lower
-     * case using the rules of the given <code>Locale</code>.  Case mapping is based
-     * on the Unicode Standard version specified by the {@link java.lang.Character Character}
-     * class. Since case mappings are not always 1:1 char mappings, the resulting
-     * <code>String</code> may be a different length than the original <code>String</code>.
-     * <p>
-     * Examples of lowercase  mappings are in the following table:
-     * <table border="1" summary="Lowercase mapping examples showing language code of locale, upper case, lower case, and description">
-     * <tr>
-     *   <th>Language Code of Locale</th>
-     *   <th>Upper Case</th>
-     *   <th>Lower Case</th>
-     *   <th>Description</th>
-     * </tr>
-     * <tr>
-     *   <td>tr (Turkish)</td>
-     *   <td>&#92;u0130</td>
-     *   <td>&#92;u0069</td>
-     *   <td>capital letter I with dot above -&gt; small letter i</td>
-     * </tr>
-     * <tr>
-     *   <td>tr (Turkish)</td>
-     *   <td>&#92;u0049</td>
-     *   <td>&#92;u0131</td>
-     *   <td>capital letter I -&gt; small letter dotless i </td>
-     * </tr>
-     * <tr>
-     *   <td>(all)</td>
-     *   <td>French Fries</td>
-     *   <td>french fries</td>
-     *   <td>lowercased all chars in String</td>
-     * </tr>
-     * <tr>
-     *   <td>(all)</td>
-     *   <td><img src="doc-files/capiota.gif" alt="capiota"><img src="doc-files/capchi.gif" alt="capchi">
-     *       <img src="doc-files/captheta.gif" alt="captheta"><img src="doc-files/capupsil.gif" alt="capupsil">
-     *       <img src="doc-files/capsigma.gif" alt="capsigma"></td>
-     *   <td><img src="doc-files/iota.gif" alt="iota"><img src="doc-files/chi.gif" alt="chi">
-     *       <img src="doc-files/theta.gif" alt="theta"><img src="doc-files/upsilon.gif" alt="upsilon">
-     *       <img src="doc-files/sigma1.gif" alt="sigma"></td>
-     *   <td>lowercased all chars in String</td>
-     * </tr>
-     * </table>
-     *
-     * @param locale use the case transformation rules for this locale
-     * @return the <code>String</code>, converted to lowercase.
-     * @see     java.lang.String#toLowerCase()
-     * @see     java.lang.String#toUpperCase()
-     * @see     java.lang.String#toUpperCase(Locale)
-     * @since   1.1
-     */
-//    public String toLowerCase(Locale locale) {
-//        if (locale == null) {
-//            throw new NullPointerException();
-//        }
-//
-//        int     firstUpper;
-//
-//        /* Now check if there are any characters that need to be changed. */
-//        scan: {
-//            for (firstUpper = 0 ; firstUpper < count; ) {
-//                char c = value[offset+firstUpper];
-//                if ((c >= Character.MIN_HIGH_SURROGATE) &&
-//                    (c <= Character.MAX_HIGH_SURROGATE)) {
-//                    int supplChar = codePointAt(firstUpper);
-//                    if (supplChar != Character.toLowerCase(supplChar)) {
-//                        break scan;
-//                    }
-//                    firstUpper += Character.charCount(supplChar);
-//                } else {
-//                    if (c != Character.toLowerCase(c)) {
-//                        break scan;
-//                    }
-//                    firstUpper++;
-//                }
-//            }
-//            return this;
-//        }
-//
-//        char[]  result = new char[count];
-//        int     resultOffset = 0;  /* result may grow, so i+resultOffset
-//                                    * is the write location in result */
-//
-//        /* Just copy the first few lowerCase characters. */
-//        System.arraycopy(value, offset, result, 0, firstUpper);
-//
-//        String lang = locale.getLanguage();
-//        boolean localeDependent =
-//            (lang == "tr" || lang == "az" || lang == "lt");
-//        char[] lowerCharArray;
-//        int lowerChar;
-//        int srcChar;
-//        int srcCount;
-//        for (int i = firstUpper; i < count; i += srcCount) {
-//            srcChar = (int)value[offset+i];
-//            if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
-//                (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
-//                srcChar = codePointAt(i);
-//                srcCount = Character.charCount(srcChar);
-//            } else {
-//                srcCount = 1;
-//            }
-//            if (localeDependent || srcChar == '\u03A3') { // GREEK CAPITAL LETTER SIGMA
-//                lowerChar = ConditionalSpecialCasing.toLowerCaseEx(this, i, locale);
-//            } else if (srcChar == '\u0130') { // LATIN CAPITAL LETTER I DOT
-//                lowerChar = Character.ERROR;
-//            } else {
-//                lowerChar = Character.toLowerCase(srcChar);
-//            }
-//            if ((lowerChar == Character.ERROR) ||
-//                (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
-//                if (lowerChar == Character.ERROR) {
-//                     if (!localeDependent && srcChar == '\u0130') {
-//                         lowerCharArray =
-//                             ConditionalSpecialCasing.toLowerCaseCharArray(this, i, Locale.ENGLISH);
-//                     } else {
-//                        lowerCharArray =
-//                            ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
-//                     }
-//                } else if (srcCount == 2) {
-//                    resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount;
-//                    continue;
-//                } else {
-//                    lowerCharArray = Character.toChars(lowerChar);
-//                }
-//
-//                /* Grow result if needed */
-//                int mapLen = lowerCharArray.length;
-//                if (mapLen > srcCount) {
-//                    char[] result2 = new char[result.length + mapLen - srcCount];
-//                    System.arraycopy(result, 0, result2, 0,
-//                        i + resultOffset);
-//                    result = result2;
-//                }
-//                for (int x=0; x<mapLen; ++x) {
-//                    result[i+resultOffset+x] = lowerCharArray[x];
-//                }
-//                resultOffset += (mapLen - srcCount);
-//            } else {
-//                result[i+resultOffset] = (char)lowerChar;
-//            }
-//        }
-//        return new String(0, count+resultOffset, result);
-//    }
-
-    /**
-     * Converts all of the characters in this <code>String</code> to lower
-     * case using the rules of the default locale. This is equivalent to calling
-     * <code>toLowerCase(Locale.getDefault())</code>.
-     * <p>
-     * <b>Note:</b> This method is locale sensitive, and may produce unexpected
-     * results if used for strings that are intended to be interpreted locale
-     * independently.
-     * Examples are programming language identifiers, protocol keys, and HTML
-     * tags.
-     * For instance, <code>"TITLE".toLowerCase()</code> in a Turkish locale
-     * returns <code>"t\u005Cu0131tle"</code>, where '\u005Cu0131' is the
-     * LATIN SMALL LETTER DOTLESS I character.
-     * To obtain correct results for locale insensitive strings, use
-     * <code>toLowerCase(Locale.ENGLISH)</code>.
-     * <p>
-     * @return  the <code>String</code>, converted to lowercase.
-     * @see     java.lang.String#toLowerCase(Locale)
-     */
-    @JavaScriptBody(args = {}, body = "return this.toLowerCase();")
-    public String toLowerCase() {
-        throw new UnsupportedOperationException("Should be supported but without connection to locale");
-    }
-
-    /**
-     * Converts all of the characters in this <code>String</code> to upper
-     * case using the rules of the given <code>Locale</code>. Case mapping is based
-     * on the Unicode Standard version specified by the {@link java.lang.Character Character}
-     * class. Since case mappings are not always 1:1 char mappings, the resulting
-     * <code>String</code> may be a different length than the original <code>String</code>.
-     * <p>
-     * Examples of locale-sensitive and 1:M case mappings are in the following table.
-     * <p>
-     * <table border="1" summary="Examples of locale-sensitive and 1:M case mappings. Shows Language code of locale, lower case, upper case, and description.">
-     * <tr>
-     *   <th>Language Code of Locale</th>
-     *   <th>Lower Case</th>
-     *   <th>Upper Case</th>
-     *   <th>Description</th>
-     * </tr>
-     * <tr>
-     *   <td>tr (Turkish)</td>
-     *   <td>&#92;u0069</td>
-     *   <td>&#92;u0130</td>
-     *   <td>small letter i -&gt; capital letter I with dot above</td>
-     * </tr>
-     * <tr>
-     *   <td>tr (Turkish)</td>
-     *   <td>&#92;u0131</td>
-     *   <td>&#92;u0049</td>
-     *   <td>small letter dotless i -&gt; capital letter I</td>
-     * </tr>
-     * <tr>
-     *   <td>(all)</td>
-     *   <td>&#92;u00df</td>
-     *   <td>&#92;u0053 &#92;u0053</td>
-     *   <td>small letter sharp s -&gt; two letters: SS</td>
-     * </tr>
-     * <tr>
-     *   <td>(all)</td>
-     *   <td>Fahrvergn&uuml;gen</td>
-     *   <td>FAHRVERGN&Uuml;GEN</td>
-     *   <td></td>
-     * </tr>
-     * </table>
-     * @param locale use the case transformation rules for this locale
-     * @return the <code>String</code>, converted to uppercase.
-     * @see     java.lang.String#toUpperCase()
-     * @see     java.lang.String#toLowerCase()
-     * @see     java.lang.String#toLowerCase(Locale)
-     * @since   1.1
-     */
-    /* not for javascript 
-    public String toUpperCase(Locale locale) {
-        if (locale == null) {
-            throw new NullPointerException();
-        }
-
-        int     firstLower;
-
-        // Now check if there are any characters that need to be changed. 
-        scan: {
-            for (firstLower = 0 ; firstLower < count; ) {
-                int c = (int)value[offset+firstLower];
-                int srcCount;
-                if ((c >= Character.MIN_HIGH_SURROGATE) &&
-                    (c <= Character.MAX_HIGH_SURROGATE)) {
-                    c = codePointAt(firstLower);
-                    srcCount = Character.charCount(c);
-                } else {
-                    srcCount = 1;
-                }
-                int upperCaseChar = Character.toUpperCaseEx(c);
-                if ((upperCaseChar == Character.ERROR) ||
-                    (c != upperCaseChar)) {
-                    break scan;
-                }
-                firstLower += srcCount;
-            }
-            return this;
-        }
-
-        char[]  result       = new char[count]; /* may grow *
-        int     resultOffset = 0;  /* result may grow, so i+resultOffset
-                                    * is the write location in result *
-
-        /* Just copy the first few upperCase characters. *
-        System.arraycopy(value, offset, result, 0, firstLower);
-
-        String lang = locale.getLanguage();
-        boolean localeDependent =
-            (lang == "tr" || lang == "az" || lang == "lt");
-        char[] upperCharArray;
-        int upperChar;
-        int srcChar;
-        int srcCount;
-        for (int i = firstLower; i < count; i += srcCount) {
-            srcChar = (int)value[offset+i];
-            if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
-                (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
-                srcChar = codePointAt(i);
-                srcCount = Character.charCount(srcChar);
-            } else {
-                srcCount = 1;
-            }
-            if (localeDependent) {
-                upperChar = ConditionalSpecialCasing.toUpperCaseEx(this, i, locale);
-            } else {
-                upperChar = Character.toUpperCaseEx(srcChar);
-            }
-            if ((upperChar == Character.ERROR) ||
-                (upperChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
-                if (upperChar == Character.ERROR) {
-                    if (localeDependent) {
-                        upperCharArray =
-                            ConditionalSpecialCasing.toUpperCaseCharArray(this, i, locale);
-                    } else {
-                        upperCharArray = Character.toUpperCaseCharArray(srcChar);
-                    }
-                } else if (srcCount == 2) {
-                    resultOffset += Character.toChars(upperChar, result, i + resultOffset) - srcCount;
-                    continue;
-                } else {
-                    upperCharArray = Character.toChars(upperChar);
-                }
-
-                /* Grow result if needed *
-                int mapLen = upperCharArray.length;
-                if (mapLen > srcCount) {
-                    char[] result2 = new char[result.length + mapLen - srcCount];
-                    System.arraycopy(result, 0, result2, 0,
-                        i + resultOffset);
-                    result = result2;
-                }
-                for (int x=0; x<mapLen; ++x) {
-                    result[i+resultOffset+x] = upperCharArray[x];
-                }
-                resultOffset += (mapLen - srcCount);
-            } else {
-                result[i+resultOffset] = (char)upperChar;
-            }
-        }
-        return new String(0, count+resultOffset, result);
-    }
-    */
-
-    /**
-     * Converts all of the characters in this <code>String</code> to upper
-     * case using the rules of the default locale. This method is equivalent to
-     * <code>toUpperCase(Locale.getDefault())</code>.
-     * <p>
-     * <b>Note:</b> This method is locale sensitive, and may produce unexpected
-     * results if used for strings that are intended to be interpreted locale
-     * independently.
-     * Examples are programming language identifiers, protocol keys, and HTML
-     * tags.
-     * For instance, <code>"title".toUpperCase()</code> in a Turkish locale
-     * returns <code>"T\u005Cu0130TLE"</code>, where '\u005Cu0130' is the
-     * LATIN CAPITAL LETTER I WITH DOT ABOVE character.
-     * To obtain correct results for locale insensitive strings, use
-     * <code>toUpperCase(Locale.ENGLISH)</code>.
-     * <p>
-     * @return  the <code>String</code>, converted to uppercase.
-     * @see     java.lang.String#toUpperCase(Locale)
-     */
-    @JavaScriptBody(args = {}, body = "return this.toUpperCase();")
-    public String toUpperCase() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns a copy of the string, with leading and trailing whitespace
-     * omitted.
-     * <p>
-     * If this <code>String</code> object represents an empty character
-     * sequence, or the first and last characters of character sequence
-     * represented by this <code>String</code> object both have codes
-     * greater than <code>'&#92;u0020'</code> (the space character), then a
-     * reference to this <code>String</code> object is returned.
-     * <p>
-     * Otherwise, if there is no character with a code greater than
-     * <code>'&#92;u0020'</code> in the string, then a new
-     * <code>String</code> object representing an empty string is created
-     * and returned.
-     * <p>
-     * Otherwise, let <i>k</i> be the index of the first character in the
-     * string whose code is greater than <code>'&#92;u0020'</code>, and let
-     * <i>m</i> be the index of the last character in the string whose code
-     * is greater than <code>'&#92;u0020'</code>. A new <code>String</code>
-     * object is created, representing the substring of this string that
-     * begins with the character at index <i>k</i> and ends with the
-     * character at index <i>m</i>-that is, the result of
-     * <code>this.substring(<i>k</i>,&nbsp;<i>m</i>+1)</code>.
-     * <p>
-     * This method may be used to trim whitespace (as defined above) from
-     * the beginning and end of a string.
-     *
-     * @return  A copy of this string with leading and trailing white
-     *          space removed, or this string if it has no leading or
-     *          trailing white space.
-     */
-    public String trim() {
-        int len = length();
-        int st = 0;
-        int off = offset();      /* avoid getfield opcode */
-        char[] val = toCharArray();    /* avoid getfield opcode */
-
-        while ((st < len) && (val[off + st] <= ' ')) {
-            st++;
-        }
-        while ((st < len) && (val[off + len - 1] <= ' ')) {
-            len--;
-        }
-        return ((st > 0) || (len < length())) ? substring(st, len) : this;
-    }
-
-    /**
-     * This object (which is already a string!) is itself returned.
-     *
-     * @return  the string itself.
-     */
-    @JavaScriptBody(args = {}, body = "return this.toString();")
-    public String toString() {
-        return this;
-    }
-
-    /**
-     * Converts this string to a new character array.
-     *
-     * @return  a newly allocated character array whose length is the length
-     *          of this string and whose contents are initialized to contain
-     *          the character sequence represented by this string.
-     */
-    public char[] toCharArray() {
-        char result[] = new char[length()];
-        getChars(0, length(), result, 0);
-        return result;
-    }
-
-    /**
-     * Returns a formatted string using the specified format string and
-     * arguments.
-     *
-     * <p> The locale always used is the one returned by {@link
-     * java.util.Locale#getDefault() Locale.getDefault()}.
-     *
-     * @param  format
-     *         A <a href="../util/Formatter.html#syntax">format string</a>
-     *
-     * @param  args
-     *         Arguments referenced by the format specifiers in the format
-     *         string.  If there are more arguments than format specifiers, the
-     *         extra arguments are ignored.  The number of arguments is
-     *         variable and may be zero.  The maximum number of arguments is
-     *         limited by the maximum dimension of a Java array as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *         The behaviour on a
-     *         <tt>null</tt> argument depends on the <a
-     *         href="../util/Formatter.html#syntax">conversion</a>.
-     *
-     * @throws  IllegalFormatException
-     *          If a format string contains an illegal syntax, a format
-     *          specifier that is incompatible with the given arguments,
-     *          insufficient arguments given the format string, or other
-     *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section of the
-     *          formatter class specification.
-     *
-     * @throws  NullPointerException
-     *          If the <tt>format</tt> is <tt>null</tt>
-     *
-     * @return  A formatted string
-     *
-     * @see  java.util.Formatter
-     * @since  1.5
-     */
-    public static String format(String format, Object ... args) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns a formatted string using the specified locale, format string,
-     * and arguments.
-     *
-     * @param  l
-     *         The {@linkplain java.util.Locale locale} to apply during
-     *         formatting.  If <tt>l</tt> is <tt>null</tt> then no localization
-     *         is applied.
-     *
-     * @param  format
-     *         A <a href="../util/Formatter.html#syntax">format string</a>
-     *
-     * @param  args
-     *         Arguments referenced by the format specifiers in the format
-     *         string.  If there are more arguments than format specifiers, the
-     *         extra arguments are ignored.  The number of arguments is
-     *         variable and may be zero.  The maximum number of arguments is
-     *         limited by the maximum dimension of a Java array as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *         The behaviour on a
-     *         <tt>null</tt> argument depends on the <a
-     *         href="../util/Formatter.html#syntax">conversion</a>.
-     *
-     * @throws  IllegalFormatException
-     *          If a format string contains an illegal syntax, a format
-     *          specifier that is incompatible with the given arguments,
-     *          insufficient arguments given the format string, or other
-     *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section of the
-     *          formatter class specification
-     *
-     * @throws  NullPointerException
-     *          If the <tt>format</tt> is <tt>null</tt>
-     *
-     * @return  A formatted string
-     *
-     * @see  java.util.Formatter
-     * @since  1.5
-     */
-//    public static String format(Locale l, String format, Object ... args) {
-//        return new Formatter(l).format(format, args).toString();
-//    }
-
-    /**
-     * Returns the string representation of the <code>Object</code> argument.
-     *
-     * @param   obj   an <code>Object</code>.
-     * @return  if the argument is <code>null</code>, then a string equal to
-     *          <code>"null"</code>; otherwise, the value of
-     *          <code>obj.toString()</code> is returned.
-     * @see     java.lang.Object#toString()
-     */
-    public static String valueOf(Object obj) {
-        return (obj == null) ? "null" : obj.toString();
-    }
-
-    /**
-     * Returns the string representation of the <code>char</code> array
-     * argument. The contents of the character array are copied; subsequent
-     * modification of the character array does not affect the newly
-     * created string.
-     *
-     * @param   data   a <code>char</code> array.
-     * @return  a newly allocated string representing the same sequence of
-     *          characters contained in the character array argument.
-     */
-    public static String valueOf(char data[]) {
-        return new String(data);
-    }
-
-    /**
-     * Returns the string representation of a specific subarray of the
-     * <code>char</code> array argument.
-     * <p>
-     * The <code>offset</code> argument is the index of the first
-     * character of the subarray. The <code>count</code> argument
-     * specifies the length of the subarray. The contents of the subarray
-     * are copied; subsequent modification of the character array does not
-     * affect the newly created string.
-     *
-     * @param   data     the character array.
-     * @param   offset   the initial offset into the value of the
-     *                  <code>String</code>.
-     * @param   count    the length of the value of the <code>String</code>.
-     * @return  a string representing the sequence of characters contained
-     *          in the subarray of the character array argument.
-     * @exception IndexOutOfBoundsException if <code>offset</code> is
-     *          negative, or <code>count</code> is negative, or
-     *          <code>offset+count</code> is larger than
-     *          <code>data.length</code>.
-     */
-    public static String valueOf(char data[], int offset, int count) {
-        return new String(data, offset, count);
-    }
-
-    /**
-     * Returns a String that represents the character sequence in the
-     * array specified.
-     *
-     * @param   data     the character array.
-     * @param   offset   initial offset of the subarray.
-     * @param   count    length of the subarray.
-     * @return  a <code>String</code> that contains the characters of the
-     *          specified subarray of the character array.
-     */
-    public static String copyValueOf(char data[], int offset, int count) {
-        // All public String constructors now copy the data.
-        return new String(data, offset, count);
-    }
-
-    /**
-     * Returns a String that represents the character sequence in the
-     * array specified.
-     *
-     * @param   data   the character array.
-     * @return  a <code>String</code> that contains the characters of the
-     *          character array.
-     */
-    public static String copyValueOf(char data[]) {
-        return copyValueOf(data, 0, data.length);
-    }
-
-    /**
-     * Returns the string representation of the <code>boolean</code> argument.
-     *
-     * @param   b   a <code>boolean</code>.
-     * @return  if the argument is <code>true</code>, a string equal to
-     *          <code>"true"</code> is returned; otherwise, a string equal to
-     *          <code>"false"</code> is returned.
-     */
-    public static String valueOf(boolean b) {
-        return b ? "true" : "false";
-    }
-
-    /**
-     * Returns the string representation of the <code>char</code>
-     * argument.
-     *
-     * @param   c   a <code>char</code>.
-     * @return  a string of length <code>1</code> containing
-     *          as its single character the argument <code>c</code>.
-     */
-    public static String valueOf(char c) {
-        char data[] = {c};
-        return new String(data, 0, 1);
-    }
-
-    /**
-     * Returns the string representation of the <code>int</code> argument.
-     * <p>
-     * The representation is exactly the one returned by the
-     * <code>Integer.toString</code> method of one argument.
-     *
-     * @param   i   an <code>int</code>.
-     * @return  a string representation of the <code>int</code> argument.
-     * @see     java.lang.Integer#toString(int, int)
-     */
-    public static String valueOf(int i) {
-        return Integer.toString(i);
-    }
-
-    /**
-     * Returns the string representation of the <code>long</code> argument.
-     * <p>
-     * The representation is exactly the one returned by the
-     * <code>Long.toString</code> method of one argument.
-     *
-     * @param   l   a <code>long</code>.
-     * @return  a string representation of the <code>long</code> argument.
-     * @see     java.lang.Long#toString(long)
-     */
-    public static String valueOf(long l) {
-        return Long.toString(l);
-    }
-
-    /**
-     * Returns the string representation of the <code>float</code> argument.
-     * <p>
-     * The representation is exactly the one returned by the
-     * <code>Float.toString</code> method of one argument.
-     *
-     * @param   f   a <code>float</code>.
-     * @return  a string representation of the <code>float</code> argument.
-     * @see     java.lang.Float#toString(float)
-     */
-    public static String valueOf(float f) {
-        return Float.toString(f);
-    }
-
-    /**
-     * Returns the string representation of the <code>double</code> argument.
-     * <p>
-     * The representation is exactly the one returned by the
-     * <code>Double.toString</code> method of one argument.
-     *
-     * @param   d   a <code>double</code>.
-     * @return  a  string representation of the <code>double</code> argument.
-     * @see     java.lang.Double#toString(double)
-     */
-    public static String valueOf(double d) {
-        return Double.toString(d);
-    }
-
-    /**
-     * Returns a canonical representation for the string object.
-     * <p>
-     * A pool of strings, initially empty, is maintained privately by the
-     * class <code>String</code>.
-     * <p>
-     * When the intern method is invoked, if the pool already contains a
-     * string equal to this <code>String</code> object as determined by
-     * the {@link #equals(Object)} method, then the string from the pool is
-     * returned. Otherwise, this <code>String</code> object is added to the
-     * pool and a reference to this <code>String</code> object is returned.
-     * <p>
-     * It follows that for any two strings <code>s</code> and <code>t</code>,
-     * <code>s.intern()&nbsp;==&nbsp;t.intern()</code> is <code>true</code>
-     * if and only if <code>s.equals(t)</code> is <code>true</code>.
-     * <p>
-     * All literal strings and string-valued constant expressions are
-     * interned. String literals are defined in section 3.10.5 of the
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * @return  a string that has the same contents as this string, but is
-     *          guaranteed to be from a pool of unique strings.
-     */
-    public native String intern();
-    
-    
-    private static <T> T checkUTF8(T data, String charsetName)
-        throws UnsupportedEncodingException {
-        if (charsetName == null) {
-            throw new NullPointerException("charsetName");
-        }
-        if (!charsetName.equalsIgnoreCase("UTF-8")
-            && !charsetName.equalsIgnoreCase("UTF8")) {
-            throw new UnsupportedEncodingException(charsetName);
-        }
-        return data;
-    }
-    
-    private static int nextChar(byte[] arr, int[] index) throws IndexOutOfBoundsException {
-        int c = arr[index[0]++] & 0xff;
-        switch (c >> 4) {
-            case 0:
-            case 1:
-            case 2:
-            case 3:
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-                /* 0xxxxxxx*/
-                return c;
-            case 12:
-            case 13: {
-                /* 110x xxxx   10xx xxxx*/
-                int char2 = (int) arr[index[0]++];
-                if ((char2 & 0xC0) != 0x80) {
-                    throw new IndexOutOfBoundsException("malformed input");
-                }
-                return (((c & 0x1F) << 6) | (char2 & 0x3F));
-            }
-            case 14: {
-                /* 1110 xxxx  10xx xxxx  10xx xxxx */
-                int char2 = arr[index[0]++];
-                int char3 = arr[index[0]++];
-                if (((char2 & 0xC0) != 0x80) || ((char3 & 0xC0) != 0x80)) {
-                    throw new IndexOutOfBoundsException("malformed input");
-                }
-                return (((c & 0x0F) << 12)
-                    | ((char2 & 0x3F) << 6)
-                    | ((char3 & 0x3F) << 0));
-            }
-            default:
-                /* 10xx xxxx,  1111 xxxx */
-                throw new IndexOutOfBoundsException("malformed input");
-        }
-        
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/StringBuffer.java
--- a/emul/mini/src/main/java/java/lang/StringBuffer.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,604 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-
-/**
- * A thread-safe, mutable sequence of characters.
- * A string buffer is like a {@link String}, but can be modified. At any
- * point in time it contains some particular sequence of characters, but
- * the length and content of the sequence can be changed through certain
- * method calls.
- * <p>
- * String buffers are safe for use by multiple threads. The methods
- * are synchronized where necessary so that all the operations on any
- * particular instance behave as if they occur in some serial order
- * that is consistent with the order of the method calls made by each of
- * the individual threads involved.
- * <p>
- * The principal operations on a <code>StringBuffer</code> are the
- * <code>append</code> and <code>insert</code> methods, which are
- * overloaded so as to accept data of any type. Each effectively
- * converts a given datum to a string and then appends or inserts the
- * characters of that string to the string buffer. The
- * <code>append</code> method always adds these characters at the end
- * of the buffer; the <code>insert</code> method adds the characters at
- * a specified point.
- * <p>
- * For example, if <code>z</code> refers to a string buffer object
- * whose current contents are "<code>start</code>", then
- * the method call <code>z.append("le")</code> would cause the string
- * buffer to contain "<code>startle</code>", whereas
- * <code>z.insert(4, "le")</code> would alter the string buffer to
- * contain "<code>starlet</code>".
- * <p>
- * In general, if sb refers to an instance of a <code>StringBuffer</code>,
- * then <code>sb.append(x)</code> has the same effect as
- * <code>sb.insert(sb.length(),&nbsp;x)</code>.
- * <p>
- * Whenever an operation occurs involving a source sequence (such as
- * appending or inserting from a source sequence) this class synchronizes
- * only on the string buffer performing the operation, not on the source.
- * <p>
- * Every string buffer has a capacity. As long as the length of the
- * character sequence contained in the string buffer does not exceed
- * the capacity, it is not necessary to allocate a new internal
- * buffer array. If the internal buffer overflows, it is
- * automatically made larger.
- *
- * As of  release JDK 5, this class has been supplemented with an equivalent
- * class designed for use by a single thread, {@link StringBuilder}.  The
- * <tt>StringBuilder</tt> class should generally be used in preference to
- * this one, as it supports all of the same operations but it is faster, as
- * it performs no synchronization.
- *
- * @author      Arthur van Hoff
- * @see     java.lang.StringBuilder
- * @see     java.lang.String
- * @since   JDK1.0
- */
- public final class StringBuffer
-    extends AbstractStringBuilder
-    implements java.io.Serializable, CharSequence
-{
-
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    static final long serialVersionUID = 3388685877147921107L;
-
-    /**
-     * Constructs a string buffer with no characters in it and an
-     * initial capacity of 16 characters.
-     */
-    public StringBuffer() {
-        super(16);
-    }
-
-    /**
-     * Constructs a string buffer with no characters in it and
-     * the specified initial capacity.
-     *
-     * @param      capacity  the initial capacity.
-     * @exception  NegativeArraySizeException  if the <code>capacity</code>
-     *               argument is less than <code>0</code>.
-     */
-    public StringBuffer(int capacity) {
-        super(capacity);
-    }
-
-    /**
-     * Constructs a string buffer initialized to the contents of the
-     * specified string. The initial capacity of the string buffer is
-     * <code>16</code> plus the length of the string argument.
-     *
-     * @param   str   the initial contents of the buffer.
-     * @exception NullPointerException if <code>str</code> is <code>null</code>
-     */
-    public StringBuffer(String str) {
-        super(str.length() + 16);
-        append(str);
-    }
-
-    /**
-     * Constructs a string buffer that contains the same characters
-     * as the specified <code>CharSequence</code>. The initial capacity of
-     * the string buffer is <code>16</code> plus the length of the
-     * <code>CharSequence</code> argument.
-     * <p>
-     * If the length of the specified <code>CharSequence</code> is
-     * less than or equal to zero, then an empty buffer of capacity
-     * <code>16</code> is returned.
-     *
-     * @param      seq   the sequence to copy.
-     * @exception NullPointerException if <code>seq</code> is <code>null</code>
-     * @since 1.5
-     */
-    public StringBuffer(CharSequence seq) {
-        this(seq.length() + 16);
-        append(seq);
-    }
-
-    public synchronized int length() {
-        return count;
-    }
-
-    public synchronized int capacity() {
-        return value.length;
-    }
-
-
-    public synchronized void ensureCapacity(int minimumCapacity) {
-        if (minimumCapacity > value.length) {
-            expandCapacity(minimumCapacity);
-        }
-    }
-
-    /**
-     * @since      1.5
-     */
-    public synchronized void trimToSize() {
-        super.trimToSize();
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @see        #length()
-     */
-    public synchronized void setLength(int newLength) {
-        super.setLength(newLength);
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @see        #length()
-     */
-    public synchronized char charAt(int index) {
-        if ((index < 0) || (index >= count))
-            throw new StringIndexOutOfBoundsException(index);
-        return value[index];
-    }
-
-    /**
-     * @since      1.5
-     */
-    public synchronized int codePointAt(int index) {
-        return super.codePointAt(index);
-    }
-
-    /**
-     * @since     1.5
-     */
-    public synchronized int codePointBefore(int index) {
-        return super.codePointBefore(index);
-    }
-
-    /**
-     * @since     1.5
-     */
-    public synchronized int codePointCount(int beginIndex, int endIndex) {
-        return super.codePointCount(beginIndex, endIndex);
-    }
-
-    /**
-     * @since     1.5
-     */
-    public synchronized int offsetByCodePoints(int index, int codePointOffset) {
-        return super.offsetByCodePoints(index, codePointOffset);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public synchronized void getChars(int srcBegin, int srcEnd, char[] dst,
-                                      int dstBegin)
-    {
-        super.getChars(srcBegin, srcEnd, dst, dstBegin);
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @see        #length()
-     */
-    public synchronized void setCharAt(int index, char ch) {
-        if ((index < 0) || (index >= count))
-            throw new StringIndexOutOfBoundsException(index);
-        value[index] = ch;
-    }
-
-    public synchronized StringBuffer append(Object obj) {
-        super.append(String.valueOf(obj));
-        return this;
-    }
-
-    public synchronized StringBuffer append(String str) {
-        super.append(str);
-        return this;
-    }
-
-    /**
-     * Appends the specified <tt>StringBuffer</tt> to this sequence.
-     * <p>
-     * The characters of the <tt>StringBuffer</tt> argument are appended,
-     * in order, to the contents of this <tt>StringBuffer</tt>, increasing the
-     * length of this <tt>StringBuffer</tt> by the length of the argument.
-     * If <tt>sb</tt> is <tt>null</tt>, then the four characters
-     * <tt>"null"</tt> are appended to this <tt>StringBuffer</tt>.
-     * <p>
-     * Let <i>n</i> be the length of the old character sequence, the one
-     * contained in the <tt>StringBuffer</tt> just prior to execution of the
-     * <tt>append</tt> method. Then the character at index <i>k</i> in
-     * the new character sequence is equal to the character at index <i>k</i>
-     * in the old character sequence, if <i>k</i> is less than <i>n</i>;
-     * otherwise, it is equal to the character at index <i>k-n</i> in the
-     * argument <code>sb</code>.
-     * <p>
-     * This method synchronizes on <code>this</code> (the destination)
-     * object but does not synchronize on the source (<code>sb</code>).
-     *
-     * @param   sb   the <tt>StringBuffer</tt> to append.
-     * @return  a reference to this object.
-     * @since 1.4
-     */
-    public synchronized StringBuffer append(StringBuffer sb) {
-        super.append(sb);
-        return this;
-    }
-
-
-    /**
-     * Appends the specified <code>CharSequence</code> to this
-     * sequence.
-     * <p>
-     * The characters of the <code>CharSequence</code> argument are appended,
-     * in order, increasing the length of this sequence by the length of the
-     * argument.
-     *
-     * <p>The result of this method is exactly the same as if it were an
-     * invocation of this.append(s, 0, s.length());
-     *
-     * <p>This method synchronizes on this (the destination)
-     * object but does not synchronize on the source (<code>s</code>).
-     *
-     * <p>If <code>s</code> is <code>null</code>, then the four characters
-     * <code>"null"</code> are appended.
-     *
-     * @param   s the <code>CharSequence</code> to append.
-     * @return  a reference to this object.
-     * @since 1.5
-     */
-    public StringBuffer append(CharSequence s) {
-        // Note, synchronization achieved via other invocations
-        if (s == null)
-            s = "null";
-        if (s instanceof String)
-            return this.append((String)s);
-        if (s instanceof StringBuffer)
-            return this.append((StringBuffer)s);
-        return this.append(s, 0, s.length());
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @since      1.5
-     */
-    public synchronized StringBuffer append(CharSequence s, int start, int end)
-    {
-        super.append(s, start, end);
-        return this;
-    }
-
-    public synchronized StringBuffer append(char[] str) {
-        super.append(str);
-        return this;
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public synchronized StringBuffer append(char[] str, int offset, int len) {
-        super.append(str, offset, len);
-        return this;
-    }
-
-    public synchronized StringBuffer append(boolean b) {
-        super.append(b);
-        return this;
-    }
-
-    public synchronized StringBuffer append(char c) {
-        super.append(c);
-        return this;
-    }
-
-    public synchronized StringBuffer append(int i) {
-        super.append(i);
-        return this;
-    }
-
-    /**
-     * @since 1.5
-     */
-    public synchronized StringBuffer appendCodePoint(int codePoint) {
-        super.appendCodePoint(codePoint);
-        return this;
-    }
-
-    public synchronized StringBuffer append(long lng) {
-        super.append(lng);
-        return this;
-    }
-
-    public synchronized StringBuffer append(float f) {
-        super.append(f);
-        return this;
-    }
-
-    public synchronized StringBuffer append(double d) {
-        super.append(d);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     * @since      1.2
-     */
-    public synchronized StringBuffer delete(int start, int end) {
-        super.delete(start, end);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     * @since      1.2
-     */
-    public synchronized StringBuffer deleteCharAt(int index) {
-        super.deleteCharAt(index);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     * @since      1.2
-     */
-    public synchronized StringBuffer replace(int start, int end, String str) {
-        super.replace(start, end, str);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     * @since      1.2
-     */
-    public synchronized String substring(int start) {
-        return substring(start, count);
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @since      1.4
-     */
-    public synchronized CharSequence subSequence(int start, int end) {
-        return super.substring(start, end);
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     * @since      1.2
-     */
-    public synchronized String substring(int start, int end) {
-        return super.substring(start, end);
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     * @since      1.2
-     */
-    public synchronized StringBuffer insert(int index, char[] str, int offset,
-                                            int len)
-    {
-        super.insert(index, str, offset, len);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public synchronized StringBuffer insert(int offset, Object obj) {
-        super.insert(offset, String.valueOf(obj));
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public synchronized StringBuffer insert(int offset, String str) {
-        super.insert(offset, str);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public synchronized StringBuffer insert(int offset, char[] str) {
-        super.insert(offset, str);
-        return this;
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @since      1.5
-     */
-    public StringBuffer insert(int dstOffset, CharSequence s) {
-        // Note, synchronization achieved via other invocations
-        if (s == null)
-            s = "null";
-        if (s instanceof String)
-            return this.insert(dstOffset, (String)s);
-        return this.insert(dstOffset, s, 0, s.length());
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     * @since      1.5
-     */
-    public synchronized StringBuffer insert(int dstOffset, CharSequence s,
-                                            int start, int end)
-    {
-        super.insert(dstOffset, s, start, end);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuffer insert(int offset, boolean b) {
-        return insert(offset, String.valueOf(b));
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public synchronized StringBuffer insert(int offset, char c) {
-        super.insert(offset, c);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuffer insert(int offset, int i) {
-        return insert(offset, String.valueOf(i));
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuffer insert(int offset, long l) {
-        return insert(offset, String.valueOf(l));
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuffer insert(int offset, float f) {
-        return insert(offset, String.valueOf(f));
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuffer insert(int offset, double d) {
-        return insert(offset, String.valueOf(d));
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since      1.4
-     */
-    public int indexOf(String str) {
-        return indexOf(str, 0);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since      1.4
-     */
-    public synchronized int indexOf(String str, int fromIndex) {
-        return super.indexOf(str, fromIndex);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since      1.4
-     */
-    public int lastIndexOf(String str) {
-        // Note, synchronization achieved via other invocations
-        return lastIndexOf(str, count);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since      1.4
-     */
-    public synchronized int lastIndexOf(String str, int fromIndex) {
-        return String.lastIndexOf(value, 0, count,
-                              str.toCharArray(), 0, str.length(), fromIndex);
-    }
-
-    /**
-     * @since   JDK1.0.2
-     */
-    public synchronized StringBuffer reverse() {
-        super.reverse();
-        return this;
-    }
-
-    public synchronized String toString() {
-        return new String(value, 0, count);
-    }
-
-//    /**
-//     * Serializable fields for StringBuffer.
-//     *
-//     * @serialField value  char[]
-//     *              The backing character array of this StringBuffer.
-//     * @serialField count int
-//     *              The number of characters in this StringBuffer.
-//     * @serialField shared  boolean
-//     *              A flag indicating whether the backing array is shared.
-//     *              The value is ignored upon deserialization.
-//     */
-//    private static final java.io.ObjectStreamField[] serialPersistentFields =
-//    {
-//        new java.io.ObjectStreamField("value", char[].class),
-//        new java.io.ObjectStreamField("count", Integer.TYPE),
-//        new java.io.ObjectStreamField("shared", Boolean.TYPE),
-//    };
-//
-//    /**
-//     * readObject is called to restore the state of the StringBuffer from
-//     * a stream.
-//     */
-//    private synchronized void writeObject(java.io.ObjectOutputStream s)
-//        throws java.io.IOException {
-//        java.io.ObjectOutputStream.PutField fields = s.putFields();
-//        fields.put("value", value);
-//        fields.put("count", count);
-//        fields.put("shared", false);
-//        s.writeFields();
-//    }
-//
-//    /**
-//     * readObject is called to restore the state of the StringBuffer from
-//     * a stream.
-//     */
-//    private void readObject(java.io.ObjectInputStream s)
-//        throws java.io.IOException, ClassNotFoundException {
-//        java.io.ObjectInputStream.GetField fields = s.readFields();
-//        value = (char[])fields.get("value", null);
-//        count = fields.get("count", 0);
-//    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/StringBuilder.java
--- a/emul/mini/src/main/java/java/lang/StringBuilder.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-
-/**
- * A mutable sequence of characters.  This class provides an API compatible
- * with <code>StringBuffer</code>, but with no guarantee of synchronization.
- * This class is designed for use as a drop-in replacement for
- * <code>StringBuffer</code> in places where the string buffer was being
- * used by a single thread (as is generally the case).   Where possible,
- * it is recommended that this class be used in preference to
- * <code>StringBuffer</code> as it will be faster under most implementations.
- *
- * <p>The principal operations on a <code>StringBuilder</code> are the
- * <code>append</code> and <code>insert</code> methods, which are
- * overloaded so as to accept data of any type. Each effectively
- * converts a given datum to a string and then appends or inserts the
- * characters of that string to the string builder. The
- * <code>append</code> method always adds these characters at the end
- * of the builder; the <code>insert</code> method adds the characters at
- * a specified point.
- * <p>
- * For example, if <code>z</code> refers to a string builder object
- * whose current contents are "<code>start</code>", then
- * the method call <code>z.append("le")</code> would cause the string
- * builder to contain "<code>startle</code>", whereas
- * <code>z.insert(4, "le")</code> would alter the string builder to
- * contain "<code>starlet</code>".
- * <p>
- * In general, if sb refers to an instance of a <code>StringBuilder</code>,
- * then <code>sb.append(x)</code> has the same effect as
- * <code>sb.insert(sb.length(),&nbsp;x)</code>.
- *
- * Every string builder has a capacity. As long as the length of the
- * character sequence contained in the string builder does not exceed
- * the capacity, it is not necessary to allocate a new internal
- * buffer. If the internal buffer overflows, it is automatically made larger.
- *
- * <p>Instances of <code>StringBuilder</code> are not safe for
- * use by multiple threads. If such synchronization is required then it is
- * recommended that {@link java.lang.StringBuffer} be used.
- *
- * @author      Michael McCloskey
- * @see         java.lang.StringBuffer
- * @see         java.lang.String
- * @since       1.5
- */
-public final class StringBuilder
-    extends AbstractStringBuilder
-    implements java.io.Serializable, CharSequence
-{
-
-    /** use serialVersionUID for interoperability */
-    static final long serialVersionUID = 4383685877147921099L;
-
-    /**
-     * Constructs a string builder with no characters in it and an
-     * initial capacity of 16 characters.
-     */
-    public StringBuilder() {
-        super(16);
-    }
-
-    /**
-     * Constructs a string builder with no characters in it and an
-     * initial capacity specified by the <code>capacity</code> argument.
-     *
-     * @param      capacity  the initial capacity.
-     * @throws     NegativeArraySizeException  if the <code>capacity</code>
-     *               argument is less than <code>0</code>.
-     */
-    public StringBuilder(int capacity) {
-        super(capacity);
-    }
-
-    /**
-     * Constructs a string builder initialized to the contents of the
-     * specified string. The initial capacity of the string builder is
-     * <code>16</code> plus the length of the string argument.
-     *
-     * @param   str   the initial contents of the buffer.
-     * @throws    NullPointerException if <code>str</code> is <code>null</code>
-     */
-    public StringBuilder(String str) {
-        super(str.length() + 16);
-        append(str);
-    }
-
-    /**
-     * Constructs a string builder that contains the same characters
-     * as the specified <code>CharSequence</code>. The initial capacity of
-     * the string builder is <code>16</code> plus the length of the
-     * <code>CharSequence</code> argument.
-     *
-     * @param      seq   the sequence to copy.
-     * @throws    NullPointerException if <code>seq</code> is <code>null</code>
-     */
-    public StringBuilder(CharSequence seq) {
-        this(seq.length() + 16);
-        append(seq);
-    }
-
-    public StringBuilder append(Object obj) {
-        return append(String.valueOf(obj));
-    }
-
-    public StringBuilder append(String str) {
-        super.append(str);
-        return this;
-    }
-
-    // Appends the specified string builder to this sequence.
-    private StringBuilder append(StringBuilder sb) {
-        if (sb == null)
-            return append("null");
-        int len = sb.length();
-        int newcount = count + len;
-        if (newcount > value.length)
-            expandCapacity(newcount);
-        sb.getChars(0, len, value, count);
-        count = newcount;
-        return this;
-    }
-
-    /**
-     * Appends the specified <tt>StringBuffer</tt> to this sequence.
-     * <p>
-     * The characters of the <tt>StringBuffer</tt> argument are appended,
-     * in order, to this sequence, increasing the
-     * length of this sequence by the length of the argument.
-     * If <tt>sb</tt> is <tt>null</tt>, then the four characters
-     * <tt>"null"</tt> are appended to this sequence.
-     * <p>
-     * Let <i>n</i> be the length of this character sequence just prior to
-     * execution of the <tt>append</tt> method. Then the character at index
-     * <i>k</i> in the new character sequence is equal to the character at
-     * index <i>k</i> in the old character sequence, if <i>k</i> is less than
-     * <i>n</i>; otherwise, it is equal to the character at index <i>k-n</i>
-     * in the argument <code>sb</code>.
-     *
-     * @param   sb   the <tt>StringBuffer</tt> to append.
-     * @return  a reference to this object.
-     */
-    public StringBuilder append(StringBuffer sb) {
-        super.append(sb);
-        return this;
-    }
-
-    /**
-     */
-    public StringBuilder append(CharSequence s) {
-        if (s == null)
-            s = "null";
-        if (s instanceof String)
-            return this.append((String)s);
-        if (s instanceof StringBuffer)
-            return this.append((StringBuffer)s);
-        if (s instanceof StringBuilder)
-            return this.append((StringBuilder)s);
-        return this.append(s, 0, s.length());
-    }
-
-    /**
-     * @throws     IndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder append(CharSequence s, int start, int end) {
-        super.append(s, start, end);
-        return this;
-    }
-
-    public StringBuilder append(char[] str) {
-        super.append(str);
-        return this;
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder append(char[] str, int offset, int len) {
-        super.append(str, offset, len);
-        return this;
-    }
-
-    public StringBuilder append(boolean b) {
-        super.append(b);
-        return this;
-    }
-
-    public StringBuilder append(char c) {
-        super.append(c);
-        return this;
-    }
-
-    public StringBuilder append(int i) {
-        super.append(i);
-        return this;
-    }
-
-    public StringBuilder append(long lng) {
-        super.append(lng);
-        return this;
-    }
-
-    public StringBuilder append(float f) {
-        super.append(f);
-        return this;
-    }
-
-    public StringBuilder append(double d) {
-        super.append(d);
-        return this;
-    }
-
-    /**
-     * @since 1.5
-     */
-    public StringBuilder appendCodePoint(int codePoint) {
-        super.appendCodePoint(codePoint);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder delete(int start, int end) {
-        super.delete(start, end);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder deleteCharAt(int index) {
-        super.deleteCharAt(index);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder replace(int start, int end, String str) {
-        super.replace(start, end, str);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int index, char[] str, int offset,
-                                int len)
-    {
-        super.insert(index, str, offset, len);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, Object obj) {
-        return insert(offset, String.valueOf(obj));
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, String str) {
-        super.insert(offset, str);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, char[] str) {
-        super.insert(offset, str);
-        return this;
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int dstOffset, CharSequence s) {
-        if (s == null)
-            s = "null";
-        if (s instanceof String)
-            return this.insert(dstOffset, (String)s);
-        return this.insert(dstOffset, s, 0, s.length());
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int dstOffset, CharSequence s,
-                                int start, int end)
-    {
-        super.insert(dstOffset, s, start, end);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, boolean b) {
-        super.insert(offset, b);
-        return this;
-    }
-
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, char c) {
-        super.insert(offset, c);
-        return this;
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, int i) {
-        return insert(offset, String.valueOf(i));
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, long l) {
-        return insert(offset, String.valueOf(l));
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, float f) {
-        return insert(offset, String.valueOf(f));
-    }
-
-    /**
-     * @throws StringIndexOutOfBoundsException {@inheritDoc}
-     */
-    public StringBuilder insert(int offset, double d) {
-        return insert(offset, String.valueOf(d));
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public int indexOf(String str) {
-        return indexOf(str, 0);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public int indexOf(String str, int fromIndex) {
-        return super.indexOf(str, fromIndex);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public int lastIndexOf(String str) {
-        return lastIndexOf(str, count);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     */
-    public int lastIndexOf(String str, int fromIndex) {
-        return String.lastIndexOf(value, 0, count,
-                              str.toCharArray(), 0, str.length(), fromIndex);
-    }
-
-    public StringBuilder reverse() {
-        super.reverse();
-        return this;
-    }
-
-    public String toString() {
-        // Create a copy, don't share the array
-        return new String(value, 0, count);
-    }
-
-    /**
-     * Save the state of the <tt>StringBuilder</tt> instance to a stream
-     * (that is, serialize it).
-     *
-     * @serialData the number of characters currently stored in the string
-     *             builder (<tt>int</tt>), followed by the characters in the
-     *             string builder (<tt>char[]</tt>).   The length of the
-     *             <tt>char</tt> array may be greater than the number of
-     *             characters currently stored in the string builder, in which
-     *             case extra characters are ignored.
-     */
-//    private void writeObject(java.io.ObjectOutputStream s)
-//        throws java.io.IOException {
-//        s.defaultWriteObject();
-//        s.writeInt(count);
-//        s.writeObject(value);
-//    }
-
-    /**
-     * readObject is called to restore the state of the StringBuffer from
-     * a stream.
-     */
-//    private void readObject(java.io.ObjectInputStream s)
-//        throws java.io.IOException, ClassNotFoundException {
-//        s.defaultReadObject();
-//        count = s.readInt();
-//        value = (char[]) s.readObject();
-//    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/StringIndexOutOfBoundsException.java
--- a/emul/mini/src/main/java/java/lang/StringIndexOutOfBoundsException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown by <code>String</code> methods to indicate that an index
- * is either negative or greater than the size of the string.  For
- * some methods such as the charAt method, this exception also is
- * thrown when the index is equal to the size of the string.
- *
- * @author  unascribed
- * @see     java.lang.String#charAt(int)
- * @since   JDK1.0
- */
-public
-class StringIndexOutOfBoundsException extends IndexOutOfBoundsException {
-    private static final long serialVersionUID = -6762910422159637258L;
-
-    /**
-     * Constructs a <code>StringIndexOutOfBoundsException</code> with no
-     * detail message.
-     *
-     * @since   JDK1.0.
-     */
-    public StringIndexOutOfBoundsException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>StringIndexOutOfBoundsException</code> with
-     * the specified detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public StringIndexOutOfBoundsException(String s) {
-        super(s);
-    }
-
-    /**
-     * Constructs a new <code>StringIndexOutOfBoundsException</code>
-     * class with an argument indicating the illegal index.
-     *
-     * @param   index   the illegal index.
-     */
-    public StringIndexOutOfBoundsException(int index) {
-        super("String index out of range: " + index);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Throwable.java
--- a/emul/mini/src/main/java/java/lang/Throwable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1088 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-import  java.io.*;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.core.JavaScriptOnly;
-
-/**
- * The {@code Throwable} class is the superclass of all errors and
- * exceptions in the Java language. Only objects that are instances of this
- * class (or one of its subclasses) are thrown by the Java Virtual Machine or
- * can be thrown by the Java {@code throw} statement. Similarly, only
- * this class or one of its subclasses can be the argument type in a
- * {@code catch} clause.
- *
- * For the purposes of compile-time checking of exceptions, {@code
- * Throwable} and any subclass of {@code Throwable} that is not also a
- * subclass of either {@link RuntimeException} or {@link Error} are
- * regarded as checked exceptions.
- *
- * <p>Instances of two subclasses, {@link java.lang.Error} and
- * {@link java.lang.Exception}, are conventionally used to indicate
- * that exceptional situations have occurred. Typically, these instances
- * are freshly created in the context of the exceptional situation so
- * as to include relevant information (such as stack trace data).
- *
- * <p>A throwable contains a snapshot of the execution stack of its
- * thread at the time it was created. It can also contain a message
- * string that gives more information about the error. Over time, a
- * throwable can {@linkplain Throwable#addSuppressed suppress} other
- * throwables from being propagated.  Finally, the throwable can also
- * contain a <i>cause</i>: another throwable that caused this
- * throwable to be constructed.  The recording of this causal information
- * is referred to as the <i>chained exception</i> facility, as the
- * cause can, itself, have a cause, and so on, leading to a "chain" of
- * exceptions, each caused by another.
- *
- * <p>One reason that a throwable may have a cause is that the class that
- * throws it is built atop a lower layered abstraction, and an operation on
- * the upper layer fails due to a failure in the lower layer.  It would be bad
- * design to let the throwable thrown by the lower layer propagate outward, as
- * it is generally unrelated to the abstraction provided by the upper layer.
- * Further, doing so would tie the API of the upper layer to the details of
- * its implementation, assuming the lower layer's exception was a checked
- * exception.  Throwing a "wrapped exception" (i.e., an exception containing a
- * cause) allows the upper layer to communicate the details of the failure to
- * its caller without incurring either of these shortcomings.  It preserves
- * the flexibility to change the implementation of the upper layer without
- * changing its API (in particular, the set of exceptions thrown by its
- * methods).
- *
- * <p>A second reason that a throwable may have a cause is that the method
- * that throws it must conform to a general-purpose interface that does not
- * permit the method to throw the cause directly.  For example, suppose
- * a persistent collection conforms to the {@link java.util.Collection
- * Collection} interface, and that its persistence is implemented atop
- * {@code java.io}.  Suppose the internals of the {@code add} method
- * can throw an {@link java.io.IOException IOException}.  The implementation
- * can communicate the details of the {@code IOException} to its caller
- * while conforming to the {@code Collection} interface by wrapping the
- * {@code IOException} in an appropriate unchecked exception.  (The
- * specification for the persistent collection should indicate that it is
- * capable of throwing such exceptions.)
- *
- * <p>A cause can be associated with a throwable in two ways: via a
- * constructor that takes the cause as an argument, or via the
- * {@link #initCause(Throwable)} method.  New throwable classes that
- * wish to allow causes to be associated with them should provide constructors
- * that take a cause and delegate (perhaps indirectly) to one of the
- * {@code Throwable} constructors that takes a cause.
- *
- * Because the {@code initCause} method is public, it allows a cause to be
- * associated with any throwable, even a "legacy throwable" whose
- * implementation predates the addition of the exception chaining mechanism to
- * {@code Throwable}.
- *
- * <p>By convention, class {@code Throwable} and its subclasses have two
- * constructors, one that takes no arguments and one that takes a
- * {@code String} argument that can be used to produce a detail message.
- * Further, those subclasses that might likely have a cause associated with
- * them should have two more constructors, one that takes a
- * {@code Throwable} (the cause), and one that takes a
- * {@code String} (the detail message) and a {@code Throwable} (the
- * cause).
- *
- * @author  unascribed
- * @author  Josh Bloch (Added exception chaining and programmatic access to
- *          stack trace in 1.4.)
- * @jls 11.2 Compile-Time Checking of Exceptions
- * @since JDK1.0
- */
-public class Throwable implements Serializable {
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = -3042686055658047285L;
-
-    /**
-     * Native code saves some indication of the stack backtrace in this slot.
-     */
-    private transient Object backtrace;
-
-    /**
-     * Specific details about the Throwable.  For example, for
-     * {@code FileNotFoundException}, this contains the name of
-     * the file that could not be found.
-     *
-     * @serial
-     */
-    private String detailMessage;
-
-
-    /**
-     * Holder class to defer initializing sentinel objects only used
-     * for serialization.
-     */
-    private static class SentinelHolder {
-        /**
-         * {@linkplain #setStackTrace(StackTraceElement[]) Setting the
-         * stack trace} to a one-element array containing this sentinel
-         * value indicates future attempts to set the stack trace will be
-         * ignored.  The sentinal is equal to the result of calling:<br>
-         * {@code new StackTraceElement("", "", null, Integer.MIN_VALUE)}
-         */
-        public static final StackTraceElement STACK_TRACE_ELEMENT_SENTINEL =
-            new StackTraceElement("", "", null, Integer.MIN_VALUE);
-
-        /**
-         * Sentinel value used in the serial form to indicate an immutable
-         * stack trace.
-         */
-        public static final StackTraceElement[] STACK_TRACE_SENTINEL =
-            new StackTraceElement[] {STACK_TRACE_ELEMENT_SENTINEL};
-    }
-
-    /**
-     * A shared value for an empty stack.
-     */
-    private static final StackTraceElement[] UNASSIGNED_STACK = new StackTraceElement[0];
-
-    /*
-     * To allow Throwable objects to be made immutable and safely
-     * reused by the JVM, such as OutOfMemoryErrors, fields of
-     * Throwable that are writable in response to user actions, cause,
-     * stackTrace, and suppressedExceptions obey the following
-     * protocol:
-     *
-     * 1) The fields are initialized to a non-null sentinel value
-     * which indicates the value has logically not been set.
-     *
-     * 2) Writing a null to the field indicates further writes
-     * are forbidden
-     *
-     * 3) The sentinel value may be replaced with another non-null
-     * value.
-     *
-     * For example, implementations of the HotSpot JVM have
-     * preallocated OutOfMemoryError objects to provide for better
-     * diagnosability of that situation.  These objects are created
-     * without calling the constructor for that class and the fields
-     * in question are initialized to null.  To support this
-     * capability, any new fields added to Throwable that require
-     * being initialized to a non-null value require a coordinated JVM
-     * change.
-     */
-
-    /**
-     * The throwable that caused this throwable to get thrown, or null if this
-     * throwable was not caused by another throwable, or if the causative
-     * throwable is unknown.  If this field is equal to this throwable itself,
-     * it indicates that the cause of this throwable has not yet been
-     * initialized.
-     *
-     * @serial
-     * @since 1.4
-     */
-    private Throwable cause = this;
-
-    /**
-     * The stack trace, as returned by {@link #getStackTrace()}.
-     *
-     * The field is initialized to a zero-length array.  A {@code
-     * null} value of this field indicates subsequent calls to {@link
-     * #setStackTrace(StackTraceElement[])} and {@link
-     * #fillInStackTrace()} will be be no-ops.
-     *
-     * @serial
-     * @since 1.4
-     */
-    private StackTraceElement[] stackTrace = UNASSIGNED_STACK;
-
-    // Setting this static field introduces an acceptable
-    // initialization dependency on a few java.util classes.
-// I don't think this dependency is acceptable
-//    private static final List<Throwable> SUPPRESSED_SENTINEL =
-//        Collections.unmodifiableList(new ArrayList<Throwable>(0));
-
-    /**
-     * The list of suppressed exceptions, as returned by {@link
-     * #getSuppressed()}.  The list is initialized to a zero-element
-     * unmodifiable sentinel list.  When a serialized Throwable is
-     * read in, if the {@code suppressedExceptions} field points to a
-     * zero-element list, the field is reset to the sentinel value.
-     *
-     * @serial
-     * @since 1.7
-     */
-//    private List<Throwable> suppressedExceptions = SUPPRESSED_SENTINEL;
-
-    /** Message for trying to suppress a null exception. */
-    private static final String NULL_CAUSE_MESSAGE = "Cannot suppress a null exception.";
-
-    /** Message for trying to suppress oneself. */
-    private static final String SELF_SUPPRESSION_MESSAGE = "Self-suppression not permitted";
-
-    /** Caption  for labeling causative exception stack traces */
-    @JavaScriptOnly(name="toString", value="function() { return this.toString__Ljava_lang_String_2().toString(); }")
-    private static void jsToString() {
-    }
-    
-    @JavaScriptOnly(name="valueOf", value="function() { return this.toString().valueOf(); }")
-    private static void jsValudOf() {
-    }
-    private static final String CAUSE_CAPTION = "Caused by: ";
-
-    /** Caption for labeling suppressed exception stack traces */
-    private static final String SUPPRESSED_CAPTION = "Suppressed: ";
-
-    /**
-     * Constructs a new throwable with {@code null} as its detail message.
-     * The cause is not initialized, and may subsequently be initialized by a
-     * call to {@link #initCause}.
-     *
-     * <p>The {@link #fillInStackTrace()} method is called to initialize
-     * the stack trace data in the newly created throwable.
-     */
-    public Throwable() {
-        fillInStackTrace();
-    }
-
-    /**
-     * Constructs a new throwable with the specified detail message.  The
-     * cause is not initialized, and may subsequently be initialized by
-     * a call to {@link #initCause}.
-     *
-     * <p>The {@link #fillInStackTrace()} method is called to initialize
-     * the stack trace data in the newly created throwable.
-     *
-     * @param   message   the detail message. The detail message is saved for
-     *          later retrieval by the {@link #getMessage()} method.
-     */
-    public Throwable(String message) {
-        fillInStackTrace();
-        detailMessage = message;
-    }
-
-    /**
-     * Constructs a new throwable with the specified detail message and
-     * cause.  <p>Note that the detail message associated with
-     * {@code cause} is <i>not</i> automatically incorporated in
-     * this throwable's detail message.
-     *
-     * <p>The {@link #fillInStackTrace()} method is called to initialize
-     * the stack trace data in the newly created throwable.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link #getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A {@code null} value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.4
-     */
-    public Throwable(String message, Throwable cause) {
-        fillInStackTrace();
-        detailMessage = message;
-        this.cause = cause;
-    }
-
-    /**
-     * Constructs a new throwable with the specified cause and a detail
-     * message of {@code (cause==null ? null : cause.toString())} (which
-     * typically contains the class and detail message of {@code cause}).
-     * This constructor is useful for throwables that are little more than
-     * wrappers for other throwables (for example, {@link
-     * java.security.PrivilegedActionException}).
-     *
-     * <p>The {@link #fillInStackTrace()} method is called to initialize
-     * the stack trace data in the newly created throwable.
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A {@code null} value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.4
-     */
-    public Throwable(Throwable cause) {
-        fillInStackTrace();
-        detailMessage = (cause==null ? null : cause.toString());
-        this.cause = cause;
-    }
-
-    /**
-     * Constructs a new throwable with the specified detail message,
-     * cause, {@linkplain #addSuppressed suppression} enabled or
-     * disabled, and writable stack trace enabled or disabled.  If
-     * suppression is disabled, {@link #getSuppressed} for this object
-     * will return a zero-length array and calls to {@link
-     * #addSuppressed} that would otherwise append an exception to the
-     * suppressed list will have no effect.  If the writable stack
-     * trace is false, this constructor will not call {@link
-     * #fillInStackTrace()}, a {@code null} will be written to the
-     * {@code stackTrace} field, and subsequent calls to {@code
-     * fillInStackTrace} and {@link
-     * #setStackTrace(StackTraceElement[])} will not set the stack
-     * trace.  If the writable stack trace is false, {@link
-     * #getStackTrace} will return a zero length array.
-     *
-     * <p>Note that the other constructors of {@code Throwable} treat
-     * suppression as being enabled and the stack trace as being
-     * writable.  Subclasses of {@code Throwable} should document any
-     * conditions under which suppression is disabled and document
-     * conditions under which the stack trace is not writable.
-     * Disabling of suppression should only occur in exceptional
-     * circumstances where special requirements exist, such as a
-     * virtual machine reusing exception objects under low-memory
-     * situations.  Circumstances where a given exception object is
-     * repeatedly caught and rethrown, such as to implement control
-     * flow between two sub-systems, is another situation where
-     * immutable throwable objects would be appropriate.
-     *
-     * @param  message the detail message.
-     * @param cause the cause.  (A {@code null} value is permitted,
-     * and indicates that the cause is nonexistent or unknown.)
-     * @param enableSuppression whether or not suppression is enabled or disabled
-     * @param writableStackTrace whether or not the stack trace should be
-     *                           writable
-     *
-     * @see OutOfMemoryError
-     * @see NullPointerException
-     * @see ArithmeticException
-     * @since 1.7
-     */
-    protected Throwable(String message, Throwable cause,
-                        boolean enableSuppression,
-                        boolean writableStackTrace) {
-        if (writableStackTrace) {
-            fillInStackTrace();
-        } else {
-            stackTrace = null;
-        }
-        detailMessage = message;
-        this.cause = cause;
-//        if (!enableSuppression)
-//            suppressedExceptions = null;
-    }
-
-    /**
-     * Returns the detail message string of this throwable.
-     *
-     * @return  the detail message string of this {@code Throwable} instance
-     *          (which may be {@code null}).
-     */
-    public String getMessage() {
-        return detailMessage;
-    }
-
-    /**
-     * Creates a localized description of this throwable.
-     * Subclasses may override this method in order to produce a
-     * locale-specific message.  For subclasses that do not override this
-     * method, the default implementation returns the same result as
-     * {@code getMessage()}.
-     *
-     * @return  The localized description of this throwable.
-     * @since   JDK1.1
-     */
-    public String getLocalizedMessage() {
-        return getMessage();
-    }
-
-    /**
-     * Returns the cause of this throwable or {@code null} if the
-     * cause is nonexistent or unknown.  (The cause is the throwable that
-     * caused this throwable to get thrown.)
-     *
-     * <p>This implementation returns the cause that was supplied via one of
-     * the constructors requiring a {@code Throwable}, or that was set after
-     * creation with the {@link #initCause(Throwable)} method.  While it is
-     * typically unnecessary to override this method, a subclass can override
-     * it to return a cause set by some other means.  This is appropriate for
-     * a "legacy chained throwable" that predates the addition of chained
-     * exceptions to {@code Throwable}.  Note that it is <i>not</i>
-     * necessary to override any of the {@code PrintStackTrace} methods,
-     * all of which invoke the {@code getCause} method to determine the
-     * cause of a throwable.
-     *
-     * @return  the cause of this throwable or {@code null} if the
-     *          cause is nonexistent or unknown.
-     * @since 1.4
-     */
-    public synchronized Throwable getCause() {
-        return (cause==this ? null : cause);
-    }
-
-    /**
-     * Initializes the <i>cause</i> of this throwable to the specified value.
-     * (The cause is the throwable that caused this throwable to get thrown.)
-     *
-     * <p>This method can be called at most once.  It is generally called from
-     * within the constructor, or immediately after creating the
-     * throwable.  If this throwable was created
-     * with {@link #Throwable(Throwable)} or
-     * {@link #Throwable(String,Throwable)}, this method cannot be called
-     * even once.
-     *
-     * <p>An example of using this method on a legacy throwable type
-     * without other support for setting the cause is:
-     *
-     * <pre>
-     * try {
-     *     lowLevelOp();
-     * } catch (LowLevelException le) {
-     *     throw (HighLevelException)
-     *           new HighLevelException().initCause(le); // Legacy constructor
-     * }
-     * </pre>
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link #getCause()} method).  (A {@code null} value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @return  a reference to this {@code Throwable} instance.
-     * @throws IllegalArgumentException if {@code cause} is this
-     *         throwable.  (A throwable cannot be its own cause.)
-     * @throws IllegalStateException if this throwable was
-     *         created with {@link #Throwable(Throwable)} or
-     *         {@link #Throwable(String,Throwable)}, or this method has already
-     *         been called on this throwable.
-     * @since  1.4
-     */
-    public synchronized Throwable initCause(Throwable cause) {
-        if (this.cause != this)
-            throw new IllegalStateException("Can't overwrite cause");
-        if (cause == this)
-            throw new IllegalArgumentException("Self-causation not permitted");
-        this.cause = cause;
-        return this;
-    }
-
-    /**
-     * Returns a short description of this throwable.
-     * The result is the concatenation of:
-     * <ul>
-     * <li> the {@linkplain Class#getName() name} of the class of this object
-     * <li> ": " (a colon and a space)
-     * <li> the result of invoking this object's {@link #getLocalizedMessage}
-     *      method
-     * </ul>
-     * If {@code getLocalizedMessage} returns {@code null}, then just
-     * the class name is returned.
-     *
-     * @return a string representation of this throwable.
-     */
-    public String toString() {
-        String s = getClass().getName();
-        String message = getLocalizedMessage();
-        return (message != null) ? (s + ": " + message) : s;
-    }
-
-    /**
-     * Prints this throwable and its backtrace to the
-     * standard error stream. This method prints a stack trace for this
-     * {@code Throwable} object on the error output stream that is
-     * the value of the field {@code System.err}. The first line of
-     * output contains the result of the {@link #toString()} method for
-     * this object.  Remaining lines represent data previously recorded by
-     * the method {@link #fillInStackTrace()}. The format of this
-     * information depends on the implementation, but the following
-     * example may be regarded as typical:
-     * <blockquote><pre>
-     * java.lang.NullPointerException
-     *         at MyClass.mash(MyClass.java:9)
-     *         at MyClass.crunch(MyClass.java:6)
-     *         at MyClass.main(MyClass.java:3)
-     * </pre></blockquote>
-     * This example was produced by running the program:
-     * <pre>
-     * class MyClass {
-     *     public static void main(String[] args) {
-     *         crunch(null);
-     *     }
-     *     static void crunch(int[] a) {
-     *         mash(a);
-     *     }
-     *     static void mash(int[] b) {
-     *         System.out.println(b[0]);
-     *     }
-     * }
-     * </pre>
-     * The backtrace for a throwable with an initialized, non-null cause
-     * should generally include the backtrace for the cause.  The format
-     * of this information depends on the implementation, but the following
-     * example may be regarded as typical:
-     * <pre>
-     * HighLevelException: MidLevelException: LowLevelException
-     *         at Junk.a(Junk.java:13)
-     *         at Junk.main(Junk.java:4)
-     * Caused by: MidLevelException: LowLevelException
-     *         at Junk.c(Junk.java:23)
-     *         at Junk.b(Junk.java:17)
-     *         at Junk.a(Junk.java:11)
-     *         ... 1 more
-     * Caused by: LowLevelException
-     *         at Junk.e(Junk.java:30)
-     *         at Junk.d(Junk.java:27)
-     *         at Junk.c(Junk.java:21)
-     *         ... 3 more
-     * </pre>
-     * Note the presence of lines containing the characters {@code "..."}.
-     * These lines indicate that the remainder of the stack trace for this
-     * exception matches the indicated number of frames from the bottom of the
-     * stack trace of the exception that was caused by this exception (the
-     * "enclosing" exception).  This shorthand can greatly reduce the length
-     * of the output in the common case where a wrapped exception is thrown
-     * from same method as the "causative exception" is caught.  The above
-     * example was produced by running the program:
-     * <pre>
-     * public class Junk {
-     *     public static void main(String args[]) {
-     *         try {
-     *             a();
-     *         } catch(HighLevelException e) {
-     *             e.printStackTrace();
-     *         }
-     *     }
-     *     static void a() throws HighLevelException {
-     *         try {
-     *             b();
-     *         } catch(MidLevelException e) {
-     *             throw new HighLevelException(e);
-     *         }
-     *     }
-     *     static void b() throws MidLevelException {
-     *         c();
-     *     }
-     *     static void c() throws MidLevelException {
-     *         try {
-     *             d();
-     *         } catch(LowLevelException e) {
-     *             throw new MidLevelException(e);
-     *         }
-     *     }
-     *     static void d() throws LowLevelException {
-     *        e();
-     *     }
-     *     static void e() throws LowLevelException {
-     *         throw new LowLevelException();
-     *     }
-     * }
-     *
-     * class HighLevelException extends Exception {
-     *     HighLevelException(Throwable cause) { super(cause); }
-     * }
-     *
-     * class MidLevelException extends Exception {
-     *     MidLevelException(Throwable cause)  { super(cause); }
-     * }
-     *
-     * class LowLevelException extends Exception {
-     * }
-     * </pre>
-     * As of release 7, the platform supports the notion of
-     * <i>suppressed exceptions</i> (in conjunction with the {@code
-     * try}-with-resources statement). Any exceptions that were
-     * suppressed in order to deliver an exception are printed out
-     * beneath the stack trace.  The format of this information
-     * depends on the implementation, but the following example may be
-     * regarded as typical:
-     *
-     * <pre>
-     * Exception in thread "main" java.lang.Exception: Something happened
-     *  at Foo.bar(Foo.java:10)
-     *  at Foo.main(Foo.java:5)
-     *  Suppressed: Resource$CloseFailException: Resource ID = 0
-     *          at Resource.close(Resource.java:26)
-     *          at Foo.bar(Foo.java:9)
-     *          ... 1 more
-     * </pre>
-     * Note that the "... n more" notation is used on suppressed exceptions
-     * just at it is used on causes. Unlike causes, suppressed exceptions are
-     * indented beyond their "containing exceptions."
-     *
-     * <p>An exception can have both a cause and one or more suppressed
-     * exceptions:
-     * <pre>
-     * Exception in thread "main" java.lang.Exception: Main block
-     *  at Foo3.main(Foo3.java:7)
-     *  Suppressed: Resource$CloseFailException: Resource ID = 2
-     *          at Resource.close(Resource.java:26)
-     *          at Foo3.main(Foo3.java:5)
-     *  Suppressed: Resource$CloseFailException: Resource ID = 1
-     *          at Resource.close(Resource.java:26)
-     *          at Foo3.main(Foo3.java:5)
-     * Caused by: java.lang.Exception: I did it
-     *  at Foo3.main(Foo3.java:8)
-     * </pre>
-     * Likewise, a suppressed exception can have a cause:
-     * <pre>
-     * Exception in thread "main" java.lang.Exception: Main block
-     *  at Foo4.main(Foo4.java:6)
-     *  Suppressed: Resource2$CloseFailException: Resource ID = 1
-     *          at Resource2.close(Resource2.java:20)
-     *          at Foo4.main(Foo4.java:5)
-     *  Caused by: java.lang.Exception: Rats, you caught me
-     *          at Resource2$CloseFailException.<init>(Resource2.java:45)
-     *          ... 2 more
-     * </pre>
-     */
-//    public void printStackTrace() {
-//        printStackTrace(System.err);
-//    }
-//
-//    /**
-//     * Prints this throwable and its backtrace to the specified print stream.
-//     *
-//     * @param s {@code PrintStream} to use for output
-//     */
-//    public void printStackTrace(PrintStream s) {
-//        printStackTrace(new WrappedPrintStream(s));
-//    }
-//
-//    private void printStackTrace(PrintStreamOrWriter s) {
-//        // Guard against malicious overrides of Throwable.equals by
-//        // using a Set with identity equality semantics.
-////        Set<Throwable> dejaVu =
-////            Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
-////        dejaVu.add(this);
-//
-//        synchronized (s.lock()) {
-//            // Print our stack trace
-//            s.println(this);
-//            StackTraceElement[] trace = getOurStackTrace();
-//            for (StackTraceElement traceElement : trace)
-//                s.println("\tat " + traceElement);
-//
-//            // Print suppressed exceptions, if any
-////            for (Throwable se : getSuppressed())
-////                se.printEnclosedStackTrace(s, trace, SUPPRESSED_CAPTION, "\t", dejaVu);
-//
-//            // Print cause, if any
-//            Throwable ourCause = getCause();
-////            if (ourCause != null)
-////                ourCause.printEnclosedStackTrace(s, trace, CAUSE_CAPTION, "", dejaVu);
-//        }
-//    }
-//
-//    /**
-//     * Print our stack trace as an enclosed exception for the specified
-//     * stack trace.
-//     */
-//    private void printEnclosedStackTrace(PrintStreamOrWriter s,
-//                                         StackTraceElement[] enclosingTrace,
-//                                         String caption,
-//                                         String prefix,
-//                                         Object dejaVu) {
-//        assert Thread.holdsLock(s.lock());
-//        {
-//            // Compute number of frames in common between this and enclosing trace
-//            StackTraceElement[] trace = getOurStackTrace();
-//            int m = trace.length - 1;
-//            int n = enclosingTrace.length - 1;
-//            while (m >= 0 && n >=0 && trace[m].equals(enclosingTrace[n])) {
-//                m--; n--;
-//            }
-//            int framesInCommon = trace.length - 1 - m;
-//
-//            // Print our stack trace
-//            s.println(prefix + caption + this);
-//            for (int i = 0; i <= m; i++)
-//                s.println(prefix + "\tat " + trace[i]);
-//            if (framesInCommon != 0)
-//                s.println(prefix + "\t... " + framesInCommon + " more");
-//
-//            // Print suppressed exceptions, if any
-//            for (Throwable se : getSuppressed())
-//                se.printEnclosedStackTrace(s, trace, SUPPRESSED_CAPTION,
-//                                           prefix +"\t", dejaVu);
-//
-//            // Print cause, if any
-//            Throwable ourCause = getCause();
-//            if (ourCause != null)
-//                ourCause.printEnclosedStackTrace(s, trace, CAUSE_CAPTION, prefix, dejaVu);
-//        }
-//    }
-//
-//    /**
-//     * Prints this throwable and its backtrace to the specified
-//     * print writer.
-//     *
-//     * @param s {@code PrintWriter} to use for output
-//     * @since   JDK1.1
-//     */
-//    public void printStackTrace(PrintWriter s) {
-//        printStackTrace(new WrappedPrintWriter(s));
-//    }
-//
-//    /**
-//     * Wrapper class for PrintStream and PrintWriter to enable a single
-//     * implementation of printStackTrace.
-//     */
-//    private abstract static class PrintStreamOrWriter {
-//        /** Returns the object to be locked when using this StreamOrWriter */
-//        abstract Object lock();
-//
-//        /** Prints the specified string as a line on this StreamOrWriter */
-//        abstract void println(Object o);
-//    }
-//
-//    private static class WrappedPrintStream extends PrintStreamOrWriter {
-//        private final PrintStream printStream;
-//
-//        WrappedPrintStream(PrintStream printStream) {
-//            this.printStream = printStream;
-//        }
-//
-//        Object lock() {
-//            return printStream;
-//        }
-//
-//        void println(Object o) {
-//            printStream.println(o);
-//        }
-//    }
-//
-//    private static class WrappedPrintWriter extends PrintStreamOrWriter {
-//        private final PrintWriter printWriter;
-//
-//        WrappedPrintWriter(PrintWriter printWriter) {
-//            this.printWriter = printWriter;
-//        }
-//
-//        Object lock() {
-//            return printWriter;
-//        }
-//
-//        void println(Object o) {
-//            printWriter.println(o);
-//        }
-//    }
-
-    /**
-     * Fills in the execution stack trace. This method records within this
-     * {@code Throwable} object information about the current state of
-     * the stack frames for the current thread.
-     *
-     * <p>If the stack trace of this {@code Throwable} {@linkplain
-     * Throwable#Throwable(String, Throwable, boolean, boolean) is not
-     * writable}, calling this method has no effect.
-     *
-     * @return  a reference to this {@code Throwable} instance.
-     * @see     java.lang.Throwable#printStackTrace()
-     */
-    public synchronized Throwable fillInStackTrace() {
-        if (stackTrace != null ||
-            backtrace != null /* Out of protocol state */ ) {
-            fillInStackTrace(0);
-            stackTrace = UNASSIGNED_STACK;
-        }
-        return this;
-    }
-
-    @JavaScriptBody(args = { "dummy" }, body = "")
-    private native Throwable fillInStackTrace(int dummy);
-
-    /**
-     * Provides programmatic access to the stack trace information printed by
-     * {@link #printStackTrace()}.  Returns an array of stack trace elements,
-     * each representing one stack frame.  The zeroth element of the array
-     * (assuming the array's length is non-zero) represents the top of the
-     * stack, which is the last method invocation in the sequence.  Typically,
-     * this is the point at which this throwable was created and thrown.
-     * The last element of the array (assuming the array's length is non-zero)
-     * represents the bottom of the stack, which is the first method invocation
-     * in the sequence.
-     *
-     * <p>Some virtual machines may, under some circumstances, omit one
-     * or more stack frames from the stack trace.  In the extreme case,
-     * a virtual machine that has no stack trace information concerning
-     * this throwable is permitted to return a zero-length array from this
-     * method.  Generally speaking, the array returned by this method will
-     * contain one element for every frame that would be printed by
-     * {@code printStackTrace}.  Writes to the returned array do not
-     * affect future calls to this method.
-     *
-     * @return an array of stack trace elements representing the stack trace
-     *         pertaining to this throwable.
-     * @since  1.4
-     */
-    public StackTraceElement[] getStackTrace() {
-        return getOurStackTrace().clone();
-    }
-
-    private synchronized StackTraceElement[] getOurStackTrace() {
-        // Initialize stack trace field with information from
-        // backtrace if this is the first call to this method
-        if (stackTrace == UNASSIGNED_STACK ||
-            (stackTrace == null && backtrace != null) /* Out of protocol state */) {
-            int depth = getStackTraceDepth();
-            stackTrace = new StackTraceElement[depth];
-            for (int i=0; i < depth; i++)
-                stackTrace[i] = getStackTraceElement(i);
-        } else if (stackTrace == null) {
-            return UNASSIGNED_STACK;
-        }
-        return stackTrace;
-    }
-
-    /**
-     * Sets the stack trace elements that will be returned by
-     * {@link #getStackTrace()} and printed by {@link #printStackTrace()}
-     * and related methods.
-     *
-     * This method, which is designed for use by RPC frameworks and other
-     * advanced systems, allows the client to override the default
-     * stack trace that is either generated by {@link #fillInStackTrace()}
-     * when a throwable is constructed or deserialized when a throwable is
-     * read from a serialization stream.
-     *
-     * <p>If the stack trace of this {@code Throwable} {@linkplain
-     * Throwable#Throwable(String, Throwable, boolean, boolean) is not
-     * writable}, calling this method has no effect other than
-     * validating its argument.
-     *
-     * @param   stackTrace the stack trace elements to be associated with
-     * this {@code Throwable}.  The specified array is copied by this
-     * call; changes in the specified array after the method invocation
-     * returns will have no affect on this {@code Throwable}'s stack
-     * trace.
-     *
-     * @throws NullPointerException if {@code stackTrace} is
-     *         {@code null} or if any of the elements of
-     *         {@code stackTrace} are {@code null}
-     *
-     * @since  1.4
-     */
-    public void setStackTrace(StackTraceElement[] stackTrace) {
-        // Validate argument
-        StackTraceElement[] defensiveCopy = stackTrace.clone();
-        for (int i = 0; i < defensiveCopy.length; i++) {
-            if (defensiveCopy[i] == null)
-                throw new NullPointerException("stackTrace[" + i + "]");
-        }
-
-        synchronized (this) {
-            if (this.stackTrace == null && // Immutable stack
-                backtrace == null) // Test for out of protocol state
-                return;
-            this.stackTrace = defensiveCopy;
-        }
-    }
-
-    /**
-     * Returns the number of elements in the stack trace (or 0 if the stack
-     * trace is unavailable).
-     *
-     * package-protection for use by SharedSecrets.
-     */
-    native int getStackTraceDepth();
-
-    /**
-     * Returns the specified element of the stack trace.
-     *
-     * package-protection for use by SharedSecrets.
-     *
-     * @param index index of the element to return.
-     * @throws IndexOutOfBoundsException if {@code index < 0 ||
-     *         index >= getStackTraceDepth() }
-     */
-    native StackTraceElement getStackTraceElement(int index);
-
-    /**
-     * Reads a {@code Throwable} from a stream, enforcing
-     * well-formedness constraints on fields.  Null entries and
-     * self-pointers are not allowed in the list of {@code
-     * suppressedExceptions}.  Null entries are not allowed for stack
-     * trace elements.  A null stack trace in the serial form results
-     * in a zero-length stack element array. A single-element stack
-     * trace whose entry is equal to {@code new StackTraceElement("",
-     * "", null, Integer.MIN_VALUE)} results in a {@code null} {@code
-     * stackTrace} field.
-     *
-     * Note that there are no constraints on the value the {@code
-     * cause} field can hold; both {@code null} and {@code this} are
-     * valid values for the field.
-     */
-//    private void readObject(ObjectInputStream s)
-//        throws IOException, ClassNotFoundException {
-//        s.defaultReadObject();     // read in all fields
-//        if (suppressedExceptions != null) {
-//            List<Throwable> suppressed = null;
-//            if (suppressedExceptions.isEmpty()) {
-//                // Use the sentinel for a zero-length list
-//                suppressed = SUPPRESSED_SENTINEL;
-//            } else { // Copy Throwables to new list
-//                suppressed = new ArrayList<Throwable>(1);
-//                for (Throwable t : suppressedExceptions) {
-//                    // Enforce constraints on suppressed exceptions in
-//                    // case of corrupt or malicious stream.
-//                    if (t == null)
-//                        throw new NullPointerException(NULL_CAUSE_MESSAGE);
-//                    if (t == this)
-//                        throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE);
-//                    suppressed.add(t);
-//                }
-//            }
-//            suppressedExceptions = suppressed;
-//        } // else a null suppressedExceptions field remains null
-//
-//        /*
-//         * For zero-length stack traces, use a clone of
-//         * UNASSIGNED_STACK rather than UNASSIGNED_STACK itself to
-//         * allow identity comparison against UNASSIGNED_STACK in
-//         * getOurStackTrace.  The identity of UNASSIGNED_STACK in
-//         * stackTrace indicates to the getOurStackTrace method that
-//         * the stackTrace needs to be constructed from the information
-//         * in backtrace.
-//         */
-//        if (stackTrace != null) {
-//            if (stackTrace.length == 0) {
-//                stackTrace = UNASSIGNED_STACK.clone();
-//            }  else if (stackTrace.length == 1 &&
-//                        // Check for the marker of an immutable stack trace
-//                        SentinelHolder.STACK_TRACE_ELEMENT_SENTINEL.equals(stackTrace[0])) {
-//                stackTrace = null;
-//            } else { // Verify stack trace elements are non-null.
-//                for(StackTraceElement ste : stackTrace) {
-//                    if (ste == null)
-//                        throw new NullPointerException("null StackTraceElement in serial stream. ");
-//                }
-//            }
-//        } else {
-//            // A null stackTrace field in the serial form can result
-//            // from an exception serialized without that field in
-//            // older JDK releases; treat such exceptions as having
-//            // empty stack traces.
-//            stackTrace = UNASSIGNED_STACK.clone();
-//        }
-//    }
-
-    /**
-     * Write a {@code Throwable} object to a stream.
-     *
-     * A {@code null} stack trace field is represented in the serial
-     * form as a one-element array whose element is equal to {@code
-     * new StackTraceElement("", "", null, Integer.MIN_VALUE)}.
-     */
-//    private synchronized void writeObject(ObjectOutputStream s)
-//        throws IOException {
-//        // Ensure that the stackTrace field is initialized to a
-//        // non-null value, if appropriate.  As of JDK 7, a null stack
-//        // trace field is a valid value indicating the stack trace
-//        // should not be set.
-//        getOurStackTrace();
-//
-//        StackTraceElement[] oldStackTrace = stackTrace;
-//        try {
-//            if (stackTrace == null)
-//                stackTrace = SentinelHolder.STACK_TRACE_SENTINEL;
-//            s.defaultWriteObject();
-//        } finally {
-//            stackTrace = oldStackTrace;
-//        }
-//    }
-
-    /**
-     * Appends the specified exception to the exceptions that were
-     * suppressed in order to deliver this exception. This method is
-     * thread-safe and typically called (automatically and implicitly)
-     * by the {@code try}-with-resources statement.
-     *
-     * <p>The suppression behavior is enabled <em>unless</em> disabled
-     * {@linkplain #Throwable(String, Throwable, boolean, boolean) via
-     * a constructor}.  When suppression is disabled, this method does
-     * nothing other than to validate its argument.
-     *
-     * <p>Note that when one exception {@linkplain
-     * #initCause(Throwable) causes} another exception, the first
-     * exception is usually caught and then the second exception is
-     * thrown in response.  In other words, there is a causal
-     * connection between the two exceptions.
-     *
-     * In contrast, there are situations where two independent
-     * exceptions can be thrown in sibling code blocks, in particular
-     * in the {@code try} block of a {@code try}-with-resources
-     * statement and the compiler-generated {@code finally} block
-     * which closes the resource.
-     *
-     * In these situations, only one of the thrown exceptions can be
-     * propagated.  In the {@code try}-with-resources statement, when
-     * there are two such exceptions, the exception originating from
-     * the {@code try} block is propagated and the exception from the
-     * {@code finally} block is added to the list of exceptions
-     * suppressed by the exception from the {@code try} block.  As an
-     * exception unwinds the stack, it can accumulate multiple
-     * suppressed exceptions.
-     *
-     * <p>An exception may have suppressed exceptions while also being
-     * caused by another exception.  Whether or not an exception has a
-     * cause is semantically known at the time of its creation, unlike
-     * whether or not an exception will suppress other exceptions
-     * which is typically only determined after an exception is
-     * thrown.
-     *
-     * <p>Note that programmer written code is also able to take
-     * advantage of calling this method in situations where there are
-     * multiple sibling exceptions and only one can be propagated.
-     *
-     * @param exception the exception to be added to the list of
-     *        suppressed exceptions
-     * @throws IllegalArgumentException if {@code exception} is this
-     *         throwable; a throwable cannot suppress itself.
-     * @throws NullPointerException if {@code exception} is {@code null}
-     * @since 1.7
-     */
-    public final synchronized void addSuppressed(Throwable exception) {
-        if (exception == this)
-            throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE);
-
-        if (exception == null)
-            throw new NullPointerException(NULL_CAUSE_MESSAGE);
-
-//        if (suppressedExceptions == null) // Suppressed exceptions not recorded
-//            return;
-//
-//        if (suppressedExceptions == SUPPRESSED_SENTINEL)
-//            suppressedExceptions = new ArrayList<Throwable>(1);
-//
-//        suppressedExceptions.add(exception);
-    }
-
-    private static final Throwable[] EMPTY_THROWABLE_ARRAY = new Throwable[0];
-
-    /**
-     * Returns an array containing all of the exceptions that were
-     * suppressed, typically by the {@code try}-with-resources
-     * statement, in order to deliver this exception.
-     *
-     * If no exceptions were suppressed or {@linkplain
-     * #Throwable(String, Throwable, boolean, boolean) suppression is
-     * disabled}, an empty array is returned.  This method is
-     * thread-safe.  Writes to the returned array do not affect future
-     * calls to this method.
-     *
-     * @return an array containing all of the exceptions that were
-     *         suppressed to deliver this exception.
-     * @since 1.7
-     */
-    public final synchronized Throwable[] getSuppressed() {
-        return new Throwable[0];
-//        if (suppressedExceptions == SUPPRESSED_SENTINEL ||
-//            suppressedExceptions == null)
-//            return EMPTY_THROWABLE_ARRAY;
-//        else
-//            return suppressedExceptions.toArray(EMPTY_THROWABLE_ARRAY);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/VirtualMachineError.java
--- a/emul/mini/src/main/java/java/lang/VirtualMachineError.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that the Java Virtual Machine is broken or has
- * run out of resources necessary for it to continue operating.
- *
- *
- * @author  Frank Yellin
- * @since   JDK1.0
- */
-abstract public
-class VirtualMachineError extends Error {
-    /**
-     * Constructs a <code>VirtualMachineError</code> with no detail message.
-     */
-    public VirtualMachineError() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>VirtualMachineError</code> with the specified
-     * detail message.
-     *
-     * @param   s   the detail message.
-     */
-    public VirtualMachineError(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/Void.java
--- a/emul/mini/src/main/java/java/lang/Void.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * The {@code Void} class is an uninstantiable placeholder class to hold a
- * reference to the {@code Class} object representing the Java keyword
- * void.
- *
- * @author  unascribed
- * @since   JDK1.1
- */
-public final
-class Void {
-
-    /**
-     * The {@code Class} object representing the pseudo-type corresponding to
-     * the keyword {@code void}.
-     */
-    public static final Class<Void> TYPE = Class.getPrimitiveClass("void");
-
-    /*
-     * The Void class cannot be instantiated.
-     */
-    private Void() {}
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/annotation/Annotation.java
--- a/emul/mini/src/main/java/java/lang/annotation/Annotation.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.annotation;
-
-/**
- * The common interface extended by all annotation types.  Note that an
- * interface that manually extends this one does <i>not</i> define
- * an annotation type.  Also note that this interface does not itself
- * define an annotation type.
- *
- * More information about annotation types can be found in section 9.6 of
- * <cite>The Java&trade; Language Specification</cite>.
- *
- * @author  Josh Bloch
- * @since   1.5
- */
-public interface Annotation {
-    /**
-     * Returns true if the specified object represents an annotation
-     * that is logically equivalent to this one.  In other words,
-     * returns true if the specified object is an instance of the same
-     * annotation type as this instance, all of whose members are equal
-     * to the corresponding member of this annotation, as defined below:
-     * <ul>
-     *    <li>Two corresponding primitive typed members whose values are
-     *    <tt>x</tt> and <tt>y</tt> are considered equal if <tt>x == y</tt>,
-     *    unless their type is <tt>float</tt> or <tt>double</tt>.
-     *
-     *    <li>Two corresponding <tt>float</tt> members whose values
-     *    are <tt>x</tt> and <tt>y</tt> are considered equal if
-     *    <tt>Float.valueOf(x).equals(Float.valueOf(y))</tt>.
-     *    (Unlike the <tt>==</tt> operator, NaN is considered equal
-     *    to itself, and <tt>0.0f</tt> unequal to <tt>-0.0f</tt>.)
-     *
-     *    <li>Two corresponding <tt>double</tt> members whose values
-     *    are <tt>x</tt> and <tt>y</tt> are considered equal if
-     *    <tt>Double.valueOf(x).equals(Double.valueOf(y))</tt>.
-     *    (Unlike the <tt>==</tt> operator, NaN is considered equal
-     *    to itself, and <tt>0.0</tt> unequal to <tt>-0.0</tt>.)
-     *
-     *    <li>Two corresponding <tt>String</tt>, <tt>Class</tt>, enum, or
-     *    annotation typed members whose values are <tt>x</tt> and <tt>y</tt>
-     *    are considered equal if <tt>x.equals(y)</tt>.  (Note that this
-     *    definition is recursive for annotation typed members.)
-     *
-     *    <li>Two corresponding array typed members <tt>x</tt> and <tt>y</tt>
-     *    are considered equal if <tt>Arrays.equals(x, y)</tt>, for the
-     *    appropriate overloading of {@link java.util.Arrays#equals}.
-     * </ul>
-     *
-     * @return true if the specified object represents an annotation
-     *     that is logically equivalent to this one, otherwise false
-     */
-    boolean equals(Object obj);
-
-    /**
-     * Returns the hash code of this annotation, as defined below:
-     *
-     * <p>The hash code of an annotation is the sum of the hash codes
-     * of its members (including those with default values), as defined
-     * below:
-     *
-     * The hash code of an annotation member is (127 times the hash code
-     * of the member-name as computed by {@link String#hashCode()}) XOR
-     * the hash code of the member-value, as defined below:
-     *
-     * <p>The hash code of a member-value depends on its type:
-     * <ul>
-     * <li>The hash code of a primitive value <tt><i>v</i></tt> is equal to
-     *     <tt><i>WrapperType</i>.valueOf(<i>v</i>).hashCode()</tt>, where
-     *     <tt><i>WrapperType</i></tt> is the wrapper type corresponding
-     *     to the primitive type of <tt><i>v</i></tt> ({@link Byte},
-     *     {@link Character}, {@link Double}, {@link Float}, {@link Integer},
-     *     {@link Long}, {@link Short}, or {@link Boolean}).
-     *
-     * <li>The hash code of a string, enum, class, or annotation member-value
-     I     <tt><i>v</i></tt> is computed as by calling
-     *     <tt><i>v</i>.hashCode()</tt>.  (In the case of annotation
-     *     member values, this is a recursive definition.)
-     *
-     * <li>The hash code of an array member-value is computed by calling
-     *     the appropriate overloading of
-     *     {@link java.util.Arrays#hashCode(long[]) Arrays.hashCode}
-     *     on the value.  (There is one overloading for each primitive
-     *     type, and one for object reference types.)
-     * </ul>
-     *
-     * @return the hash code of this annotation
-     */
-    int hashCode();
-
-    /**
-     * Returns a string representation of this annotation.  The details
-     * of the representation are implementation-dependent, but the following
-     * may be regarded as typical:
-     * <pre>
-     *   &#064;com.acme.util.Name(first=Alfred, middle=E., last=Neuman)
-     * </pre>
-     *
-     * @return a string representation of this annotation
-     */
-    String toString();
-
-    /**
-     * Returns the annotation type of this annotation.
-     */
-    Class<? extends Annotation> annotationType();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/annotation/Documented.java
--- a/emul/mini/src/main/java/java/lang/annotation/Documented.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.annotation;
-
-/**
- * Indicates that annotations with a type are to be documented by javadoc
- * and similar tools by default.  This type should be used to annotate the
- * declarations of types whose annotations affect the use of annotated
- * elements by their clients.  If a type declaration is annotated with
- * Documented, its annotations become part of the public API
- * of the annotated elements.
- *
- * @author  Joshua Bloch
- * @since 1.5
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
-public @interface Documented {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/annotation/ElementType.java
--- a/emul/mini/src/main/java/java/lang/annotation/ElementType.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.annotation;
-
-/**
- * A program element type.  The constants of this enumerated type
- * provide a simple classification of the declared elements in a
- * Java program.
- *
- * <p>These constants are used with the {@link Target} meta-annotation type
- * to specify where it is legal to use an annotation type.
- *
- * @author  Joshua Bloch
- * @since 1.5
- */
-public enum ElementType {
-    /** Class, interface (including annotation type), or enum declaration */
-    TYPE,
-
-    /** Field declaration (includes enum constants) */
-    FIELD,
-
-    /** Method declaration */
-    METHOD,
-
-    /** Parameter declaration */
-    PARAMETER,
-
-    /** Constructor declaration */
-    CONSTRUCTOR,
-
-    /** Local variable declaration */
-    LOCAL_VARIABLE,
-
-    /** Annotation type declaration */
-    ANNOTATION_TYPE,
-
-    /** Package declaration */
-    PACKAGE
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/annotation/Retention.java
--- a/emul/mini/src/main/java/java/lang/annotation/Retention.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.annotation;
-
-/**
- * Indicates how long annotations with the annotated type are to
- * be retained.  If no Retention annotation is present on
- * an annotation type declaration, the retention policy defaults to
- * {@code RetentionPolicy.CLASS}.
- *
- * <p>A Retention meta-annotation has effect only if the
- * meta-annotated type is used directly for annotation.  It has no
- * effect if the meta-annotated type is used as a member type in
- * another annotation type.
- *
- * @author  Joshua Bloch
- * @since 1.5
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
-public @interface Retention {
-    RetentionPolicy value();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/annotation/RetentionPolicy.java
--- a/emul/mini/src/main/java/java/lang/annotation/RetentionPolicy.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.annotation;
-
-/**
- * Annotation retention policy.  The constants of this enumerated type
- * describe the various policies for retaining annotations.  They are used
- * in conjunction with the {@link Retention} meta-annotation type to specify
- * how long annotations are to be retained.
- *
- * @author  Joshua Bloch
- * @since 1.5
- */
-public enum RetentionPolicy {
-    /**
-     * Annotations are to be discarded by the compiler.
-     */
-    SOURCE,
-
-    /**
-     * Annotations are to be recorded in the class file by the compiler
-     * but need not be retained by the VM at run time.  This is the default
-     * behavior.
-     */
-    CLASS,
-
-    /**
-     * Annotations are to be recorded in the class file by the compiler and
-     * retained by the VM at run time, so they may be read reflectively.
-     *
-     * @see java.lang.reflect.AnnotatedElement
-     */
-    RUNTIME
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/annotation/Target.java
--- a/emul/mini/src/main/java/java/lang/annotation/Target.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.annotation;
-
-/**
- * Indicates the kinds of program element to which an annotation type
- * is applicable.  If a Target meta-annotation is not present on an
- * annotation type declaration, the declared type may be used on any
- * program element.  If such a meta-annotation is present, the compiler
- * will enforce the specified usage restriction.
- *
- * For example, this meta-annotation indicates that the declared type is
- * itself a meta-annotation type.  It can only be used on annotation type
- * declarations:
- * <pre>
- *    &#064;Target(ElementType.ANNOTATION_TYPE)
- *    public &#064;interface MetaAnnotationType {
- *        ...
- *    }
- * </pre>
- * This meta-annotation indicates that the declared type is intended solely
- * for use as a member type in complex annotation type declarations.  It
- * cannot be used to annotate anything directly:
- * <pre>
- *    &#064;Target({})
- *    public &#064;interface MemberType {
- *        ...
- *    }
- * </pre>
- * It is a compile-time error for a single ElementType constant to
- * appear more than once in a Target annotation.  For example, the
- * following meta-annotation is illegal:
- * <pre>
- *    &#064;Target({ElementType.FIELD, ElementType.METHOD, ElementType.FIELD})
- *    public &#064;interface Bogus {
- *        ...
- *    }
- * </pre>
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
-public @interface Target {
-    ElementType[] value();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/annotation/UnsupportedOperationException.java
--- a/emul/mini/src/main/java/java/lang/annotation/UnsupportedOperationException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-/**
- * Thrown to indicate that the requested operation is not supported.<p>
- *
- * This class is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author  Josh Bloch
- * @since   1.2
- */
-public class UnsupportedOperationException extends RuntimeException {
-    /**
-     * Constructs an UnsupportedOperationException with no detail message.
-     */
-    public UnsupportedOperationException() {
-    }
-
-    /**
-     * Constructs an UnsupportedOperationException with the specified
-     * detail message.
-     *
-     * @param message the detail message
-     */
-    public UnsupportedOperationException(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and
-     * cause.
-     *
-     * <p>Note that the detail message associated with <code>cause</code> is
-     * <i>not</i> automatically incorporated in this exception's detail
-     * message.
-     *
-     * @param  message the detail message (which is saved for later retrieval
-     *         by the {@link Throwable#getMessage()} method).
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value
-     *         is permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since 1.5
-     */
-    public UnsupportedOperationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new exception with the specified cause and a detail
-     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
-     * typically contains the class and detail message of <tt>cause</tt>).
-     * This constructor is useful for exceptions that are little more than
-     * wrappers for other throwables (for example, {@link
-     * java.security.PrivilegedActionException}).
-     *
-     * @param  cause the cause (which is saved for later retrieval by the
-     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value is
-     *         permitted, and indicates that the cause is nonexistent or
-     *         unknown.)
-     * @since  1.5
-     */
-    public UnsupportedOperationException(Throwable cause) {
-        super(cause);
-    }
-
-    static final long serialVersionUID = -1242599979055084673L;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/AccessibleObject.java
--- a/emul/mini/src/main/java/java/lang/reflect/AccessibleObject.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import java.lang.annotation.Annotation;
-
-/**
- * The AccessibleObject class is the base class for Field, Method and
- * Constructor objects.  It provides the ability to flag a reflected
- * object as suppressing default Java language access control checks
- * when it is used.  The access checks--for public, default (package)
- * access, protected, and private members--are performed when Fields,
- * Methods or Constructors are used to set or get fields, to invoke
- * methods, or to create and initialize new instances of classes,
- * respectively.
- *
- * <p>Setting the {@code accessible} flag in a reflected object
- * permits sophisticated applications with sufficient privilege, such
- * as Java Object Serialization or other persistence mechanisms, to
- * manipulate objects in a manner that would normally be prohibited.
- *
- * <p>By default, a reflected object is <em>not</em> accessible.
- *
- * @see Field
- * @see Method
- * @see Constructor
- * @see ReflectPermission
- *
- * @since 1.2
- */
-public class AccessibleObject implements AnnotatedElement {
-
-    /**
-     * Convenience method to set the {@code accessible} flag for an
-     * array of objects with a single security check (for efficiency).
-     *
-     * <p>First, if there is a security manager, its
-     * {@code checkPermission} method is called with a
-     * {@code ReflectPermission("suppressAccessChecks")} permission.
-     *
-     * <p>A {@code SecurityException} is raised if {@code flag} is
-     * {@code true} but accessibility of any of the elements of the input
-     * {@code array} may not be changed (for example, if the element
-     * object is a {@link Constructor} object for the class {@link
-     * java.lang.Class}).  In the event of such a SecurityException, the
-     * accessibility of objects is set to {@code flag} for array elements
-     * upto (and excluding) the element for which the exception occurred; the
-     * accessibility of elements beyond (and including) the element for which
-     * the exception occurred is unchanged.
-     *
-     * @param array the array of AccessibleObjects
-     * @param flag  the new value for the {@code accessible} flag
-     *              in each object
-     * @throws SecurityException if the request is denied.
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     */
-    public static void setAccessible(AccessibleObject[] array, boolean flag)
-        throws SecurityException {
-        throw new SecurityException();
-    }
-
-    /**
-     * Set the {@code accessible} flag for this object to
-     * the indicated boolean value.  A value of {@code true} indicates that
-     * the reflected object should suppress Java language access
-     * checking when it is used.  A value of {@code false} indicates
-     * that the reflected object should enforce Java language access checks.
-     *
-     * <p>First, if there is a security manager, its
-     * {@code checkPermission} method is called with a
-     * {@code ReflectPermission("suppressAccessChecks")} permission.
-     *
-     * <p>A {@code SecurityException} is raised if {@code flag} is
-     * {@code true} but accessibility of this object may not be changed
-     * (for example, if this element object is a {@link Constructor} object for
-     * the class {@link java.lang.Class}).
-     *
-     * <p>A {@code SecurityException} is raised if this object is a {@link
-     * java.lang.reflect.Constructor} object for the class
-     * {@code java.lang.Class}, and {@code flag} is true.
-     *
-     * @param flag the new value for the {@code accessible} flag
-     * @throws SecurityException if the request is denied.
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     */
-    public void setAccessible(boolean flag) throws SecurityException {
-        throw new SecurityException();
-    }
-
-    /**
-     * Get the value of the {@code accessible} flag for this object.
-     *
-     * @return the value of the object's {@code accessible} flag
-     */
-    public boolean isAccessible() {
-        return override;
-    }
-
-    /**
-     * Constructor: only used by the Java Virtual Machine.
-     */
-    protected AccessibleObject() {}
-
-    // Indicates whether language-level access checks are overridden
-    // by this object. Initializes to "false". This field is used by
-    // Field, Method, and Constructor.
-    //
-    // NOTE: for security purposes, this field must not be visible
-    // outside this package.
-    boolean override;
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        throw new AssertionError("All subclasses should override this method");
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public boolean isAnnotationPresent(
-        Class<? extends Annotation> annotationClass) {
-        return getAnnotation(annotationClass) != null;
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getAnnotations() {
-        return getDeclaredAnnotations();
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        throw new AssertionError("All subclasses should override this method");
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/AnnotatedElement.java
--- a/emul/mini/src/main/java/java/lang/reflect/AnnotatedElement.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Represents an annotated element of the program currently running in this
- * VM.  This interface allows annotations to be read reflectively.  All
- * annotations returned by methods in this interface are immutable and
- * serializable.  It is permissible for the caller to modify the
- * arrays returned by accessors for array-valued enum members; it will
- * have no affect on the arrays returned to other callers.
- *
- * <p>If an annotation returned by a method in this interface contains
- * (directly or indirectly) a {@link Class}-valued member referring to
- * a class that is not accessible in this VM, attempting to read the class
- * by calling the relevant Class-returning method on the returned annotation
- * will result in a {@link TypeNotPresentException}.
- *
- * <p>Similarly, attempting to read an enum-valued member will result in
- * a {@link EnumConstantNotPresentException} if the enum constant in the
- * annotation is no longer present in the enum type.
- *
- * <p>Finally, Attempting to read a member whose definition has evolved
- * incompatibly will result in a {@link
- * java.lang.annotation.AnnotationTypeMismatchException} or an
- * {@link java.lang.annotation.IncompleteAnnotationException}.
- *
- * @see java.lang.EnumConstantNotPresentException
- * @see java.lang.TypeNotPresentException
- * @see java.lang.annotation.AnnotationFormatError
- * @see java.lang.annotation.AnnotationTypeMismatchException
- * @see java.lang.annotation.IncompleteAnnotationException
- * @since 1.5
- * @author Josh Bloch
- */
-public interface AnnotatedElement {
-    /**
-     * Returns true if an annotation for the specified type
-     * is present on this element, else false.  This method
-     * is designed primarily for convenient access to marker annotations.
-     *
-     * @param annotationClass the Class object corresponding to the
-     *        annotation type
-     * @return true if an annotation for the specified annotation
-     *     type is present on this element, else false
-     * @throws NullPointerException if the given annotation class is null
-     * @since 1.5
-     */
-     boolean isAnnotationPresent(Class<? extends Annotation> annotationClass);
-
-   /**
-     * Returns this element's annotation for the specified type if
-     * such an annotation is present, else null.
-     *
-     * @param annotationClass the Class object corresponding to the
-     *        annotation type
-     * @return this element's annotation for the specified annotation type if
-     *     present on this element, else null
-     * @throws NullPointerException if the given annotation class is null
-     * @since 1.5
-     */
-    <T extends Annotation> T getAnnotation(Class<T> annotationClass);
-
-    /**
-     * Returns all annotations present on this element.  (Returns an array
-     * of length zero if this element has no annotations.)  The caller of
-     * this method is free to modify the returned array; it will have no
-     * effect on the arrays returned to other callers.
-     *
-     * @return all annotations present on this element
-     * @since 1.5
-     */
-    Annotation[] getAnnotations();
-
-    /**
-     * Returns all annotations that are directly present on this
-     * element.  Unlike the other methods in this interface, this method
-     * ignores inherited annotations.  (Returns an array of length zero if
-     * no annotations are directly present on this element.)  The caller of
-     * this method is free to modify the returned array; it will have no
-     * effect on the arrays returned to other callers.
-     *
-     * @return All annotations directly present on this element
-     * @since 1.5
-     */
-    Annotation[] getDeclaredAnnotations();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/Array.java
--- a/emul/mini/src/main/java/java/lang/reflect/Array.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,663 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
-
-/**
- * The {@code Array} class provides static methods to dynamically create and
- * access Java arrays.
- *
- * <p>{@code Array} permits widening conversions to occur during a get or set
- * operation, but throws an {@code IllegalArgumentException} if a narrowing
- * conversion would occur.
- *
- * @author Nakul Saraiya
- */
-@JavaScriptPrototype(prototype = "new Array", container = "Array.prototype")
-public final
-class Array {
-
-    /**
-     * Constructor.  Class Array is not instantiable.
-     */
-    private Array() {}
-
-    /**
-     * Creates a new array with the specified component type and
-     * length.
-     * Invoking this method is equivalent to creating an array
-     * as follows:
-     * <blockquote>
-     * <pre>
-     * int[] x = {length};
-     * Array.newInstance(componentType, x);
-     * </pre>
-     * </blockquote>
-     *
-     * @param componentType the {@code Class} object representing the
-     * component type of the new array
-     * @param length the length of the new array
-     * @return the new array
-     * @exception NullPointerException if the specified
-     * {@code componentType} parameter is null
-     * @exception IllegalArgumentException if componentType is {@link Void#TYPE}
-     * @exception NegativeArraySizeException if the specified {@code length}
-     * is negative
-     */
-    public static Object newInstance(Class<?> componentType, int length)
-    throws NegativeArraySizeException {
-        if (length < 0) {
-            throw new NegativeArraySizeException();
-        }
-        String sig = findSignature(componentType);
-        return newArray(componentType.isPrimitive(), sig, length);
-    }
-    
-    private static String findSignature(Class<?> type) {
-        if (type == Integer.TYPE) {
-            return "[I";
-        }
-        if (type == Long.TYPE) {
-            return "[J";
-        }
-        if (type == Double.TYPE) {
-            return "[D";
-        }
-        if (type == Float.TYPE) {
-            return "[F";
-        }
-        if (type == Byte.TYPE) {
-            return "[B";
-        }
-        if (type == Boolean.TYPE) {
-            return "[Z";
-        }
-        if (type == Short.TYPE) {
-            return "[S";
-        }
-        if (type == Character.TYPE) {
-            return "[C";
-        }
-        if (type.getName().equals("void")) {
-            throw new IllegalStateException("Can't create array for " + type);
-        }
-        return "[L" + type.getName() + ";";
-    }
-    /**
-     * Creates a new array
-     * with the specified component type and dimensions.
-     * If {@code componentType}
-     * represents a non-array class or interface, the new array
-     * has {@code dimensions.length} dimensions and
-     * {@code componentType} as its component type. If
-     * {@code componentType} represents an array class, the
-     * number of dimensions of the new array is equal to the sum
-     * of {@code dimensions.length} and the number of
-     * dimensions of {@code componentType}. In this case, the
-     * component type of the new array is the component type of
-     * {@code componentType}.
-     *
-     * <p>The number of dimensions of the new array must not
-     * exceed the number of array dimensions supported by the
-     * implementation (typically 255).
-     *
-     * @param componentType the {@code Class} object representing the component
-     * type of the new array
-     * @param dimensions an array of {@code int} representing the dimensions of
-     * the new array
-     * @return the new array
-     * @exception NullPointerException if the specified
-     * {@code componentType} argument is null
-     * @exception IllegalArgumentException if the specified {@code dimensions}
-     * argument is a zero-dimensional array, or if the number of
-     * requested dimensions exceeds the limit on the number of array dimensions
-     * supported by the implementation (typically 255), or if componentType
-     * is {@link Void#TYPE}.
-     * @exception NegativeArraySizeException if any of the components in
-     * the specified {@code dimensions} argument is negative.
-     */
-    public static Object newInstance(Class<?> componentType, int... dimensions)
-        throws IllegalArgumentException, NegativeArraySizeException {
-        StringBuilder sig = new StringBuilder();
-        for (int i = 1; i < dimensions.length; i++) {
-            sig.append('[');
-        }
-        sig.append(findSignature(componentType));
-        return multiNewArray(sig.toString(), dimensions, 0);
-    }
-
-    /**
-     * Returns the length of the specified array object, as an {@code int}.
-     *
-     * @param array the array
-     * @return the length of the array
-     * @exception IllegalArgumentException if the object argument is not
-     * an array
-     */
-    public static int getLength(Object array)
-    throws IllegalArgumentException {
-        if (!array.getClass().isArray()) {
-            throw new IllegalArgumentException("Argument is not an array");
-        }
-        return length(array);
-    }
-    
-    @JavaScriptBody(args = { "arr" }, body = "return arr.length;")
-    private static native int length(Object arr);
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object.  The value is automatically wrapped in an object
-     * if it has a primitive type.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the (possibly wrapped) value of the indexed component in
-     * the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     */
-    public static Object get(Object array, int index)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        final Class<?> t = array.getClass().getComponentType();
-        if (t.isPrimitive()) {
-            return fromPrimitive(t, array, index);
-        } else {
-            return ((Object[])array)[index];
-        }
-    }
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object, as a {@code boolean}.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the value of the indexed component in the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array, or if the indexed element cannot be converted to the
-     * return type by an identity or widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     * @see Array#get
-     */
-    public static native boolean getBoolean(Object array, int index)
-        throws IllegalArgumentException, ArrayIndexOutOfBoundsException;
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object, as a {@code byte}.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the value of the indexed component in the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array, or if the indexed element cannot be converted to the
-     * return type by an identity or widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     * @see Array#get
-     */
-    public static byte getByte(Object array, int index)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        if (array.getClass().getComponentType() != Byte.TYPE) {
-            throw new IllegalArgumentException();
-        }
-        byte[] arr = (byte[]) array;
-        return arr[index];
-    }
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object, as a {@code char}.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the value of the indexed component in the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array, or if the indexed element cannot be converted to the
-     * return type by an identity or widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     * @see Array#get
-     */
-    public static native char getChar(Object array, int index)
-        throws IllegalArgumentException, ArrayIndexOutOfBoundsException;
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object, as a {@code short}.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the value of the indexed component in the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array, or if the indexed element cannot be converted to the
-     * return type by an identity or widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     * @see Array#get
-     */
-    public static short getShort(Object array, int index)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        final Class<?> t = array.getClass().getComponentType();
-        if (t == Short.TYPE) {
-            short[] arr = (short[]) array;
-            return arr[index];
-        }
-        return getByte(array, index);
-    }
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object, as an {@code int}.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the value of the indexed component in the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array, or if the indexed element cannot be converted to the
-     * return type by an identity or widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     * @see Array#get
-     */
-    public static int getInt(Object array, int index) 
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        final Class<?> t = array.getClass().getComponentType();
-        if (t == Integer.TYPE) {
-            int[] arr = (int[]) array;
-            return arr[index];
-        }
-        return getShort(array, index);
-    }
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object, as a {@code long}.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the value of the indexed component in the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array, or if the indexed element cannot be converted to the
-     * return type by an identity or widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     * @see Array#get
-     */
-    public static long getLong(Object array, int index)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        final Class<?> t = array.getClass().getComponentType();
-        if (t == Long.TYPE) {
-            long[] arr = (long[]) array;
-            return arr[index];
-        }
-        return getInt(array, index);
-    }
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object, as a {@code float}.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the value of the indexed component in the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array, or if the indexed element cannot be converted to the
-     * return type by an identity or widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     * @see Array#get
-     */
-    public static float getFloat(Object array, int index)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        final Class<?> t = array.getClass().getComponentType();
-        if (t == Float.TYPE) {
-            float[] arr = (float[]) array;
-            return arr[index];
-        }
-        return getLong(array, index);
-    }
-
-    /**
-     * Returns the value of the indexed component in the specified
-     * array object, as a {@code double}.
-     *
-     * @param array the array
-     * @param index the index
-     * @return the value of the indexed component in the specified array
-     * @exception NullPointerException If the specified object is null
-     * @exception IllegalArgumentException If the specified object is not
-     * an array, or if the indexed element cannot be converted to the
-     * return type by an identity or widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to the
-     * length of the specified array
-     * @see Array#get
-     */
-    public static double getDouble(Object array, int index)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        final Class<?> t = array.getClass().getComponentType();
-        if (t == Double.TYPE) {
-            double[] arr = (double[]) array;
-            return arr[index];
-        }
-        return getFloat(array, index);
-    }
-
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified new value.  The new value is first
-     * automatically unwrapped if the array has a primitive component
-     * type.
-     * @param array the array
-     * @param index the index into the array
-     * @param value the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the array component type is primitive and
-     * an unwrapping conversion fails
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     */
-    public static void set(Object array, int index, Object value)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        if (array.getClass().getComponentType().isPrimitive()) {
-            throw new IllegalArgumentException();
-        } else {
-            Object[] arr = (Object[])array;
-            arr[index] = value;
-        }
-    }
-
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified {@code boolean} value.
-     * @param array the array
-     * @param index the index into the array
-     * @param z the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the specified value cannot be converted
-     * to the underlying array's component type by an identity or a
-     * primitive widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     * @see Array#set
-     */
-    public static native void setBoolean(Object array, int index, boolean z)
-        throws IllegalArgumentException, ArrayIndexOutOfBoundsException;
-
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified {@code byte} value.
-     * @param array the array
-     * @param index the index into the array
-     * @param b the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the specified value cannot be converted
-     * to the underlying array's component type by an identity or a
-     * primitive widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     * @see Array#set
-     */
-    public static void setByte(Object array, int index, byte b)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        Class<?> t = array.getClass().getComponentType();
-        if (t == Byte.TYPE) {
-            byte[] arr = (byte[]) array;
-            arr[index] = b;
-        } else {
-            setShort(array, index, b);
-        }
-    }
-
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified {@code char} value.
-     * @param array the array
-     * @param index the index into the array
-     * @param c the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the specified value cannot be converted
-     * to the underlying array's component type by an identity or a
-     * primitive widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     * @see Array#set
-     */
-    public static native void setChar(Object array, int index, char c)
-        throws IllegalArgumentException, ArrayIndexOutOfBoundsException;
-
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified {@code short} value.
-     * @param array the array
-     * @param index the index into the array
-     * @param s the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the specified value cannot be converted
-     * to the underlying array's component type by an identity or a
-     * primitive widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     * @see Array#set
-     */
-    public static void setShort(Object array, int index, short s)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        Class<?> t = array.getClass().getComponentType();
-        if (t == Short.TYPE) {
-            short[] arr = (short[]) array;
-            arr[index] = s;
-        } else {
-            setInt(array, index, s);
-        }
-        
-    }
-    
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified {@code int} value.
-     * @param array the array
-     * @param index the index into the array
-     * @param i the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the specified value cannot be converted
-     * to the underlying array's component type by an identity or a
-     * primitive widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     * @see Array#set
-     */
-    public static void setInt(Object array, int index, int i)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        Class<?> t = array.getClass().getComponentType();
-        if (t == Integer.TYPE) {
-            int[] arr = (int[]) array;
-            arr[index] = i;
-        } else {
-            setLong(array, index, i);
-        }
-    }
-
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified {@code long} value.
-     * @param array the array
-     * @param index the index into the array
-     * @param l the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the specified value cannot be converted
-     * to the underlying array's component type by an identity or a
-     * primitive widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     * @see Array#set
-     */
-    public static void setLong(Object array, int index, long l)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        Class<?> t = array.getClass().getComponentType();
-        if (t == Long.TYPE) {
-            long[] arr = (long[]) array;
-            arr[index] = l;
-        } else {
-            setFloat(array, index, l);
-        }
-    }
-
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified {@code float} value.
-     * @param array the array
-     * @param index the index into the array
-     * @param f the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the specified value cannot be converted
-     * to the underlying array's component type by an identity or a
-     * primitive widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     * @see Array#set
-     */
-    public static void setFloat(Object array, int index, float f)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        Class<?> t = array.getClass().getComponentType();
-        if (t == Float.TYPE) {
-            float[] arr = (float[])array;
-            arr[index] = f;
-        } else {
-            setDouble(array, index, f);
-        }
-    }
-
-    /**
-     * Sets the value of the indexed component of the specified array
-     * object to the specified {@code double} value.
-     * @param array the array
-     * @param index the index into the array
-     * @param d the new value of the indexed component
-     * @exception NullPointerException If the specified object argument
-     * is null
-     * @exception IllegalArgumentException If the specified object argument
-     * is not an array, or if the specified value cannot be converted
-     * to the underlying array's component type by an identity or a
-     * primitive widening conversion
-     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
-     * argument is negative, or if it is greater than or equal to
-     * the length of the specified array
-     * @see Array#set
-     */
-    public static void setDouble(Object array, int index, double d)
-    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-        Class<?> t = array.getClass().getComponentType();
-        if (t == Double.TYPE) {
-            double[] arr = (double[])array;
-            arr[index] = d;
-        } else {
-            throw new IllegalArgumentException("argument type mismatch");
-        }
-    }
-
-    /*
-     * Private
-     */
-
-    @JavaScriptBody(args = { "primitive", "sig", "length" }, body =
-          "var arr = new Array(length);\n"
-        + "var value = primitive ? 0 : null;\n"
-        + "for(var i = 0; i < length; i++) arr[i] = value;\n"
-        + "arr.jvmName = sig;\n"
-        + "return arr;"
-    )
-    private static native Object newArray(boolean primitive, String sig, int length);
-
-    private static Object multiNewArray(String sig, int[] dims, int index)
-    throws IllegalArgumentException, NegativeArraySizeException {
-        if (dims.length == index + 1) {
-            return newArray(sig.length() == 2, sig, dims[index]);
-        }
-        Object arr = newArray(false, sig, dims[index]);
-        String compsig = sig.substring(1);
-        int len = getLength(arr);
-        for (int i = 0; i < len; i++) {
-            setArray(arr, i, multiNewArray(compsig, dims, index + 1));
-        }
-        return arr;
-    }
-    private static Object fromPrimitive(Class<?> t, Object array, int index) {
-        return Method.fromPrimitive(t, atArray(array, index));
-    }
-    
-    @JavaScriptBody(args = { "array", "index" }, body = "return array[index];")
-    private static native Object atArray(Object array, int index);
-
-    @JavaScriptBody(args = { "array", "index", "v" }, body = "array[index] = v;")
-    private static native Object setArray(Object array, int index, Object v);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/Constructor.java
--- a/emul/mini/src/main/java/java/lang/reflect/Constructor.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,567 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import java.lang.annotation.Annotation;
-import org.apidesign.bck2brwsr.emul.reflect.TypeProvider;
-
-/**
- * {@code Constructor} provides information about, and access to, a single
- * constructor for a class.
- *
- * <p>{@code Constructor} permits widening conversions to occur when matching the
- * actual parameters to newInstance() with the underlying
- * constructor's formal parameters, but throws an
- * {@code IllegalArgumentException} if a narrowing conversion would occur.
- *
- * @param <T> the class in which the constructor is declared
- *
- * @see Member
- * @see java.lang.Class
- * @see java.lang.Class#getConstructors()
- * @see java.lang.Class#getConstructor(Class[])
- * @see java.lang.Class#getDeclaredConstructors()
- *
- * @author      Kenneth Russell
- * @author      Nakul Saraiya
- */
-public final
-    class Constructor<T> extends AccessibleObject implements
-                                                    GenericDeclaration,
-                                                    Member {
-
-    private Class<T>            clazz;
-    private int                 slot;
-    private Class<?>[]          parameterTypes;
-    private Class<?>[]          exceptionTypes;
-    private int                 modifiers;
-    // Generics and annotations support
-    private transient String    signature;
-    private byte[]              annotations;
-    private byte[]              parameterAnnotations;
-
-
-    // For sharing of ConstructorAccessors. This branching structure
-    // is currently only two levels deep (i.e., one root Constructor
-    // and potentially many Constructor objects pointing to it.)
-    private Constructor<T>      root;
-
-    /**
-     * Package-private constructor used by ReflectAccess to enable
-     * instantiation of these objects in Java code from the java.lang
-     * package via sun.reflect.LangReflectAccess.
-     */
-    Constructor(Class<T> declaringClass,
-                Class<?>[] parameterTypes,
-                Class<?>[] checkedExceptions,
-                int modifiers,
-                int slot,
-                String signature,
-                byte[] annotations,
-                byte[] parameterAnnotations)
-    {
-        this.clazz = declaringClass;
-        this.parameterTypes = parameterTypes;
-        this.exceptionTypes = checkedExceptions;
-        this.modifiers = modifiers;
-        this.slot = slot;
-        this.signature = signature;
-        this.annotations = annotations;
-        this.parameterAnnotations = parameterAnnotations;
-    }
-
-    /**
-     * Package-private routine (exposed to java.lang.Class via
-     * ReflectAccess) which returns a copy of this Constructor. The copy's
-     * "root" field points to this Constructor.
-     */
-    Constructor<T> copy() {
-        return this;
-    }
-
-    /**
-     * Returns the {@code Class} object representing the class that declares
-     * the constructor represented by this {@code Constructor} object.
-     */
-    public Class<T> getDeclaringClass() {
-        return clazz;
-    }
-
-    /**
-     * Returns the name of this constructor, as a string.  This is
-     * the binary name of the constructor's declaring class.
-     */
-    public String getName() {
-        return getDeclaringClass().getName();
-    }
-
-    /**
-     * Returns the Java language modifiers for the constructor
-     * represented by this {@code Constructor} object, as an integer. The
-     * {@code Modifier} class should be used to decode the modifiers.
-     *
-     * @see Modifier
-     */
-    public int getModifiers() {
-        return modifiers;
-    }
-
-    /**
-     * Returns an array of {@code TypeVariable} objects that represent the
-     * type variables declared by the generic declaration represented by this
-     * {@code GenericDeclaration} object, in declaration order.  Returns an
-     * array of length 0 if the underlying generic declaration declares no type
-     * variables.
-     *
-     * @return an array of {@code TypeVariable} objects that represent
-     *     the type variables declared by this generic declaration
-     * @throws GenericSignatureFormatError if the generic
-     *     signature of this generic declaration does not conform to
-     *     the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @since 1.5
-     */
-    public TypeVariable<Constructor<T>>[] getTypeParameters() {
-        return TypeProvider.getDefault().getTypeParameters(this);
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects that represent the formal
-     * parameter types, in declaration order, of the constructor
-     * represented by this {@code Constructor} object.  Returns an array of
-     * length 0 if the underlying constructor takes no parameters.
-     *
-     * @return the parameter types for the constructor this object
-     * represents
-     */
-    public Class<?>[] getParameterTypes() {
-        return (Class<?>[]) parameterTypes.clone();
-    }
-
-
-    /**
-     * Returns an array of {@code Type} objects that represent the formal
-     * parameter types, in declaration order, of the method represented by
-     * this {@code Constructor} object. Returns an array of length 0 if the
-     * underlying method takes no parameters.
-     *
-     * <p>If a formal parameter type is a parameterized type,
-     * the {@code Type} object returned for it must accurately reflect
-     * the actual type parameters used in the source code.
-     *
-     * <p>If a formal parameter type is a type variable or a parameterized
-     * type, it is created. Otherwise, it is resolved.
-     *
-     * @return an array of {@code Type}s that represent the formal
-     *     parameter types of the underlying method, in declaration order
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if any of the parameter
-     *     types of the underlying method refers to a non-existent type
-     *     declaration
-     * @throws MalformedParameterizedTypeException if any of
-     *     the underlying method's parameter types refer to a parameterized
-     *     type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-    public Type[] getGenericParameterTypes() {
-        return TypeProvider.getDefault().getGenericParameterTypes(this);
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects that represent the types
-     * of exceptions declared to be thrown by the underlying constructor
-     * represented by this {@code Constructor} object.  Returns an array of
-     * length 0 if the constructor declares no exceptions in its {@code throws} clause.
-     *
-     * @return the exception types declared as being thrown by the
-     * constructor this object represents
-     */
-    public Class<?>[] getExceptionTypes() {
-        return (Class<?>[])exceptionTypes.clone();
-    }
-
-
-    /**
-     * Returns an array of {@code Type} objects that represent the
-     * exceptions declared to be thrown by this {@code Constructor} object.
-     * Returns an array of length 0 if the underlying method declares
-     * no exceptions in its {@code throws} clause.
-     *
-     * <p>If an exception type is a type variable or a parameterized
-     * type, it is created. Otherwise, it is resolved.
-     *
-     * @return an array of Types that represent the exception types
-     *     thrown by the underlying method
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the underlying method's
-     *     {@code throws} clause refers to a non-existent type declaration
-     * @throws MalformedParameterizedTypeException if
-     *     the underlying method's {@code throws} clause refers to a
-     *     parameterized type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-      public Type[] getGenericExceptionTypes() {
-          return TypeProvider.getDefault().getGenericExceptionTypes(this);
-      }
-
-    /**
-     * Compares this {@code Constructor} against the specified object.
-     * Returns true if the objects are the same.  Two {@code Constructor} objects are
-     * the same if they were declared by the same class and have the
-     * same formal parameter types.
-     */
-    public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Constructor) {
-            Constructor<?> other = (Constructor<?>)obj;
-            if (getDeclaringClass() == other.getDeclaringClass()) {
-                /* Avoid unnecessary cloning */
-                Class<?>[] params1 = parameterTypes;
-                Class<?>[] params2 = other.parameterTypes;
-                if (params1.length == params2.length) {
-                    for (int i = 0; i < params1.length; i++) {
-                        if (params1[i] != params2[i])
-                            return false;
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a hashcode for this {@code Constructor}. The hashcode is
-     * the same as the hashcode for the underlying constructor's
-     * declaring class name.
-     */
-    public int hashCode() {
-        return getDeclaringClass().getName().hashCode();
-    }
-
-    /**
-     * Returns a string describing this {@code Constructor}.  The string is
-     * formatted as the constructor access modifiers, if any,
-     * followed by the fully-qualified name of the declaring class,
-     * followed by a parenthesized, comma-separated list of the
-     * constructor's formal parameter types.  For example:
-     * <pre>
-     *    public java.util.Hashtable(int,float)
-     * </pre>
-     *
-     * <p>The only possible modifiers for constructors are the access
-     * modifiers {@code public}, {@code protected} or
-     * {@code private}.  Only one of these may appear, or none if the
-     * constructor has default (package) access.
-     */
-    public String toString() {
-        try {
-            StringBuffer sb = new StringBuffer();
-            int mod = getModifiers() & Modifier.constructorModifiers();
-            if (mod != 0) {
-                sb.append(Modifier.toString(mod) + " ");
-            }
-            sb.append(Field.getTypeName(getDeclaringClass()));
-            sb.append("(");
-            Class<?>[] params = parameterTypes; // avoid clone
-            for (int j = 0; j < params.length; j++) {
-                sb.append(Field.getTypeName(params[j]));
-                if (j < (params.length - 1))
-                    sb.append(",");
-            }
-            sb.append(")");
-            Class<?>[] exceptions = exceptionTypes; // avoid clone
-            if (exceptions.length > 0) {
-                sb.append(" throws ");
-                for (int k = 0; k < exceptions.length; k++) {
-                    sb.append(exceptions[k].getName());
-                    if (k < (exceptions.length - 1))
-                        sb.append(",");
-                }
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "<" + e + ">";
-        }
-    }
-
-    /**
-     * Returns a string describing this {@code Constructor},
-     * including type parameters.  The string is formatted as the
-     * constructor access modifiers, if any, followed by an
-     * angle-bracketed comma separated list of the constructor's type
-     * parameters, if any, followed by the fully-qualified name of the
-     * declaring class, followed by a parenthesized, comma-separated
-     * list of the constructor's generic formal parameter types.
-     *
-     * If this constructor was declared to take a variable number of
-     * arguments, instead of denoting the last parameter as
-     * "<tt><i>Type</i>[]</tt>", it is denoted as
-     * "<tt><i>Type</i>...</tt>".
-     *
-     * A space is used to separate access modifiers from one another
-     * and from the type parameters or return type.  If there are no
-     * type parameters, the type parameter list is elided; if the type
-     * parameter list is present, a space separates the list from the
-     * class name.  If the constructor is declared to throw
-     * exceptions, the parameter list is followed by a space, followed
-     * by the word "{@code throws}" followed by a
-     * comma-separated list of the thrown exception types.
-     *
-     * <p>The only possible modifiers for constructors are the access
-     * modifiers {@code public}, {@code protected} or
-     * {@code private}.  Only one of these may appear, or none if the
-     * constructor has default (package) access.
-     *
-     * @return a string describing this {@code Constructor},
-     * include type parameters
-     *
-     * @since 1.5
-     */
-    public String toGenericString() {
-        try {
-            StringBuilder sb = new StringBuilder();
-            int mod = getModifiers() & Modifier.constructorModifiers();
-            if (mod != 0) {
-                sb.append(Modifier.toString(mod) + " ");
-            }
-            TypeVariable<?>[] typeparms = getTypeParameters();
-            if (typeparms.length > 0) {
-                boolean first = true;
-                sb.append("<");
-                for(TypeVariable<?> typeparm: typeparms) {
-                    if (!first)
-                        sb.append(",");
-                    // Class objects can't occur here; no need to test
-                    // and call Class.getName().
-                    sb.append(typeparm.toString());
-                    first = false;
-                }
-                sb.append("> ");
-            }
-            sb.append(Field.getTypeName(getDeclaringClass()));
-            sb.append("(");
-            Type[] params = getGenericParameterTypes();
-            for (int j = 0; j < params.length; j++) {
-                String param = (params[j] instanceof Class<?>)?
-                    Field.getTypeName((Class<?>)params[j]):
-                    (params[j].toString());
-                if (isVarArgs() && (j == params.length - 1)) // replace T[] with T...
-                    param = param.replaceFirst("\\[\\]$", "...");
-                sb.append(param);
-                if (j < (params.length - 1))
-                    sb.append(",");
-            }
-            sb.append(")");
-            Type[] exceptions = getGenericExceptionTypes();
-            if (exceptions.length > 0) {
-                sb.append(" throws ");
-                for (int k = 0; k < exceptions.length; k++) {
-                    sb.append((exceptions[k] instanceof Class)?
-                              ((Class<?>)exceptions[k]).getName():
-                              exceptions[k].toString());
-                    if (k < (exceptions.length - 1))
-                        sb.append(",");
-                }
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "<" + e + ">";
-        }
-    }
-
-    /**
-     * Uses the constructor represented by this {@code Constructor} object to
-     * create and initialize a new instance of the constructor's
-     * declaring class, with the specified initialization parameters.
-     * Individual parameters are automatically unwrapped to match
-     * primitive formal parameters, and both primitive and reference
-     * parameters are subject to method invocation conversions as necessary.
-     *
-     * <p>If the number of formal parameters required by the underlying constructor
-     * is 0, the supplied {@code initargs} array may be of length 0 or null.
-     *
-     * <p>If the constructor's declaring class is an inner class in a
-     * non-static context, the first argument to the constructor needs
-     * to be the enclosing instance; see section 15.9.3 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * <p>If the required access and argument checks succeed and the
-     * instantiation will proceed, the constructor's declaring class
-     * is initialized if it has not already been initialized.
-     *
-     * <p>If the constructor completes normally, returns the newly
-     * created and initialized instance.
-     *
-     * @param initargs array of objects to be passed as arguments to
-     * the constructor call; values of primitive types are wrapped in
-     * a wrapper object of the appropriate type (e.g. a {@code float}
-     * in a {@link java.lang.Float Float})
-     *
-     * @return a new object created by calling the constructor
-     * this object represents
-     *
-     * @exception IllegalAccessException    if this {@code Constructor} object
-     *              is enforcing Java language access control and the underlying
-     *              constructor is inaccessible.
-     * @exception IllegalArgumentException  if the number of actual
-     *              and formal parameters differ; if an unwrapping
-     *              conversion for primitive arguments fails; or if,
-     *              after possible unwrapping, a parameter value
-     *              cannot be converted to the corresponding formal
-     *              parameter type by a method invocation conversion; if
-     *              this constructor pertains to an enum type.
-     * @exception InstantiationException    if the class that declares the
-     *              underlying constructor represents an abstract class.
-     * @exception InvocationTargetException if the underlying constructor
-     *              throws an exception.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     */
-    public T newInstance(Object ... initargs)
-        throws InstantiationException, IllegalAccessException,
-               IllegalArgumentException, InvocationTargetException
-    {
-        throw new SecurityException();
-    }
-
-    /**
-     * Returns {@code true} if this constructor was declared to take
-     * a variable number of arguments; returns {@code false}
-     * otherwise.
-     *
-     * @return {@code true} if an only if this constructor was declared to
-     * take a variable number of arguments.
-     * @since 1.5
-     */
-    public boolean isVarArgs() {
-        return (getModifiers() & Modifier.VARARGS) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this constructor is a synthetic
-     * constructor; returns {@code false} otherwise.
-     *
-     * @return true if and only if this constructor is a synthetic
-     * constructor as defined by
-     * <cite>The Java&trade; Language Specification</cite>.
-     * @since 1.5
-     */
-    public boolean isSynthetic() {
-        return Modifier.isSynthetic(getModifiers());
-    }
-
-    int getSlot() {
-        return slot;
-    }
-
-   String getSignature() {
-            return signature;
-   }
-
-    byte[] getRawAnnotations() {
-        return annotations;
-    }
-
-    byte[] getRawParameterAnnotations() {
-        return parameterAnnotations;
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        if (annotationClass == null)
-            throw new NullPointerException();
-
-        return null; // XXX (T) declaredAnnotations().get(annotationClass);
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        return new Annotation[0]; // XXX AnnotationParser.toArray(declaredAnnotations());
-    }
-
-    /**
-     * Returns an array of arrays that represent the annotations on the formal
-     * parameters, in declaration order, of the method represented by
-     * this {@code Constructor} object. (Returns an array of length zero if the
-     * underlying method is parameterless.  If the method has one or more
-     * parameters, a nested array of length zero is returned for each parameter
-     * with no annotations.) The annotation objects contained in the returned
-     * arrays are serializable.  The caller of this method is free to modify
-     * the returned arrays; it will have no effect on the arrays returned to
-     * other callers.
-     *
-     * @return an array of arrays that represent the annotations on the formal
-     *    parameters, in declaration order, of the method represented by this
-     *    Constructor object
-     * @since 1.5
-     */
-    public Annotation[][] getParameterAnnotations() {
-        int numParameters = parameterTypes.length;
-        if (parameterAnnotations == null)
-            return new Annotation[numParameters][0];
-        
-        return new Annotation[numParameters][0]; // XXX
-/*
-        Annotation[][] result = AnnotationParser.parseParameterAnnotations(
-            parameterAnnotations,
-            sun.misc.SharedSecrets.getJavaLangAccess().
-                getConstantPool(getDeclaringClass()),
-            getDeclaringClass());
-        if (result.length != numParameters) {
-            Class<?> declaringClass = getDeclaringClass();
-            if (declaringClass.isEnum() ||
-                declaringClass.isAnonymousClass() ||
-                declaringClass.isLocalClass() )
-                ; // Can't do reliable parameter counting
-            else {
-                if (!declaringClass.isMemberClass() || // top-level
-                    // Check for the enclosing instance parameter for
-                    // non-static member classes
-                    (declaringClass.isMemberClass() &&
-                     ((declaringClass.getModifiers() & Modifier.STATIC) == 0)  &&
-                     result.length + 1 != numParameters) ) {
-                    throw new AnnotationFormatError(
-                              "Parameter annotations don't match number of parameters");
-                }
-            }
-        }
-        return result;
-        */
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/Field.java
--- a/emul/mini/src/main/java/java/lang/reflect/Field.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,953 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import java.lang.annotation.Annotation;
-
-
-/**
- * A {@code Field} provides information about, and dynamic access to, a
- * single field of a class or an interface.  The reflected field may
- * be a class (static) field or an instance field.
- *
- * <p>A {@code Field} permits widening conversions to occur during a get or
- * set access operation, but throws an {@code IllegalArgumentException} if a
- * narrowing conversion would occur.
- *
- * @see Member
- * @see java.lang.Class
- * @see java.lang.Class#getFields()
- * @see java.lang.Class#getField(String)
- * @see java.lang.Class#getDeclaredFields()
- * @see java.lang.Class#getDeclaredField(String)
- *
- * @author Kenneth Russell
- * @author Nakul Saraiya
- */
-public final
-class Field extends AccessibleObject implements Member {
-
-    private Class<?>            clazz;
-    private int                 slot;
-    // This is guaranteed to be interned by the VM in the 1.4
-    // reflection implementation
-    private String              name;
-    private Class<?>            type;
-    private int                 modifiers;
-    // Generics and annotations support
-    private transient String    signature;
-    private byte[]              annotations;
-    // For sharing of FieldAccessors. This branching structure is
-    // currently only two levels deep (i.e., one root Field and
-    // potentially many Field objects pointing to it.)
-    private Field               root;
-
-    // Generics infrastructure
-
-    private String getGenericSignature() {return signature;}
-
-
-    /**
-     * Package-private constructor used by ReflectAccess to enable
-     * instantiation of these objects in Java code from the java.lang
-     * package via sun.reflect.LangReflectAccess.
-     */
-    Field(Class<?> declaringClass,
-          String name,
-          Class<?> type,
-          int modifiers,
-          int slot,
-          String signature,
-          byte[] annotations)
-    {
-        this.clazz = declaringClass;
-        this.name = name;
-        this.type = type;
-        this.modifiers = modifiers;
-        this.slot = slot;
-        this.signature = signature;
-        this.annotations = annotations;
-    }
-
-    /**
-     * Package-private routine (exposed to java.lang.Class via
-     * ReflectAccess) which returns a copy of this Field. The copy's
-     * "root" field points to this Field.
-     */
-    Field copy() {
-        // This routine enables sharing of FieldAccessor objects
-        // among Field objects which refer to the same underlying
-        // method in the VM. (All of this contortion is only necessary
-        // because of the "accessibility" bit in AccessibleObject,
-        // which implicitly requires that new java.lang.reflect
-        // objects be fabricated for each reflective call on Class
-        // objects.)
-        Field res = new Field(clazz, name, type, modifiers, slot, signature, annotations);
-        res.root = this;
-        return res;
-    }
-
-    /**
-     * Returns the {@code Class} object representing the class or interface
-     * that declares the field represented by this {@code Field} object.
-     */
-    public Class<?> getDeclaringClass() {
-        return clazz;
-    }
-
-    /**
-     * Returns the name of the field represented by this {@code Field} object.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the Java language modifiers for the field represented
-     * by this {@code Field} object, as an integer. The {@code Modifier} class should
-     * be used to decode the modifiers.
-     *
-     * @see Modifier
-     */
-    public int getModifiers() {
-        return modifiers;
-    }
-
-    /**
-     * Returns {@code true} if this field represents an element of
-     * an enumerated type; returns {@code false} otherwise.
-     *
-     * @return {@code true} if and only if this field represents an element of
-     * an enumerated type.
-     * @since 1.5
-     */
-    public boolean isEnumConstant() {
-        return (getModifiers() & Modifier.ENUM) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this field is a synthetic
-     * field; returns {@code false} otherwise.
-     *
-     * @return true if and only if this field is a synthetic
-     * field as defined by the Java Language Specification.
-     * @since 1.5
-     */
-    public boolean isSynthetic() {
-        return Modifier.isSynthetic(getModifiers());
-    }
-
-    /**
-     * Returns a {@code Class} object that identifies the
-     * declared type for the field represented by this
-     * {@code Field} object.
-     *
-     * @return a {@code Class} object identifying the declared
-     * type of the field represented by this object
-     */
-    public Class<?> getType() {
-        return type;
-    }
-
-    /**
-     * Returns a {@code Type} object that represents the declared type for
-     * the field represented by this {@code Field} object.
-     *
-     * <p>If the {@code Type} is a parameterized type, the
-     * {@code Type} object returned must accurately reflect the
-     * actual type parameters used in the source code.
-     *
-     * <p>If the type of the underlying field is a type variable or a
-     * parameterized type, it is created. Otherwise, it is resolved.
-     *
-     * @return a {@code Type} object that represents the declared type for
-     *     the field represented by this {@code Field} object
-     * @throws GenericSignatureFormatError if the generic field
-     *     signature does not conform to the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the generic type
-     *     signature of the underlying field refers to a non-existent
-     *     type declaration
-     * @throws MalformedParameterizedTypeException if the generic
-     *     signature of the underlying field refers to a parameterized type
-     *     that cannot be instantiated for any reason
-     * @since 1.5
-     */
-    public Type getGenericType() {
-        throw new UnsupportedOperationException();
-    }
-
-
-    /**
-     * Compares this {@code Field} against the specified object.  Returns
-     * true if the objects are the same.  Two {@code Field} objects are the same if
-     * they were declared by the same class and have the same name
-     * and type.
-     */
-    public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Field) {
-            Field other = (Field)obj;
-            return (getDeclaringClass() == other.getDeclaringClass())
-                && (getName() == other.getName())
-                && (getType() == other.getType());
-        }
-        return false;
-    }
-
-    /**
-     * Returns a hashcode for this {@code Field}.  This is computed as the
-     * exclusive-or of the hashcodes for the underlying field's
-     * declaring class name and its name.
-     */
-    public int hashCode() {
-        return getDeclaringClass().getName().hashCode() ^ getName().hashCode();
-    }
-
-    /**
-     * Returns a string describing this {@code Field}.  The format is
-     * the access modifiers for the field, if any, followed
-     * by the field type, followed by a space, followed by
-     * the fully-qualified name of the class declaring the field,
-     * followed by a period, followed by the name of the field.
-     * For example:
-     * <pre>
-     *    public static final int java.lang.Thread.MIN_PRIORITY
-     *    private int java.io.FileDescriptor.fd
-     * </pre>
-     *
-     * <p>The modifiers are placed in canonical order as specified by
-     * "The Java Language Specification".  This is {@code public},
-     * {@code protected} or {@code private} first, and then other
-     * modifiers in the following order: {@code static}, {@code final},
-     * {@code transient}, {@code volatile}.
-     */
-    public String toString() {
-        int mod = getModifiers();
-        return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
-            + getTypeName(getType()) + " "
-            + getTypeName(getDeclaringClass()) + "."
-            + getName());
-    }
-
-    /**
-     * Returns a string describing this {@code Field}, including
-     * its generic type.  The format is the access modifiers for the
-     * field, if any, followed by the generic field type, followed by
-     * a space, followed by the fully-qualified name of the class
-     * declaring the field, followed by a period, followed by the name
-     * of the field.
-     *
-     * <p>The modifiers are placed in canonical order as specified by
-     * "The Java Language Specification".  This is {@code public},
-     * {@code protected} or {@code private} first, and then other
-     * modifiers in the following order: {@code static}, {@code final},
-     * {@code transient}, {@code volatile}.
-     *
-     * @return a string describing this {@code Field}, including
-     * its generic type
-     *
-     * @since 1.5
-     */
-    public String toGenericString() {
-        int mod = getModifiers();
-        Type fieldType = getGenericType();
-        return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
-            +  ((fieldType instanceof Class) ?
-                getTypeName((Class)fieldType): fieldType.toString())+ " "
-            + getTypeName(getDeclaringClass()) + "."
-            + getName());
-    }
-
-    /**
-     * Returns the value of the field represented by this {@code Field}, on
-     * the specified object. The value is automatically wrapped in an
-     * object if it has a primitive type.
-     *
-     * <p>The underlying field's value is obtained as follows:
-     *
-     * <p>If the underlying field is a static field, the {@code obj} argument
-     * is ignored; it may be null.
-     *
-     * <p>Otherwise, the underlying field is an instance field.  If the
-     * specified {@code obj} argument is null, the method throws a
-     * {@code NullPointerException}. If the specified object is not an
-     * instance of the class or interface declaring the underlying
-     * field, the method throws an {@code IllegalArgumentException}.
-     *
-     * <p>If this {@code Field} object is enforcing Java language access control, and
-     * the underlying field is inaccessible, the method throws an
-     * {@code IllegalAccessException}.
-     * If the underlying field is static, the class that declared the
-     * field is initialized if it has not already been initialized.
-     *
-     * <p>Otherwise, the value is retrieved from the underlying instance
-     * or static field.  If the field has a primitive type, the value
-     * is wrapped in an object before being returned, otherwise it is
-     * returned as is.
-     *
-     * <p>If the field is hidden in the type of {@code obj},
-     * the field's value is obtained according to the preceding rules.
-     *
-     * @param obj object from which the represented field's value is
-     * to be extracted
-     * @return the value of the represented field in object
-     * {@code obj}; primitive values are wrapped in an appropriate
-     * object before being returned
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof).
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     */
-    public Object get(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).get(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance {@code boolean} field.
-     *
-     * @param obj the object to extract the {@code boolean} value
-     * from
-     * @return the value of the {@code boolean} field
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code boolean} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    public boolean getBoolean(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).getBoolean(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance {@code byte} field.
-     *
-     * @param obj the object to extract the {@code byte} value
-     * from
-     * @return the value of the {@code byte} field
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code byte} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    public byte getByte(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).getByte(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code char} or of another primitive type convertible to
-     * type {@code char} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code char} value
-     * from
-     * @return the value of the field converted to type {@code char}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code char} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see Field#get
-     */
-    public char getChar(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).getChar(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code short} or of another primitive type convertible to
-     * type {@code short} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code short} value
-     * from
-     * @return the value of the field converted to type {@code short}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code short} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    public short getShort(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).getShort(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code int} or of another primitive type convertible to
-     * type {@code int} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code int} value
-     * from
-     * @return the value of the field converted to type {@code int}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code int} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    public int getInt(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).getInt(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code long} or of another primitive type convertible to
-     * type {@code long} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code long} value
-     * from
-     * @return the value of the field converted to type {@code long}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code long} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    public long getLong(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).getLong(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code float} or of another primitive type convertible to
-     * type {@code float} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code float} value
-     * from
-     * @return the value of the field converted to type {@code float}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code float} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see Field#get
-     */
-    public float getFloat(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).getFloat(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code double} or of another primitive type convertible to
-     * type {@code double} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code double} value
-     * from
-     * @return the value of the field converted to type {@code double}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code double} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    public double getDouble(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        return getFieldAccessor(obj).getDouble(obj);
-    }
-
-    /**
-     * Sets the field represented by this {@code Field} object on the
-     * specified object argument to the specified new value. The new
-     * value is automatically unwrapped if the underlying field has a
-     * primitive type.
-     *
-     * <p>The operation proceeds as follows:
-     *
-     * <p>If the underlying field is static, the {@code obj} argument is
-     * ignored; it may be null.
-     *
-     * <p>Otherwise the underlying field is an instance field.  If the
-     * specified object argument is null, the method throws a
-     * {@code NullPointerException}.  If the specified object argument is not
-     * an instance of the class or interface declaring the underlying
-     * field, the method throws an {@code IllegalArgumentException}.
-     *
-     * <p>If this {@code Field} object is enforcing Java language access control, and
-     * the underlying field is inaccessible, the method throws an
-     * {@code IllegalAccessException}.
-     *
-     * <p>If the underlying field is final, the method throws an
-     * {@code IllegalAccessException} unless {@code setAccessible(true)}
-     * has succeeded for this {@code Field} object
-     * and the field is non-static. Setting a final field in this way
-     * is meaningful only during deserialization or reconstruction of
-     * instances of classes with blank final fields, before they are
-     * made available for access by other parts of a program. Use in
-     * any other context may have unpredictable effects, including cases
-     * in which other parts of a program continue to use the original
-     * value of this field.
-     *
-     * <p>If the underlying field is of a primitive type, an unwrapping
-     * conversion is attempted to convert the new value to a value of
-     * a primitive type.  If this attempt fails, the method throws an
-     * {@code IllegalArgumentException}.
-     *
-     * <p>If, after possible unwrapping, the new value cannot be
-     * converted to the type of the underlying field by an identity or
-     * widening conversion, the method throws an
-     * {@code IllegalArgumentException}.
-     *
-     * <p>If the underlying field is static, the class that declared the
-     * field is initialized if it has not already been initialized.
-     *
-     * <p>The field is set to the possibly unwrapped and widened new value.
-     *
-     * <p>If the field is hidden in the type of {@code obj},
-     * the field's value is set according to the preceding rules.
-     *
-     * @param obj the object whose field should be modified
-     * @param value the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     */
-    public void set(Object obj, Object value)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).set(obj, value);
-    }
-
-    /**
-     * Sets the value of a field as a {@code boolean} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, zObj)},
-     * where {@code zObj} is a {@code Boolean} object and
-     * {@code zObj.booleanValue() == z}.
-     *
-     * @param obj the object whose field should be modified
-     * @param z   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    public void setBoolean(Object obj, boolean z)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).setBoolean(obj, z);
-    }
-
-    /**
-     * Sets the value of a field as a {@code byte} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, bObj)},
-     * where {@code bObj} is a {@code Byte} object and
-     * {@code bObj.byteValue() == b}.
-     *
-     * @param obj the object whose field should be modified
-     * @param b   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    public void setByte(Object obj, byte b)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).setByte(obj, b);
-    }
-
-    /**
-     * Sets the value of a field as a {@code char} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, cObj)},
-     * where {@code cObj} is a {@code Character} object and
-     * {@code cObj.charValue() == c}.
-     *
-     * @param obj the object whose field should be modified
-     * @param c   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    public void setChar(Object obj, char c)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).setChar(obj, c);
-    }
-
-    /**
-     * Sets the value of a field as a {@code short} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, sObj)},
-     * where {@code sObj} is a {@code Short} object and
-     * {@code sObj.shortValue() == s}.
-     *
-     * @param obj the object whose field should be modified
-     * @param s   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    public void setShort(Object obj, short s)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).setShort(obj, s);
-    }
-
-    /**
-     * Sets the value of a field as an {@code int} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, iObj)},
-     * where {@code iObj} is a {@code Integer} object and
-     * {@code iObj.intValue() == i}.
-     *
-     * @param obj the object whose field should be modified
-     * @param i   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    public void setInt(Object obj, int i)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).setInt(obj, i);
-    }
-
-    /**
-     * Sets the value of a field as a {@code long} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, lObj)},
-     * where {@code lObj} is a {@code Long} object and
-     * {@code lObj.longValue() == l}.
-     *
-     * @param obj the object whose field should be modified
-     * @param l   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    public void setLong(Object obj, long l)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).setLong(obj, l);
-    }
-
-    /**
-     * Sets the value of a field as a {@code float} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, fObj)},
-     * where {@code fObj} is a {@code Float} object and
-     * {@code fObj.floatValue() == f}.
-     *
-     * @param obj the object whose field should be modified
-     * @param f   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    public void setFloat(Object obj, float f)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).setFloat(obj, f);
-    }
-
-    /**
-     * Sets the value of a field as a {@code double} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, dObj)},
-     * where {@code dObj} is a {@code Double} object and
-     * {@code dObj.doubleValue() == d}.
-     *
-     * @param obj the object whose field should be modified
-     * @param d   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    public void setDouble(Object obj, double d)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        getFieldAccessor(obj).setDouble(obj, d);
-    }
-
-    // Convenience routine which performs security checks
-    private FieldAccessor getFieldAccessor(Object obj)
-        throws IllegalAccessException
-    {
-        throw new SecurityException();
-    }
-    
-    private static abstract class FieldAccessor {
-        abstract void setShort(Object obj, short s);
-        abstract void setInt(Object obj, int i);
-        abstract void setChar(Object obj, char c);
-        abstract void setByte(Object obj, byte b);
-        abstract void setBoolean(Object obj, boolean z);
-        abstract void set(Object obj, Object value);
-        abstract double getDouble(Object obj);
-        abstract void setLong(Object obj, long l);
-        abstract void setFloat(Object obj, float f);
-        abstract void setDouble(Object obj, double d);
-        abstract long getLong(Object obj);
-        abstract int getInt(Object obj);
-        abstract short getShort(Object obj);
-        abstract char getChar(Object obj);
-        abstract byte getByte(Object obj);
-        abstract boolean getBoolean(Object obj);
-        abstract Object get(Object obj);
-        abstract float getFloat(Object obj);
-    }
-
-    /*
-     * Utility routine to paper over array type names
-     */
-    static String getTypeName(Class<?> type) {
-        if (type.isArray()) {
-            try {
-                Class<?> cl = type;
-                int dimensions = 0;
-                while (cl.isArray()) {
-                    dimensions++;
-                    cl = cl.getComponentType();
-                }
-                StringBuffer sb = new StringBuffer();
-                sb.append(cl.getName());
-                for (int i = 0; i < dimensions; i++) {
-                    sb.append("[]");
-                }
-                return sb.toString();
-            } catch (Throwable e) { /*FALLTHRU*/ }
-        }
-        return type.getName();
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        if (annotationClass == null)
-            throw new NullPointerException();
-
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        throw new UnsupportedOperationException();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/GenericDeclaration.java
--- a/emul/mini/src/main/java/java/lang/reflect/GenericDeclaration.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-/**
- * A common interface for all entities that declare type variables.
- *
- * @since 1.5
- */
-public interface GenericDeclaration {
-    /**
-     * Returns an array of {@code TypeVariable} objects that
-     * represent the type variables declared by the generic
-     * declaration represented by this {@code GenericDeclaration}
-     * object, in declaration order.  Returns an array of length 0 if
-     * the underlying generic declaration declares no type variables.
-     *
-     * @return an array of {@code TypeVariable} objects that represent
-     *     the type variables declared by this generic declaration
-     * @throws GenericSignatureFormatError if the generic
-     *     signature of this generic declaration does not conform to
-     *     the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     */
-    public TypeVariable<?>[] getTypeParameters();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/InvocationHandler.java
--- a/emul/mini/src/main/java/java/lang/reflect/InvocationHandler.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-/**
- * {@code InvocationHandler} is the interface implemented by
- * the <i>invocation handler</i> of a proxy instance.
- *
- * <p>Each proxy instance has an associated invocation handler.
- * When a method is invoked on a proxy instance, the method
- * invocation is encoded and dispatched to the {@code invoke}
- * method of its invocation handler.
- *
- * @author      Peter Jones
- * @see         Proxy
- * @since       1.3
- */
-public interface InvocationHandler {
-
-    /**
-     * Processes a method invocation on a proxy instance and returns
-     * the result.  This method will be invoked on an invocation handler
-     * when a method is invoked on a proxy instance that it is
-     * associated with.
-     *
-     * @param   proxy the proxy instance that the method was invoked on
-     *
-     * @param   method the {@code Method} instance corresponding to
-     * the interface method invoked on the proxy instance.  The declaring
-     * class of the {@code Method} object will be the interface that
-     * the method was declared in, which may be a superinterface of the
-     * proxy interface that the proxy class inherits the method through.
-     *
-     * @param   args an array of objects containing the values of the
-     * arguments passed in the method invocation on the proxy instance,
-     * or {@code null} if interface method takes no arguments.
-     * Arguments of primitive types are wrapped in instances of the
-     * appropriate primitive wrapper class, such as
-     * {@code java.lang.Integer} or {@code java.lang.Boolean}.
-     *
-     * @return  the value to return from the method invocation on the
-     * proxy instance.  If the declared return type of the interface
-     * method is a primitive type, then the value returned by
-     * this method must be an instance of the corresponding primitive
-     * wrapper class; otherwise, it must be a type assignable to the
-     * declared return type.  If the value returned by this method is
-     * {@code null} and the interface method's return type is
-     * primitive, then a {@code NullPointerException} will be
-     * thrown by the method invocation on the proxy instance.  If the
-     * value returned by this method is otherwise not compatible with
-     * the interface method's declared return type as described above,
-     * a {@code ClassCastException} will be thrown by the method
-     * invocation on the proxy instance.
-     *
-     * @throws  Throwable the exception to throw from the method
-     * invocation on the proxy instance.  The exception's type must be
-     * assignable either to any of the exception types declared in the
-     * {@code throws} clause of the interface method or to the
-     * unchecked exception types {@code java.lang.RuntimeException}
-     * or {@code java.lang.Error}.  If a checked exception is
-     * thrown by this method that is not assignable to any of the
-     * exception types declared in the {@code throws} clause of
-     * the interface method, then an
-     * {@link UndeclaredThrowableException} containing the
-     * exception that was thrown by this method will be thrown by the
-     * method invocation on the proxy instance.
-     *
-     * @see     UndeclaredThrowableException
-     */
-    public Object invoke(Object proxy, Method method, Object[] args)
-        throws Throwable;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/InvocationTargetException.java
--- a/emul/mini/src/main/java/java/lang/reflect/InvocationTargetException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-/**
- * InvocationTargetException is a checked exception that wraps
- * an exception thrown by an invoked method or constructor.
- *
- * <p>As of release 1.4, this exception has been retrofitted to conform to
- * the general purpose exception-chaining mechanism.  The "target exception"
- * that is provided at construction time and accessed via the
- * {@link #getTargetException()} method is now known as the <i>cause</i>,
- * and may be accessed via the {@link Throwable#getCause()} method,
- * as well as the aforementioned "legacy method."
- *
- * @see Method
- * @see Constructor
- */
-public class InvocationTargetException extends ReflectiveOperationException {
-    /**
-     * Use serialVersionUID from JDK 1.1.X for interoperability
-     */
-    private static final long serialVersionUID = 4085088731926701167L;
-
-     /**
-     * This field holds the target if the
-     * InvocationTargetException(Throwable target) constructor was
-     * used to instantiate the object
-     *
-     * @serial
-     *
-     */
-    private Throwable target;
-
-    /**
-     * Constructs an {@code InvocationTargetException} with
-     * {@code null} as the target exception.
-     */
-    protected InvocationTargetException() {
-        super((Throwable)null);  // Disallow initCause
-    }
-
-    /**
-     * Constructs a InvocationTargetException with a target exception.
-     *
-     * @param target the target exception
-     */
-    public InvocationTargetException(Throwable target) {
-        super((Throwable)null);  // Disallow initCause
-        this.target = target;
-    }
-
-    /**
-     * Constructs a InvocationTargetException with a target exception
-     * and a detail message.
-     *
-     * @param target the target exception
-     * @param s      the detail message
-     */
-    public InvocationTargetException(Throwable target, String s) {
-        super(s, null);  // Disallow initCause
-        this.target = target;
-    }
-
-    /**
-     * Get the thrown target exception.
-     *
-     * <p>This method predates the general-purpose exception chaining facility.
-     * The {@link Throwable#getCause()} method is now the preferred means of
-     * obtaining this information.
-     *
-     * @return the thrown target exception (cause of this exception).
-     */
-    public Throwable getTargetException() {
-        return target;
-    }
-
-    /**
-     * Returns the cause of this exception (the thrown target exception,
-     * which may be {@code null}).
-     *
-     * @return  the cause of this exception.
-     * @since   1.4
-     */
-    public Throwable getCause() {
-        return target;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/Member.java
--- a/emul/mini/src/main/java/java/lang/reflect/Member.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-/**
- * Member is an interface that reflects identifying information about
- * a single member (a field or a method) or a constructor.
- *
- * @see java.lang.Class
- * @see Field
- * @see Method
- * @see Constructor
- *
- * @author Nakul Saraiya
- */
-public
-interface Member {
-
-    /**
-     * Identifies the set of all public members of a class or interface,
-     * including inherited members.
-     * @see java.lang.SecurityManager#checkMemberAccess
-     */
-    public static final int PUBLIC = 0;
-
-    /**
-     * Identifies the set of declared members of a class or interface.
-     * Inherited members are not included.
-     * @see java.lang.SecurityManager#checkMemberAccess
-     */
-    public static final int DECLARED = 1;
-
-    /**
-     * Returns the Class object representing the class or interface
-     * that declares the member or constructor represented by this Member.
-     *
-     * @return an object representing the declaring class of the
-     * underlying member
-     */
-    public Class<?> getDeclaringClass();
-
-    /**
-     * Returns the simple name of the underlying member or constructor
-     * represented by this Member.
-     *
-     * @return the simple name of the underlying member
-     */
-    public String getName();
-
-    /**
-     * Returns the Java language modifiers for the member or
-     * constructor represented by this Member, as an integer.  The
-     * Modifier class should be used to decode the modifiers in
-     * the integer.
-     *
-     * @return the Java language modifiers for the underlying member
-     * @see Modifier
-     */
-    public int getModifiers();
-
-    /**
-     * Returns {@code true} if this member was introduced by
-     * the compiler; returns {@code false} otherwise.
-     *
-     * @return true if and only if this member was introduced by
-     * the compiler.
-     * @since 1.5
-     */
-    public boolean isSynthetic();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/Method.java
--- a/emul/mini/src/main/java/java/lang/reflect/Method.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,721 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import java.lang.annotation.Annotation;
-import java.util.Enumeration;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.emul.reflect.AnnotationImpl;
-import org.apidesign.bck2brwsr.emul.reflect.MethodImpl;
-
-/**
- * A {@code Method} provides information about, and access to, a single method
- * on a class or interface.  The reflected method may be a class method
- * or an instance method (including an abstract method).
- *
- * <p>A {@code Method} permits widening conversions to occur when matching the
- * actual parameters to invoke with the underlying method's formal
- * parameters, but it throws an {@code IllegalArgumentException} if a
- * narrowing conversion would occur.
- *
- * @see Member
- * @see java.lang.Class
- * @see java.lang.Class#getMethods()
- * @see java.lang.Class#getMethod(String, Class[])
- * @see java.lang.Class#getDeclaredMethods()
- * @see java.lang.Class#getDeclaredMethod(String, Class[])
- *
- * @author Kenneth Russell
- * @author Nakul Saraiya
- */
-public final
-    class Method extends AccessibleObject implements GenericDeclaration,
-                                                     Member {
-    private final Class<?> clazz;
-    private final String name;
-    private final Object data;
-    private final String sig;
-
-   // Generics infrastructure
-
-    private String getGenericSignature() {return null;}
-
-    /**
-     * Package-private constructor used by ReflectAccess to enable
-     * instantiation of these objects in Java code from the java.lang
-     * package via sun.reflect.LangReflectAccess.
-     */
-    Method(Class<?> declaringClass, String name, Object data, String sig)
-    {
-        this.clazz = declaringClass;
-        this.name = name;
-        this.data = data;
-        this.sig = sig;
-    }
-
-    /**
-     * Package-private routine (exposed to java.lang.Class via
-     * ReflectAccess) which returns a copy of this Method. The copy's
-     * "root" field points to this Method.
-     */
-    Method copy() {
-        return this;
-    }
-
-    /**
-     * Returns the {@code Class} object representing the class or interface
-     * that declares the method represented by this {@code Method} object.
-     */
-    public Class<?> getDeclaringClass() {
-        return clazz;
-    }
-
-    /**
-     * Returns the name of the method represented by this {@code Method}
-     * object, as a {@code String}.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the Java language modifiers for the method represented
-     * by this {@code Method} object, as an integer. The {@code Modifier} class should
-     * be used to decode the modifiers.
-     *
-     * @see Modifier
-     */
-    public int getModifiers() {
-        return getAccess(data);
-    }
-    
-    @JavaScriptBody(args = "self", body = "return self.access;")
-    private static native int getAccess(Object self);
-    
-    /**
-     * Returns an array of {@code TypeVariable} objects that represent the
-     * type variables declared by the generic declaration represented by this
-     * {@code GenericDeclaration} object, in declaration order.  Returns an
-     * array of length 0 if the underlying generic declaration declares no type
-     * variables.
-     *
-     * @return an array of {@code TypeVariable} objects that represent
-     *     the type variables declared by this generic declaration
-     * @throws GenericSignatureFormatError if the generic
-     *     signature of this generic declaration does not conform to
-     *     the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @since 1.5
-     */
-    public TypeVariable<Method>[] getTypeParameters() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns a {@code Class} object that represents the formal return type
-     * of the method represented by this {@code Method} object.
-     *
-     * @return the return type for the method this object represents
-     */
-    public Class<?> getReturnType() {
-        return MethodImpl.signatureParser(sig).nextElement();
-    }
-
-    /**
-     * Returns a {@code Type} object that represents the formal return
-     * type of the method represented by this {@code Method} object.
-     *
-     * <p>If the return type is a parameterized type,
-     * the {@code Type} object returned must accurately reflect
-     * the actual type parameters used in the source code.
-     *
-     * <p>If the return type is a type variable or a parameterized type, it
-     * is created. Otherwise, it is resolved.
-     *
-     * @return  a {@code Type} object that represents the formal return
-     *     type of the underlying  method
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the underlying method's
-     *     return type refers to a non-existent type declaration
-     * @throws MalformedParameterizedTypeException if the
-     *     underlying method's return typed refers to a parameterized
-     *     type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-    public Type getGenericReturnType() {
-        throw new UnsupportedOperationException();
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects that represent the formal
-     * parameter types, in declaration order, of the method
-     * represented by this {@code Method} object.  Returns an array of length
-     * 0 if the underlying method takes no parameters.
-     *
-     * @return the parameter types for the method this object
-     * represents
-     */
-    public Class<?>[] getParameterTypes() {
-        Class[] arr = new Class[MethodImpl.signatureElements(sig) - 1];
-        Enumeration<Class> en = MethodImpl.signatureParser(sig);
-        en.nextElement(); // return type
-        for (int i = 0; i < arr.length; i++) {
-            arr[i] = en.nextElement();
-        }
-        return arr;
-    }
-
-    /**
-     * Returns an array of {@code Type} objects that represent the formal
-     * parameter types, in declaration order, of the method represented by
-     * this {@code Method} object. Returns an array of length 0 if the
-     * underlying method takes no parameters.
-     *
-     * <p>If a formal parameter type is a parameterized type,
-     * the {@code Type} object returned for it must accurately reflect
-     * the actual type parameters used in the source code.
-     *
-     * <p>If a formal parameter type is a type variable or a parameterized
-     * type, it is created. Otherwise, it is resolved.
-     *
-     * @return an array of Types that represent the formal
-     *     parameter types of the underlying method, in declaration order
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if any of the parameter
-     *     types of the underlying method refers to a non-existent type
-     *     declaration
-     * @throws MalformedParameterizedTypeException if any of
-     *     the underlying method's parameter types refer to a parameterized
-     *     type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-    public Type[] getGenericParameterTypes() {
-        throw new UnsupportedOperationException();
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects that represent
-     * the types of the exceptions declared to be thrown
-     * by the underlying method
-     * represented by this {@code Method} object.  Returns an array of length
-     * 0 if the method declares no exceptions in its {@code throws} clause.
-     *
-     * @return the exception types declared as being thrown by the
-     * method this object represents
-     */
-    public Class<?>[] getExceptionTypes() {
-        throw new UnsupportedOperationException();
-        //return (Class<?>[]) exceptionTypes.clone();
-    }
-
-    /**
-     * Returns an array of {@code Type} objects that represent the
-     * exceptions declared to be thrown by this {@code Method} object.
-     * Returns an array of length 0 if the underlying method declares
-     * no exceptions in its {@code throws} clause.
-     *
-     * <p>If an exception type is a type variable or a parameterized
-     * type, it is created. Otherwise, it is resolved.
-     *
-     * @return an array of Types that represent the exception types
-     *     thrown by the underlying method
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the underlying method's
-     *     {@code throws} clause refers to a non-existent type declaration
-     * @throws MalformedParameterizedTypeException if
-     *     the underlying method's {@code throws} clause refers to a
-     *     parameterized type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-      public Type[] getGenericExceptionTypes() {
-        throw new UnsupportedOperationException();
-      }
-
-    /**
-     * Compares this {@code Method} against the specified object.  Returns
-     * true if the objects are the same.  Two {@code Methods} are the same if
-     * they were declared by the same class and have the same name
-     * and formal parameter types and return type.
-     */
-    public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Method) {
-            Method other = (Method)obj;
-            return data == other.data;
-        }
-        return false;
-    }
-
-    /**
-     * Returns a hashcode for this {@code Method}.  The hashcode is computed
-     * as the exclusive-or of the hashcodes for the underlying
-     * method's declaring class name and the method's name.
-     */
-    public int hashCode() {
-        return getDeclaringClass().getName().hashCode() ^ getName().hashCode();
-    }
-
-    /**
-     * Returns a string describing this {@code Method}.  The string is
-     * formatted as the method access modifiers, if any, followed by
-     * the method return type, followed by a space, followed by the
-     * class declaring the method, followed by a period, followed by
-     * the method name, followed by a parenthesized, comma-separated
-     * list of the method's formal parameter types. If the method
-     * throws checked exceptions, the parameter list is followed by a
-     * space, followed by the word throws followed by a
-     * comma-separated list of the thrown exception types.
-     * For example:
-     * <pre>
-     *    public boolean java.lang.Object.equals(java.lang.Object)
-     * </pre>
-     *
-     * <p>The access modifiers are placed in canonical order as
-     * specified by "The Java Language Specification".  This is
-     * {@code public}, {@code protected} or {@code private} first,
-     * and then other modifiers in the following order:
-     * {@code abstract}, {@code static}, {@code final},
-     * {@code synchronized}, {@code native}, {@code strictfp}.
-     */
-    public String toString() {
-        try {
-            StringBuilder sb = new StringBuilder();
-            int mod = getModifiers() & Modifier.methodModifiers();
-            if (mod != 0) {
-                sb.append(Modifier.toString(mod)).append(' ');
-            }
-            sb.append(Field.getTypeName(getReturnType())).append(' ');
-            sb.append(Field.getTypeName(getDeclaringClass())).append('.');
-            sb.append(getName()).append('(');
-            Class<?>[] params = getParameterTypes(); // avoid clone
-            for (int j = 0; j < params.length; j++) {
-                sb.append(Field.getTypeName(params[j]));
-                if (j < (params.length - 1))
-                    sb.append(',');
-            }
-            sb.append(')');
-            /*
-            Class<?>[] exceptions = exceptionTypes; // avoid clone
-            if (exceptions.length > 0) {
-                sb.append(" throws ");
-                for (int k = 0; k < exceptions.length; k++) {
-                    sb.append(exceptions[k].getName());
-                    if (k < (exceptions.length - 1))
-                        sb.append(',');
-                }
-            }
-            */
-            return sb.toString();
-        } catch (Exception e) {
-            return "<" + e + ">";
-        }
-    }
-
-    /**
-     * Returns a string describing this {@code Method}, including
-     * type parameters.  The string is formatted as the method access
-     * modifiers, if any, followed by an angle-bracketed
-     * comma-separated list of the method's type parameters, if any,
-     * followed by the method's generic return type, followed by a
-     * space, followed by the class declaring the method, followed by
-     * a period, followed by the method name, followed by a
-     * parenthesized, comma-separated list of the method's generic
-     * formal parameter types.
-     *
-     * If this method was declared to take a variable number of
-     * arguments, instead of denoting the last parameter as
-     * "<tt><i>Type</i>[]</tt>", it is denoted as
-     * "<tt><i>Type</i>...</tt>".
-     *
-     * A space is used to separate access modifiers from one another
-     * and from the type parameters or return type.  If there are no
-     * type parameters, the type parameter list is elided; if the type
-     * parameter list is present, a space separates the list from the
-     * class name.  If the method is declared to throw exceptions, the
-     * parameter list is followed by a space, followed by the word
-     * throws followed by a comma-separated list of the generic thrown
-     * exception types.  If there are no type parameters, the type
-     * parameter list is elided.
-     *
-     * <p>The access modifiers are placed in canonical order as
-     * specified by "The Java Language Specification".  This is
-     * {@code public}, {@code protected} or {@code private} first,
-     * and then other modifiers in the following order:
-     * {@code abstract}, {@code static}, {@code final},
-     * {@code synchronized}, {@code native}, {@code strictfp}.
-     *
-     * @return a string describing this {@code Method},
-     * include type parameters
-     *
-     * @since 1.5
-     */
-    public String toGenericString() {
-        try {
-            StringBuilder sb = new StringBuilder();
-            int mod = getModifiers() & Modifier.methodModifiers();
-            if (mod != 0) {
-                sb.append(Modifier.toString(mod)).append(' ');
-            }
-            TypeVariable<?>[] typeparms = getTypeParameters();
-            if (typeparms.length > 0) {
-                boolean first = true;
-                sb.append('<');
-                for(TypeVariable<?> typeparm: typeparms) {
-                    if (!first)
-                        sb.append(',');
-                    // Class objects can't occur here; no need to test
-                    // and call Class.getName().
-                    sb.append(typeparm.toString());
-                    first = false;
-                }
-                sb.append("> ");
-            }
-
-            Type genRetType = getGenericReturnType();
-            sb.append( ((genRetType instanceof Class<?>)?
-                        Field.getTypeName((Class<?>)genRetType):genRetType.toString()))
-                    .append(' ');
-
-            sb.append(Field.getTypeName(getDeclaringClass())).append('.');
-            sb.append(getName()).append('(');
-            Type[] params = getGenericParameterTypes();
-            for (int j = 0; j < params.length; j++) {
-                String param = (params[j] instanceof Class)?
-                    Field.getTypeName((Class)params[j]):
-                    (params[j].toString());
-                if (isVarArgs() && (j == params.length - 1)) // replace T[] with T...
-                    param = param.replaceFirst("\\[\\]$", "...");
-                sb.append(param);
-                if (j < (params.length - 1))
-                    sb.append(',');
-            }
-            sb.append(')');
-            Type[] exceptions = getGenericExceptionTypes();
-            if (exceptions.length > 0) {
-                sb.append(" throws ");
-                for (int k = 0; k < exceptions.length; k++) {
-                    sb.append((exceptions[k] instanceof Class)?
-                              ((Class)exceptions[k]).getName():
-                              exceptions[k].toString());
-                    if (k < (exceptions.length - 1))
-                        sb.append(',');
-                }
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "<" + e + ">";
-        }
-    }
-
-    /**
-     * Invokes the underlying method represented by this {@code Method}
-     * object, on the specified object with the specified parameters.
-     * Individual parameters are automatically unwrapped to match
-     * primitive formal parameters, and both primitive and reference
-     * parameters are subject to method invocation conversions as
-     * necessary.
-     *
-     * <p>If the underlying method is static, then the specified {@code obj}
-     * argument is ignored. It may be null.
-     *
-     * <p>If the number of formal parameters required by the underlying method is
-     * 0, the supplied {@code args} array may be of length 0 or null.
-     *
-     * <p>If the underlying method is an instance method, it is invoked
-     * using dynamic method lookup as documented in The Java Language
-     * Specification, Second Edition, section 15.12.4.4; in particular,
-     * overriding based on the runtime type of the target object will occur.
-     *
-     * <p>If the underlying method is static, the class that declared
-     * the method is initialized if it has not already been initialized.
-     *
-     * <p>If the method completes normally, the value it returns is
-     * returned to the caller of invoke; if the value has a primitive
-     * type, it is first appropriately wrapped in an object. However,
-     * if the value has the type of an array of a primitive type, the
-     * elements of the array are <i>not</i> wrapped in objects; in
-     * other words, an array of primitive type is returned.  If the
-     * underlying method return type is void, the invocation returns
-     * null.
-     *
-     * @param obj  the object the underlying method is invoked from
-     * @param args the arguments used for the method call
-     * @return the result of dispatching the method represented by
-     * this object on {@code obj} with parameters
-     * {@code args}
-     *
-     * @exception IllegalAccessException    if this {@code Method} object
-     *              is enforcing Java language access control and the underlying
-     *              method is inaccessible.
-     * @exception IllegalArgumentException  if the method is an
-     *              instance method and the specified object argument
-     *              is not an instance of the class or interface
-     *              declaring the underlying method (or of a subclass
-     *              or implementor thereof); if the number of actual
-     *              and formal parameters differ; if an unwrapping
-     *              conversion for primitive arguments fails; or if,
-     *              after possible unwrapping, a parameter value
-     *              cannot be converted to the corresponding formal
-     *              parameter type by a method invocation conversion.
-     * @exception InvocationTargetException if the underlying method
-     *              throws an exception.
-     * @exception NullPointerException      if the specified object is null
-     *              and the method is an instance method.
-     * @exception ExceptionInInitializerError if the initialization
-     * provoked by this method fails.
-     */
-    public Object invoke(Object obj, Object... args)
-        throws IllegalAccessException, IllegalArgumentException,
-           InvocationTargetException
-    {
-        final boolean isStatic = (getModifiers() & Modifier.STATIC) == 0;
-        if (isStatic && obj == null) {
-            throw new NullPointerException();
-        }
-        Class[] types = getParameterTypes();
-        if (types.length != args.length) {
-            throw new IllegalArgumentException("Types len " + types.length + " args: " + args.length);
-        } else {
-            args = args.clone();
-            for (int i = 0; i < types.length; i++) {
-                Class c = types[i];
-                if (c.isPrimitive()) {
-                    args[i] = toPrimitive(c, args[i]);
-                }
-            }
-        }
-        Object res = invoke0(isStatic, this, obj, args);
-        if (getReturnType().isPrimitive()) {
-            res = fromPrimitive(getReturnType(), res);
-        }
-        return res;
-    }
-    
-    @JavaScriptBody(args = { "st", "method", "self", "args" }, body =
-          "var p;\n"
-        + "if (st) {\n"
-        + "  p = new Array(1);\n"
-        + "  p[0] = self;\n"
-        + "  p = p.concat(args);\n"
-        + "} else {\n"
-        + "  p = args;\n"
-        + "}\n"
-        + "return method._data().apply(self, p);\n"
-    )
-    private static native Object invoke0(boolean isStatic, Method m, Object self, Object[] args);
-
-    static Object fromPrimitive(Class<?> type, Object o) {
-        if (type == Integer.TYPE) {
-            return fromRaw(Integer.class, "valueOf__Ljava_lang_Integer_2I", o);
-        }
-        if (type == Long.TYPE) {
-            return fromRaw(Long.class, "valueOf__Ljava_lang_Long_2J", o);
-        }
-        if (type == Double.TYPE) {
-            return fromRaw(Double.class, "valueOf__Ljava_lang_Double_2D", o);
-        }
-        if (type == Float.TYPE) {
-            return fromRaw(Float.class, "valueOf__Ljava_lang_Float_2F", o);
-        }
-        if (type == Byte.TYPE) {
-            return fromRaw(Byte.class, "valueOf__Ljava_lang_Byte_2B", o);
-        }
-        if (type == Boolean.TYPE) {
-            return fromRaw(Boolean.class, "valueOf__Ljava_lang_Boolean_2Z", o);
-        }
-        if (type == Short.TYPE) {
-            return fromRaw(Short.class, "valueOf__Ljava_lang_Short_2S", o);
-        }
-        if (type == Character.TYPE) {
-            return fromRaw(Character.class, "valueOf__Ljava_lang_Character_2C", o);
-        }
-        if (type.getName().equals("void")) {
-            return null;
-        }
-        throw new IllegalStateException("Can't convert " + o);
-    }
-    
-    @JavaScriptBody(args = { "cls", "m", "o" }, 
-        body = "return cls.cnstr(false)[m](o);"
-    )
-    private static native Integer fromRaw(Class<?> cls, String m, Object o);
-
-    private static Object toPrimitive(Class<?> type, Object o) {
-        if (type == Integer.TYPE) {
-            return toRaw("intValue__I", o);
-        }
-        if (type == Long.TYPE) {
-            return toRaw("longValue__J", o);
-        }
-        if (type == Double.TYPE) {
-            return toRaw("doubleValue__D", o);
-        }
-        if (type == Float.TYPE) {
-            return toRaw("floatValue__F", o);
-        }
-        if (type == Byte.TYPE) {
-            return toRaw("byteValue__B", o);
-        }
-        if (type == Boolean.TYPE) {
-            return toRaw("booleanValue__Z", o);
-        }
-        if (type == Short.TYPE) {
-            return toRaw("shortValue__S", o);
-        }
-        if (type == Character.TYPE) {
-            return toRaw("charValue__C", o);
-        }
-        if (type.getName().equals("void")) {
-            return o;
-        }
-        throw new IllegalStateException("Can't convert " + o);
-    }
-    
-    @JavaScriptBody(args = { "m", "o" }, 
-        body = "return o[m](o);"
-    )
-    private static native Object toRaw(String m, Object o);
-    
-    /**
-     * Returns {@code true} if this method is a bridge
-     * method; returns {@code false} otherwise.
-     *
-     * @return true if and only if this method is a bridge
-     * method as defined by the Java Language Specification.
-     * @since 1.5
-     */
-    public boolean isBridge() {
-        return (getModifiers() & Modifier.BRIDGE) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this method was declared to take
-     * a variable number of arguments; returns {@code false}
-     * otherwise.
-     *
-     * @return {@code true} if an only if this method was declared to
-     * take a variable number of arguments.
-     * @since 1.5
-     */
-    public boolean isVarArgs() {
-        return (getModifiers() & Modifier.VARARGS) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this method is a synthetic
-     * method; returns {@code false} otherwise.
-     *
-     * @return true if and only if this method is a synthetic
-     * method as defined by the Java Language Specification.
-     * @since 1.5
-     */
-    public boolean isSynthetic() {
-        return Modifier.isSynthetic(getModifiers());
-    }
-
-    @JavaScriptBody(args = { "ac" }, 
-        body = 
-          "var a = this._data().anno;"
-        + "if (a) {"
-        + "  return a['L' + ac.jvmName + ';'];"
-        + "} else return null;"
-    )
-    private Object getAnnotationData(Class<?> annotationClass) {
-        throw new UnsupportedOperationException();
-    }
-    
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        Object data = getAnnotationData(annotationClass);
-        return data == null ? null : AnnotationImpl.create(annotationClass, data);
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns the default value for the annotation member represented by
-     * this {@code Method} instance.  If the member is of a primitive type,
-     * an instance of the corresponding wrapper type is returned. Returns
-     * null if no default is associated with the member, or if the method
-     * instance does not represent a declared member of an annotation type.
-     *
-     * @return the default value for the annotation member represented
-     *     by this {@code Method} instance.
-     * @throws TypeNotPresentException if the annotation is of type
-     *     {@link Class} and no definition can be found for the
-     *     default class value.
-     * @since  1.5
-     */
-    public Object getDefaultValue() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns an array of arrays that represent the annotations on the formal
-     * parameters, in declaration order, of the method represented by
-     * this {@code Method} object. (Returns an array of length zero if the
-     * underlying method is parameterless.  If the method has one or more
-     * parameters, a nested array of length zero is returned for each parameter
-     * with no annotations.) The annotation objects contained in the returned
-     * arrays are serializable.  The caller of this method is free to modify
-     * the returned arrays; it will have no effect on the arrays returned to
-     * other callers.
-     *
-     * @return an array of arrays that represent the annotations on the formal
-     *    parameters, in declaration order, of the method represented by this
-     *    Method object
-     * @since 1.5
-     */
-    public Annotation[][] getParameterAnnotations() {
-        throw new UnsupportedOperationException();
-    }
-
-    static {
-        MethodImpl.INSTANCE = new MethodImpl() {
-            protected Method create(Class<?> declaringClass, String name, Object data, String sig) {
-                return new Method(declaringClass, name, data, sig);
-            }
-        };
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/Modifier.java
--- a/emul/mini/src/main/java/java/lang/reflect/Modifier.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,437 +0,0 @@
-/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-/**
- * The Modifier class provides {@code static} methods and
- * constants to decode class and member access modifiers.  The sets of
- * modifiers are represented as integers with distinct bit positions
- * representing different modifiers.  The values for the constants
- * representing the modifiers are taken from the tables in sections 4.1, 4.4, 4.5, and 4.7 of
- * <cite>The Java&trade; Virtual Machine Specification</cite>.
- *
- * @see Class#getModifiers()
- * @see Member#getModifiers()
- *
- * @author Nakul Saraiya
- * @author Kenneth Russell
- */
-public
-class Modifier {
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code public} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code public} modifier; {@code false} otherwise.
-     */
-    public static boolean isPublic(int mod) {
-        return (mod & PUBLIC) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code private} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code private} modifier; {@code false} otherwise.
-     */
-    public static boolean isPrivate(int mod) {
-        return (mod & PRIVATE) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code protected} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code protected} modifier; {@code false} otherwise.
-     */
-    public static boolean isProtected(int mod) {
-        return (mod & PROTECTED) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code static} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code static} modifier; {@code false} otherwise.
-     */
-    public static boolean isStatic(int mod) {
-        return (mod & STATIC) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code final} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code final} modifier; {@code false} otherwise.
-     */
-    public static boolean isFinal(int mod) {
-        return (mod & FINAL) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code synchronized} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code synchronized} modifier; {@code false} otherwise.
-     */
-    public static boolean isSynchronized(int mod) {
-        return (mod & SYNCHRONIZED) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code volatile} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code volatile} modifier; {@code false} otherwise.
-     */
-    public static boolean isVolatile(int mod) {
-        return (mod & VOLATILE) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code transient} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code transient} modifier; {@code false} otherwise.
-     */
-    public static boolean isTransient(int mod) {
-        return (mod & TRANSIENT) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code native} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code native} modifier; {@code false} otherwise.
-     */
-    public static boolean isNative(int mod) {
-        return (mod & NATIVE) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code interface} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code interface} modifier; {@code false} otherwise.
-     */
-    public static boolean isInterface(int mod) {
-        return (mod & INTERFACE) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code abstract} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code abstract} modifier; {@code false} otherwise.
-     */
-    public static boolean isAbstract(int mod) {
-        return (mod & ABSTRACT) != 0;
-    }
-
-    /**
-     * Return {@code true} if the integer argument includes the
-     * {@code strictfp} modifier, {@code false} otherwise.
-     *
-     * @param   mod a set of modifiers
-     * @return {@code true} if {@code mod} includes the
-     * {@code strictfp} modifier; {@code false} otherwise.
-     */
-    public static boolean isStrict(int mod) {
-        return (mod & STRICT) != 0;
-    }
-
-    /**
-     * Return a string describing the access modifier flags in
-     * the specified modifier. For example:
-     * <blockquote><pre>
-     *    public final synchronized strictfp
-     * </pre></blockquote>
-     * The modifier names are returned in an order consistent with the
-     * suggested modifier orderings given in sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     * The full modifier ordering used by this method is:
-     * <blockquote> {@code
-     * public protected private abstract static final transient
-     * volatile synchronized native strictfp
-     * interface } </blockquote>
-     * The {@code interface} modifier discussed in this class is
-     * not a true modifier in the Java language and it appears after
-     * all other modifiers listed by this method.  This method may
-     * return a string of modifiers that are not valid modifiers of a
-     * Java entity; in other words, no checking is done on the
-     * possible validity of the combination of modifiers represented
-     * by the input.
-     *
-     * Note that to perform such checking for a known kind of entity,
-     * such as a constructor or method, first AND the argument of
-     * {@code toString} with the appropriate mask from a method like
-     * {@link #constructorModifiers} or {@link #methodModifiers}.
-     *
-     * @param   mod a set of modifiers
-     * @return  a string representation of the set of modifiers
-     * represented by {@code mod}
-     */
-    public static String toString(int mod) {
-        StringBuffer sb = new StringBuffer();
-        int len;
-
-        if ((mod & PUBLIC) != 0)        sb.append("public ");
-        if ((mod & PROTECTED) != 0)     sb.append("protected ");
-        if ((mod & PRIVATE) != 0)       sb.append("private ");
-
-        /* Canonical order */
-        if ((mod & ABSTRACT) != 0)      sb.append("abstract ");
-        if ((mod & STATIC) != 0)        sb.append("static ");
-        if ((mod & FINAL) != 0)         sb.append("final ");
-        if ((mod & TRANSIENT) != 0)     sb.append("transient ");
-        if ((mod & VOLATILE) != 0)      sb.append("volatile ");
-        if ((mod & SYNCHRONIZED) != 0)  sb.append("synchronized ");
-        if ((mod & NATIVE) != 0)        sb.append("native ");
-        if ((mod & STRICT) != 0)        sb.append("strictfp ");
-        if ((mod & INTERFACE) != 0)     sb.append("interface ");
-
-        if ((len = sb.length()) > 0)    /* trim trailing space */
-            return sb.toString().substring(0, len-1);
-        return "";
-    }
-
-    /*
-     * Access modifier flag constants from tables 4.1, 4.4, 4.5, and 4.7 of
-     * <cite>The Java&trade; Virtual Machine Specification</cite>
-     */
-
-    /**
-     * The {@code int} value representing the {@code public}
-     * modifier.
-     */
-    public static final int PUBLIC           = 0x00000001;
-
-    /**
-     * The {@code int} value representing the {@code private}
-     * modifier.
-     */
-    public static final int PRIVATE          = 0x00000002;
-
-    /**
-     * The {@code int} value representing the {@code protected}
-     * modifier.
-     */
-    public static final int PROTECTED        = 0x00000004;
-
-    /**
-     * The {@code int} value representing the {@code static}
-     * modifier.
-     */
-    public static final int STATIC           = 0x00000008;
-
-    /**
-     * The {@code int} value representing the {@code final}
-     * modifier.
-     */
-    public static final int FINAL            = 0x00000010;
-
-    /**
-     * The {@code int} value representing the {@code synchronized}
-     * modifier.
-     */
-    public static final int SYNCHRONIZED     = 0x00000020;
-
-    /**
-     * The {@code int} value representing the {@code volatile}
-     * modifier.
-     */
-    public static final int VOLATILE         = 0x00000040;
-
-    /**
-     * The {@code int} value representing the {@code transient}
-     * modifier.
-     */
-    public static final int TRANSIENT        = 0x00000080;
-
-    /**
-     * The {@code int} value representing the {@code native}
-     * modifier.
-     */
-    public static final int NATIVE           = 0x00000100;
-
-    /**
-     * The {@code int} value representing the {@code interface}
-     * modifier.
-     */
-    public static final int INTERFACE        = 0x00000200;
-
-    /**
-     * The {@code int} value representing the {@code abstract}
-     * modifier.
-     */
-    public static final int ABSTRACT         = 0x00000400;
-
-    /**
-     * The {@code int} value representing the {@code strictfp}
-     * modifier.
-     */
-    public static final int STRICT           = 0x00000800;
-
-    // Bits not (yet) exposed in the public API either because they
-    // have different meanings for fields and methods and there is no
-    // way to distinguish between the two in this class, or because
-    // they are not Java programming language keywords
-    static final int BRIDGE    = 0x00000040;
-    static final int VARARGS   = 0x00000080;
-    static final int SYNTHETIC = 0x00001000;
-    static final int ANNOTATION= 0x00002000;
-    static final int ENUM      = 0x00004000;
-    static boolean isSynthetic(int mod) {
-      return (mod & SYNTHETIC) != 0;
-    }
-
-    /**
-     * See JLSv3 section 8.1.1.
-     */
-    private static final int CLASS_MODIFIERS =
-        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
-        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.FINAL   |
-        Modifier.STRICT;
-
-    /**
-     * See JLSv3 section 9.1.1.
-     */
-    private static final int INTERFACE_MODIFIERS =
-        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
-        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.STRICT;
-
-
-    /**
-     * See JLSv3 section 8.8.3.
-     */
-    private static final int CONSTRUCTOR_MODIFIERS =
-        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE;
-
-    /**
-     * See JLSv3 section 8.4.3.
-     */
-    private static final int METHOD_MODIFIERS =
-        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
-        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.FINAL   |
-        Modifier.SYNCHRONIZED   | Modifier.NATIVE       | Modifier.STRICT;
-
-    /**
-     * See JLSv3 section 8.3.1.
-     */
-    private static final int FIELD_MODIFIERS =
-        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
-        Modifier.STATIC         | Modifier.FINAL        | Modifier.TRANSIENT |
-        Modifier.VOLATILE;
-
-    /**
-     * Return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to a class.
-     * @return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to a class.
-     *
-     * @jls 8.1.1 Class Modifiers
-     * @since 1.7
-     */
-    public static int classModifiers() {
-        return CLASS_MODIFIERS;
-    }
-
-    /**
-     * Return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to an interface.
-     * @return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to an inteface.
-     *
-     * @jls 9.1.1 Interface Modifiers
-     * @since 1.7
-     */
-    public static int interfaceModifiers() {
-        return INTERFACE_MODIFIERS;
-    }
-
-    /**
-     * Return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to a constructor.
-     * @return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to a constructor.
-     *
-     * @jls 8.8.3 Constructor Modifiers
-     * @since 1.7
-     */
-    public static int constructorModifiers() {
-        return CONSTRUCTOR_MODIFIERS;
-    }
-
-    /**
-     * Return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to a method.
-     * @return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to a method.
-     *
-     * @jls 8.4.3 Method Modifiers
-     * @since 1.7
-     */
-    public static int methodModifiers() {
-        return METHOD_MODIFIERS;
-    }
-
-
-    /**
-     * Return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to a field.
-     * @return an {@code int} value OR-ing together the source language
-     * modifiers that can be applied to a field.
-     *
-     * @jls 8.3.1 Field Modifiers
-     * @since 1.7
-     */
-    public static int fieldModifiers() {
-        return FIELD_MODIFIERS;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/Proxy.java
--- a/emul/mini/src/main/java/java/lang/reflect/Proxy.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-
-/**
- * {@code Proxy} provides static methods for creating dynamic proxy
- * classes and instances, and it is also the superclass of all
- * dynamic proxy classes created by those methods.
- *
- * <p>To create a proxy for some interface {@code Foo}:
- * <pre>
- *     InvocationHandler handler = new MyInvocationHandler(...);
- *     Class proxyClass = Proxy.getProxyClass(
- *         Foo.class.getClassLoader(), new Class[] { Foo.class });
- *     Foo f = (Foo) proxyClass.
- *         getConstructor(new Class[] { InvocationHandler.class }).
- *         newInstance(new Object[] { handler });
- * </pre>
- * or more simply:
- * <pre>
- *     Foo f = (Foo) Proxy.newProxyInstance(Foo.class.getClassLoader(),
- *                                          new Class[] { Foo.class },
- *                                          handler);
- * </pre>
- *
- * <p>A <i>dynamic proxy class</i> (simply referred to as a <i>proxy
- * class</i> below) is a class that implements a list of interfaces
- * specified at runtime when the class is created, with behavior as
- * described below.
- *
- * A <i>proxy interface</i> is such an interface that is implemented
- * by a proxy class.
- *
- * A <i>proxy instance</i> is an instance of a proxy class.
- *
- * Each proxy instance has an associated <i>invocation handler</i>
- * object, which implements the interface {@link InvocationHandler}.
- * A method invocation on a proxy instance through one of its proxy
- * interfaces will be dispatched to the {@link InvocationHandler#invoke
- * invoke} method of the instance's invocation handler, passing the proxy
- * instance, a {@code java.lang.reflect.Method} object identifying
- * the method that was invoked, and an array of type {@code Object}
- * containing the arguments.  The invocation handler processes the
- * encoded method invocation as appropriate and the result that it
- * returns will be returned as the result of the method invocation on
- * the proxy instance.
- *
- * <p>A proxy class has the following properties:
- *
- * <ul>
- * <li>Proxy classes are public, final, and not abstract.
- *
- * <li>The unqualified name of a proxy class is unspecified.  The space
- * of class names that begin with the string {@code "$Proxy"}
- * should be, however, reserved for proxy classes.
- *
- * <li>A proxy class extends {@code java.lang.reflect.Proxy}.
- *
- * <li>A proxy class implements exactly the interfaces specified at its
- * creation, in the same order.
- *
- * <li>If a proxy class implements a non-public interface, then it will
- * be defined in the same package as that interface.  Otherwise, the
- * package of a proxy class is also unspecified.  Note that package
- * sealing will not prevent a proxy class from being successfully defined
- * in a particular package at runtime, and neither will classes already
- * defined by the same class loader and the same package with particular
- * signers.
- *
- * <li>Since a proxy class implements all of the interfaces specified at
- * its creation, invoking {@code getInterfaces} on its
- * {@code Class} object will return an array containing the same
- * list of interfaces (in the order specified at its creation), invoking
- * {@code getMethods} on its {@code Class} object will return
- * an array of {@code Method} objects that include all of the
- * methods in those interfaces, and invoking {@code getMethod} will
- * find methods in the proxy interfaces as would be expected.
- *
- * <li>The {@link Proxy#isProxyClass Proxy.isProxyClass} method will
- * return true if it is passed a proxy class-- a class returned by
- * {@code Proxy.getProxyClass} or the class of an object returned by
- * {@code Proxy.newProxyInstance}-- and false otherwise.
- *
- * <li>The {@code java.security.ProtectionDomain} of a proxy class
- * is the same as that of system classes loaded by the bootstrap class
- * loader, such as {@code java.lang.Object}, because the code for a
- * proxy class is generated by trusted system code.  This protection
- * domain will typically be granted
- * {@code java.security.AllPermission}.
- *
- * <li>Each proxy class has one public constructor that takes one argument,
- * an implementation of the interface {@link InvocationHandler}, to set
- * the invocation handler for a proxy instance.  Rather than having to use
- * the reflection API to access the public constructor, a proxy instance
- * can be also be created by calling the {@link Proxy#newProxyInstance
- * Proxy.newProxyInstance} method, which combines the actions of calling
- * {@link Proxy#getProxyClass Proxy.getProxyClass} with invoking the
- * constructor with an invocation handler.
- * </ul>
- *
- * <p>A proxy instance has the following properties:
- *
- * <ul>
- * <li>Given a proxy instance {@code proxy} and one of the
- * interfaces implemented by its proxy class {@code Foo}, the
- * following expression will return true:
- * <pre>
- *     {@code proxy instanceof Foo}
- * </pre>
- * and the following cast operation will succeed (rather than throwing
- * a {@code ClassCastException}):
- * <pre>
- *     {@code (Foo) proxy}
- * </pre>
- *
- * <li>Each proxy instance has an associated invocation handler, the one
- * that was passed to its constructor.  The static
- * {@link Proxy#getInvocationHandler Proxy.getInvocationHandler} method
- * will return the invocation handler associated with the proxy instance
- * passed as its argument.
- *
- * <li>An interface method invocation on a proxy instance will be
- * encoded and dispatched to the invocation handler's {@link
- * InvocationHandler#invoke invoke} method as described in the
- * documentation for that method.
- *
- * <li>An invocation of the {@code hashCode},
- * {@code equals}, or {@code toString} methods declared in
- * {@code java.lang.Object} on a proxy instance will be encoded and
- * dispatched to the invocation handler's {@code invoke} method in
- * the same manner as interface method invocations are encoded and
- * dispatched, as described above.  The declaring class of the
- * {@code Method} object passed to {@code invoke} will be
- * {@code java.lang.Object}.  Other public methods of a proxy
- * instance inherited from {@code java.lang.Object} are not
- * overridden by a proxy class, so invocations of those methods behave
- * like they do for instances of {@code java.lang.Object}.
- * </ul>
- *
- * <h3>Methods Duplicated in Multiple Proxy Interfaces</h3>
- *
- * <p>When two or more interfaces of a proxy class contain a method with
- * the same name and parameter signature, the order of the proxy class's
- * interfaces becomes significant.  When such a <i>duplicate method</i>
- * is invoked on a proxy instance, the {@code Method} object passed
- * to the invocation handler will not necessarily be the one whose
- * declaring class is assignable from the reference type of the interface
- * that the proxy's method was invoked through.  This limitation exists
- * because the corresponding method implementation in the generated proxy
- * class cannot determine which interface it was invoked through.
- * Therefore, when a duplicate method is invoked on a proxy instance,
- * the {@code Method} object for the method in the foremost interface
- * that contains the method (either directly or inherited through a
- * superinterface) in the proxy class's list of interfaces is passed to
- * the invocation handler's {@code invoke} method, regardless of the
- * reference type through which the method invocation occurred.
- *
- * <p>If a proxy interface contains a method with the same name and
- * parameter signature as the {@code hashCode}, {@code equals},
- * or {@code toString} methods of {@code java.lang.Object},
- * when such a method is invoked on a proxy instance, the
- * {@code Method} object passed to the invocation handler will have
- * {@code java.lang.Object} as its declaring class.  In other words,
- * the public, non-final methods of {@code java.lang.Object}
- * logically precede all of the proxy interfaces for the determination of
- * which {@code Method} object to pass to the invocation handler.
- *
- * <p>Note also that when a duplicate method is dispatched to an
- * invocation handler, the {@code invoke} method may only throw
- * checked exception types that are assignable to one of the exception
- * types in the {@code throws} clause of the method in <i>all</i> of
- * the proxy interfaces that it can be invoked through.  If the
- * {@code invoke} method throws a checked exception that is not
- * assignable to any of the exception types declared by the method in one
- * of the proxy interfaces that it can be invoked through, then an
- * unchecked {@code UndeclaredThrowableException} will be thrown by
- * the invocation on the proxy instance.  This restriction means that not
- * all of the exception types returned by invoking
- * {@code getExceptionTypes} on the {@code Method} object
- * passed to the {@code invoke} method can necessarily be thrown
- * successfully by the {@code invoke} method.
- *
- * @author      Peter Jones
- * @see         InvocationHandler
- * @since       1.3
- */
-public class Proxy implements java.io.Serializable {
-
-    private static final long serialVersionUID = -2222568056686623797L;
-
-
-
-    /**
-     * the invocation handler for this proxy instance.
-     * @serial
-     */
-    protected InvocationHandler h;
-
-    /**
-     * Prohibits instantiation.
-     */
-    private Proxy() {
-    }
-
-    /**
-     * Constructs a new {@code Proxy} instance from a subclass
-     * (typically, a dynamic proxy class) with the specified value
-     * for its invocation handler.
-     *
-     * @param   h the invocation handler for this proxy instance
-     */
-    protected Proxy(InvocationHandler h) {
-        this.h = h;
-    }
-
-    /**
-     * Returns the {@code java.lang.Class} object for a proxy class
-     * given a class loader and an array of interfaces.  The proxy class
-     * will be defined by the specified class loader and will implement
-     * all of the supplied interfaces.  If a proxy class for the same
-     * permutation of interfaces has already been defined by the class
-     * loader, then the existing proxy class will be returned; otherwise,
-     * a proxy class for those interfaces will be generated dynamically
-     * and defined by the class loader.
-     *
-     * <p>There are several restrictions on the parameters that may be
-     * passed to {@code Proxy.getProxyClass}:
-     *
-     * <ul>
-     * <li>All of the {@code Class} objects in the
-     * {@code interfaces} array must represent interfaces, not
-     * classes or primitive types.
-     *
-     * <li>No two elements in the {@code interfaces} array may
-     * refer to identical {@code Class} objects.
-     *
-     * <li>All of the interface types must be visible by name through the
-     * specified class loader.  In other words, for class loader
-     * {@code cl} and every interface {@code i}, the following
-     * expression must be true:
-     * <pre>
-     *     Class.forName(i.getName(), false, cl) == i
-     * </pre>
-     *
-     * <li>All non-public interfaces must be in the same package;
-     * otherwise, it would not be possible for the proxy class to
-     * implement all of the interfaces, regardless of what package it is
-     * defined in.
-     *
-     * <li>For any set of member methods of the specified interfaces
-     * that have the same signature:
-     * <ul>
-     * <li>If the return type of any of the methods is a primitive
-     * type or void, then all of the methods must have that same
-     * return type.
-     * <li>Otherwise, one of the methods must have a return type that
-     * is assignable to all of the return types of the rest of the
-     * methods.
-     * </ul>
-     *
-     * <li>The resulting proxy class must not exceed any limits imposed
-     * on classes by the virtual machine.  For example, the VM may limit
-     * the number of interfaces that a class may implement to 65535; in
-     * that case, the size of the {@code interfaces} array must not
-     * exceed 65535.
-     * </ul>
-     *
-     * <p>If any of these restrictions are violated,
-     * {@code Proxy.getProxyClass} will throw an
-     * {@code IllegalArgumentException}.  If the {@code interfaces}
-     * array argument or any of its elements are {@code null}, a
-     * {@code NullPointerException} will be thrown.
-     *
-     * <p>Note that the order of the specified proxy interfaces is
-     * significant: two requests for a proxy class with the same combination
-     * of interfaces but in a different order will result in two distinct
-     * proxy classes.
-     *
-     * @param   loader the class loader to define the proxy class
-     * @param   interfaces the list of interfaces for the proxy class
-     *          to implement
-     * @return  a proxy class that is defined in the specified class loader
-     *          and that implements the specified interfaces
-     * @throws  IllegalArgumentException if any of the restrictions on the
-     *          parameters that may be passed to {@code getProxyClass}
-     *          are violated
-     * @throws  NullPointerException if the {@code interfaces} array
-     *          argument or any of its elements are {@code null}
-     */
-    public static Class<?> getProxyClass(ClassLoader loader,
-                                         Class<?>... interfaces)
-        throws IllegalArgumentException
-    {
-        throw new IllegalArgumentException();
-    }
-
-    /**
-     * Returns an instance of a proxy class for the specified interfaces
-     * that dispatches method invocations to the specified invocation
-     * handler.  This method is equivalent to:
-     * <pre>
-     *     Proxy.getProxyClass(loader, interfaces).
-     *         getConstructor(new Class[] { InvocationHandler.class }).
-     *         newInstance(new Object[] { handler });
-     * </pre>
-     *
-     * <p>{@code Proxy.newProxyInstance} throws
-     * {@code IllegalArgumentException} for the same reasons that
-     * {@code Proxy.getProxyClass} does.
-     *
-     * @param   loader the class loader to define the proxy class
-     * @param   interfaces the list of interfaces for the proxy class
-     *          to implement
-     * @param   h the invocation handler to dispatch method invocations to
-     * @return  a proxy instance with the specified invocation handler of a
-     *          proxy class that is defined by the specified class loader
-     *          and that implements the specified interfaces
-     * @throws  IllegalArgumentException if any of the restrictions on the
-     *          parameters that may be passed to {@code getProxyClass}
-     *          are violated
-     * @throws  NullPointerException if the {@code interfaces} array
-     *          argument or any of its elements are {@code null}, or
-     *          if the invocation handler, {@code h}, is
-     *          {@code null}
-     */
-    public static Object newProxyInstance(ClassLoader loader,
-                                          Class<?>[] interfaces,
-                                          InvocationHandler h)
-        throws IllegalArgumentException
-    {
-        if (h == null) {
-            throw new NullPointerException();
-        }
-        throw new IllegalArgumentException();
-    }
-
-    /**
-     * Returns true if and only if the specified class was dynamically
-     * generated to be a proxy class using the {@code getProxyClass}
-     * method or the {@code newProxyInstance} method.
-     *
-     * <p>The reliability of this method is important for the ability
-     * to use it to make security decisions, so its implementation should
-     * not just test if the class in question extends {@code Proxy}.
-     *
-     * @param   cl the class to test
-     * @return  {@code true} if the class is a proxy class and
-     *          {@code false} otherwise
-     * @throws  NullPointerException if {@code cl} is {@code null}
-     */
-    public static boolean isProxyClass(Class<?> cl) {
-        if (cl == null) {
-            throw new NullPointerException();
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the invocation handler for the specified proxy instance.
-     *
-     * @param   proxy the proxy instance to return the invocation handler for
-     * @return  the invocation handler for the proxy instance
-     * @throws  IllegalArgumentException if the argument is not a
-     *          proxy instance
-     */
-    public static InvocationHandler getInvocationHandler(Object proxy)
-        throws IllegalArgumentException
-    {
-        /*
-         * Verify that the object is actually a proxy instance.
-         */
-        if (!isProxyClass(proxy.getClass())) {
-            throw new IllegalArgumentException("not a proxy instance");
-        }
-
-        Proxy p = (Proxy) proxy;
-        return p.h;
-    }
-
-    private static native Class defineClass0(ClassLoader loader, String name,
-                                             byte[] b, int off, int len);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/Type.java
--- a/emul/mini/src/main/java/java/lang/reflect/Type.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-/**
- * Type is the common superinterface for all types in the Java
- * programming language. These include raw types, parameterized types,
- * array types, type variables and primitive types.
- *
- * @since 1.5
- */
-
-public interface Type {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/TypeVariable.java
--- a/emul/mini/src/main/java/java/lang/reflect/TypeVariable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-/**
- * TypeVariable is the common superinterface for type variables of kinds.
- * A type variable is created the first time it is needed by a reflective
- * method, as specified in this package.  If a type variable t is referenced
- * by a type (i.e, class, interface or annotation type) T, and T is declared
- * by the nth enclosing class of T (see JLS 8.1.2), then the creation of t
- * requires the resolution (see JVMS 5) of the ith enclosing class of T,
- * for i = 0 to n, inclusive. Creating a type variable must not cause the
- * creation of its bounds. Repeated creation of a type variable has no effect.
- *
- * <p>Multiple objects may be instantiated at run-time to
- * represent a given type variable. Even though a type variable is
- * created only once, this does not imply any requirement to cache
- * instances representing the type variable. However, all instances
- * representing a type variable must be equal() to each other.
- * As a consequence, users of type variables must not rely on the identity
- * of instances of classes implementing this interface.
- *
- * @param <D> the type of generic declaration that declared the
- * underlying type variable.
- *
- * @since 1.5
- */
-public interface TypeVariable<D extends GenericDeclaration> extends Type {
-    /**
-     * Returns an array of {@code Type} objects representing the
-     * upper bound(s) of this type variable.  Note that if no upper bound is
-     * explicitly declared, the upper bound is {@code Object}.
-     *
-     * <p>For each upper bound B: <ul> <li>if B is a parameterized
-     * type or a type variable, it is created, (see {@link
-     * java.lang.reflect.ParameterizedType ParameterizedType} for the
-     * details of the creation process for parameterized types).
-     * <li>Otherwise, B is resolved.  </ul>
-     *
-     * @throws TypeNotPresentException  if any of the
-     *     bounds refers to a non-existent type declaration
-     * @throws MalformedParameterizedTypeException if any of the
-     *     bounds refer to a parameterized type that cannot be instantiated
-     *     for any reason
-     * @return an array of {@code Type}s representing the upper
-     *     bound(s) of this type variable
-    */
-    Type[] getBounds();
-
-    /**
-     * Returns the {@code GenericDeclaration} object representing the
-     * generic declaration declared this type variable.
-     *
-     * @return the generic declaration declared for this type variable.
-     *
-     * @since 1.5
-     */
-    D getGenericDeclaration();
-
-    /**
-     * Returns the name of this type variable, as it occurs in the source code.
-     *
-     * @return the name of this type variable, as it appears in the source code
-     */
-    String getName();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/UndeclaredThrowableException.java
--- a/emul/mini/src/main/java/java/lang/reflect/UndeclaredThrowableException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-/**
- * Thrown by a method invocation on a proxy instance if its invocation
- * handler's {@link InvocationHandler#invoke invoke} method throws a
- * checked exception (a {@code Throwable} that is not assignable
- * to {@code RuntimeException} or {@code Error}) that
- * is not assignable to any of the exception types declared in the
- * {@code throws} clause of the method that was invoked on the
- * proxy instance and dispatched to the invocation handler.
- *
- * <p>An {@code UndeclaredThrowableException} instance contains
- * the undeclared checked exception that was thrown by the invocation
- * handler, and it can be retrieved with the
- * {@code getUndeclaredThrowable()} method.
- * {@code UndeclaredThrowableException} extends
- * {@code RuntimeException}, so it is an unchecked exception
- * that wraps a checked exception.
- *
- * <p>As of release 1.4, this exception has been retrofitted to
- * conform to the general purpose exception-chaining mechanism.  The
- * "undeclared checked exception that was thrown by the invocation
- * handler" that may be provided at construction time and accessed via
- * the {@link #getUndeclaredThrowable()} method is now known as the
- * <i>cause</i>, and may be accessed via the {@link
- * Throwable#getCause()} method, as well as the aforementioned "legacy
- * method."
- *
- * @author      Peter Jones
- * @see         InvocationHandler
- * @since       1.3
- */
-public class UndeclaredThrowableException extends RuntimeException {
-    static final long serialVersionUID = 330127114055056639L;
-
-    /**
-     * the undeclared checked exception that was thrown
-     * @serial
-     */
-    private Throwable undeclaredThrowable;
-
-    /**
-     * Constructs an {@code UndeclaredThrowableException} with the
-     * specified {@code Throwable}.
-     *
-     * @param   undeclaredThrowable the undeclared checked exception
-     *          that was thrown
-     */
-    public UndeclaredThrowableException(Throwable undeclaredThrowable) {
-        super((Throwable) null);  // Disallow initCause
-        this.undeclaredThrowable = undeclaredThrowable;
-    }
-
-    /**
-     * Constructs an {@code UndeclaredThrowableException} with the
-     * specified {@code Throwable} and a detail message.
-     *
-     * @param   undeclaredThrowable the undeclared checked exception
-     *          that was thrown
-     * @param   s the detail message
-     */
-    public UndeclaredThrowableException(Throwable undeclaredThrowable,
-                                        String s)
-    {
-        super(s, null);  // Disallow initCause
-        this.undeclaredThrowable = undeclaredThrowable;
-    }
-
-    /**
-     * Returns the {@code Throwable} instance wrapped in this
-     * {@code UndeclaredThrowableException}, which may be {@code null}.
-     *
-     * <p>This method predates the general-purpose exception chaining facility.
-     * The {@link Throwable#getCause()} method is now the preferred means of
-     * obtaining this information.
-     *
-     * @return the undeclared checked exception that was thrown
-     */
-    public Throwable getUndeclaredThrowable() {
-        return undeclaredThrowable;
-    }
-
-    /**
-     * Returns the cause of this exception (the {@code Throwable}
-     * instance wrapped in this {@code UndeclaredThrowableException},
-     * which may be {@code null}).
-     *
-     * @return  the cause of this exception.
-     * @since   1.4
-     */
-    public Throwable getCause() {
-        return undeclaredThrowable;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/lang/reflect/package-info.java
--- a/emul/mini/src/main/java/java/lang/reflect/package-info.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * Provides classes and interfaces for obtaining reflective
- * information about classes and objects.  Reflection allows
- * programmatic access to information about the fields, methods and
- * constructors of loaded classes, and the use of reflected fields,
- * methods, and constructors to operate on their underlying
- * counterparts, within security restrictions.
- *
- * <p>{@code AccessibleObject} allows suppression of access checks if
- * the necessary {@code ReflectPermission} is available.
- *
- * <p>{@code Array} provides static methods to dynamically create and
- * access arrays.
- *
- * <p>Classes in this package, along with {@code java.lang.Class}
- * accommodate applications such as debuggers, interpreters, object
- * inspectors, class browsers, and services such as Object
- * Serialization and JavaBeans that need access to either the public
- * members of a target object (based on its runtime class) or the
- * members declared by a given class.
- *
- * @since JDK1.1
- */
-package java.lang.reflect;
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/net/MalformedURLException.java
--- a/emul/mini/src/main/java/java/net/MalformedURLException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.net;
-
-import java.io.IOException;
-
-/**
- * Thrown to indicate that a malformed URL has occurred. Either no
- * legal protocol could be found in a specification string or the
- * string could not be parsed.
- *
- * @author  Arthur van Hoff
- * @since   JDK1.0
- */
-public class MalformedURLException extends IOException {
-    private static final long serialVersionUID = -182787522200415866L;
-
-    /**
-     * Constructs a <code>MalformedURLException</code> with no detail message.
-     */
-    public MalformedURLException() {
-    }
-
-    /**
-     * Constructs a <code>MalformedURLException</code> with the
-     * specified detail message.
-     *
-     * @param   msg   the detail message.
-     */
-    public MalformedURLException(String msg) {
-        super(msg);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/net/URL.java
--- a/emul/mini/src/main/java/java/net/URL.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1090 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.net;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-
-/**
- * Class <code>URL</code> represents a Uniform Resource
- * Locator, a pointer to a "resource" on the World
- * Wide Web. A resource can be something as simple as a file or a
- * directory, or it can be a reference to a more complicated object,
- * such as a query to a database or to a search engine. More
- * information on the types of URLs and their formats can be found at:
- * <blockquote>
- *     <a href="http://www.socs.uts.edu.au/MosaicDocs-old/url-primer.html">
- *    <i>http://www.socs.uts.edu.au/MosaicDocs-old/url-primer.html</i></a>
- * </blockquote>
- * <p>
- * In general, a URL can be broken into several parts. The previous
- * example of a URL indicates that the protocol to use is
- * <code>http</code> (HyperText Transfer Protocol) and that the
- * information resides on a host machine named
- * <code>www.socs.uts.edu.au</code>. The information on that host
- * machine is named <code>/MosaicDocs-old/url-primer.html</code>. The exact
- * meaning of this name on the host machine is both protocol
- * dependent and host dependent. The information normally resides in
- * a file, but it could be generated on the fly. This component of
- * the URL is called the <i>path</i> component.
- * <p>
- * A URL can optionally specify a "port", which is the
- * port number to which the TCP connection is made on the remote host
- * machine. If the port is not specified, the default port for
- * the protocol is used instead. For example, the default port for
- * <code>http</code> is <code>80</code>. An alternative port could be
- * specified as:
- * <blockquote><pre>
- *     http://www.socs.uts.edu.au:80/MosaicDocs-old/url-primer.html
- * </pre></blockquote>
- * <p>
- * The syntax of <code>URL</code> is defined by  <a
- * href="http://www.ietf.org/rfc/rfc2396.txt"><i>RFC&nbsp;2396: Uniform
- * Resource Identifiers (URI): Generic Syntax</i></a>, amended by <a
- * href="http://www.ietf.org/rfc/rfc2732.txt"><i>RFC&nbsp;2732: Format for
- * Literal IPv6 Addresses in URLs</i></a>. The Literal IPv6 address format
- * also supports scope_ids. The syntax and usage of scope_ids is described
- * <a href="Inet6Address.html#scoped">here</a>.
- * <p>
- * A URL may have appended to it a "fragment", also known
- * as a "ref" or a "reference". The fragment is indicated by the sharp
- * sign character "#" followed by more characters. For example,
- * <blockquote><pre>
- *     http://java.sun.com/index.html#chapter1
- * </pre></blockquote>
- * <p>
- * This fragment is not technically part of the URL. Rather, it
- * indicates that after the specified resource is retrieved, the
- * application is specifically interested in that part of the
- * document that has the tag <code>chapter1</code> attached to it. The
- * meaning of a tag is resource specific.
- * <p>
- * An application can also specify a "relative URL",
- * which contains only enough information to reach the resource
- * relative to another URL. Relative URLs are frequently used within
- * HTML pages. For example, if the contents of the URL:
- * <blockquote><pre>
- *     http://java.sun.com/index.html
- * </pre></blockquote>
- * contained within it the relative URL:
- * <blockquote><pre>
- *     FAQ.html
- * </pre></blockquote>
- * it would be a shorthand for:
- * <blockquote><pre>
- *     http://java.sun.com/FAQ.html
- * </pre></blockquote>
- * <p>
- * The relative URL need not specify all the components of a URL. If
- * the protocol, host name, or port number is missing, the value is
- * inherited from the fully specified URL. The file component must be
- * specified. The optional fragment is not inherited.
- * <p>
- * The URL class does not itself encode or decode any URL components
- * according to the escaping mechanism defined in RFC2396. It is the
- * responsibility of the caller to encode any fields, which need to be
- * escaped prior to calling URL, and also to decode any escaped fields,
- * that are returned from URL. Furthermore, because URL has no knowledge
- * of URL escaping, it does not recognise equivalence between the encoded
- * or decoded form of the same URL. For example, the two URLs:<br>
- * <pre>    http://foo.com/hello world/ and http://foo.com/hello%20world</pre>
- * would be considered not equal to each other.
- * <p>
- * Note, the {@link java.net.URI} class does perform escaping of its
- * component fields in certain circumstances. The recommended way
- * to manage the encoding and decoding of URLs is to use {@link java.net.URI},
- * and to convert between these two classes using {@link #toURI()} and
- * {@link URI#toURL()}.
- * <p>
- * The {@link URLEncoder} and {@link URLDecoder} classes can also be
- * used, but only for HTML form encoding, which is not the same
- * as the encoding scheme defined in RFC2396.
- *
- * @author  James Gosling
- * @since JDK1.0
- */
-public final class URL implements java.io.Serializable {
-
-    static final long serialVersionUID = -7627629688361524110L;
-
-    /**
-     * The property which specifies the package prefix list to be scanned
-     * for protocol handlers.  The value of this property (if any) should
-     * be a vertical bar delimited list of package names to search through
-     * for a protocol handler to load.  The policy of this class is that
-     * all protocol handlers will be in a class called <protocolname>.Handler,
-     * and each package in the list is examined in turn for a matching
-     * handler.  If none are found (or the property is not specified), the
-     * default package prefix, sun.net.www.protocol, is used.  The search
-     * proceeds from the first package in the list to the last and stops
-     * when a match is found.
-     */
-    private static final String protocolPathProp = "java.protocol.handler.pkgs";
-
-    /**
-     * The protocol to use (ftp, http, nntp, ... etc.) .
-     * @serial
-     */
-    private String protocol;
-
-    /**
-     * The host name to connect to.
-     * @serial
-     */
-    private String host;
-
-    /**
-     * The protocol port to connect to.
-     * @serial
-     */
-    private int port = -1;
-
-    /**
-     * The specified file name on that host. <code>file</code> is
-     * defined as <code>path[?query]</code>
-     * @serial
-     */
-    private String file;
-
-    /**
-     * The query part of this URL.
-     */
-    private transient String query;
-
-    /**
-     * The authority part of this URL.
-     * @serial
-     */
-    private String authority;
-
-    /**
-     * The path part of this URL.
-     */
-    private transient String path;
-
-    /**
-     * The userinfo part of this URL.
-     */
-    private transient String userInfo;
-
-    /**
-     * # reference.
-     * @serial
-     */
-    private String ref;
-
-    /**
-     * The host's IP address, used in equals and hashCode.
-     * Computed on demand. An uninitialized or unknown hostAddress is null.
-     */
-    transient Object hostAddress;
-
-    /**
-     * The URLStreamHandler for this URL.
-     */
-    transient URLStreamHandler handler;
-
-    /* Our hash code.
-     * @serial
-     */
-    private int hashCode = -1;
-    
-    /** input stream associated with the URL */
-    private InputStream is;
-
-    /**
-     * Creates a <code>URL</code> object from the specified
-     * <code>protocol</code>, <code>host</code>, <code>port</code>
-     * number, and <code>file</code>.<p>
-     *
-     * <code>host</code> can be expressed as a host name or a literal
-     * IP address. If IPv6 literal address is used, it should be
-     * enclosed in square brackets (<tt>'['</tt> and <tt>']'</tt>), as
-     * specified by <a
-     * href="http://www.ietf.org/rfc/rfc2732.txt">RFC&nbsp;2732</a>;
-     * However, the literal IPv6 address format defined in <a
-     * href="http://www.ietf.org/rfc/rfc2373.txt"><i>RFC&nbsp;2373: IP
-     * Version 6 Addressing Architecture</i></a> is also accepted.<p>
-     *
-     * Specifying a <code>port</code> number of <code>-1</code>
-     * indicates that the URL should use the default port for the
-     * protocol.<p>
-     *
-     * If this is the first URL object being created with the specified
-     * protocol, a <i>stream protocol handler</i> object, an instance of
-     * class <code>URLStreamHandler</code>, is created for that protocol:
-     * <ol>
-     * <li>If the application has previously set up an instance of
-     *     <code>URLStreamHandlerFactory</code> as the stream handler factory,
-     *     then the <code>createURLStreamHandler</code> method of that instance
-     *     is called with the protocol string as an argument to create the
-     *     stream protocol handler.
-     * <li>If no <code>URLStreamHandlerFactory</code> has yet been set up,
-     *     or if the factory's <code>createURLStreamHandler</code> method
-     *     returns <code>null</code>, then the constructor finds the
-     *     value of the system property:
-     *     <blockquote><pre>
-     *         java.protocol.handler.pkgs
-     *     </pre></blockquote>
-     *     If the value of that system property is not <code>null</code>,
-     *     it is interpreted as a list of packages separated by a vertical
-     *     slash character '<code>|</code>'. The constructor tries to load
-     *     the class named:
-     *     <blockquote><pre>
-     *         &lt;<i>package</i>&gt;.&lt;<i>protocol</i>&gt;.Handler
-     *     </pre></blockquote>
-     *     where &lt;<i>package</i>&gt; is replaced by the name of the package
-     *     and &lt;<i>protocol</i>&gt; is replaced by the name of the protocol.
-     *     If this class does not exist, or if the class exists but it is not
-     *     a subclass of <code>URLStreamHandler</code>, then the next package
-     *     in the list is tried.
-     * <li>If the previous step fails to find a protocol handler, then the
-     *     constructor tries to load from a system default package.
-     *     <blockquote><pre>
-     *         &lt;<i>system default package</i>&gt;.&lt;<i>protocol</i>&gt;.Handler
-     *     </pre></blockquote>
-     *     If this class does not exist, or if the class exists but it is not a
-     *     subclass of <code>URLStreamHandler</code>, then a
-     *     <code>MalformedURLException</code> is thrown.
-     * </ol>
-     *
-     * <p>Protocol handlers for the following protocols are guaranteed
-     * to exist on the search path :-
-     * <blockquote><pre>
-     *     http, https, ftp, file, and jar
-     * </pre></blockquote>
-     * Protocol handlers for additional protocols may also be
-     * available.
-     *
-     * <p>No validation of the inputs is performed by this constructor.
-     *
-     * @param      protocol   the name of the protocol to use.
-     * @param      host       the name of the host.
-     * @param      port       the port number on the host.
-     * @param      file       the file on the host
-     * @exception  MalformedURLException  if an unknown protocol is specified.
-     * @see        java.lang.System#getProperty(java.lang.String)
-     * @see        java.net.URL#setURLStreamHandlerFactory(
-     *                  java.net.URLStreamHandlerFactory)
-     * @see        java.net.URLStreamHandler
-     * @see        java.net.URLStreamHandlerFactory#createURLStreamHandler(
-     *                  java.lang.String)
-     */
-    public URL(String protocol, String host, int port, String file)
-        throws MalformedURLException
-    {
-        this(protocol, host, port, file, null);
-    }
-
-    /**
-     * Creates a URL from the specified <code>protocol</code>
-     * name, <code>host</code> name, and <code>file</code> name. The
-     * default port for the specified protocol is used.
-     * <p>
-     * This method is equivalent to calling the four-argument
-     * constructor with the arguments being <code>protocol</code>,
-     * <code>host</code>, <code>-1</code>, and <code>file</code>.
-     *
-     * No validation of the inputs is performed by this constructor.
-     *
-     * @param      protocol   the name of the protocol to use.
-     * @param      host       the name of the host.
-     * @param      file       the file on the host.
-     * @exception  MalformedURLException  if an unknown protocol is specified.
-     * @see        java.net.URL#URL(java.lang.String, java.lang.String,
-     *                  int, java.lang.String)
-     */
-    public URL(String protocol, String host, String file)
-            throws MalformedURLException {
-        this(protocol, host, -1, file);
-    }
-
-    /**
-     * Creates a <code>URL</code> object from the specified
-     * <code>protocol</code>, <code>host</code>, <code>port</code>
-     * number, <code>file</code>, and <code>handler</code>. Specifying
-     * a <code>port</code> number of <code>-1</code> indicates that
-     * the URL should use the default port for the protocol. Specifying
-     * a <code>handler</code> of <code>null</code> indicates that the URL
-     * should use a default stream handler for the protocol, as outlined
-     * for:
-     *     java.net.URL#URL(java.lang.String, java.lang.String, int,
-     *                      java.lang.String)
-     *
-     * <p>If the handler is not null and there is a security manager,
-     * the security manager's <code>checkPermission</code>
-     * method is called with a
-     * <code>NetPermission("specifyStreamHandler")</code> permission.
-     * This may result in a SecurityException.
-     *
-     * No validation of the inputs is performed by this constructor.
-     *
-     * @param      protocol   the name of the protocol to use.
-     * @param      host       the name of the host.
-     * @param      port       the port number on the host.
-     * @param      file       the file on the host
-     * @param      handler    the stream handler for the URL.
-     * @exception  MalformedURLException  if an unknown protocol is specified.
-     * @exception  SecurityException
-     *        if a security manager exists and its
-     *        <code>checkPermission</code> method doesn't allow
-     *        specifying a stream handler explicitly.
-     * @see        java.lang.System#getProperty(java.lang.String)
-     * @see        java.net.URL#setURLStreamHandlerFactory(
-     *                  java.net.URLStreamHandlerFactory)
-     * @see        java.net.URLStreamHandler
-     * @see        java.net.URLStreamHandlerFactory#createURLStreamHandler(
-     *                  java.lang.String)
-     * @see        SecurityManager#checkPermission
-     * @see        java.net.NetPermission
-     */
-    public URL(String protocol, String host, int port, String file,
-               URLStreamHandler handler) throws MalformedURLException {
-        if (handler != null) {
-            throw new SecurityException();
-        }
-
-        protocol = protocol.toLowerCase();
-        this.protocol = protocol;
-        if (host != null) {
-
-            /**
-             * if host is a literal IPv6 address,
-             * we will make it conform to RFC 2732
-             */
-            if (host.indexOf(':') >= 0 && !host.startsWith("[")) {
-                host = "["+host+"]";
-            }
-            this.host = host;
-
-            if (port < -1) {
-                throw new MalformedURLException("Invalid port number :" +
-                                                    port);
-            }
-            this.port = port;
-            authority = (port == -1) ? host : host + ":" + port;
-        }
-
-        Parts parts = new Parts(file);
-        path = parts.getPath();
-        query = parts.getQuery();
-
-        if (query != null) {
-            this.file = path + "?" + query;
-        } else {
-            this.file = path;
-        }
-        ref = parts.getRef();
-
-        // Note: we don't do validation of the URL here. Too risky to change
-        // right now, but worth considering for future reference. -br
-        if (handler == null &&
-            (handler = getURLStreamHandler(protocol)) == null) {
-            throw new MalformedURLException("unknown protocol: " + protocol);
-        }
-        this.handler = handler;
-    }
-
-    /**
-     * Creates a <code>URL</code> object from the <code>String</code>
-     * representation.
-     * <p>
-     * This constructor is equivalent to a call to the two-argument
-     * constructor with a <code>null</code> first argument.
-     *
-     * @param      spec   the <code>String</code> to parse as a URL.
-     * @exception  MalformedURLException  if no protocol is specified, or an
-     *               unknown protocol is found, or <tt>spec</tt> is <tt>null</tt>.
-     * @see        java.net.URL#URL(java.net.URL, java.lang.String)
-     */
-    public URL(String spec) throws MalformedURLException {
-        this(null, spec);
-    }
-    
-    private URL(String spec, InputStream is) throws MalformedURLException {
-        this(null, spec);
-        this.is = is;
-    }
-
-    /**
-     * Creates a URL by parsing the given spec within a specified context.
-     *
-     * The new URL is created from the given context URL and the spec
-     * argument as described in
-     * RFC2396 &quot;Uniform Resource Identifiers : Generic * Syntax&quot; :
-     * <blockquote><pre>
-     *          &lt;scheme&gt;://&lt;authority&gt;&lt;path&gt;?&lt;query&gt;#&lt;fragment&gt;
-     * </pre></blockquote>
-     * The reference is parsed into the scheme, authority, path, query and
-     * fragment parts. If the path component is empty and the scheme,
-     * authority, and query components are undefined, then the new URL is a
-     * reference to the current document. Otherwise, the fragment and query
-     * parts present in the spec are used in the new URL.
-     * <p>
-     * If the scheme component is defined in the given spec and does not match
-     * the scheme of the context, then the new URL is created as an absolute
-     * URL based on the spec alone. Otherwise the scheme component is inherited
-     * from the context URL.
-     * <p>
-     * If the authority component is present in the spec then the spec is
-     * treated as absolute and the spec authority and path will replace the
-     * context authority and path. If the authority component is absent in the
-     * spec then the authority of the new URL will be inherited from the
-     * context.
-     * <p>
-     * If the spec's path component begins with a slash character
-     * &quot;/&quot; then the
-     * path is treated as absolute and the spec path replaces the context path.
-     * <p>
-     * Otherwise, the path is treated as a relative path and is appended to the
-     * context path, as described in RFC2396. Also, in this case,
-     * the path is canonicalized through the removal of directory
-     * changes made by occurences of &quot;..&quot; and &quot;.&quot;.
-     * <p>
-     * For a more detailed description of URL parsing, refer to RFC2396.
-     *
-     * @param      context   the context in which to parse the specification.
-     * @param      spec      the <code>String</code> to parse as a URL.
-     * @exception  MalformedURLException  if no protocol is specified, or an
-     *               unknown protocol is found, or <tt>spec</tt> is <tt>null</tt>.
-     * @see        java.net.URL#URL(java.lang.String, java.lang.String,
-     *                  int, java.lang.String)
-     * @see        java.net.URLStreamHandler
-     * @see        java.net.URLStreamHandler#parseURL(java.net.URL,
-     *                  java.lang.String, int, int)
-     */
-    public URL(URL context, String spec) throws MalformedURLException {
-        this(context, spec, null);
-    }
-
-    /**
-     * Creates a URL by parsing the given spec with the specified handler
-     * within a specified context. If the handler is null, the parsing
-     * occurs as with the two argument constructor.
-     *
-     * @param      context   the context in which to parse the specification.
-     * @param      spec      the <code>String</code> to parse as a URL.
-     * @param      handler   the stream handler for the URL.
-     * @exception  MalformedURLException  if no protocol is specified, or an
-     *               unknown protocol is found, or <tt>spec</tt> is <tt>null</tt>.
-     * @exception  SecurityException
-     *        if a security manager exists and its
-     *        <code>checkPermission</code> method doesn't allow
-     *        specifying a stream handler.
-     * @see        java.net.URL#URL(java.lang.String, java.lang.String,
-     *                  int, java.lang.String)
-     * @see        java.net.URLStreamHandler
-     * @see        java.net.URLStreamHandler#parseURL(java.net.URL,
-     *                  java.lang.String, int, int)
-     */
-    public URL(URL context, String spec, URLStreamHandler handler)
-        throws MalformedURLException
-    {
-        this(findContext(context), spec, handler != null);
-    }
-    
-    private URL(URL context, String spec, boolean ishandler)
-    throws MalformedURLException {
-        // Check for permission to specify a handler
-        if (ishandler) {
-            throw new SecurityException();
-        }
-        URLStreamHandler handler = null;
-        
-        String original = spec;
-        int i, limit, c;
-        int start = 0;
-        String newProtocol = null;
-        boolean aRef=false;
-        boolean isRelative = false;
-
-
-        try {
-            limit = spec.length();
-            while ((limit > 0) && (spec.charAt(limit - 1) <= ' ')) {
-                limit--;        //eliminate trailing whitespace
-            }
-            while ((start < limit) && (spec.charAt(start) <= ' ')) {
-                start++;        // eliminate leading whitespace
-            }
-
-            if (spec.regionMatches(true, start, "url:", 0, 4)) {
-                start += 4;
-            }
-            if (start < spec.length() && spec.charAt(start) == '#') {
-                /* we're assuming this is a ref relative to the context URL.
-                 * This means protocols cannot start w/ '#', but we must parse
-                 * ref URL's like: "hello:there" w/ a ':' in them.
-                 */
-                aRef=true;
-            }
-            for (i = start ; !aRef && (i < limit) &&
-                     ((c = spec.charAt(i)) != '/') ; i++) {
-                if (c == ':') {
-
-                    String s = spec.substring(start, i).toLowerCase();
-                    if (isValidProtocol(s)) {
-                        newProtocol = s;
-                        start = i + 1;
-                    }
-                    break;
-                }
-            }
-
-            // Only use our context if the protocols match.
-            protocol = newProtocol;
-            if ((context != null) && ((newProtocol == null) ||
-                            newProtocol.equalsIgnoreCase(context.protocol))) {
-                // inherit the protocol handler from the context
-                // if not specified to the constructor
-                if (handler == null) {
-                    handler = context.handler;
-                }
-
-                // If the context is a hierarchical URL scheme and the spec
-                // contains a matching scheme then maintain backwards
-                // compatibility and treat it as if the spec didn't contain
-                // the scheme; see 5.2.3 of RFC2396
-                if (context.path != null && context.path.startsWith("/"))
-                    newProtocol = null;
-
-                if (newProtocol == null) {
-                    protocol = context.protocol;
-                    authority = context.authority;
-                    userInfo = context.userInfo;
-                    host = context.host;
-                    port = context.port;
-                    file = context.file;
-                    path = context.path;
-                    isRelative = true;
-                }
-            }
-
-            if (protocol == null) {
-                throw new MalformedURLException("no protocol: "+original);
-            }
-
-            // Get the protocol handler if not specified or the protocol
-            // of the context could not be used
-            if (handler == null &&
-                (handler = getURLStreamHandler(protocol)) == null) {
-                throw new MalformedURLException("unknown protocol: "+protocol);
-            }
-            this.handler = handler;
-
-            i = spec.indexOf('#', start);
-            if (i >= 0) {
-//thrw(protocol + " hnd: " + handler.getClass().getName() + " i: " + i);
-                ref = spec.substring(i + 1, limit);
-                limit = i;
-            }
-
-            /*
-             * Handle special case inheritance of query and fragment
-             * implied by RFC2396 section 5.2.2.
-             */
-            if (isRelative && start == limit) {
-                query = context.query;
-                if (ref == null) {
-                    ref = context.ref;
-                }
-            }
-
-            handler.parseURL(this, spec, start, limit);
-
-        } catch(MalformedURLException e) {
-            throw e;
-        } catch(Exception e) {
-            MalformedURLException exception = new MalformedURLException(e.getMessage());
-            exception.initCause(e);
-            throw exception;
-        }
-    }
-    
-    /*
-     * Returns true if specified string is a valid protocol name.
-     */
-    private boolean isValidProtocol(String protocol) {
-        int len = protocol.length();
-        if (len < 1)
-            return false;
-        char c = protocol.charAt(0);
-        if (!Character.isLetter(c))
-            return false;
-        for (int i = 1; i < len; i++) {
-            c = protocol.charAt(i);
-            if (!Character.isLetterOrDigit(c) && c != '.' && c != '+' &&
-                c != '-') {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Sets the fields of the URL. This is not a public method so that
-     * only URLStreamHandlers can modify URL fields. URLs are
-     * otherwise constant.
-     *
-     * @param protocol the name of the protocol to use
-     * @param host the name of the host
-       @param port the port number on the host
-     * @param file the file on the host
-     * @param ref the internal reference in the URL
-     */
-    protected void set(String protocol, String host,
-                       int port, String file, String ref) {
-        synchronized (this) {
-            this.protocol = protocol;
-            this.host = host;
-            authority = port == -1 ? host : host + ":" + port;
-            this.port = port;
-            this.file = file;
-            this.ref = ref;
-            /* This is very important. We must recompute this after the
-             * URL has been changed. */
-            hashCode = -1;
-            hostAddress = null;
-            int q = file.lastIndexOf('?');
-            if (q != -1) {
-                query = file.substring(q+1);
-                path = file.substring(0, q);
-            } else
-                path = file;
-        }
-    }
-
-    /**
-     * Sets the specified 8 fields of the URL. This is not a public method so
-     * that only URLStreamHandlers can modify URL fields. URLs are otherwise
-     * constant.
-     *
-     * @param protocol the name of the protocol to use
-     * @param host the name of the host
-     * @param port the port number on the host
-     * @param authority the authority part for the url
-     * @param userInfo the username and password
-     * @param path the file on the host
-     * @param ref the internal reference in the URL
-     * @param query the query part of this URL
-     * @since 1.3
-     */
-    protected void set(String protocol, String host, int port,
-                       String authority, String userInfo, String path,
-                       String query, String ref) {
-        synchronized (this) {
-            this.protocol = protocol;
-            this.host = host;
-            this.port = port;
-            this.file = query == null ? path : path + "?" + query;
-            this.userInfo = userInfo;
-            this.path = path;
-            this.ref = ref;
-            /* This is very important. We must recompute this after the
-             * URL has been changed. */
-            hashCode = -1;
-            hostAddress = null;
-            this.query = query;
-            this.authority = authority;
-        }
-    }
-
-    /**
-     * Gets the query part of this <code>URL</code>.
-     *
-     * @return  the query part of this <code>URL</code>,
-     * or <CODE>null</CODE> if one does not exist
-     * @since 1.3
-     */
-    public String getQuery() {
-        return query;
-    }
-
-    /**
-     * Gets the path part of this <code>URL</code>.
-     *
-     * @return  the path part of this <code>URL</code>, or an
-     * empty string if one does not exist
-     * @since 1.3
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * Gets the userInfo part of this <code>URL</code>.
-     *
-     * @return  the userInfo part of this <code>URL</code>, or
-     * <CODE>null</CODE> if one does not exist
-     * @since 1.3
-     */
-    public String getUserInfo() {
-        return userInfo;
-    }
-
-    /**
-     * Gets the authority part of this <code>URL</code>.
-     *
-     * @return  the authority part of this <code>URL</code>
-     * @since 1.3
-     */
-    public String getAuthority() {
-        return authority;
-    }
-
-    /**
-     * Gets the port number of this <code>URL</code>.
-     *
-     * @return  the port number, or -1 if the port is not set
-     */
-    public int getPort() {
-        return port;
-    }
-
-    /**
-     * Gets the default port number of the protocol associated
-     * with this <code>URL</code>. If the URL scheme or the URLStreamHandler
-     * for the URL do not define a default port number,
-     * then -1 is returned.
-     *
-     * @return  the port number
-     * @since 1.4
-     */
-    public int getDefaultPort() {
-        return handler.getDefaultPort();
-    }
-
-    /**
-     * Gets the protocol name of this <code>URL</code>.
-     *
-     * @return  the protocol of this <code>URL</code>.
-     */
-    public String getProtocol() {
-        return protocol;
-    }
-
-    /**
-     * Gets the host name of this <code>URL</code>, if applicable.
-     * The format of the host conforms to RFC 2732, i.e. for a
-     * literal IPv6 address, this method will return the IPv6 address
-     * enclosed in square brackets (<tt>'['</tt> and <tt>']'</tt>).
-     *
-     * @return  the host name of this <code>URL</code>.
-     */
-    public String getHost() {
-        return host;
-    }
-
-    /**
-     * Gets the file name of this <code>URL</code>.
-     * The returned file portion will be
-     * the same as <CODE>getPath()</CODE>, plus the concatenation of
-     * the value of <CODE>getQuery()</CODE>, if any. If there is
-     * no query portion, this method and <CODE>getPath()</CODE> will
-     * return identical results.
-     *
-     * @return  the file name of this <code>URL</code>,
-     * or an empty string if one does not exist
-     */
-    public String getFile() {
-        return file;
-    }
-
-    /**
-     * Gets the anchor (also known as the "reference") of this
-     * <code>URL</code>.
-     *
-     * @return  the anchor (also known as the "reference") of this
-     *          <code>URL</code>, or <CODE>null</CODE> if one does not exist
-     */
-    public String getRef() {
-        return ref;
-    }
-
-    /**
-     * Compares this URL for equality with another object.<p>
-     *
-     * If the given object is not a URL then this method immediately returns
-     * <code>false</code>.<p>
-     *
-     * Two URL objects are equal if they have the same protocol, reference
-     * equivalent hosts, have the same port number on the host, and the same
-     * file and fragment of the file.<p>
-     *
-     * Two hosts are considered equivalent if both host names can be resolved
-     * into the same IP addresses; else if either host name can't be
-     * resolved, the host names must be equal without regard to case; or both
-     * host names equal to null.<p>
-     *
-     * Since hosts comparison requires name resolution, this operation is a
-     * blocking operation. <p>
-     *
-     * Note: The defined behavior for <code>equals</code> is known to
-     * be inconsistent with virtual hosting in HTTP.
-     *
-     * @param   obj   the URL to compare against.
-     * @return  <code>true</code> if the objects are the same;
-     *          <code>false</code> otherwise.
-     */
-    public boolean equals(Object obj) {
-        if (!(obj instanceof URL))
-            return false;
-        URL u2 = (URL)obj;
-
-        return handler.equals(this, u2);
-    }
-
-    /**
-     * Creates an integer suitable for hash table indexing.<p>
-     *
-     * The hash code is based upon all the URL components relevant for URL
-     * comparison. As such, this operation is a blocking operation.<p>
-     *
-     * @return  a hash code for this <code>URL</code>.
-     */
-    public synchronized int hashCode() {
-        if (hashCode != -1)
-            return hashCode;
-
-        hashCode = handler.hashCode(this);
-        return hashCode;
-    }
-
-    /**
-     * Compares two URLs, excluding the fragment component.<p>
-     *
-     * Returns <code>true</code> if this <code>URL</code> and the
-     * <code>other</code> argument are equal without taking the
-     * fragment component into consideration.
-     *
-     * @param   other   the <code>URL</code> to compare against.
-     * @return  <code>true</code> if they reference the same remote object;
-     *          <code>false</code> otherwise.
-     */
-    public boolean sameFile(URL other) {
-        return handler.sameFile(this, other);
-    }
-
-    /**
-     * Constructs a string representation of this <code>URL</code>. The
-     * string is created by calling the <code>toExternalForm</code>
-     * method of the stream protocol handler for this object.
-     *
-     * @return  a string representation of this object.
-     * @see     java.net.URL#URL(java.lang.String, java.lang.String, int,
-     *                  java.lang.String)
-     * @see     java.net.URLStreamHandler#toExternalForm(java.net.URL)
-     */
-    public String toString() {
-        return toExternalForm();
-    }
-
-    /**
-     * Constructs a string representation of this <code>URL</code>. The
-     * string is created by calling the <code>toExternalForm</code>
-     * method of the stream protocol handler for this object.
-     *
-     * @return  a string representation of this object.
-     * @see     java.net.URL#URL(java.lang.String, java.lang.String,
-     *                  int, java.lang.String)
-     * @see     java.net.URLStreamHandler#toExternalForm(java.net.URL)
-     */
-    public String toExternalForm() {
-        return handler.toExternalForm(this);
-    }
-
-    /**
-     * Returns a {@link java.net.URLConnection URLConnection} instance that
-     * represents a connection to the remote object referred to by the
-     * {@code URL}.
-     *
-     * <P>A new instance of {@linkplain java.net.URLConnection URLConnection} is
-     * created every time when invoking the
-     * {@linkplain java.net.URLStreamHandler#openConnection(URL)
-     * URLStreamHandler.openConnection(URL)} method of the protocol handler for
-     * this URL.</P>
-     *
-     * <P>It should be noted that a URLConnection instance does not establish
-     * the actual network connection on creation. This will happen only when
-     * calling {@linkplain java.net.URLConnection#connect() URLConnection.connect()}.</P>
-     *
-     * <P>If for the URL's protocol (such as HTTP or JAR), there
-     * exists a public, specialized URLConnection subclass belonging
-     * to one of the following packages or one of their subpackages:
-     * java.lang, java.io, java.util, java.net, the connection
-     * returned will be of that subclass. For example, for HTTP an
-     * HttpURLConnection will be returned, and for JAR a
-     * JarURLConnection will be returned.</P>
-     *
-     * @return     a {@link java.net.URLConnection URLConnection} linking
-     *             to the URL.
-     * @exception  IOException  if an I/O exception occurs.
-     * @see        java.net.URL#URL(java.lang.String, java.lang.String,
-     *             int, java.lang.String)
-     */
-//    public URLConnection openConnection() throws java.io.IOException {
-//        return handler.openConnection(this);
-//    }
-
-
-    /**
-     * Opens a connection to this <code>URL</code> and returns an
-     * <code>InputStream</code> for reading from that connection. This
-     * method is a shorthand for:
-     * <blockquote><pre>
-     *     openConnection().getInputStream()
-     * </pre></blockquote>
-     *
-     * @return     an input stream for reading from the URL connection.
-     * @exception  IOException  if an I/O exception occurs.
-     * @see        java.net.URL#openConnection()
-     * @see        java.net.URLConnection#getInputStream()
-     */
-    public final InputStream openStream() throws java.io.IOException {
-        if (is != null) {
-            return is;
-        }
-        byte[] arr = (byte[]) getContent(new Class[] { byte[].class });
-        if (arr == null) {
-            throw new IOException();
-        }
-        return new ByteArrayInputStream(arr);
-    }
-
-    /**
-     * Gets the contents of this URL. This method is a shorthand for:
-     * <blockquote><pre>
-     *     openConnection().getContent()
-     * </pre></blockquote>
-     *
-     * @return     the contents of this URL.
-     * @exception  IOException  if an I/O exception occurs.
-     * @see        java.net.URLConnection#getContent()
-     */
-    public final Object getContent() throws java.io.IOException {
-        return loadText(toExternalForm());
-    }
-    
-    @JavaScriptBody(args = "url", body = ""
-        + "var request = new XMLHttpRequest();\n"
-        + "request.open('GET', url, false);\n"
-        + "request.send();\n"
-        + "return request.responseText;\n"
-    )
-    private static native String loadText(String url) throws IOException;
-
-    @JavaScriptBody(args = { "url", "arr" }, body = ""
-        + "var request = new XMLHttpRequest();\n"
-        + "request.open('GET', url, false);\n"
-        + "request.overrideMimeType('text\\/plain; charset=x-user-defined');\n"
-        + "request.send();\n"
-        + "var t = request.responseText;\n"
-        + "for (var i = 0; i < t.length; i++) arr.push(t.charCodeAt(i) & 0xff);\n"
-        + "return arr;\n"
-    )
-    private static native Object loadBytes(String url, byte[] arr) throws IOException;
-
-    /**
-     * Gets the contents of this URL. This method is a shorthand for:
-     * <blockquote><pre>
-     *     openConnection().getContent(Class[])
-     * </pre></blockquote>
-     *
-     * @param classes an array of Java types
-     * @return     the content object of this URL that is the first match of
-     *               the types specified in the classes array.
-     *               null if none of the requested types are supported.
-     * @exception  IOException  if an I/O exception occurs.
-     * @see        java.net.URLConnection#getContent(Class[])
-     * @since 1.3
-     */
-    public final Object getContent(Class[] classes)
-    throws java.io.IOException {
-        for (Class<?> c : classes) {
-            if (c == String.class) {
-                return loadText(toExternalForm());
-            }
-            if (c == byte[].class) {
-                return loadBytes(toExternalForm(), new byte[0]);
-            }
-        }
-        return null;
-    }
-
-    static URLStreamHandler getURLStreamHandler(String protocol) {
-        URLStreamHandler universal = new URLStreamHandler() {};
-        return universal;
-    }
-
-    private static URL findContext(URL context) throws MalformedURLException {
-        if (context == null) {
-            String base = findBaseURL();
-            if (base != null) {
-                context = new URL(null, base, false);
-            }
-        }
-        return context;
-    }
-    
-    @JavaScriptBody(args = {}, body = 
-          "if (typeof window !== 'object') return null;\n"
-        + "if (!window.location) return null;\n"
-        + "if (!window.location.href) return null;\n"
-        + "return window.location.href;\n"
-    )
-    private static native String findBaseURL();
-}
-class Parts {
-    String path, query, ref;
-
-    Parts(String file) {
-        int ind = file.indexOf('#');
-        ref = ind < 0 ? null: file.substring(ind + 1);
-        file = ind < 0 ? file: file.substring(0, ind);
-        int q = file.lastIndexOf('?');
-        if (q != -1) {
-            query = file.substring(q+1);
-            path = file.substring(0, q);
-        } else {
-            path = file;
-        }
-    }
-
-    String getPath() {
-        return path;
-    }
-
-    String getQuery() {
-        return query;
-    }
-
-    String getRef() {
-        return ref;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/net/URLStreamHandler.java
--- a/emul/mini/src/main/java/java/net/URLStreamHandler.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,568 +0,0 @@
-/*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.net;
-
-
-/**
- * The abstract class <code>URLStreamHandler</code> is the common
- * superclass for all stream protocol handlers. A stream protocol
- * handler knows how to make a connection for a particular protocol
- * type, such as <code>http</code>, <code>ftp</code>, or
- * <code>gopher</code>.
- * <p>
- * In most cases, an instance of a <code>URLStreamHandler</code>
- * subclass is not created directly by an application. Rather, the
- * first time a protocol name is encountered when constructing a
- * <code>URL</code>, the appropriate stream protocol handler is
- * automatically loaded.
- *
- * @author  James Gosling
- * @see     java.net.URL#URL(java.lang.String, java.lang.String, int, java.lang.String)
- * @since   JDK1.0
- */
-public abstract class URLStreamHandler {
-    /**
-     * Opens a connection to the object referenced by the
-     * <code>URL</code> argument.
-     * This method should be overridden by a subclass.
-     *
-     * <p>If for the handler's protocol (such as HTTP or JAR), there
-     * exists a public, specialized URLConnection subclass belonging
-     * to one of the following packages or one of their subpackages:
-     * java.lang, java.io, java.util, java.net, the connection
-     * returned will be of that subclass. For example, for HTTP an
-     * HttpURLConnection will be returned, and for JAR a
-     * JarURLConnection will be returned.
-     *
-     * @param      u   the URL that this connects to.
-     * @return     a <code>URLConnection</code> object for the <code>URL</code>.
-     * @exception  IOException  if an I/O error occurs while opening the
-     *               connection.
-     */
-//    abstract protected URLConnection openConnection(URL u) throws IOException;
-
-    /**
-     * Same as openConnection(URL), except that the connection will be
-     * made through the specified proxy; Protocol handlers that do not
-     * support proxying will ignore the proxy parameter and make a
-     * normal connection.
-     *
-     * Calling this method preempts the system's default ProxySelector
-     * settings.
-     *
-     * @param      u   the URL that this connects to.
-     * @param      p   the proxy through which the connection will be made.
-     *                 If direct connection is desired, Proxy.NO_PROXY
-     *                 should be specified.
-     * @return     a <code>URLConnection</code> object for the <code>URL</code>.
-     * @exception  IOException  if an I/O error occurs while opening the
-     *               connection.
-     * @exception  IllegalArgumentException if either u or p is null,
-     *               or p has the wrong type.
-     * @exception  UnsupportedOperationException if the subclass that
-     *               implements the protocol doesn't support this method.
-     * @since      1.5
-     */
-//    protected URLConnection openConnection(URL u, Proxy p) throws IOException {
-//        throw new UnsupportedOperationException("Method not implemented.");
-//    }
-
-    /**
-     * Parses the string representation of a <code>URL</code> into a
-     * <code>URL</code> object.
-     * <p>
-     * If there is any inherited context, then it has already been
-     * copied into the <code>URL</code> argument.
-     * <p>
-     * The <code>parseURL</code> method of <code>URLStreamHandler</code>
-     * parses the string representation as if it were an
-     * <code>http</code> specification. Most URL protocol families have a
-     * similar parsing. A stream protocol handler for a protocol that has
-     * a different syntax must override this routine.
-     *
-     * @param   u       the <code>URL</code> to receive the result of parsing
-     *                  the spec.
-     * @param   spec    the <code>String</code> representing the URL that
-     *                  must be parsed.
-     * @param   start   the character index at which to begin parsing. This is
-     *                  just past the '<code>:</code>' (if there is one) that
-     *                  specifies the determination of the protocol name.
-     * @param   limit   the character position to stop parsing at. This is the
-     *                  end of the string or the position of the
-     *                  "<code>#</code>" character, if present. All information
-     *                  after the sharp sign indicates an anchor.
-     */
-    protected void parseURL(URL u, String spec, int start, int limit) {
-        // These fields may receive context content if this was relative URL
-        String protocol = u.getProtocol();
-        String authority = u.getAuthority();
-        String userInfo = u.getUserInfo();
-        String host = u.getHost();
-        int port = u.getPort();
-        String path = u.getPath();
-        String query = u.getQuery();
-
-        // This field has already been parsed
-        String ref = u.getRef();
-
-        boolean isRelPath = false;
-        boolean queryOnly = false;
-
-// FIX: should not assume query if opaque
-        // Strip off the query part
-        if (start < limit) {
-            int queryStart = spec.indexOf('?');
-            queryOnly = queryStart == start;
-            if ((queryStart != -1) && (queryStart < limit)) {
-                query = spec.substring(queryStart+1, limit);
-                if (limit > queryStart)
-                    limit = queryStart;
-                spec = spec.substring(0, queryStart);
-            }
-        }
-
-        int i = 0;
-        // Parse the authority part if any
-        boolean isUNCName = (start <= limit - 4) &&
-                        (spec.charAt(start) == '/') &&
-                        (spec.charAt(start + 1) == '/') &&
-                        (spec.charAt(start + 2) == '/') &&
-                        (spec.charAt(start + 3) == '/');
-        if (!isUNCName && (start <= limit - 2) && (spec.charAt(start) == '/') &&
-            (spec.charAt(start + 1) == '/')) {
-            start += 2;
-            i = spec.indexOf('/', start);
-            if (i < 0) {
-                i = spec.indexOf('?', start);
-                if (i < 0)
-                    i = limit;
-            }
-
-            host = authority = spec.substring(start, i);
-
-            int ind = authority.indexOf('@');
-            if (ind != -1) {
-                userInfo = authority.substring(0, ind);
-                host = authority.substring(ind+1);
-            } else {
-                userInfo = null;
-            }
-            if (host != null) {
-                // If the host is surrounded by [ and ] then its an IPv6
-                // literal address as specified in RFC2732
-                if (host.length()>0 && (host.charAt(0) == '[')) {
-                    if ((ind = host.indexOf(']')) > 2) {
-
-                        String nhost = host ;
-                        host = nhost.substring(0,ind+1);
-//                        if (!IPAddressUtil.
-//                            isIPv6LiteralAddress(host.substring(1, ind))) {
-//                            throw new IllegalArgumentException(
-//                                "Invalid host: "+ host);
-//                        }
-
-                        port = -1 ;
-                        if (nhost.length() > ind+1) {
-                            if (nhost.charAt(ind+1) == ':') {
-                                ++ind ;
-                                // port can be null according to RFC2396
-                                if (nhost.length() > (ind + 1)) {
-                                    port = Integer.parseInt(nhost.substring(ind+1));
-                                }
-                            } else {
-                                throw new IllegalArgumentException(
-                                    "Invalid authority field: " + authority);
-                            }
-                        }
-                    } else {
-                        throw new IllegalArgumentException(
-                            "Invalid authority field: " + authority);
-                    }
-                } else {
-                    ind = host.indexOf(':');
-                    port = -1;
-                    if (ind >= 0) {
-                        // port can be null according to RFC2396
-                        if (host.length() > (ind + 1)) {
-                            port = Integer.parseInt(host.substring(ind + 1));
-                        }
-                        host = host.substring(0, ind);
-                    }
-                }
-            } else {
-                host = "";
-            }
-            if (port < -1)
-                throw new IllegalArgumentException("Invalid port number :" +
-                                                   port);
-            start = i;
-            // If the authority is defined then the path is defined by the
-            // spec only; See RFC 2396 Section 5.2.4.
-            if (authority != null && authority.length() > 0)
-                path = "";
-        }
-
-        if (host == null) {
-            host = "";
-        }
-
-        // Parse the file path if any
-        if (start < limit) {
-            if (spec.charAt(start) == '/') {
-                path = spec.substring(start, limit);
-            } else if (path != null && path.length() > 0) {
-                isRelPath = true;
-                int ind = path.lastIndexOf('/');
-                String seperator = "";
-                if (ind == -1 && authority != null)
-                    seperator = "/";
-                path = path.substring(0, ind + 1) + seperator +
-                         spec.substring(start, limit);
-
-            } else {
-                String seperator = (authority != null) ? "/" : "";
-                path = seperator + spec.substring(start, limit);
-            }
-        } else if (queryOnly && path != null) {
-            int ind = path.lastIndexOf('/');
-            if (ind < 0)
-                ind = 0;
-            path = path.substring(0, ind) + "/";
-        }
-        if (path == null)
-            path = "";
-
-        if (isRelPath) {
-            // Remove embedded /./
-            while ((i = path.indexOf("/./")) >= 0) {
-                path = path.substring(0, i) + path.substring(i + 2);
-            }
-            // Remove embedded /../ if possible
-            i = 0;
-            while ((i = path.indexOf("/../", i)) >= 0) {
-                /*
-                 * A "/../" will cancel the previous segment and itself,
-                 * unless that segment is a "/../" itself
-                 * i.e. "/a/b/../c" becomes "/a/c"
-                 * but "/../../a" should stay unchanged
-                 */
-                if (i > 0 && (limit = path.lastIndexOf('/', i - 1)) >= 0 &&
-                    (path.indexOf("/../", limit) != 0)) {
-                    path = path.substring(0, limit) + path.substring(i + 3);
-                    i = 0;
-                } else {
-                    i = i + 3;
-                }
-            }
-            // Remove trailing .. if possible
-            while (path.endsWith("/..")) {
-                i = path.indexOf("/..");
-                if ((limit = path.lastIndexOf('/', i - 1)) >= 0) {
-                    path = path.substring(0, limit+1);
-                } else {
-                    break;
-                }
-            }
-            // Remove starting .
-            if (path.startsWith("./") && path.length() > 2)
-                path = path.substring(2);
-
-            // Remove trailing .
-            if (path.endsWith("/."))
-                path = path.substring(0, path.length() -1);
-        }
-
-        setURL(u, protocol, host, port, authority, userInfo, path, query, ref);
-    }
-
-    /**
-     * Returns the default port for a URL parsed by this handler. This method
-     * is meant to be overidden by handlers with default port numbers.
-     * @return the default port for a <code>URL</code> parsed by this handler.
-     * @since 1.3
-     */
-    protected int getDefaultPort() {
-        return -1;
-    }
-
-    /**
-     * Provides the default equals calculation. May be overidden by handlers
-     * for other protocols that have different requirements for equals().
-     * This method requires that none of its arguments is null. This is
-     * guaranteed by the fact that it is only called by java.net.URL class.
-     * @param u1 a URL object
-     * @param u2 a URL object
-     * @return <tt>true</tt> if the two urls are
-     * considered equal, ie. they refer to the same
-     * fragment in the same file.
-     * @since 1.3
-     */
-    protected boolean equals(URL u1, URL u2) {
-        String ref1 = u1.getRef();
-        String ref2 = u2.getRef();
-        return (ref1 == ref2 || (ref1 != null && ref1.equals(ref2))) &&
-               sameFile(u1, u2);
-    }
-
-    /**
-     * Provides the default hash calculation. May be overidden by handlers for
-     * other protocols that have different requirements for hashCode
-     * calculation.
-     * @param u a URL object
-     * @return an <tt>int</tt> suitable for hash table indexing
-     * @since 1.3
-     */
-    protected int hashCode(URL u) {
-        int h = 0;
-
-        // Generate the protocol part.
-        String protocol = u.getProtocol();
-        if (protocol != null)
-            h += protocol.hashCode();
-
-        // Generate the host part.
-        Object addr = getHostAddress(u);
-        if (addr != null) {
-            h += addr.hashCode();
-        } else {
-            String host = u.getHost();
-            if (host != null)
-                h += host.toLowerCase().hashCode();
-        }
-
-        // Generate the file part.
-        String file = u.getFile();
-        if (file != null)
-            h += file.hashCode();
-
-        // Generate the port part.
-        if (u.getPort() == -1)
-            h += getDefaultPort();
-        else
-            h += u.getPort();
-
-        // Generate the ref part.
-        String ref = u.getRef();
-        if (ref != null)
-            h += ref.hashCode();
-
-        return h;
-    }
-
-    /**
-     * Compare two urls to see whether they refer to the same file,
-     * i.e., having the same protocol, host, port, and path.
-     * This method requires that none of its arguments is null. This is
-     * guaranteed by the fact that it is only called indirectly
-     * by java.net.URL class.
-     * @param u1 a URL object
-     * @param u2 a URL object
-     * @return true if u1 and u2 refer to the same file
-     * @since 1.3
-     */
-    protected boolean sameFile(URL u1, URL u2) {
-        // Compare the protocols.
-        if (!((u1.getProtocol() == u2.getProtocol()) ||
-              (u1.getProtocol() != null &&
-               u1.getProtocol().equalsIgnoreCase(u2.getProtocol()))))
-            return false;
-
-        // Compare the files.
-        if (!(u1.getFile() == u2.getFile() ||
-              (u1.getFile() != null && u1.getFile().equals(u2.getFile()))))
-            return false;
-
-        // Compare the ports.
-        int port1, port2;
-        port1 = (u1.getPort() != -1) ? u1.getPort() : u1.handler.getDefaultPort();
-        port2 = (u2.getPort() != -1) ? u2.getPort() : u2.handler.getDefaultPort();
-        if (port1 != port2)
-            return false;
-
-        // Compare the hosts.
-        if (!hostsEqual(u1, u2))
-            return false;
-
-        return true;
-    }
-
-    /**
-     * Get the IP address of our host. An empty host field or a DNS failure
-     * will result in a null return.
-     *
-     * @param u a URL object
-     * @return an <code>InetAddress</code> representing the host
-     * IP address.
-     * @since 1.3
-     */
-    private synchronized Object getHostAddress(URL u) {
-        return u.hostAddress;
-    }
-
-    /**
-     * Compares the host components of two URLs.
-     * @param u1 the URL of the first host to compare
-     * @param u2 the URL of the second host to compare
-     * @return  <tt>true</tt> if and only if they
-     * are equal, <tt>false</tt> otherwise.
-     * @since 1.3
-     */
-    protected boolean hostsEqual(URL u1, URL u2) {
-        Object a1 = getHostAddress(u1);
-        Object a2 = getHostAddress(u2);
-        // if we have internet address for both, compare them
-        if (a1 != null && a2 != null) {
-            return a1.equals(a2);
-        // else, if both have host names, compare them
-        } else if (u1.getHost() != null && u2.getHost() != null)
-            return u1.getHost().equalsIgnoreCase(u2.getHost());
-         else
-            return u1.getHost() == null && u2.getHost() == null;
-    }
-
-    /**
-     * Converts a <code>URL</code> of a specific protocol to a
-     * <code>String</code>.
-     *
-     * @param   u   the URL.
-     * @return  a string representation of the <code>URL</code> argument.
-     */
-    protected String toExternalForm(URL u) {
-
-        // pre-compute length of StringBuffer
-        int len = u.getProtocol().length() + 1;
-        if (u.getAuthority() != null && u.getAuthority().length() > 0)
-            len += 2 + u.getAuthority().length();
-        if (u.getPath() != null) {
-            len += u.getPath().length();
-        }
-        if (u.getQuery() != null) {
-            len += 1 + u.getQuery().length();
-        }
-        if (u.getRef() != null)
-            len += 1 + u.getRef().length();
-
-        StringBuffer result = new StringBuffer(len);
-        result.append(u.getProtocol());
-        result.append(":");
-        if (u.getAuthority() != null && u.getAuthority().length() > 0) {
-            result.append("//");
-            result.append(u.getAuthority());
-        }
-        if (u.getPath() != null) {
-            result.append(u.getPath());
-        }
-        if (u.getQuery() != null) {
-            result.append('?');
-            result.append(u.getQuery());
-        }
-        if (u.getRef() != null) {
-            result.append("#");
-            result.append(u.getRef());
-        }
-        return result.toString();
-    }
-
-    /**
-     * Sets the fields of the <code>URL</code> argument to the indicated values.
-     * Only classes derived from URLStreamHandler are supposed to be able
-     * to call the set method on a URL.
-     *
-     * @param   u         the URL to modify.
-     * @param   protocol  the protocol name.
-     * @param   host      the remote host value for the URL.
-     * @param   port      the port on the remote machine.
-     * @param   authority the authority part for the URL.
-     * @param   userInfo the userInfo part of the URL.
-     * @param   path      the path component of the URL.
-     * @param   query     the query part for the URL.
-     * @param   ref       the reference.
-     * @exception       SecurityException       if the protocol handler of the URL is
-     *                                  different from this one
-     * @see     java.net.URL#set(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String)
-     * @since 1.3
-     */
-       protected void setURL(URL u, String protocol, String host, int port,
-                             String authority, String userInfo, String path,
-                             String query, String ref) {
-        if (this != u.handler) {
-            throw new SecurityException("handler for url different from " +
-                                        "this handler");
-        }
-        // ensure that no one can reset the protocol on a given URL.
-        u.set(u.getProtocol(), host, port, authority, userInfo, path, query, ref);
-    }
-
-    /**
-     * Sets the fields of the <code>URL</code> argument to the indicated values.
-     * Only classes derived from URLStreamHandler are supposed to be able
-     * to call the set method on a URL.
-     *
-     * @param   u         the URL to modify.
-     * @param   protocol  the protocol name. This value is ignored since 1.2.
-     * @param   host      the remote host value for the URL.
-     * @param   port      the port on the remote machine.
-     * @param   file      the file.
-     * @param   ref       the reference.
-     * @exception       SecurityException       if the protocol handler of the URL is
-     *                                  different from this one
-     * @deprecated Use setURL(URL, String, String, int, String, String, String,
-     *             String);
-     */
-    @Deprecated
-    protected void setURL(URL u, String protocol, String host, int port,
-                          String file, String ref) {
-        /*
-         * Only old URL handlers call this, so assume that the host
-         * field might contain "user:passwd@host". Fix as necessary.
-         */
-        String authority = null;
-        String userInfo = null;
-        if (host != null && host.length() != 0) {
-            authority = (port == -1) ? host : host + ":" + port;
-            int at = host.lastIndexOf('@');
-            if (at != -1) {
-                userInfo = host.substring(0, at);
-                host = host.substring(at+1);
-            }
-        }
-
-        /*
-         * Assume file might contain query part. Fix as necessary.
-         */
-        String path = null;
-        String query = null;
-        if (file != null) {
-            int q = file.lastIndexOf('?');
-            if (q != -1) {
-                query = file.substring(q+1);
-                path = file.substring(0, q);
-            } else
-                path = file;
-        }
-        setURL(u, protocol, host, port, authority, userInfo, path, query, ref);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/Comparator.java
--- a/emul/mini/src/main/java/java/util/Comparator.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * A comparison function, which imposes a <i>total ordering</i> on some
- * collection of objects.  Comparators can be passed to a sort method (such
- * as {@link Collections#sort(List,Comparator) Collections.sort} or {@link
- * Arrays#sort(Object[],Comparator) Arrays.sort}) to allow precise control
- * over the sort order.  Comparators can also be used to control the order of
- * certain data structures (such as {@link SortedSet sorted sets} or {@link
- * SortedMap sorted maps}), or to provide an ordering for collections of
- * objects that don't have a {@link Comparable natural ordering}.<p>
- *
- * The ordering imposed by a comparator <tt>c</tt> on a set of elements
- * <tt>S</tt> is said to be <i>consistent with equals</i> if and only if
- * <tt>c.compare(e1, e2)==0</tt> has the same boolean value as
- * <tt>e1.equals(e2)</tt> for every <tt>e1</tt> and <tt>e2</tt> in
- * <tt>S</tt>.<p>
- *
- * Caution should be exercised when using a comparator capable of imposing an
- * ordering inconsistent with equals to order a sorted set (or sorted map).
- * Suppose a sorted set (or sorted map) with an explicit comparator <tt>c</tt>
- * is used with elements (or keys) drawn from a set <tt>S</tt>.  If the
- * ordering imposed by <tt>c</tt> on <tt>S</tt> is inconsistent with equals,
- * the sorted set (or sorted map) will behave "strangely."  In particular the
- * sorted set (or sorted map) will violate the general contract for set (or
- * map), which is defined in terms of <tt>equals</tt>.<p>
- *
- * For example, suppose one adds two elements {@code a} and {@code b} such that
- * {@code (a.equals(b) && c.compare(a, b) != 0)}
- * to an empty {@code TreeSet} with comparator {@code c}.
- * The second {@code add} operation will return
- * true (and the size of the tree set will increase) because {@code a} and
- * {@code b} are not equivalent from the tree set's perspective, even though
- * this is contrary to the specification of the
- * {@link Set#add Set.add} method.<p>
- *
- * Note: It is generally a good idea for comparators to also implement
- * <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
- * serializable data structures (like {@link TreeSet}, {@link TreeMap}).  In
- * order for the data structure to serialize successfully, the comparator (if
- * provided) must implement <tt>Serializable</tt>.<p>
- *
- * For the mathematically inclined, the <i>relation</i> that defines the
- * <i>imposed ordering</i> that a given comparator <tt>c</tt> imposes on a
- * given set of objects <tt>S</tt> is:<pre>
- *       {(x, y) such that c.compare(x, y) &lt;= 0}.
- * </pre> The <i>quotient</i> for this total order is:<pre>
- *       {(x, y) such that c.compare(x, y) == 0}.
- * </pre>
- *
- * It follows immediately from the contract for <tt>compare</tt> that the
- * quotient is an <i>equivalence relation</i> on <tt>S</tt>, and that the
- * imposed ordering is a <i>total order</i> on <tt>S</tt>.  When we say that
- * the ordering imposed by <tt>c</tt> on <tt>S</tt> is <i>consistent with
- * equals</i>, we mean that the quotient for the ordering is the equivalence
- * relation defined by the objects' {@link Object#equals(Object)
- * equals(Object)} method(s):<pre>
- *     {(x, y) such that x.equals(y)}. </pre>
- *
- * <p>Unlike {@code Comparable}, a comparator may optionally permit
- * comparison of null arguments, while maintaining the requirements for
- * an equivalence relation.
- *
- * <p>This interface is a member of the
- * <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @param <T> the type of objects that may be compared by this comparator
- *
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see Comparable
- * @see java.io.Serializable
- * @since 1.2
- */
-
-public interface Comparator<T> {
-    /**
-     * Compares its two arguments for order.  Returns a negative integer,
-     * zero, or a positive integer as the first argument is less than, equal
-     * to, or greater than the second.<p>
-     *
-     * In the foregoing description, the notation
-     * <tt>sgn(</tt><i>expression</i><tt>)</tt> designates the mathematical
-     * <i>signum</i> function, which is defined to return one of <tt>-1</tt>,
-     * <tt>0</tt>, or <tt>1</tt> according to whether the value of
-     * <i>expression</i> is negative, zero or positive.<p>
-     *
-     * The implementor must ensure that <tt>sgn(compare(x, y)) ==
-     * -sgn(compare(y, x))</tt> for all <tt>x</tt> and <tt>y</tt>.  (This
-     * implies that <tt>compare(x, y)</tt> must throw an exception if and only
-     * if <tt>compare(y, x)</tt> throws an exception.)<p>
-     *
-     * The implementor must also ensure that the relation is transitive:
-     * <tt>((compare(x, y)&gt;0) &amp;&amp; (compare(y, z)&gt;0))</tt> implies
-     * <tt>compare(x, z)&gt;0</tt>.<p>
-     *
-     * Finally, the implementor must ensure that <tt>compare(x, y)==0</tt>
-     * implies that <tt>sgn(compare(x, z))==sgn(compare(y, z))</tt> for all
-     * <tt>z</tt>.<p>
-     *
-     * It is generally the case, but <i>not</i> strictly required that
-     * <tt>(compare(x, y)==0) == (x.equals(y))</tt>.  Generally speaking,
-     * any comparator that violates this condition should clearly indicate
-     * this fact.  The recommended language is "Note: this comparator
-     * imposes orderings that are inconsistent with equals."
-     *
-     * @param o1 the first object to be compared.
-     * @param o2 the second object to be compared.
-     * @return a negative integer, zero, or a positive integer as the
-     *         first argument is less than, equal to, or greater than the
-     *         second.
-     * @throws NullPointerException if an argument is null and this
-     *         comparator does not permit null arguments
-     * @throws ClassCastException if the arguments' types prevent them from
-     *         being compared by this comparator.
-     */
-    int compare(T o1, T o2);
-
-    /**
-     * Indicates whether some other object is &quot;equal to&quot; this
-     * comparator.  This method must obey the general contract of
-     * {@link Object#equals(Object)}.  Additionally, this method can return
-     * <tt>true</tt> <i>only</i> if the specified object is also a comparator
-     * and it imposes the same ordering as this comparator.  Thus,
-     * <code>comp1.equals(comp2)</code> implies that <tt>sgn(comp1.compare(o1,
-     * o2))==sgn(comp2.compare(o1, o2))</tt> for every object reference
-     * <tt>o1</tt> and <tt>o2</tt>.<p>
-     *
-     * Note that it is <i>always</i> safe <i>not</i> to override
-     * <tt>Object.equals(Object)</tt>.  However, overriding this method may,
-     * in some cases, improve performance by allowing programs to determine
-     * that two distinct comparators impose the same order.
-     *
-     * @param   obj   the reference object with which to compare.
-     * @return  <code>true</code> only if the specified object is also
-     *          a comparator and it imposes the same ordering as this
-     *          comparator.
-     * @see Object#equals(Object)
-     * @see Object#hashCode()
-     */
-    boolean equals(Object obj);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/Enumeration.java
--- a/emul/mini/src/main/java/java/util/Enumeration.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1994, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * An object that implements the Enumeration interface generates a
- * series of elements, one at a time. Successive calls to the
- * <code>nextElement</code> method return successive elements of the
- * series.
- * <p>
- * For example, to print all elements of a <tt>Vector&lt;E&gt;</tt> <i>v</i>:
- * <pre>
- *   for (Enumeration&lt;E&gt; e = v.elements(); e.hasMoreElements();)
- *       System.out.println(e.nextElement());</pre>
- * <p>
- * Methods are provided to enumerate through the elements of a
- * vector, the keys of a hashtable, and the values in a hashtable.
- * Enumerations are also used to specify the input streams to a
- * <code>SequenceInputStream</code>.
- * <p>
- * NOTE: The functionality of this interface is duplicated by the Iterator
- * interface.  In addition, Iterator adds an optional remove operation, and
- * has shorter method names.  New implementations should consider using
- * Iterator in preference to Enumeration.
- *
- * @see     java.util.Iterator
- * @see     java.io.SequenceInputStream
- * @see     java.util.Enumeration#nextElement()
- * @see     java.util.Hashtable
- * @see     java.util.Hashtable#elements()
- * @see     java.util.Hashtable#keys()
- * @see     java.util.Vector
- * @see     java.util.Vector#elements()
- *
- * @author  Lee Boynton
- * @since   JDK1.0
- */
-public interface Enumeration<E> {
-    /**
-     * Tests if this enumeration contains more elements.
-     *
-     * @return  <code>true</code> if and only if this enumeration object
-     *           contains at least one more element to provide;
-     *          <code>false</code> otherwise.
-     */
-    boolean hasMoreElements();
-
-    /**
-     * Returns the next element of this enumeration if this enumeration
-     * object has at least one more element to provide.
-     *
-     * @return     the next element of this enumeration.
-     * @exception  NoSuchElementException  if no more elements exist.
-     */
-    E nextElement();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/NoSuchElementException.java
--- a/emul/mini/src/main/java/java/util/NoSuchElementException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util;
-
-/**
- * Thrown by the <code>nextElement</code> method of an
- * <code>Enumeration</code> to indicate that there are no more
- * elements in the enumeration.
- *
- * @author  unascribed
- * @see     java.util.Enumeration
- * @see     java.util.Enumeration#nextElement()
- * @since   JDK1.0
- */
-public
-class NoSuchElementException extends RuntimeException {
-    private static final long serialVersionUID = 6769829250639411880L;
-
-    /**
-     * Constructs a <code>NoSuchElementException</code> with <tt>null</tt>
-     * as its error message string.
-     */
-    public NoSuchElementException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>NoSuchElementException</code>, saving a reference
-     * to the error message string <tt>s</tt> for later retrieval by the
-     * <tt>getMessage</tt> method.
-     *
-     * @param   s   the detail message.
-     */
-    public NoSuchElementException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/Adler32.java
--- a/emul/mini/src/main/java/java/util/zip/Adler32.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-/* Adler32.java - Computes Adler32 data checksum of a data stream
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package java.util.zip;
-
-/*
- * Written using on-line Java Platform 1.2 API Specification, as well
- * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
- * The actual Adler32 algorithm is taken from RFC 1950.
- * Status:  Believed complete and correct.
- */
-
-/**
- * Computes Adler32 checksum for a stream of data. An Adler32 
- * checksum is not as reliable as a CRC32 checksum, but a lot faster to 
- * compute.
- *<p>
- * The specification for Adler32 may be found in RFC 1950.
- * (ZLIB Compressed Data Format Specification version 3.3)
- *<p>
- *<p>
- * From that document:
- *<p>
- *      "ADLER32 (Adler-32 checksum)
- *       This contains a checksum value of the uncompressed data
- *       (excluding any dictionary data) computed according to Adler-32
- *       algorithm. This algorithm is a 32-bit extension and improvement
- *       of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
- *       standard. 
- *<p>
- *       Adler-32 is composed of two sums accumulated per byte: s1 is
- *       the sum of all bytes, s2 is the sum of all s1 values. Both sums
- *       are done modulo 65521. s1 is initialized to 1, s2 to zero.  The
- *       Adler-32 checksum is stored as s2*65536 + s1 in most-
- *       significant-byte first (network) order."
- *<p>
- * "8.2. The Adler-32 algorithm
- *<p>
- *    The Adler-32 algorithm is much faster than the CRC32 algorithm yet
- *    still provides an extremely low probability of undetected errors.
- *<p>
- *    The modulo on unsigned long accumulators can be delayed for 5552
- *    bytes, so the modulo operation time is negligible.  If the bytes
- *    are a, b, c, the second sum is 3a + 2b + c + 3, and so is position
- *    and order sensitive, unlike the first sum, which is just a
- *    checksum.  That 65521 is prime is important to avoid a possible
- *    large class of two-byte errors that leave the check unchanged.
- *    (The Fletcher checksum uses 255, which is not prime and which also
- *    makes the Fletcher check insensitive to single byte changes 0 <->
- *    255.)
- *<p>
- *    The sum s1 is initialized to 1 instead of zero to make the length
- *    of the sequence part of s2, so that the length does not have to be
- *   checked separately. (Any sequence of zeroes has a Fletcher
- *    checksum of zero.)"
- *
- * @author John Leuner, Per Bothner
- * @since JDK 1.1
- *
- * @see InflaterInputStream
- * @see DeflaterOutputStream
- */
-public class Adler32 implements Checksum
-{
-
-  /** largest prime smaller than 65536 */
-  private static final int BASE = 65521;
-
-  private int checksum; //we do all in int.
-
-  //Note that java doesn't have unsigned integers,
-  //so we have to be careful with what arithmetic 
-  //we do. We return the checksum as a long to 
-  //avoid sign confusion.
-
-  /**
-   * Creates a new instance of the <code>Adler32</code> class. 
-   * The checksum starts off with a value of 1. 
-   */
-  public Adler32 ()
-  {
-    reset();
-  }
-
-  /**
-   * Resets the Adler32 checksum to the initial value.
-   */
-  public void reset () 
-  {
-    checksum = 1; //Initialize to 1    
-  }
-
-  /**
-   * Updates the checksum with the byte b. 
-   *
-   * @param bval the data value to add. The high byte of the int is ignored.
-   */
-  public void update (int bval)
-  {
-    //We could make a length 1 byte array and call update again, but I
-    //would rather not have that overhead
-    int s1 = checksum & 0xffff;
-    int s2 = checksum >>> 16;
-    
-    s1 = (s1 + (bval & 0xFF)) % BASE;
-    s2 = (s1 + s2) % BASE;
-    
-    checksum = (s2 << 16) + s1;
-  }
-
-  /**
-   * Updates the checksum with the bytes taken from the array. 
-   * 
-   * @param buffer an array of bytes
-   */
-  public void update (byte[] buffer)
-  {
-    update(buffer, 0, buffer.length);
-  }
-
-  /**
-   * Updates the checksum with the bytes taken from the array. 
-   * 
-   * @param buf an array of bytes
-   * @param off the start of the data used for this update
-   * @param len the number of bytes to use for this update
-   */
-  public void update (byte[] buf, int off, int len)
-  {
-    //(By Per Bothner)
-    int s1 = checksum & 0xffff;
-    int s2 = checksum >>> 16;
-
-    while (len > 0)
-      {
-	// We can defer the modulo operation:
-	// s1 maximally grows from 65521 to 65521 + 255 * 3800
-	// s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31
-	int n = 3800;
-	if (n > len)
-	  n = len;
-	len -= n;
-	while (--n >= 0)
-	  {
-	    s1 = s1 + (buf[off++] & 0xFF);
-	    s2 = s2 + s1;
-	  }
-	s1 %= BASE;
-	s2 %= BASE;
-      }
-
-    /*Old implementation, borrowed from somewhere:
-    int n;
-    
-    while (len-- > 0) {
-
-      s1 = (s1 + (bs[offset++] & 0xff)) % BASE; 
-      s2 = (s2 + s1) % BASE;
-    }*/
-    
-    checksum = (s2 << 16) | s1;
-  }
-
-  /**
-   * Returns the Adler32 data checksum computed so far.
-   */
-  public long getValue()
-  {
-    return (long) checksum & 0xffffffffL;
-  }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/CRC32.java
--- a/emul/mini/src/main/java/java/util/zip/CRC32.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/* CRC32.java - Computes CRC32 data checksum of a data stream
-   Copyright (C) 1999. 2000, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package java.util.zip;
-
-/*
- * Written using on-line Java Platform 1.2 API Specification, as well
- * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
- * The actual CRC32 algorithm is taken from RFC 1952.
- * Status:  Believed complete and correct.
- */
-
-/**
- * Computes CRC32 data checksum of a data stream.
- * The actual CRC32 algorithm is described in RFC 1952
- * (GZIP file format specification version 4.3).
- * Can be used to get the CRC32 over a stream if used with checked input/output
- * streams.
- *
- * @see InflaterInputStream
- * @see DeflaterOutputStream
- *
- * @author Per Bothner
- * @date April 1, 1999.
- */
-public class CRC32 implements Checksum
-{
-  /** The crc data checksum so far. */
-  private int crc = 0;
-
-  /** The fast CRC table. Computed once when the CRC32 class is loaded. */
-  private static int[] crc_table = make_crc_table();
-
-  /** Make the table for a fast CRC. */
-  private static int[] make_crc_table ()
-  {
-    int[] crc_table = new int[256];
-    for (int n = 0; n < 256; n++)
-      {
-	int c = n;
-	for (int k = 8;  --k >= 0; )
-	  {
-	    if ((c & 1) != 0)
-	      c = 0xedb88320 ^ (c >>> 1);
-	    else
-	      c = c >>> 1;
-	  }
-	crc_table[n] = c;
-      }
-    return crc_table;
-  }
-
-  /**
-   * Returns the CRC32 data checksum computed so far.
-   */
-  public long getValue ()
-  {
-    return (long) crc & 0xffffffffL;
-  }
-
-  /**
-   * Resets the CRC32 data checksum as if no update was ever called.
-   */
-  public void reset () { crc = 0; }
-
-  /**
-   * Updates the checksum with the int bval. 
-   *
-   * @param bval (the byte is taken as the lower 8 bits of bval)
-   */
-
-  public void update (int bval)
-  {
-    int c = ~crc;
-    c = crc_table[(c ^ bval) & 0xff] ^ (c >>> 8);
-    crc = ~c;
-  }
-
-  /**
-   * Adds the byte array to the data checksum.
-   *
-   * @param buf the buffer which contains the data
-   * @param off the offset in the buffer where the data starts
-   * @param len the length of the data
-   */
-  public void update (byte[] buf, int off, int len)
-  {
-    int c = ~crc;
-    while (--len >= 0)
-      c = crc_table[(c ^ buf[off++]) & 0xff] ^ (c >>> 8);
-    crc = ~c;
-  }
-
-  /**
-   * Adds the complete byte array to the data checksum.
-   */
-  public void update (byte[] buf) { update(buf, 0, buf.length); }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/Checksum.java
--- a/emul/mini/src/main/java/java/util/zip/Checksum.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-/**
- * An interface representing a data checksum.
- *
- * @author      David Connelly
- */
-public
-interface Checksum {
-    /**
-     * Updates the current checksum with the specified byte.
-     *
-     * @param b the byte to update the checksum with
-     */
-    public void update(int b);
-
-    /**
-     * Updates the current checksum with the specified array of bytes.
-     * @param b the byte array to update the checksum with
-     * @param off the start offset of the data
-     * @param len the number of bytes to use for the update
-     */
-    public void update(byte[] b, int off, int len);
-
-    /**
-     * Returns the current checksum value.
-     * @return the current checksum value
-     */
-    public long getValue();
-
-    /**
-     * Resets the checksum to its initial value.
-     */
-    public void reset();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/DataFormatException.java
--- a/emul/mini/src/main/java/java/util/zip/DataFormatException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-/**
- * Signals that a data format error has occurred.
- *
- * @author      David Connelly
- */
-public
-class DataFormatException extends Exception {
-    private static final long serialVersionUID = 2219632870893641452L;
-
-    /**
-     * Constructs a DataFormatException with no detail message.
-     */
-    public DataFormatException() {
-        super();
-    }
-
-    /**
-     * Constructs a DataFormatException with the specified detail message.
-     * A detail message is a String that describes this particular exception.
-     * @param s the String containing a detail message
-     */
-    public DataFormatException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/Inflater.java
--- a/emul/mini/src/main/java/java/util/zip/Inflater.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,310 +0,0 @@
-/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-/**
- * This class provides support for general purpose decompression using the
- * popular ZLIB compression library. The ZLIB compression library was
- * initially developed as part of the PNG graphics standard and is not
- * protected by patents. It is fully described in the specifications at
- * the <a href="package-summary.html#package_description">java.util.zip
- * package description</a>.
- *
- * <p>The following code fragment demonstrates a trivial compression
- * and decompression of a string using <tt>Deflater</tt> and
- * <tt>Inflater</tt>.
- *
- * <blockquote><pre>
- * try {
- *     // Encode a String into bytes
- *     String inputString = "blahblahblah\u20AC\u20AC";
- *     byte[] input = inputString.getBytes("UTF-8");
- *
- *     // Compress the bytes
- *     byte[] output = new byte[100];
- *     Deflater compresser = new Deflater();
- *     compresser.setInput(input);
- *     compresser.finish();
- *     int compressedDataLength = compresser.deflate(output);
- *
- *     // Decompress the bytes
- *     Inflater decompresser = new Inflater();
- *     decompresser.setInput(output, 0, compressedDataLength);
- *     byte[] result = new byte[100];
- *     int resultLength = decompresser.inflate(result);
- *     decompresser.end();
- *
- *     // Decode the bytes into a String
- *     String outputString = new String(result, 0, resultLength, "UTF-8");
- * } catch(java.io.UnsupportedEncodingException ex) {
- *     // handle
- * } catch (java.util.zip.DataFormatException ex) {
- *     // handle
- * }
- * </pre></blockquote>
- *
- * @see         Deflater
- * @author      David Connelly
- *
- */
-public
-class Inflater {
-    private final org.apidesign.bck2brwsr.emul.zip.Inflater impl;
-    
-    /**
-     * Creates a new decompressor. If the parameter 'nowrap' is true then
-     * the ZLIB header and checksum fields will not be used. This provides
-     * compatibility with the compression format used by both GZIP and PKZIP.
-     * <p>
-     * Note: When using the 'nowrap' option it is also necessary to provide
-     * an extra "dummy" byte as input. This is required by the ZLIB native
-     * library in order to support certain optimizations.
-     *
-     * @param nowrap if true then support GZIP compatible compression
-     */
-    public Inflater(boolean nowrap) {
-        if (getClass() == org.apidesign.bck2brwsr.emul.zip.Inflater.class) {
-            impl = null;
-        } else {
-            impl = new org.apidesign.bck2brwsr.emul.zip.Inflater(nowrap);
-        }
-    }
-
-    /**
-     * Creates a new decompressor.
-     */
-    public Inflater() {
-        this(false);
-    }
-
-    /**
-     * Sets input data for decompression. Should be called whenever
-     * needsInput() returns true indicating that more input data is
-     * required.
-     * @param b the input data bytes
-     * @param off the start offset of the input data
-     * @param len the length of the input data
-     * @see Inflater#needsInput
-     */
-    public void setInput(byte[] b, int off, int len) {
-        impl.setInput(b, off, len);
-    }
-
-    /**
-     * Sets input data for decompression. Should be called whenever
-     * needsInput() returns true indicating that more input data is
-     * required.
-     * @param b the input data bytes
-     * @see Inflater#needsInput
-     */
-    public void setInput(byte[] b) {
-        impl.setInput(b);
-    }
-
-    /**
-     * Sets the preset dictionary to the given array of bytes. Should be
-     * called when inflate() returns 0 and needsDictionary() returns true
-     * indicating that a preset dictionary is required. The method getAdler()
-     * can be used to get the Adler-32 value of the dictionary needed.
-     * @param b the dictionary data bytes
-     * @param off the start offset of the data
-     * @param len the length of the data
-     * @see Inflater#needsDictionary
-     * @see Inflater#getAdler
-     */
-    public void setDictionary(byte[] b, int off, int len) {
-        impl.setDictionary(b, off, len);
-    }
-
-    /**
-     * Sets the preset dictionary to the given array of bytes. Should be
-     * called when inflate() returns 0 and needsDictionary() returns true
-     * indicating that a preset dictionary is required. The method getAdler()
-     * can be used to get the Adler-32 value of the dictionary needed.
-     * @param b the dictionary data bytes
-     * @see Inflater#needsDictionary
-     * @see Inflater#getAdler
-     */
-    public void setDictionary(byte[] b) {
-        impl.setDictionary(b);
-    }
-
-    /**
-     * Returns the total number of bytes remaining in the input buffer.
-     * This can be used to find out what bytes still remain in the input
-     * buffer after decompression has finished.
-     * @return the total number of bytes remaining in the input buffer
-     */
-    public int getRemaining() {
-        return impl.getRemaining();
-    }
-
-    /**
-     * Returns true if no data remains in the input buffer. This can
-     * be used to determine if #setInput should be called in order
-     * to provide more input.
-     * @return true if no data remains in the input buffer
-     */
-    public boolean needsInput() {
-        return impl.needsInput();
-    }
-
-    /**
-     * Returns true if a preset dictionary is needed for decompression.
-     * @return true if a preset dictionary is needed for decompression
-     * @see Inflater#setDictionary
-     */
-    public boolean needsDictionary() {
-        return impl.needsDictionary();
-    }
-
-    /**
-     * Returns true if the end of the compressed data stream has been
-     * reached.
-     * @return true if the end of the compressed data stream has been
-     * reached
-     */
-    public boolean finished() {
-        return impl.finished();
-    }
-
-    /**
-     * Uncompresses bytes into specified buffer. Returns actual number
-     * of bytes uncompressed. A return value of 0 indicates that
-     * needsInput() or needsDictionary() should be called in order to
-     * determine if more input data or a preset dictionary is required.
-     * In the latter case, getAdler() can be used to get the Adler-32
-     * value of the dictionary required.
-     * @param b the buffer for the uncompressed data
-     * @param off the start offset of the data
-     * @param len the maximum number of uncompressed bytes
-     * @return the actual number of uncompressed bytes
-     * @exception DataFormatException if the compressed data format is invalid
-     * @see Inflater#needsInput
-     * @see Inflater#needsDictionary
-     */
-    public int inflate(byte[] b, int off, int len)
-        throws DataFormatException
-    {
-        return impl.inflate(b, off, len);
-    }
-
-    /**
-     * Uncompresses bytes into specified buffer. Returns actual number
-     * of bytes uncompressed. A return value of 0 indicates that
-     * needsInput() or needsDictionary() should be called in order to
-     * determine if more input data or a preset dictionary is required.
-     * In the latter case, getAdler() can be used to get the Adler-32
-     * value of the dictionary required.
-     * @param b the buffer for the uncompressed data
-     * @return the actual number of uncompressed bytes
-     * @exception DataFormatException if the compressed data format is invalid
-     * @see Inflater#needsInput
-     * @see Inflater#needsDictionary
-     */
-    public int inflate(byte[] b) throws DataFormatException {
-        return impl.inflate(b);
-    }
-
-    /**
-     * Returns the ADLER-32 value of the uncompressed data.
-     * @return the ADLER-32 value of the uncompressed data
-     */
-    public int getAdler() {
-        return impl.getAdler();
-    }
-
-    /**
-     * Returns the total number of compressed bytes input so far.
-     *
-     * <p>Since the number of bytes may be greater than
-     * Integer.MAX_VALUE, the {@link #getBytesRead()} method is now
-     * the preferred means of obtaining this information.</p>
-     *
-     * @return the total number of compressed bytes input so far
-     */
-    public int getTotalIn() {
-        return impl.getTotalIn();
-    }
-
-    /**
-     * Returns the total number of compressed bytes input so far.</p>
-     *
-     * @return the total (non-negative) number of compressed bytes input so far
-     * @since 1.5
-     */
-    public long getBytesRead() {
-        return impl.getBytesRead();
-    }
-
-    /**
-     * Returns the total number of uncompressed bytes output so far.
-     *
-     * <p>Since the number of bytes may be greater than
-     * Integer.MAX_VALUE, the {@link #getBytesWritten()} method is now
-     * the preferred means of obtaining this information.</p>
-     *
-     * @return the total number of uncompressed bytes output so far
-     */
-    public int getTotalOut() {
-        return impl.getTotalOut();
-    }
-
-    /**
-     * Returns the total number of uncompressed bytes output so far.</p>
-     *
-     * @return the total (non-negative) number of uncompressed bytes output so far
-     * @since 1.5
-     */
-    public long getBytesWritten() {
-        return impl.getBytesWritten();
-    }
-
-    /**
-     * Resets inflater so that a new set of input data can be processed.
-     */
-    public void reset() {
-        impl.reset();
-    }
-
-    /**
-     * Closes the decompressor and discards any unprocessed input.
-     * This method should be called when the decompressor is no longer
-     * being used, but will also be called automatically by the finalize()
-     * method. Once this method is called, the behavior of the Inflater
-     * object is undefined.
-     */
-    public void end() {
-        impl.end();
-    }
-
-    /**
-     * Closes the decompressor when garbage is collected.
-     */
-    protected void finalize() {
-        end();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/InflaterInputStream.java
--- a/emul/mini/src/main/java/java/util/zip/InflaterInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-import java.io.FilterInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.EOFException;
-
-/**
- * This class implements a stream filter for uncompressing data in the
- * "deflate" compression format. It is also used as the basis for other
- * decompression filters, such as GZIPInputStream.
- *
- * @see         Inflater
- * @author      David Connelly
- */
-public
-class InflaterInputStream extends FilterInputStream {
-    /**
-     * Decompressor for this stream.
-     */
-    protected Inflater inf;
-
-    /**
-     * Input buffer for decompression.
-     */
-    protected byte[] buf;
-
-    /**
-     * Length of input buffer.
-     */
-    protected int len;
-
-    private boolean closed = false;
-    // this flag is set to true after EOF has reached
-    private boolean reachEOF = false;
-
-    /**
-     * Check to make sure that this stream has not been closed
-     */
-    private void ensureOpen() throws IOException {
-        if (closed) {
-            throw new IOException("Stream closed");
-        }
-    }
-
-
-    /**
-     * Creates a new input stream with the specified decompressor and
-     * buffer size.
-     * @param in the input stream
-     * @param inf the decompressor ("inflater")
-     * @param size the input buffer size
-     * @exception IllegalArgumentException if size is <= 0
-     */
-    public InflaterInputStream(InputStream in, Inflater inf, int size) {
-        super(in);
-        if (in == null || inf == null) {
-            throw new NullPointerException();
-        } else if (size <= 0) {
-            throw new IllegalArgumentException("buffer size <= 0");
-        }
-        this.inf = inf;
-        buf = new byte[size];
-    }
-
-    /**
-     * Creates a new input stream with the specified decompressor and a
-     * default buffer size.
-     * @param in the input stream
-     * @param inf the decompressor ("inflater")
-     */
-    public InflaterInputStream(InputStream in, Inflater inf) {
-        this(in, inf, 512);
-    }
-
-    boolean usesDefaultInflater = false;
-
-    /**
-     * Creates a new input stream with a default decompressor and buffer size.
-     * @param in the input stream
-     */
-    public InflaterInputStream(InputStream in) {
-        this(in, new Inflater());
-        usesDefaultInflater = true;
-    }
-
-    private byte[] singleByteBuf = new byte[1];
-
-    /**
-     * Reads a byte of uncompressed data. This method will block until
-     * enough input is available for decompression.
-     * @return the byte read, or -1 if end of compressed input is reached
-     * @exception IOException if an I/O error has occurred
-     */
-    public int read() throws IOException {
-        ensureOpen();
-        return read(singleByteBuf, 0, 1) == -1 ? -1 : singleByteBuf[0] & 0xff;
-    }
-
-    /**
-     * Reads uncompressed data into an array of bytes. If <code>len</code> is not
-     * zero, the method will block until some input can be decompressed; otherwise,
-     * no bytes are read and <code>0</code> is returned.
-     * @param b the buffer into which the data is read
-     * @param off the start offset in the destination array <code>b</code>
-     * @param len the maximum number of bytes read
-     * @return the actual number of bytes read, or -1 if the end of the
-     *         compressed input is reached or a preset dictionary is needed
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     * @exception ZipException if a ZIP format error has occurred
-     * @exception IOException if an I/O error has occurred
-     */
-    public int read(byte[] b, int off, int len) throws IOException {
-        ensureOpen();
-        if (b == null) {
-            throw new NullPointerException();
-        } else if (off < 0 || len < 0 || len > b.length - off) {
-            throw new IndexOutOfBoundsException();
-        } else if (len == 0) {
-            return 0;
-        }
-        try {
-            int n;
-            while ((n = inf.inflate(b, off, len)) == 0) {
-                if (inf.finished() || inf.needsDictionary()) {
-                    reachEOF = true;
-                    return -1;
-                }
-                if (inf.needsInput()) {
-                    fill();
-                }
-            }
-            return n;
-        } catch (DataFormatException e) {
-            String s = e.getMessage();
-            throw new ZipException(s != null ? s : "Invalid ZLIB data format");
-        }
-    }
-
-    /**
-     * Returns 0 after EOF has been reached, otherwise always return 1.
-     * <p>
-     * Programs should not count on this method to return the actual number
-     * of bytes that could be read without blocking.
-     *
-     * @return     1 before EOF and 0 after EOF.
-     * @exception  IOException  if an I/O error occurs.
-     *
-     */
-    public int available() throws IOException {
-        ensureOpen();
-        if (reachEOF) {
-            return 0;
-        } else {
-            return 1;
-        }
-    }
-
-    private byte[] b = new byte[512];
-
-    /**
-     * Skips specified number of bytes of uncompressed data.
-     * @param n the number of bytes to skip
-     * @return the actual number of bytes skipped.
-     * @exception IOException if an I/O error has occurred
-     * @exception IllegalArgumentException if n < 0
-     */
-    public long skip(long n) throws IOException {
-        if (n < 0) {
-            throw new IllegalArgumentException("negative skip length");
-        }
-        ensureOpen();
-        int max = (int)Math.min(n, Integer.MAX_VALUE);
-        int total = 0;
-        while (total < max) {
-            int len = max - total;
-            if (len > b.length) {
-                len = b.length;
-            }
-            len = read(b, 0, len);
-            if (len == -1) {
-                reachEOF = true;
-                break;
-            }
-            total += len;
-        }
-        return total;
-    }
-
-    /**
-     * Closes this input stream and releases any system resources associated
-     * with the stream.
-     * @exception IOException if an I/O error has occurred
-     */
-    public void close() throws IOException {
-        if (!closed) {
-            if (usesDefaultInflater)
-                inf.end();
-            in.close();
-            closed = true;
-        }
-    }
-
-    /**
-     * Fills input buffer with more data to decompress.
-     * @exception IOException if an I/O error has occurred
-     */
-    protected void fill() throws IOException {
-        ensureOpen();
-        len = in.read(buf, 0, buf.length);
-        if (len == -1) {
-            throw new EOFException("Unexpected end of ZLIB input stream");
-        }
-        inf.setInput(buf, 0, len);
-    }
-
-    /**
-     * Tests if this input stream supports the <code>mark</code> and
-     * <code>reset</code> methods. The <code>markSupported</code>
-     * method of <code>InflaterInputStream</code> returns
-     * <code>false</code>.
-     *
-     * @return  a <code>boolean</code> indicating if this stream type supports
-     *          the <code>mark</code> and <code>reset</code> methods.
-     * @see     java.io.InputStream#mark(int)
-     * @see     java.io.InputStream#reset()
-     */
-    public boolean markSupported() {
-        return false;
-    }
-
-    /**
-     * Marks the current position in this input stream.
-     *
-     * <p> The <code>mark</code> method of <code>InflaterInputStream</code>
-     * does nothing.
-     *
-     * @param   readlimit   the maximum limit of bytes that can be read before
-     *                      the mark position becomes invalid.
-     * @see     java.io.InputStream#reset()
-     */
-    public synchronized void mark(int readlimit) {
-    }
-
-    /**
-     * Repositions this stream to the position at the time the
-     * <code>mark</code> method was last called on this input stream.
-     *
-     * <p> The method <code>reset</code> for class
-     * <code>InflaterInputStream</code> does nothing except throw an
-     * <code>IOException</code>.
-     *
-     * @exception  IOException  if this method is invoked.
-     * @see     java.io.InputStream#mark(int)
-     * @see     java.io.IOException
-     */
-    public synchronized void reset() throws IOException {
-        throw new IOException("mark/reset not supported");
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/ZStreamRef.java
--- a/emul/mini/src/main/java/java/util/zip/ZStreamRef.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-/**
- * A reference to the native zlib's z_stream structure.
- */
-
-class ZStreamRef {
-
-    private long address;
-    ZStreamRef (long address) {
-        this.address = address;
-    }
-
-    long address() {
-        return address;
-    }
-
-    void clear() {
-        address = 0;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/ZipConstants.java
--- a/emul/mini/src/main/java/java/util/zip/ZipConstants.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-/*
- * This interface defines the constants that are used by the classes
- * which manipulate ZIP files.
- *
- * @author      David Connelly
- */
-interface ZipConstants {
-    /*
-     * Header signatures
-     */
-    static long LOCSIG = 0x04034b50L;   // "PK\003\004"
-    static long EXTSIG = 0x08074b50L;   // "PK\007\008"
-    static long CENSIG = 0x02014b50L;   // "PK\001\002"
-    static long ENDSIG = 0x06054b50L;   // "PK\005\006"
-
-    /*
-     * Header sizes in bytes (including signatures)
-     */
-    static final int LOCHDR = 30;       // LOC header size
-    static final int EXTHDR = 16;       // EXT header size
-    static final int CENHDR = 46;       // CEN header size
-    static final int ENDHDR = 22;       // END header size
-
-    /*
-     * Local file (LOC) header field offsets
-     */
-    static final int LOCVER = 4;        // version needed to extract
-    static final int LOCFLG = 6;        // general purpose bit flag
-    static final int LOCHOW = 8;        // compression method
-    static final int LOCTIM = 10;       // modification time
-    static final int LOCCRC = 14;       // uncompressed file crc-32 value
-    static final int LOCSIZ = 18;       // compressed size
-    static final int LOCLEN = 22;       // uncompressed size
-    static final int LOCNAM = 26;       // filename length
-    static final int LOCEXT = 28;       // extra field length
-
-    /*
-     * Extra local (EXT) header field offsets
-     */
-    static final int EXTCRC = 4;        // uncompressed file crc-32 value
-    static final int EXTSIZ = 8;        // compressed size
-    static final int EXTLEN = 12;       // uncompressed size
-
-    /*
-     * Central directory (CEN) header field offsets
-     */
-    static final int CENVEM = 4;        // version made by
-    static final int CENVER = 6;        // version needed to extract
-    static final int CENFLG = 8;        // encrypt, decrypt flags
-    static final int CENHOW = 10;       // compression method
-    static final int CENTIM = 12;       // modification time
-    static final int CENCRC = 16;       // uncompressed file crc-32 value
-    static final int CENSIZ = 20;       // compressed size
-    static final int CENLEN = 24;       // uncompressed size
-    static final int CENNAM = 28;       // filename length
-    static final int CENEXT = 30;       // extra field length
-    static final int CENCOM = 32;       // comment length
-    static final int CENDSK = 34;       // disk number start
-    static final int CENATT = 36;       // internal file attributes
-    static final int CENATX = 38;       // external file attributes
-    static final int CENOFF = 42;       // LOC header offset
-
-    /*
-     * End of central directory (END) header field offsets
-     */
-    static final int ENDSUB = 8;        // number of entries on this disk
-    static final int ENDTOT = 10;       // total number of entries
-    static final int ENDSIZ = 12;       // central directory size in bytes
-    static final int ENDOFF = 16;       // offset of first CEN header
-    static final int ENDCOM = 20;       // zip file comment length
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/ZipEntry.java
--- a/emul/mini/src/main/java/java/util/zip/ZipEntry.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,331 +0,0 @@
-/*
- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-/**
- * This class is used to represent a ZIP file entry.
- *
- * @author      David Connelly
- */
-public
-class ZipEntry implements ZipConstants, Cloneable {
-    String name;        // entry name
-    long time = -1;     // modification time (in DOS time)
-    long crc = -1;      // crc-32 of entry data
-    long size = -1;     // uncompressed size of entry data
-    long csize = -1;    // compressed size of entry data
-    int method = -1;    // compression method
-    int flag = 0;       // general purpose flag
-    byte[] extra;       // optional extra field data for entry
-    String comment;     // optional comment string for entry
-
-    /**
-     * Compression method for uncompressed entries.
-     */
-    public static final int STORED = 0;
-
-    /**
-     * Compression method for compressed (deflated) entries.
-     */
-    public static final int DEFLATED = 8;
-
-    /**
-     * Creates a new zip entry with the specified name.
-     *
-     * @param name the entry name
-     * @exception NullPointerException if the entry name is null
-     * @exception IllegalArgumentException if the entry name is longer than
-     *            0xFFFF bytes
-     */
-    public ZipEntry(String name) {
-        if (name == null) {
-            throw new NullPointerException();
-        }
-        if (name.length() > 0xFFFF) {
-            throw new IllegalArgumentException("entry name too long");
-        }
-        this.name = name;
-    }
-
-    /**
-     * Creates a new zip entry with fields taken from the specified
-     * zip entry.
-     * @param e a zip Entry object
-     */
-    public ZipEntry(ZipEntry e) {
-        name = e.name;
-        time = e.time;
-        crc = e.crc;
-        size = e.size;
-        csize = e.csize;
-        method = e.method;
-        flag = e.flag;
-        extra = e.extra;
-        comment = e.comment;
-    }
-
-    /*
-     * Creates a new un-initialized zip entry
-     */
-    ZipEntry() {}
-
-    /**
-     * Returns the name of the entry.
-     * @return the name of the entry
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the modification time of the entry.
-     * @param time the entry modification time in number of milliseconds
-     *             since the epoch
-     * @see #getTime()
-     */
-    public void setTime(long time) {
-        this.time = javaToDosTime(time);
-    }
-
-    /**
-     * Returns the modification time of the entry, or -1 if not specified.
-     * @return the modification time of the entry, or -1 if not specified
-     * @see #setTime(long)
-     */
-    public long getTime() {
-        return time != -1 ? dosToJavaTime(time) : -1;
-    }
-
-    /**
-     * Sets the uncompressed size of the entry data.
-     * @param size the uncompressed size in bytes
-     * @exception IllegalArgumentException if the specified size is less
-     *            than 0, is greater than 0xFFFFFFFF when
-     *            <a href="package-summary.html#zip64">ZIP64 format</a> is not supported,
-     *            or is less than 0 when ZIP64 is supported
-     * @see #getSize()
-     */
-    public void setSize(long size) {
-        if (size < 0) {
-            throw new IllegalArgumentException("invalid entry size");
-        }
-        this.size = size;
-    }
-
-    /**
-     * Returns the uncompressed size of the entry data, or -1 if not known.
-     * @return the uncompressed size of the entry data, or -1 if not known
-     * @see #setSize(long)
-     */
-    public long getSize() {
-        return size;
-    }
-
-    /**
-     * Returns the size of the compressed entry data, or -1 if not known.
-     * In the case of a stored entry, the compressed size will be the same
-     * as the uncompressed size of the entry.
-     * @return the size of the compressed entry data, or -1 if not known
-     * @see #setCompressedSize(long)
-     */
-    public long getCompressedSize() {
-        return csize;
-    }
-
-    /**
-     * Sets the size of the compressed entry data.
-     * @param csize the compressed size to set to
-     * @see #getCompressedSize()
-     */
-    public void setCompressedSize(long csize) {
-        this.csize = csize;
-    }
-
-    /**
-     * Sets the CRC-32 checksum of the uncompressed entry data.
-     * @param crc the CRC-32 value
-     * @exception IllegalArgumentException if the specified CRC-32 value is
-     *            less than 0 or greater than 0xFFFFFFFF
-     * @see #getCrc()
-     */
-    public void setCrc(long crc) {
-        if (crc < 0 || crc > 0xFFFFFFFFL) {
-            throw new IllegalArgumentException("invalid entry crc-32");
-        }
-        this.crc = crc;
-    }
-
-    /**
-     * Returns the CRC-32 checksum of the uncompressed entry data, or -1 if
-     * not known.
-     * @return the CRC-32 checksum of the uncompressed entry data, or -1 if
-     * not known
-     * @see #setCrc(long)
-     */
-    public long getCrc() {
-        return crc;
-    }
-
-    /**
-     * Sets the compression method for the entry.
-     * @param method the compression method, either STORED or DEFLATED
-     * @exception IllegalArgumentException if the specified compression
-     *            method is invalid
-     * @see #getMethod()
-     */
-    public void setMethod(int method) {
-        if (method != STORED && method != DEFLATED) {
-            throw new IllegalArgumentException("invalid compression method");
-        }
-        this.method = method;
-    }
-
-    /**
-     * Returns the compression method of the entry, or -1 if not specified.
-     * @return the compression method of the entry, or -1 if not specified
-     * @see #setMethod(int)
-     */
-    public int getMethod() {
-        return method;
-    }
-
-    /**
-     * Sets the optional extra field data for the entry.
-     * @param extra the extra field data bytes
-     * @exception IllegalArgumentException if the length of the specified
-     *            extra field data is greater than 0xFFFF bytes
-     * @see #getExtra()
-     */
-    public void setExtra(byte[] extra) {
-        if (extra != null && extra.length > 0xFFFF) {
-            throw new IllegalArgumentException("invalid extra field length");
-        }
-        this.extra = extra;
-    }
-
-    /**
-     * Returns the extra field data for the entry, or null if none.
-     * @return the extra field data for the entry, or null if none
-     * @see #setExtra(byte[])
-     */
-    public byte[] getExtra() {
-        return extra;
-    }
-
-    /**
-     * Sets the optional comment string for the entry.
-     *
-     * <p>ZIP entry comments have maximum length of 0xffff. If the length of the
-     * specified comment string is greater than 0xFFFF bytes after encoding, only
-     * the first 0xFFFF bytes are output to the ZIP file entry.
-     *
-     * @param comment the comment string
-     *
-     * @see #getComment()
-     */
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    /**
-     * Returns the comment string for the entry, or null if none.
-     * @return the comment string for the entry, or null if none
-     * @see #setComment(String)
-     */
-    public String getComment() {
-        return comment;
-    }
-
-    /**
-     * Returns true if this is a directory entry. A directory entry is
-     * defined to be one whose name ends with a '/'.
-     * @return true if this is a directory entry
-     */
-    public boolean isDirectory() {
-        return name.endsWith("/");
-    }
-
-    /**
-     * Returns a string representation of the ZIP entry.
-     */
-    public String toString() {
-        return getName();
-    }
-
-    /*
-     * Converts DOS time to Java time (number of milliseconds since epoch).
-     */
-    private static long dosToJavaTime(long dtime) {
-        return dtime;
-        /* XXX:
-        Date d = new Date((int)(((dtime >> 25) & 0x7f) + 80),
-                          (int)(((dtime >> 21) & 0x0f) - 1),
-                          (int)((dtime >> 16) & 0x1f),
-                          (int)((dtime >> 11) & 0x1f),
-                          (int)((dtime >> 5) & 0x3f),
-                          (int)((dtime << 1) & 0x3e));
-        return d.getTime();
-        */
-    }
-
-    /*
-     * Converts Java time to DOS time.
-     */
-    private static long javaToDosTime(long time) {
-        return time;
-        /* XXX:
-        Date d = new Date(time);
-        int year = d.getYear() + 1900;
-        if (year < 1980) {
-            return (1 << 21) | (1 << 16);
-        }
-        return (year - 1980) << 25 | (d.getMonth() + 1) << 21 |
-               d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 |
-               d.getSeconds() >> 1;
-        */
-    }
-
-    /**
-     * Returns the hash code value for this entry.
-     */
-    public int hashCode() {
-        return name.hashCode();
-    }
-
-    /**
-     * Returns a copy of this entry.
-     */
-    public Object clone() {
-        try {
-            ZipEntry e = (ZipEntry)super.clone();
-            e.extra = (extra == null) ? null : extra.clone();
-            return e;
-        } catch (CloneNotSupportedException e) {
-            // This should never happen, since we are Cloneable
-            throw new IllegalStateException();
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/ZipException.java
--- a/emul/mini/src/main/java/java/util/zip/ZipException.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-import java.io.IOException;
-
-/**
- * Signals that a Zip exception of some sort has occurred.
- *
- * @author  unascribed
- * @see     java.io.IOException
- * @since   JDK1.0
- */
-
-public
-class ZipException extends IOException {
-    private static final long serialVersionUID = 8000196834066748623L;
-
-    /**
-     * Constructs a <code>ZipException</code> with <code>null</code>
-     * as its error detail message.
-     */
-    public ZipException() {
-        super();
-    }
-
-    /**
-     * Constructs a <code>ZipException</code> with the specified detail
-     * message.
-     *
-     * @param   s   the detail message.
-     */
-
-    public ZipException(String s) {
-        super(s);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/ZipInputStream.java
--- a/emul/mini/src/main/java/java/util/zip/ZipInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.util.zip;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * This class implements an input stream filter for reading files in the
- * ZIP file format. Includes support for both compressed and uncompressed
- * entries.
- *
- * @author      David Connelly
- */
-public
-class ZipInputStream extends InflaterInputStream implements ZipConstants {
-    private final org.apidesign.bck2brwsr.emul.zip.ZipInputStream impl;
-
-    /**
-     * Creates a new ZIP input stream.
-     *
-     * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
-     * decode the entry names.
-     *
-     * @param in the actual input stream
-     */
-    public ZipInputStream(InputStream in) {
-        super(in);
-        impl = new org.apidesign.bck2brwsr.emul.zip.ZipInputStream(in);
-    }
-
-    /**
-     * Creates a new ZIP input stream.
-     *
-     * @param in the actual input stream
-     *
-     * @param charset
-     *        The {@linkplain java.nio.charset.Charset charset} to be
-     *        used to decode the ZIP entry name (ignored if the
-     *        <a href="package-summary.html#lang_encoding"> language
-     *        encoding bit</a> of the ZIP entry's general purpose bit
-     *        flag is set).
-     *
-     * @since 1.7
-     *
-    public ZipInputStream(InputStream in, Charset charset) {
-        super(new PushbackInputStream(in, 512), new Inflater(true), 512);
-        usesDefaultInflater = true;
-        if(in == null) {
-            throw new NullPointerException("in is null");
-        }
-        if (charset == null)
-            throw new NullPointerException("charset is null");
-        this.zc = ZipCoder.get(charset);
-    }
-    */
-
-    /**
-     * Reads the next ZIP file entry and positions the stream at the
-     * beginning of the entry data.
-     * @return the next ZIP file entry, or null if there are no more entries
-     * @exception ZipException if a ZIP file error has occurred
-     * @exception IOException if an I/O error has occurred
-     */
-    public ZipEntry getNextEntry() throws IOException {
-        return impl.getNextEntry();
-    }
-
-    /**
-     * Closes the current ZIP entry and positions the stream for reading the
-     * next entry.
-     * @exception ZipException if a ZIP file error has occurred
-     * @exception IOException if an I/O error has occurred
-     */
-    public void closeEntry() throws IOException {
-        impl.closeEntry();
-    }
-
-    /**
-     * Returns 0 after EOF has reached for the current entry data,
-     * otherwise always return 1.
-     * <p>
-     * Programs should not count on this method to return the actual number
-     * of bytes that could be read without blocking.
-     *
-     * @return     1 before EOF and 0 after EOF has reached for current entry.
-     * @exception  IOException  if an I/O error occurs.
-     *
-     */
-    public int available() throws IOException {
-        return impl.available();
-    }
-
-    /**
-     * Reads from the current ZIP entry into an array of bytes.
-     * If <code>len</code> is not zero, the method
-     * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
-     * @param b the buffer into which the data is read
-     * @param off the start offset in the destination array <code>b</code>
-     * @param len the maximum number of bytes read
-     * @return the actual number of bytes read, or -1 if the end of the
-     *         entry is reached
-     * @exception  NullPointerException if <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException if <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     * @exception ZipException if a ZIP file error has occurred
-     * @exception IOException if an I/O error has occurred
-     */
-    public int read(byte[] b, int off, int len) throws IOException {
-        return impl.read(b, off, len);
-    }
-
-    /**
-     * Skips specified number of bytes in the current ZIP entry.
-     * @param n the number of bytes to skip
-     * @return the actual number of bytes skipped
-     * @exception ZipException if a ZIP file error has occurred
-     * @exception IOException if an I/O error has occurred
-     * @exception IllegalArgumentException if n < 0
-     */
-    public long skip(long n) throws IOException {
-        return impl.skip(n);
-    }
-
-    /**
-     * Closes this input stream and releases any system resources associated
-     * with the stream.
-     * @exception IOException if an I/O error has occurred
-     */
-    public void close() throws IOException {
-        impl.close();
-    }
-
-    /**
-     * Creates a new <code>ZipEntry</code> object for the specified
-     * entry name.
-     *
-     * @param name the ZIP file entry name
-     * @return the ZipEntry just created
-     */
-    protected ZipEntry createZipEntry(String name) {
-        return new ZipEntry(name);
-    }
-
-    @Override
-    public int read() throws IOException {
-        return impl.read();
-    }
-
-    @Override
-    public boolean markSupported() {
-        return impl.markSupported();
-    }
-
-    @Override
-    public void mark(int readlimit) {
-        impl.mark(readlimit);
-    }
-
-    @Override
-    public void reset() throws IOException {
-        impl.reset();
-    }
-
-    @Override
-    public int read(byte[] b) throws IOException {
-        return impl.read(b);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/java/util/zip/package.html
--- a/emul/mini/src/main/java/java/util/zip/package.html	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-This code is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 only, as
-published by the Free Software Foundation.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
--->
-
-</head>
-<body bgcolor="white">
-
-Provides classes for reading and writing the standard ZIP and GZIP
-file formats.  Also includes classes for compressing and decompressing
-data using the DEFLATE compression algorithm, which is used by the
-ZIP and GZIP file formats. Additionally, there are utility classes
-for computing the CRC-32 and Adler-32 checksums of arbitrary
-input streams.
-
-
-<h2>Package Specification</h2>
-
-</a>
-<ul>
-  <li><a href="ftp://ftp.uu.net/pub/archiving/zip/doc/appnote-970311-iz.zip">
-      Info-ZIP Application Note 970311
-      </a> - a detailed description of the Info-ZIP format upon which
-      the <code>java.util.zip</code> classes are based.
-<p>
-  <a name="zip64">
-  <li>An implementation may optionally support the ZIP64(tm) format extensions
-      defined by the 
-      <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">
-      PKWARE ZIP File Format Specification</a>. The ZIP64(tm) format extensions
-      are used to overcome the size limitations of the original ZIP format.
-<p>
-  <a name="lang_encoding">
-  <li>APPENDIX D of <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">
-      PKWARE ZIP File Format Specification</a> - Language Encoding Flag (EFS) to
-      encode ZIP entry filename and comment fields using UTF-8.
-<p>
-  <li><a href="http://www.ietf.org/rfc/rfc1950.txt">
-      ZLIB Compressed Data Format Specification version 3.3</a>
-      &nbsp;
-      <a href="http://www.ietf.org/rfc/rfc1950.txt.pdf">(pdf)</a>
-      (RFC 1950)
-<p>
-  <li><a href="http://www.ietf.org/rfc/rfc1951.txt">
-      DEFLATE Compressed Data Format Specification version 1.3</a>
-      &nbsp;
-      <a href="http://www.ietf.org/rfc/rfc1951.txt.pdf">(pdf)</a>
-      (RFC 1951)
-<p>
-  <li><a href="http://www.ietf.org/rfc/rfc1952.txt">
-      GZIP file format specification version 4.3</a>
-      &nbsp;
-      <a href="http://www.ietf.org/rfc/rfc1952.txt.pdf">(pdf)</a>
-      (RFC 1952)
-<p>
-  <li>CRC-32 checksum is described in RFC 1952 (above)
-<p>
-  <li>Adler-32 checksum is described in RFC 1950 (above)
-</ul>
-
-
-<!--
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
-  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
--->
-
-@since JDK1.1
-</body>
-</html>
-
-
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/ManifestInputStream.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/ManifestInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.apidesign.bck2brwsr.emul.lang;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/*
- * A fast buffered input stream for parsing manifest files.
- * 
- * Taken from java.util.jar.Manifest.FastInputStream and modified to be
- * independent of other Manifest functionality.
- */
-public abstract class ManifestInputStream extends FilterInputStream {
-    private byte[] buf;
-    private int count = 0;
-    private int pos = 0;
-
-    protected ManifestInputStream(InputStream in) {
-        this(in, 8192);
-    }
-
-    protected ManifestInputStream(InputStream in, int size) {
-        super(in);
-        buf = new byte[size];
-    }
-
-    public int read() throws IOException {
-        if (pos >= count) {
-            fill();
-            if (pos >= count) {
-                return -1;
-            }
-        }
-        return buf[pos++] & 0xff;
-    }
-
-    public int read(byte[] b, int off, int len) throws IOException {
-        int avail = count - pos;
-        if (avail <= 0) {
-            if (len >= buf.length) {
-                return in.read(b, off, len);
-            }
-            fill();
-            avail = count - pos;
-            if (avail <= 0) {
-                return -1;
-            }
-        }
-        if (len > avail) {
-            len = avail;
-        }
-        System.arraycopy(buf, pos, b, off, len);
-        pos += len;
-        return len;
-    }
-
-    /*
-     * Reads 'len' bytes from the input stream, or until an end-of-line
-     * is reached. Returns the number of bytes read.
-     */
-    public int readLine(byte[] b, int off, int len) throws IOException {
-        byte[] tbuf = this.buf;
-        int total = 0;
-        while (total < len) {
-            int avail = count - pos;
-            if (avail <= 0) {
-                fill();
-                avail = count - pos;
-                if (avail <= 0) {
-                    return -1;
-                }
-            }
-            int n = len - total;
-            if (n > avail) {
-                n = avail;
-            }
-            int tpos = pos;
-            int maxpos = tpos + n;
-            while (tpos < maxpos && tbuf[tpos++] != '\n') {
-                ;
-            }
-            n = tpos - pos;
-            System.arraycopy(tbuf, pos, b, off, n);
-            off += n;
-            total += n;
-            pos = tpos;
-            if (tbuf[tpos - 1] == '\n') {
-                break;
-            }
-        }
-        return total;
-    }
-
-    public byte peek() throws IOException {
-        if (pos == count) {
-            fill();
-        }
-        if (pos == count) {
-            return -1; // nothing left in buffer
-        }
-        return buf[pos];
-    }
-
-    public int readLine(byte[] b) throws IOException {
-        return readLine(b, 0, b.length);
-    }
-
-    public long skip(long n) throws IOException {
-        if (n <= 0) {
-            return 0;
-        }
-        long avail = count - pos;
-        if (avail <= 0) {
-            return in.skip(n);
-        }
-        if (n > avail) {
-            n = avail;
-        }
-        pos += n;
-        return n;
-    }
-
-    public int available() throws IOException {
-        return (count - pos) + in.available();
-    }
-
-    public void close() throws IOException {
-        if (in != null) {
-            in.close();
-            in = null;
-            buf = null;
-        }
-    }
-
-    private void fill() throws IOException {
-        count = pos = 0;
-        int n = in.read(buf, 0, buf.length);
-        if (n > 0) {
-            count = n;
-        }
-    }
-    
-    protected abstract String putValue(String key, String value);
-
-    public void readAttributes(byte[] lbuf) throws IOException {
-        ManifestInputStream is = this;
-
-        String name = null;
-        String value = null;
-        byte[] lastline = null;
-        int len;
-        while ((len = is.readLine(lbuf)) != -1) {
-            boolean lineContinued = false;
-            if (lbuf[--len] != '\n') {
-                throw new IOException("line too long");
-            }
-            if (len > 0 && lbuf[len - 1] == '\r') {
-                --len;
-            }
-            if (len == 0) {
-                break;
-            }
-            int i = 0;
-            if (lbuf[0] == ' ') {
-                if (name == null) {
-                    throw new IOException("misplaced continuation line");
-                }
-                lineContinued = true;
-                byte[] buf = new byte[lastline.length + len - 1];
-                System.arraycopy(lastline, 0, buf, 0, lastline.length);
-                System.arraycopy(lbuf, 1, buf, lastline.length, len - 1);
-                if (is.peek() == ' ') {
-                    lastline = buf;
-                    continue;
-                }
-                value = new String(buf, 0, buf.length, "UTF8");
-                lastline = null;
-            } else {
-                while (lbuf[i++] != ':') {
-                    if (i >= len) {
-                        throw new IOException("invalid header field");
-                    }
-                }
-                if (lbuf[i++] != ' ') {
-                    throw new IOException("invalid header field");
-                }
-                name = new String(lbuf, 0, 0, i - 2);
-                if (is.peek() == ' ') {
-                    lastline = new byte[len - i];
-                    System.arraycopy(lbuf, i, lastline, 0, len - i);
-                    continue;
-                }
-                value = new String(lbuf, i, len - i, "UTF8");
-            }
-            try {
-                if ((putValue(name, value) != null) && (!lineContinued)) {
-                    throw new IOException("Duplicate name in Manifest: " + name + ".\n" + "Ensure that the manifest does not " + "have duplicate entries, and\n" + "that blank lines separate " + "individual sections in both your\n" + "manifest and in the META-INF/MANIFEST.MF " + "entry in the jar file.");
-                }
-            } catch (IllegalArgumentException e) {
-                throw new IOException("invalid header field name: " + name);
-            }
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.emul.lang;
-
-import java.lang.reflect.Method;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class System {
-    private System() {
-    }
-
-    @JavaScriptBody(args = { "value", "srcBegin", "dst", "dstBegin", "count" }, body = 
-        "if (srcBegin < dstBegin) {\n" +
-        "    while (count-- > 0) {\n" +
-        "        dst[dstBegin + count] = value[srcBegin + count];\n" +
-        "    }\n" +
-        "} else {\n" +
-        "    while (count-- > 0) {\n" +
-        "        dst[dstBegin++] = value[srcBegin++];\n" +
-        "    }\n" +
-        "}"
-    )
-    public static void arraycopy(Object src, int srcBegin, Object dst, int dstBegin, int count) {
-        try {
-            Class<?> system = Class.forName("java.lang.System");
-            Method m = system.getMethod("arraycopy", Object.class, int.class, Object.class, int.class, int.class);
-            m.invoke(null, src, srcBegin, dst, dstBegin, count);
-        } catch (Exception ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    @JavaScriptBody(args = { "arr", "expectedSize" }, body = 
-        "while (expectedSize-- > arr.length) { arr.push(0); }; return arr;"
-    )
-    public static native byte[] expandArray(byte[] arr, int expectedSize);
-
-    @JavaScriptBody(args = {}, body = "return new Date().getTime();")
-    public static native long currentTimeMillis();
-    
-    public static long nanoTime() {
-        return 1000000L * currentTimeMillis();
-    }
-    @JavaScriptBody(args = { "obj" }, body="return vm.java_lang_Object(false).hashCode__I.call(obj);")
-    public static native int identityHashCode(Object obj);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/AnnotationImpl.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/AnnotationImpl.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.emul.reflect;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class AnnotationImpl implements Annotation {
-    private final Class<? extends Annotation> type;
-
-    public AnnotationImpl(Class<? extends Annotation> type) {
-        this.type = type;
-    }
-    
-    public Class<? extends Annotation> annotationType() {
-        return type;
-    }
-
-    @JavaScriptBody(args = { "a", "n", "arr", "values" }, body = ""
-        + "function f(val, prop, clazz) {\n"
-        + "  return function() {\n"
-        + "    if (clazz == null) return val[prop];\n"
-        + "    if (clazz.isArray__Z()) {\n"
-        + "      var valarr = val[prop];\n"
-        + "      var cmp = clazz.getComponentType__Ljava_lang_Class_2();\n"
-        + "      var retarr = vm.java_lang_reflect_Array(false).newInstance__Ljava_lang_Object_2Ljava_lang_Class_2I(cmp, valarr.length);\n"
-        + "      for (var i = 0; i < valarr.length; i++) {\n"
-        + "        retarr[i] = CLS.prototype.c__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_Object_2(cmp, valarr[i]);\n"
-        + "      }\n"
-        + "      return retarr;\n"
-        + "    }\n"
-        + "    return CLS.prototype.c__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_Object_2(clazz, val[prop]);\n"
-        + "  };\n"
-        + "}\n"
-        + "for (var i = 0; i < arr.length; i += 3) {\n"
-        + "  var m = arr[i];\n"
-        + "  var p = arr[i + 1];\n"
-        + "  var c = arr[i + 2];\n"
-        + "  a[m] = f(values, p, c);\n"
-        + "}\n"
-        + "a['$instOf_' + n] = true;\n"
-        + "return a;"
-    )
-    private static native <T extends Annotation> T create(
-        AnnotationImpl a, String n, Object[] methodsAndProps, Object values
-    );
-    
-    private static Object c(Class<? extends Annotation> a, Object v) {
-        return create(a, v);
-    }
-    
-    public static <T extends Annotation> T create(Class<T> annoClass, Object values) {
-        return create(new AnnotationImpl(annoClass), 
-            annoClass.getName().replace('.', '_'), 
-            findProps(annoClass), values
-        );
-    }
-
-    public static Annotation[] create(Object anno) {
-        String[] names = findNames(anno);
-        Annotation[] ret = new Annotation[names.length];
-        for (int i = 0; i < names.length; i++) {
-            String annoNameSlash = names[i].substring(1, names[i].length() - 1);
-            Class<? extends Annotation> annoClass;
-            try {
-                annoClass = (Class<? extends Annotation>)Class.forName(annoNameSlash.replace('/', '.'));
-            } catch (ClassNotFoundException ex) {
-                throw new IllegalStateException("Can't find annotation class " + annoNameSlash);
-            }
-            ret[i] = create(
-                new AnnotationImpl(annoClass), 
-                annoNameSlash.replace('/', '_'),
-                findProps(annoClass),
-                findData(anno, names[i])
-            );
-        }
-        return ret;
-    }
-    @JavaScriptBody(args = "anno", body =
-          "var arr = new Array();"
-        + "var props = Object.getOwnPropertyNames(anno);\n"
-        + "for (var i = 0; i < props.length; i++) {\n"
-        + "  var p = props[i];\n"
-        + "  arr.push(p);"
-        + "}"
-        + "return arr;"
-    )
-    private static native String[] findNames(Object anno);
-
-    @JavaScriptBody(args={ "anno", "p"}, body="return anno[p];")
-    private static native Object findData(Object anno, String p);
-
-    private static Object[] findProps(Class<?> annoClass) {
-        final Method[] marr = MethodImpl.findMethods(annoClass, Modifier.PUBLIC);
-        Object[] arr = new Object[marr.length * 3];
-        int pos = 0;
-        for (Method m : marr) {
-            arr[pos++] = MethodImpl.toSignature(m);
-            arr[pos++] = m.getName();
-            final Class<?> rt = m.getReturnType();
-            if (rt.isArray()) {
-                arr[pos++] = rt.getComponentType().isAnnotation() ? rt : null;
-            } else {
-                arr[pos++] = rt.isAnnotation() ? rt : null;
-            }
-        }
-        return arr;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/MethodImpl.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/MethodImpl.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.emul.reflect;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.util.Enumeration;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/** Utilities to work on methods.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public abstract class MethodImpl {
-    public static MethodImpl INSTANCE;
-    static {
-        try {
-            Class.forName(Method.class.getName());
-        } catch (ClassNotFoundException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    protected abstract Method create(Class<?> declaringClass, String name, Object data, String sig);
-    
-    
-    //
-    // bck2brwsr implementation
-    //
-
-    @JavaScriptBody(args = {"clazz", "prefix"},
-        body = ""
-        + "var c = clazz.cnstr.prototype;"
-        + "var arr = new Array();\n"
-        + "for (m in c) {\n"
-        + "  if (m.indexOf(prefix) === 0) {\n"
-        + "     if (!c[m].cls) continue;\n"
-        + "     arr.push(m);\n"
-        + "     arr.push(c[m]);\n"
-        + "     arr.push(c[m].cls.$class);\n"
-        + "  }"
-        + "}\n"
-        + "return arr;")
-    private static native Object[] findMethodData(
-        Class<?> clazz, String prefix);
-
-    public static Method findMethod(
-        Class<?> clazz, String name, Class<?>... parameterTypes) {
-        Object[] data = findMethodData(clazz, name + "__");
-        BIG: for (int i = 0; i < data.length; i += 3) {
-            String sig = ((String) data[i]).substring(name.length() + 2);
-            Class<?> cls = (Class<?>) data[i + 2];
-            Method tmp = INSTANCE.create(cls, name, data[i + 1], sig);
-            Class<?>[] tmpParms = tmp.getParameterTypes();
-            if (parameterTypes.length != tmpParms.length) {
-                continue;
-            }
-            for (int j = 0; j < tmpParms.length; j++) {
-                if (!parameterTypes[j].equals(tmpParms[j])) {
-                    continue BIG;
-                }
-            }
-            return tmp;
-        }
-        return null;
-    }
-
-    public static Method[] findMethods(Class<?> clazz, int mask) {
-        Object[] namesAndData = findMethodData(clazz, "");
-        int cnt = 0;
-        for (int i = 0; i < namesAndData.length; i += 3) {
-            String sig = (String) namesAndData[i];
-            Object data = namesAndData[i + 1];
-            int middle = sig.indexOf("__");
-            if (middle == -1) {
-                continue;
-            }
-            String name = sig.substring(0, middle);
-            sig = sig.substring(middle + 2);
-            Class<?> cls = (Class<?>) namesAndData[i + 2];
-            final Method m = INSTANCE.create(cls, name, data, sig);
-            if ((m.getModifiers() & mask) == 0) {
-                continue;
-            }
-            namesAndData[cnt++] = m;
-        }
-        Method[] arr = new Method[cnt];
-        for (int i = 0; i < cnt; i++) {
-            arr[i] = (Method) namesAndData[i];
-        }
-        return arr;
-    }
-    static String toSignature(Method m) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(m.getName()).append("__");
-        appendType(sb, m.getReturnType());
-        Class<?>[] arr = m.getParameterTypes();
-        for (int i = 0; i < arr.length; i++) {
-            appendType(sb, arr[i]);
-        }
-        return sb.toString();
-    }
-    
-    private static void appendType(StringBuilder sb, Class<?> type) {
-        if (type == Integer.TYPE) {
-            sb.append('I');
-            return;
-        }
-        if (type == Long.TYPE) {
-            sb.append('J');
-            return;
-        }
-        if (type == Double.TYPE) {
-            sb.append('D');
-            return;
-        }
-        if (type == Float.TYPE) {
-            sb.append('F');
-            return;
-        }
-        if (type == Byte.TYPE) {
-            sb.append('B');
-            return;
-        }
-        if (type == Boolean.TYPE) {
-            sb.append('Z');
-            return;
-        }
-        if (type == Short.TYPE) {
-            sb.append('S');
-            return;
-        }
-        if (type == Void.TYPE) {
-            sb.append('V');
-            return;
-        }
-        if (type == Character.TYPE) {
-            sb.append('C');
-            return;
-        }
-        if (type.isArray()) {
-            sb.append("_3");
-            appendType(sb, type.getComponentType());
-            return;
-        }
-        sb.append('L').append(type.getName().replace('.', '_'));
-        sb.append("_2");
-    }
-
-    public static int signatureElements(String sig) {
-        Enumeration<Class> en = signatureParser(sig);
-        int cnt = 0;
-        while (en.hasMoreElements()) {
-            en.nextElement();
-            cnt++;
-        }
-        return cnt;
-    }
-    
-    public static Enumeration<Class> signatureParser(final String sig) {
-        class E implements Enumeration<Class> {
-            int pos;
-            
-            public boolean hasMoreElements() {
-                return pos < sig.length();
-            }
-
-            public Class nextElement() {
-                switch (sig.charAt(pos++)) {
-                    case 'I':
-                        return Integer.TYPE;
-                    case 'J':
-                        return Long.TYPE;
-                    case 'D':
-                        return Double.TYPE;
-                    case 'F':
-                        return Float.TYPE;
-                    case 'B':
-                        return Byte.TYPE;
-                    case 'Z':
-                        return Boolean.TYPE;
-                    case 'S':
-                        return Short.TYPE;
-                    case 'V':
-                        return Void.TYPE;
-                    case 'C':
-                        return Character.TYPE;
-                    case 'L':
-                        try {
-                            int up = sig.indexOf("_2", pos);
-                            String type = sig.substring(pos, up);
-                            pos = up + 2;
-                            return Class.forName(type.replace('_', '.'));
-                        } catch (ClassNotFoundException ex) {
-                            throw new IllegalStateException(ex);
-                        }
-                    case '_': {
-                        char nch = sig.charAt(pos++);
-                        assert nch == '3' : "Can't find '3' at " + sig.substring(pos - 1);
-                        final Class compType = nextElement();
-                        return Array.newInstance(compType, 0).getClass();
-                    }
-                }
-                throw new UnsupportedOperationException(sig + " at " + pos);
-            }
-        }
-        return new E();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/TypeProvider.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/TypeProvider.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.emul.reflect;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public abstract class TypeProvider {
-    private TypeProvider() {
-    }
-    
-    public static TypeProvider getDefault() {
-        return null;
-    }
-    
-    public abstract <T> TypeVariable<Constructor<T>>[] getTypeParameters(Constructor<T> c);
-    public abstract <T> Type[] getGenericParameterTypes(Constructor<T> c);
-    public abstract <T> Type[] getGenericExceptionTypes(Constructor<T> c);
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Adler32.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Adler32.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; -*- */
-/*
-Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-final class Adler32 implements Checksum {
-
-  // largest prime smaller than 65536
-  static final private int BASE=65521; 
-  // NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1
-  static final private int NMAX=5552;
-
-  private long s1=1L;
-  private long s2=0L;
-
-  public void reset(long init){
-    s1=init&0xffff;
-    s2=(init>>16)&0xffff;
-  }
-
-  public void reset(){
-    s1=1L;
-    s2=0L;
-  }
-
-  public long getValue(){
-    return ((s2<<16)|s1);
-  }
-
-  public void update(byte[] buf, int index, int len){
-
-    if(len==1){
-      s1+=buf[index++]&0xff; s2+=s1;
-      s1%=BASE;
-      s2%=BASE;
-      return;
-    }
-
-    int len1 = len/NMAX;
-    int len2 = len%NMAX;
-    while(len1-->0) {
-      int k=NMAX;
-      len-=k;
-      while(k-->0){
-	s1+=buf[index++]&0xff; s2+=s1;
-      }
-      s1%=BASE;
-      s2%=BASE;
-    }
-
-    int k=len2;
-    len-=k;
-    while(k-->0){
-      s1+=buf[index++]&0xff; s2+=s1;
-    }
-    s1%=BASE;
-    s2%=BASE;
-  }
-
-  public Adler32 copy(){
-    Adler32 foo = new Adler32();
-    foo.s1 = this.s1;
-    foo.s2 = this.s2;
-    return foo;
-  }
-
-  // The following logic has come from zlib.1.2.
-  static long combine(long adler1, long adler2, long len2){
-    long BASEL = (long)BASE;
-    long sum1;
-    long sum2;
-    long rem;  // unsigned int
-
-    rem = len2 % BASEL;
-    sum1 = adler1 & 0xffffL;
-    sum2 = rem * sum1;
-    sum2 %= BASEL; // MOD(sum2);
-    sum1 += (adler2 & 0xffffL) + BASEL - 1;
-    sum2 += ((adler1 >> 16) & 0xffffL) + ((adler2 >> 16) & 0xffffL) + BASEL - rem;
-    if (sum1 >= BASEL) sum1 -= BASEL;
-    if (sum1 >= BASEL) sum1 -= BASEL;
-    if (sum2 >= (BASEL << 1)) sum2 -= (BASEL << 1);
-    if (sum2 >= BASEL) sum2 -= BASEL;
-    return sum1 | (sum2 << 16);
-  }
-
-/*
-  private java.util.zip.Adler32 adler=new java.util.zip.Adler32();
-  public void update(byte[] buf, int index, int len){
-    if(buf==null) {adler.reset();}
-    else{adler.update(buf, index, len);}
-  }
-  public void reset(){
-    adler.reset();
-  }
-  public void reset(long init){
-    if(init==1L){
-      adler.reset();
-    }
-    else{
-      System.err.println("unsupported operation");
-    }
-  }
-  public long getValue(){
-    return adler.getValue();
-  }
-*/
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/CRC32.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/CRC32.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; -*- */
-/*
-Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-final class CRC32 implements Checksum {
-
-  /*
-   *  The following logic has come from RFC1952.
-   */
-  private int v = 0;
-  private static int[] crc_table = null;
-  static {
-    crc_table = new int[256];
-    for (int n = 0; n < 256; n++) {
-      int c = n;
-      for (int k = 8;  --k >= 0; ) {
-        if ((c & 1) != 0)
-	  c = 0xedb88320 ^ (c >>> 1);
-        else
-          c = c >>> 1;
-      }
-      crc_table[n] = c;
-    }
-  }
-
-  public void update (byte[] buf, int index, int len) {
-    int c = ~v;
-    while (--len >= 0)
-      c = crc_table[(c^buf[index++])&0xff]^(c >>> 8);
-    v = ~c;
-  }
-
-  public void reset(){
-    v = 0;
-  }
-
-  public void reset(long vv){
-    v = (int)(vv&0xffffffffL);
-  }
-
-  public long getValue(){
-    return (long)(v&0xffffffffL);
-  }
-
-  // The following logic has come from zlib.1.2.
-  private static final int GF2_DIM = 32;
-  static long combine(long crc1, long crc2, long len2){
-    long row;
-    long[] even = new long[GF2_DIM];
-    long[] odd = new long[GF2_DIM];
-
-    // degenerate case (also disallow negative lengths)
-    if (len2 <= 0)
-      return crc1;
-
-    // put operator for one zero bit in odd
-    odd[0] = 0xedb88320L;          // CRC-32 polynomial
-    row = 1;
-    for (int n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    // put operator for two zero bits in even
-    gf2_matrix_square(even, odd);
-
-    // put operator for four zero bits in odd
-    gf2_matrix_square(odd, even);
-
-    // apply len2 zeros to crc1 (first square will put the operator for one
-    // zero byte, eight zero bits, in even)
-    do {
-      // apply zeros operator for this bit of len2
-      gf2_matrix_square(even, odd);
-      if ((len2 & 1)!=0)
-        crc1 = gf2_matrix_times(even, crc1);
-      len2 >>= 1;
-
-      // if no more bits set, then done
-      if (len2 == 0)
-        break;
-
-      // another iteration of the loop with odd and even swapped
-      gf2_matrix_square(odd, even);
-      if ((len2 & 1)!=0)
-        crc1 = gf2_matrix_times(odd, crc1);
-      len2 >>= 1;
-
-      // if no more bits set, then done
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
-  }
-
-  private static long gf2_matrix_times(long[] mat, long vec){
-    long sum = 0;
-    int index = 0;
-    while (vec!=0) {
-      if ((vec & 1)!=0)
-        sum ^= mat[index];
-      vec >>= 1;
-      index++;
-    }
-    return sum;
-  }
-
-  static final void gf2_matrix_square(long[] square, long[] mat) {
-    for (int n = 0; n < GF2_DIM; n++)
-      square[n] = gf2_matrix_times(mat, mat[n]);
-  }
-
-  /*
-  private java.util.zip.CRC32 crc32 = new java.util.zip.CRC32();
-
-  public void update(byte[] buf, int index, int len){
-    if(buf==null) {crc32.reset();}
-    else{crc32.update(buf, index, len);}
-  }
-  public void reset(){
-    crc32.reset();
-  }
-  public void reset(long init){
-    if(init==0L){
-      crc32.reset();
-    }
-    else{
-      System.err.println("unsupported operation");
-    }
-  }
-  public long getValue(){
-    return crc32.getValue();
-  }
-*/
-  public CRC32 copy(){
-    CRC32 foo = new CRC32();
-    foo.v = this.v;
-    return foo;
-  }
-
-  public static int[] getCRC32Table(){
-    int[] tmp = new int[crc_table.length];
-    System.arraycopy(crc_table, 0, tmp, 0, tmp.length);
-    return tmp;
-  }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Checksum.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Checksum.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; -*- */
-/*
-Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-interface Checksum {
-  void update(byte[] buf, int index, int len);
-  void reset();
-  void reset(long init);
-  long getValue();
-  Checksum copy();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/FastJar.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/FastJar.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2007 Sun Microsystems, Inc.
- */
-package org.apidesign.bck2brwsr.emul.zip;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-/**
- *
- * @author Tomas Zezula
- */
-public final class FastJar {
-    private final byte[] arr;
-
-    public FastJar(byte[] arr) {
-        this.arr = arr;
-    }
-    
-    
-    private static final int GIVE_UP = 1<<16;
-
-    public static final  class Entry {
-        
-        public final String name;
-        final long offset;
-        private final long dosTime;
-        
-        Entry (String name, long offset, long time) {
-            assert name != null;
-            this.name = name;
-            this.offset = offset;
-            this.dosTime = time;
-        }        
-/*        
-        public long getTime () {
-            Date d = new Date((int)(((dosTime >> 25) & 0x7f) + 80),
-                    (int)(((dosTime >> 21) & 0x0f) - 1),
-                    (int)((dosTime >> 16) & 0x1f),
-                    (int)((dosTime >> 11) & 0x1f),
-                    (int)((dosTime >> 5) & 0x3f),
-                    (int)((dosTime << 1) & 0x3e));
-            return d.getTime();
-        }
-        */
-    }
-    
-    public InputStream getInputStream (final Entry e) throws IOException {
-        return getInputStream(arr, e.offset);
-    }
-    
-    private static InputStream getInputStream (byte[] arr, final long offset) throws IOException {
-        ByteArrayInputStream is = new ByteArrayInputStream(arr);
-        is.skip(offset);
-        ZipInputStream in = new ZipInputStream (is);
-        ZipEntry e = in.getNextEntry();
-        if (e != null && e.getCrc() == 0L && e.getMethod() == ZipEntry.STORED) {
-            int cp = arr.length - is.available();
-            return new ByteArrayInputStream(arr, cp, (int)e.getSize());
-        }
-        return in;
-    }
-    
-    public Entry[] list() throws IOException {
-        final int size = arr.length;
-
-        int at = size - ZipInputStream.ENDHDR;
-
-        byte[] data = new byte[ZipInputStream.ENDHDR];        
-        int giveup = 0;
-
-        do {
-            org.apidesign.bck2brwsr.emul.lang.System.arraycopy(arr, at, data, 0, data.length);
-            at--;
-            giveup++;
-            if (giveup > GIVE_UP) {
-                throw new IOException ();
-            }
-        } while (getsig(data) != ZipInputStream.ENDSIG);
-
-
-        final long censize = endsiz(data);
-        final long cenoff  = endoff(data);
-        at = (int) cenoff;                                                     
-
-        Entry[] result = new Entry[0];
-        int cenread = 0;
-        data = new byte[ZipInputStream.CENHDR];
-        while (cenread < censize) {
-            org.apidesign.bck2brwsr.emul.lang.System.arraycopy(arr, at, data, 0, data.length);
-            at += data.length;
-            if (getsig(data) != ZipInputStream.CENSIG) {
-                throw new IOException("No central table");          //NOI18N
-            }
-            int cennam = cennam(data);
-            int cenext = cenext(data);
-            int cencom = cencom(data);
-            long lhoff = cenoff(data);
-            long centim = centim(data);
-            String name = new String(arr, at, cennam, "UTF-8");
-            at += cennam;
-            int seekby = cenext+cencom;
-            int cendatalen = ZipInputStream.CENHDR + cennam + seekby;
-            cenread+=cendatalen;
-            result = addEntry(result, new Entry(name,lhoff, centim));
-            at += seekby;
-        }
-        return result;
-    }
-
-    private Entry[] addEntry(Entry[] result, Entry entry) {
-        Entry[] e = new Entry[result.length + 1];
-        e[result.length] = entry;
-        org.apidesign.bck2brwsr.emul.lang.System.arraycopy(result, 0, e, 0, result.length);
-        return e;
-    }
-
-    private static final long getsig(final byte[] b) throws IOException {return get32(b,0);}
-    private static final long endsiz(final byte[] b) throws IOException {return get32(b,ZipInputStream.ENDSIZ);}
-    private static final long endoff(final byte[] b) throws IOException {return get32(b,ZipInputStream.ENDOFF);}
-    private static final long  cenlen(final byte[] b) throws IOException {return get32(b,ZipInputStream.CENLEN);}
-    private static final long  censiz(final byte[] b) throws IOException {return get32(b,ZipInputStream.CENSIZ);}
-    private static final long centim(final byte[] b) throws IOException {return get32(b,ZipInputStream.CENTIM);}
-    private static final int  cennam(final byte[] b) throws IOException {return get16(b,ZipInputStream.CENNAM);}
-    private static final int  cenext(final byte[] b) throws IOException {return get16(b,ZipInputStream.CENEXT);}
-    private static final int  cencom(final byte[] b) throws IOException {return get16(b,ZipInputStream.CENCOM);}
-    private static final long cenoff (final byte[] b) throws IOException {return get32(b,ZipInputStream.CENOFF);}
-    private static final int lochow(final byte[] b) throws IOException {return get16(b,ZipInputStream.LOCHOW);}
-    private static final int locname(final byte[] b) throws IOException {return get16(b,ZipInputStream.LOCNAM);}
-    private static final int locext(final byte[] b) throws IOException {return get16(b,ZipInputStream.LOCEXT);}
-    private static final long locsiz(final byte[] b) throws IOException {return get32(b,ZipInputStream.LOCSIZ);}
-    
-    private static final int get16(final byte[] b, int off) throws IOException {        
-        final int b1 = b[off];
-	final int b2 = b[off+1];
-        return (b1 & 0xff) | ((b2 & 0xff) << 8);
-    }
-
-    private static final long get32(final byte[] b, int off) throws IOException {
-	final int s1 = get16(b, off);
-	final int s2 = get16(b, off+2);
-        return s1 | ((long)s2 << 16);
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/GZIPHeader.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/GZIPHeader.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; -*- */
-/*
-Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @see "http://www.ietf.org/rfc/rfc1952.txt"
- */
-final class GZIPHeader implements Cloneable {
-
-  public static final byte OS_MSDOS = (byte) 0x00;
-  public static final byte OS_AMIGA = (byte) 0x01;
-  public static final byte OS_VMS = (byte) 0x02;
-  public static final byte OS_UNIX = (byte) 0x03;
-  public static final byte OS_ATARI = (byte) 0x05;
-  public static final byte OS_OS2 = (byte) 0x06;
-  public static final byte OS_MACOS = (byte) 0x07;
-  public static final byte OS_TOPS20 = (byte) 0x0a;
-  public static final byte OS_WIN32 = (byte) 0x0b;
-  public static final byte OS_VMCMS = (byte) 0x04;
-  public static final byte OS_ZSYSTEM = (byte) 0x08;
-  public static final byte OS_CPM = (byte) 0x09;
-  public static final byte OS_QDOS = (byte) 0x0c;
-  public static final byte OS_RISCOS = (byte) 0x0d;
-  public static final byte OS_UNKNOWN = (byte) 0xff;
-
-  boolean text = false;
-  private boolean fhcrc = false;
-  long time;
-  int xflags;
-  int os = 255;
-  byte[] extra;
-  byte[] name;
-  byte[] comment;
-  int hcrc;
-  long crc;
-  boolean done = false;
-  long mtime = 0;
-
-  public void setModifiedTime(long mtime) {
-    this.mtime = mtime;
-  }
-
-  public long getModifiedTime() {
-    return mtime;
-  }
-
-  public void setOS(int os) {
-    if((0<=os && os <=13) || os==255)
-      this.os=os;
-    else
-      throw new IllegalArgumentException("os: "+os);
-  }
-
-  public int getOS(){
-    return os;
-  }
-
-  public void setName(String name) {
-    try{
-      this.name=name.getBytes("ISO-8859-1");
-    }
-    catch(UnsupportedEncodingException e){
-      throw new IllegalArgumentException("name must be in ISO-8859-1 "+name);
-    }
-  }
-
-  public String getName(){
-    if(name==null) return "";
-    try {
-      return new String(name, "ISO-8859-1");
-    }
-    catch (UnsupportedEncodingException e) {
-      throw new IllegalArgumentException(e.toString());
-    }
-  }
-
-  public void setComment(String comment) {
-    try{
-      this.comment=comment.getBytes("ISO-8859-1");
-    }
-    catch(UnsupportedEncodingException e){
-      throw new IllegalArgumentException("comment must be in ISO-8859-1 "+name);
-    }
-  }
-
-  public String getComment(){
-    if(comment==null) return "";
-    try {
-      return new String(comment, "ISO-8859-1");
-    }
-    catch (UnsupportedEncodingException e) {
-      throw new IllegalArgumentException(e.toString());
-    }
-  }
-
-  public void setCRC(long crc){
-    this.crc = crc;
-  }
-
-  public long getCRC(){
-    return crc;
-  }
-/*
-  void put(Deflate d){
-    int flag = 0;
-    if(text){
-      flag |= 1;     // FTEXT
-    }
-    if(fhcrc){
-      flag |= 2;     // FHCRC
-    }
-    if(extra!=null){
-      flag |= 4;     // FEXTRA
-    }
-    if(name!=null){
-      flag |= 8;    // FNAME
-    }
-    if(comment!=null){
-      flag |= 16;   // FCOMMENT
-    }
-    int xfl = 0;
-    if(d.level == JZlib.Z_BEST_SPEED){
-      xfl |= 4;
-    }
-    else if (d.level == JZlib.Z_BEST_COMPRESSION){
-      xfl |= 2;
-    }
-
-    d.put_short((short)0x8b1f);  // ID1 ID2
-    d.put_byte((byte)8);         // CM(Compression Method)
-    d.put_byte((byte)flag);
-    d.put_byte((byte)mtime);
-    d.put_byte((byte)(mtime>>8));
-    d.put_byte((byte)(mtime>>16));
-    d.put_byte((byte)(mtime>>24));
-    d.put_byte((byte)xfl);
-    d.put_byte((byte)os);
-
-    if(extra!=null){
-      d.put_byte((byte)extra.length);
-      d.put_byte((byte)(extra.length>>8));
-      d.put_byte(extra, 0, extra.length);
-    }
-
-    if(name!=null){
-      d.put_byte(name, 0, name.length);
-      d.put_byte((byte)0);
-    }
-
-    if(comment!=null){
-      d.put_byte(comment, 0, comment.length);
-      d.put_byte((byte)0);
-    }
-  }
-*/
-  @Override
-  public Object clone() throws CloneNotSupportedException {
-    GZIPHeader gheader = (GZIPHeader)super.clone();
-    byte[] tmp;
-    if(gheader.extra!=null){
-      tmp=new byte[gheader.extra.length];
-      System.arraycopy(gheader.extra, 0, tmp, 0, tmp.length);
-      gheader.extra = tmp;
-    }
-
-    if(gheader.name!=null){
-      tmp=new byte[gheader.name.length];
-      System.arraycopy(gheader.name, 0, tmp, 0, tmp.length);
-      gheader.name = tmp;
-    }
-
-    if(gheader.comment!=null){
-      tmp=new byte[gheader.comment.length];
-      System.arraycopy(gheader.comment, 0, tmp, 0, tmp.length);
-      gheader.comment = tmp;
-    }
-
-    return gheader;
-  }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfBlocks.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfBlocks.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,616 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; -*- */
-/*
-Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-final class InfBlocks{
-  static final private int MANY=1440;
-
-  // And'ing with mask[n] masks the lower n bits
-  static final private int[] inflate_mask = {
-    0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f,
-    0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff,
-    0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff,
-    0x00007fff, 0x0000ffff
-  };
-
-  // Table for deflate from PKZIP's appnote.txt.
-  static final int[] border = { // Order of the bit length code lengths
-    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-  };
-
-  static final private int Z_OK=0;
-  static final private int Z_STREAM_END=1;
-  static final private int Z_NEED_DICT=2;
-  static final private int Z_ERRNO=-1;
-  static final private int Z_STREAM_ERROR=-2;
-  static final private int Z_DATA_ERROR=-3;
-  static final private int Z_MEM_ERROR=-4;
-  static final private int Z_BUF_ERROR=-5;
-  static final private int Z_VERSION_ERROR=-6;
-
-  static final private int TYPE=0;  // get type bits (3, including end bit)
-  static final private int LENS=1;  // get lengths for stored
-  static final private int STORED=2;// processing stored block
-  static final private int TABLE=3; // get table lengths
-  static final private int BTREE=4; // get bit lengths tree for a dynamic block
-  static final private int DTREE=5; // get length, distance trees for a dynamic block
-  static final private int CODES=6; // processing fixed or dynamic block
-  static final private int DRY=7;   // output remaining window bytes
-  static final private int DONE=8;  // finished last block, done
-  static final private int BAD=9;   // ot a data error--stuck here
-
-  int mode;            // current inflate_block mode 
-
-  int left;            // if STORED, bytes left to copy 
-
-  int table;           // table lengths (14 bits) 
-  int index;           // index into blens (or border) 
-  int[] blens;         // bit lengths of codes 
-  int[] bb=new int[1]; // bit length tree depth 
-  int[] tb=new int[1]; // bit length decoding tree 
-
-  int[] bl=new int[1];
-  int[] bd=new int[1];
-
-  int[][] tl=new int[1][];
-  int[][] td=new int[1][];
-  int[] tli=new int[1]; // tl_index
-  int[] tdi=new int[1]; // td_index
-
-  private final InfCodes codes;      // if CODES, current state 
-
-  int last;            // true if this block is the last block 
-
-  // mode independent information 
-  int bitk;            // bits in bit buffer 
-  int bitb;            // bit buffer 
-  int[] hufts;         // single malloc for tree space 
-  byte[] window;       // sliding window 
-  int end;             // one byte after sliding window 
-  int read;            // window read pointer 
-  int write;           // window write pointer 
-  private boolean check;
-
-  private final InfTree inftree=new InfTree();
-
-  private final ZStream z; 
-
-  InfBlocks(ZStream z, int w){
-    this.z=z;
-    this.codes=new InfCodes(this.z, this);
-    hufts=new int[MANY*3];
-    window=new byte[w];
-    end=w;
-    this.check = (z.istate.wrap==0) ? false : true;
-    mode = TYPE;
-    reset();
-  }
-
-  void reset(){
-    if(mode==BTREE || mode==DTREE){
-    }
-    if(mode==CODES){
-      codes.free(z);
-    }
-    mode=TYPE;
-    bitk=0;
-    bitb=0;
-    read=write=0;
-    if(check){
-      z.adler.reset();
-    }
-  }
-
-  int proc(int r){
-    int t;              // temporary storage
-    int b;              // bit buffer
-    int k;              // bits in bit buffer
-    int p;              // input data pointer
-    int n;              // bytes available there
-    int q;              // output window write pointer
-    int m;              // bytes to end of window or read pointer
-
-    // copy input/output information to locals (UPDATE macro restores)
-    {p=z.next_in_index;n=z.avail_in;b=bitb;k=bitk;}
-    {q=write;m=(int)(q<read?read-q-1:end-q);}
-
-    // process input based on current state
-    while(true){
-      switch (mode){
-      case TYPE:
-
-	while(k<(3)){
-	  if(n!=0){
-	    r=Z_OK;
-	  }
-	  else{
-	    bitb=b; bitk=k; 
-	    z.avail_in=n;
-	    z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    write=q;
-	    return inflate_flush(r);
-	  };
-	  n--;
-	  b|=(z.next_in[p++]&0xff)<<k;
-	  k+=8;
-	}
-	t = (int)(b & 7);
-	last = t & 1;
-
-	switch (t >>> 1){
-        case 0:                         // stored 
-          {b>>>=(3);k-=(3);}
-          t = k & 7;                    // go to byte boundary
-
-          {b>>>=(t);k-=(t);}
-          mode = LENS;                  // get length of stored block
-          break;
-        case 1:                         // fixed
-          InfTree.inflate_trees_fixed(bl, bd, tl, td, z);
-          codes.init(bl[0], bd[0], tl[0], 0, td[0], 0);
-
-          {b>>>=(3);k-=(3);}
-
-          mode = CODES;
-          break;
-        case 2:                         // dynamic
-
-          {b>>>=(3);k-=(3);}
-
-          mode = TABLE;
-          break;
-        case 3:                         // illegal
-
-          {b>>>=(3);k-=(3);}
-          mode = BAD;
-          z.msg = "invalid block type";
-          r = Z_DATA_ERROR;
-
-	  bitb=b; bitk=k; 
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  write=q;
-	  return inflate_flush(r);
-	}
-	break;
-      case LENS:
-
-	while(k<(32)){
-	  if(n!=0){
-	    r=Z_OK;
-	  }
-	  else{
-	    bitb=b; bitk=k; 
-	    z.avail_in=n;
-	    z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    write=q;
-	    return inflate_flush(r);
-	  };
-	  n--;
-	  b|=(z.next_in[p++]&0xff)<<k;
-	  k+=8;
-	}
-
-	if ((((~b) >>> 16) & 0xffff) != (b & 0xffff)){
-	  mode = BAD;
-	  z.msg = "invalid stored block lengths";
-	  r = Z_DATA_ERROR;
-
-	  bitb=b; bitk=k; 
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  write=q;
-	  return inflate_flush(r);
-	}
-	left = (b & 0xffff);
-	b = k = 0;                       // dump bits
-	mode = left!=0 ? STORED : (last!=0 ? DRY : TYPE);
-	break;
-      case STORED:
-	if (n == 0){
-	  bitb=b; bitk=k; 
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  write=q;
-	  return inflate_flush(r);
-	}
-
-	if(m==0){
-	  if(q==end&&read!=0){
-	    q=0; m=(int)(q<read?read-q-1:end-q);
-	  }
-	  if(m==0){
-	    write=q; 
-	    r=inflate_flush(r);
-	    q=write;m=(int)(q<read?read-q-1:end-q);
-	    if(q==end&&read!=0){
-	      q=0; m=(int)(q<read?read-q-1:end-q);
-	    }
-	    if(m==0){
-	      bitb=b; bitk=k; 
-	      z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	      write=q;
-	      return inflate_flush(r);
-	    }
-	  }
-	}
-	r=Z_OK;
-
-	t = left;
-	if(t>n) t = n;
-	if(t>m) t = m;
-	System.arraycopy(z.next_in, p, window, q, t);
-	p += t;  n -= t;
-	q += t;  m -= t;
-	if ((left -= t) != 0)
-	  break;
-	mode = last!=0 ? DRY : TYPE;
-	break;
-      case TABLE:
-
-	while(k<(14)){
-	  if(n!=0){
-	    r=Z_OK;
-	  }
-	  else{
-	    bitb=b; bitk=k; 
-	    z.avail_in=n;
-	    z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    write=q;
-	    return inflate_flush(r);
-	  };
-	  n--;
-	  b|=(z.next_in[p++]&0xff)<<k;
-	  k+=8;
-	}
-
-	table = t = (b & 0x3fff);
-	if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
-	  {
-	    mode = BAD;
-	    z.msg = "too many length or distance symbols";
-	    r = Z_DATA_ERROR;
-
-	    bitb=b; bitk=k; 
-	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    write=q;
-	    return inflate_flush(r);
-	  }
-	t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
-	if(blens==null || blens.length<t){
-	  blens=new int[t];
-	}
-	else{
-	  for(int i=0; i<t; i++){blens[i]=0;}
-	}
-
-	{b>>>=(14);k-=(14);}
-
-	index = 0;
-	mode = BTREE;
-      case BTREE:
-	while (index < 4 + (table >>> 10)){
-	  while(k<(3)){
-	    if(n!=0){
-	      r=Z_OK;
-	    }
-	    else{
-	      bitb=b; bitk=k; 
-	      z.avail_in=n;
-	      z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	      write=q;
-	      return inflate_flush(r);
-	    };
-	    n--;
-	    b|=(z.next_in[p++]&0xff)<<k;
-	    k+=8;
-	  }
-
-	  blens[border[index++]] = b&7;
-
-	  {b>>>=(3);k-=(3);}
-	}
-
-	while(index < 19){
-	  blens[border[index++]] = 0;
-	}
-
-	bb[0] = 7;
-	t = inftree.inflate_trees_bits(blens, bb, tb, hufts, z);
-	if (t != Z_OK){
-	  r = t;
-	  if (r == Z_DATA_ERROR){
-	    blens=null;
-	    mode = BAD;
-	  }
-
-	  bitb=b; bitk=k; 
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  write=q;
-	  return inflate_flush(r);
-	}
-
-	index = 0;
-	mode = DTREE;
-      case DTREE:
-	while (true){
-	  t = table;
-	  if(!(index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))){
-	    break;
-	  }
-
-	  int[] h;
-	  int i, j, c;
-
-	  t = bb[0];
-
-	  while(k<(t)){
-	    if(n!=0){
-	      r=Z_OK;
-	    }
-	    else{
-	      bitb=b; bitk=k; 
-	      z.avail_in=n;
-	      z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	      write=q;
-	      return inflate_flush(r);
-	    };
-	    n--;
-	    b|=(z.next_in[p++]&0xff)<<k;
-	    k+=8;
-	  }
-
-	  if(tb[0]==-1){
-            //System.err.println("null...");
-	  }
-
-	  t=hufts[(tb[0]+(b&inflate_mask[t]))*3+1];
-	  c=hufts[(tb[0]+(b&inflate_mask[t]))*3+2];
-
-	  if (c < 16){
-	    b>>>=(t);k-=(t);
-	    blens[index++] = c;
-	  }
-	  else { // c == 16..18
-	    i = c == 18 ? 7 : c - 14;
-	    j = c == 18 ? 11 : 3;
-
-	    while(k<(t+i)){
-	      if(n!=0){
-		r=Z_OK;
-	      }
-	      else{
-		bitb=b; bitk=k; 
-		z.avail_in=n;
-		z.total_in+=p-z.next_in_index;z.next_in_index=p;
-		write=q;
-		return inflate_flush(r);
-	      };
-	      n--;
-	      b|=(z.next_in[p++]&0xff)<<k;
-	      k+=8;
-	    }
-
-	    b>>>=(t);k-=(t);
-
-	    j += (b & inflate_mask[i]);
-
-	    b>>>=(i);k-=(i);
-
-	    i = index;
-	    t = table;
-	    if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
-		(c == 16 && i < 1)){
-	      blens=null;
-	      mode = BAD;
-	      z.msg = "invalid bit length repeat";
-	      r = Z_DATA_ERROR;
-
-	      bitb=b; bitk=k; 
-	      z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	      write=q;
-	      return inflate_flush(r);
-	    }
-
-	    c = c == 16 ? blens[i-1] : 0;
-	    do{
-	      blens[i++] = c;
-	    }
-	    while (--j!=0);
-	    index = i;
-	  }
-	}
-
-	tb[0]=-1;
-	{
-	  bl[0] = 9;         // must be <= 9 for lookahead assumptions
-	  bd[0] = 6;         // must be <= 9 for lookahead assumptions
-	  t = table;
-	  t = inftree.inflate_trees_dynamic(257 + (t & 0x1f), 
-					    1 + ((t >> 5) & 0x1f),
-					    blens, bl, bd, tli, tdi, hufts, z);
-
-	  if (t != Z_OK){
-	    if (t == Z_DATA_ERROR){
-	      blens=null;
-	      mode = BAD;
-	    }
-	    r = t;
-
-	    bitb=b; bitk=k; 
-	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    write=q;
-	    return inflate_flush(r);
-	  }
-	  codes.init(bl[0], bd[0], hufts, tli[0], hufts, tdi[0]);
-	}
-	mode = CODES;
-      case CODES:
-	bitb=b; bitk=k;
-	z.avail_in=n; z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	write=q;
-
-	if ((r = codes.proc(r)) != Z_STREAM_END){
-	  return inflate_flush(r);
-	}
-	r = Z_OK;
-	codes.free(z);
-
-	p=z.next_in_index; n=z.avail_in;b=bitb;k=bitk;
-	q=write;m=(int)(q<read?read-q-1:end-q);
-
-	if (last==0){
-	  mode = TYPE;
-	  break;
-	}
-	mode = DRY;
-      case DRY:
-	write=q; 
-	r=inflate_flush(r); 
-	q=write; m=(int)(q<read?read-q-1:end-q);
-	if (read != write){
-	  bitb=b; bitk=k; 
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  write=q;
-	  return inflate_flush(r);
-	}
-	mode = DONE;
-      case DONE:
-	r = Z_STREAM_END;
-
-	bitb=b; bitk=k; 
-	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	write=q;
-	return inflate_flush(r);
-      case BAD:
-	r = Z_DATA_ERROR;
-
-	bitb=b; bitk=k; 
-	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	write=q;
-	return inflate_flush(r);
-
-      default:
-	r = Z_STREAM_ERROR;
-
-	bitb=b; bitk=k; 
-	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	write=q;
-	return inflate_flush(r);
-      }
-    }
-  }
-
-  void free(){
-    reset();
-    window=null;
-    hufts=null;
-    //ZFREE(z, s);
-  }
-
-  void set_dictionary(byte[] d, int start, int n){
-    System.arraycopy(d, start, window, 0, n);
-    read = write = n;
-  }
-
-  // Returns true if inflate is currently at the end of a block generated
-  // by Z_SYNC_FLUSH or Z_FULL_FLUSH. 
-  int sync_point(){
-    return mode == LENS ? 1 : 0;
-  }
-
-  // copy as much as possible from the sliding window to the output area
-  int inflate_flush(int r){
-    int n;
-    int p;
-    int q;
-
-    // local copies of source and destination pointers
-    p = z.next_out_index;
-    q = read;
-
-    // compute number of bytes to copy as far as end of window
-    n = (int)((q <= write ? write : end) - q);
-    if(n > z.avail_out) n = z.avail_out;
-    if(n!=0 && r == Z_BUF_ERROR) r = Z_OK;
-
-    // update counters
-    z.avail_out -= n;
-    z.total_out += n;
-
-    // update check information
-    if(check && n>0){
-      z.adler.update(window, q, n);
-    }
-
-    // copy as far as end of window
-    System.arraycopy(window, q, z.next_out, p, n);
-    p += n;
-    q += n;
-
-    // see if more to copy at beginning of window
-    if (q == end){
-      // wrap pointers
-      q = 0;
-      if (write == end)
-        write = 0;
-
-      // compute bytes to copy
-      n = write - q;
-      if (n > z.avail_out) n = z.avail_out;
-      if (n!=0 && r == Z_BUF_ERROR) r = Z_OK;
-
-      // update counters
-      z.avail_out -= n;
-      z.total_out += n;
-
-      // update check information
-      if(check && n>0){
-	z.adler.update(window, q, n);
-      }
-
-      // copy
-      System.arraycopy(window, q, z.next_out, p, n);
-      p += n;
-      q += n;
-    }
-
-    // update pointers
-    z.next_out_index = p;
-    read = q;
-
-    // done
-    return r;
-  }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfCodes.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfCodes.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,612 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; -*- */
-/*
-Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-final class InfCodes{
-
-  static final private int[] inflate_mask = {
-    0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f,
-    0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff,
-    0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff,
-    0x00007fff, 0x0000ffff
-  };
-
-  static final private int Z_OK=0;
-  static final private int Z_STREAM_END=1;
-  static final private int Z_NEED_DICT=2;
-  static final private int Z_ERRNO=-1;
-  static final private int Z_STREAM_ERROR=-2;
-  static final private int Z_DATA_ERROR=-3;
-  static final private int Z_MEM_ERROR=-4;
-  static final private int Z_BUF_ERROR=-5;
-  static final private int Z_VERSION_ERROR=-6;
-
-  // waiting for "i:"=input,
-  //             "o:"=output,
-  //             "x:"=nothing
-  static final private int START=0;  // x: set up for LEN
-  static final private int LEN=1;    // i: get length/literal/eob next
-  static final private int LENEXT=2; // i: getting length extra (have base)
-  static final private int DIST=3;   // i: get distance next
-  static final private int DISTEXT=4;// i: getting distance extra
-  static final private int COPY=5;   // o: copying bytes in window, waiting for space
-  static final private int LIT=6;    // o: got literal, waiting for output space
-  static final private int WASH=7;   // o: got eob, possibly still output waiting
-  static final private int END=8;    // x: got eob and all data flushed
-  static final private int BADCODE=9;// x: got error
-
-  int mode;      // current inflate_codes mode
-
-  // mode dependent information
-  int len;
-
-  int[] tree; // pointer into tree
-  int tree_index=0;
-  int need;   // bits needed
-
-  int lit;
-
-  // if EXT or COPY, where and how much
-  int get;              // bits to get for extra
-  int dist;             // distance back to copy from
-
-  byte lbits;           // ltree bits decoded per branch
-  byte dbits;           // dtree bits decoder per branch
-  int[] ltree;          // literal/length/eob tree
-  int ltree_index;      // literal/length/eob tree
-  int[] dtree;          // distance tree
-  int dtree_index;      // distance tree
-
-  private final ZStream z;
-  private final InfBlocks s;
-  InfCodes(ZStream z, InfBlocks s){
-    this.z=z; 
-    this.s=s; 
-  }
-
-  void init(int bl, int bd,
-	   int[] tl, int tl_index,
-	   int[] td, int td_index){
-    mode=START;
-    lbits=(byte)bl;
-    dbits=(byte)bd;
-    ltree=tl;
-    ltree_index=tl_index;
-    dtree = td;
-    dtree_index=td_index;
-    tree=null;
-  }
-
-  int proc(int r){ 
-    int j;              // temporary storage
-    int[] t;            // temporary pointer
-    int tindex;         // temporary pointer
-    int e;              // extra bits or operation
-    int b=0;            // bit buffer
-    int k=0;            // bits in bit buffer
-    int p=0;            // input data pointer
-    int n;              // bytes available there
-    int q;              // output window write pointer
-    int m;              // bytes to end of window or read pointer
-    int f;              // pointer to copy strings from
-
-    // copy input/output information to locals (UPDATE macro restores)
-    p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
-    q=s.write;m=q<s.read?s.read-q-1:s.end-q;
-
-    // process input and output based on current state
-    while (true){
-      switch (mode){
-	// waiting for "i:"=input, "o:"=output, "x:"=nothing
-      case START:         // x: set up for LEN
-	if (m >= 258 && n >= 10){
-
-	  s.bitb=b;s.bitk=k;
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  s.write=q;
-	  r = inflate_fast(lbits, dbits, 
-			   ltree, ltree_index, 
-			   dtree, dtree_index,
-			   s, z);
-
-	  p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
-	  q=s.write;m=q<s.read?s.read-q-1:s.end-q;
-
-	  if (r != Z_OK){
-	    mode = r == Z_STREAM_END ? WASH : BADCODE;
-	    break;
-	  }
-	}
-	need = lbits;
-	tree = ltree;
-	tree_index=ltree_index;
-
-	mode = LEN;
-      case LEN:           // i: get length/literal/eob next
-	j = need;
-
-	while(k<(j)){
-	  if(n!=0)r=Z_OK;
-	  else{
-
-	    s.bitb=b;s.bitk=k;
-	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    s.write=q;
-	    return s.inflate_flush(r);
-	  }
-	  n--;
-	  b|=(z.next_in[p++]&0xff)<<k;
-	  k+=8;
-	}
-
-	tindex=(tree_index+(b&inflate_mask[j]))*3;
-
-	b>>>=(tree[tindex+1]);
-	k-=(tree[tindex+1]);
-
-	e=tree[tindex];
-
-	if(e == 0){               // literal
-	  lit = tree[tindex+2];
-	  mode = LIT;
-	  break;
-	}
-	if((e & 16)!=0 ){          // length
-	  get = e & 15;
-	  len = tree[tindex+2];
-	  mode = LENEXT;
-	  break;
-	}
-	if ((e & 64) == 0){        // next table
-	  need = e;
-	  tree_index = tindex/3+tree[tindex+2];
-	  break;
-	}
-	if ((e & 32)!=0){               // end of block
-	  mode = WASH;
-	  break;
-	}
-	mode = BADCODE;        // invalid code
-	z.msg = "invalid literal/length code";
-	r = Z_DATA_ERROR;
-
-	s.bitb=b;s.bitk=k;
-	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	s.write=q;
-	return s.inflate_flush(r);
-
-      case LENEXT:        // i: getting length extra (have base)
-	j = get;
-
-	while(k<(j)){
-	  if(n!=0)r=Z_OK;
-	  else{
-
-	    s.bitb=b;s.bitk=k;
-	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    s.write=q;
-	    return s.inflate_flush(r);
-	  }
-	  n--; b|=(z.next_in[p++]&0xff)<<k;
-	  k+=8;
-	}
-
-	len += (b & inflate_mask[j]);
-
-	b>>=j;
-	k-=j;
-
-	need = dbits;
-	tree = dtree;
-	tree_index=dtree_index;
-	mode = DIST;
-      case DIST:          // i: get distance next
-	j = need;
-
-	while(k<(j)){
-	  if(n!=0)r=Z_OK;
-	  else{
-
-	    s.bitb=b;s.bitk=k;
-	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    s.write=q;
-	    return s.inflate_flush(r);
-	  }
-	  n--; b|=(z.next_in[p++]&0xff)<<k;
-	  k+=8;
-	}
-
-	tindex=(tree_index+(b & inflate_mask[j]))*3;
-
-	b>>=tree[tindex+1];
-	k-=tree[tindex+1];
-
-	e = (tree[tindex]);
-	if((e & 16)!=0){               // distance
-	  get = e & 15;
-	  dist = tree[tindex+2];
-	  mode = DISTEXT;
-	  break;
-	}
-	if ((e & 64) == 0){        // next table
-	  need = e;
-	  tree_index = tindex/3 + tree[tindex+2];
-	  break;
-	}
-	mode = BADCODE;        // invalid code
-	z.msg = "invalid distance code";
-	r = Z_DATA_ERROR;
-
-	s.bitb=b;s.bitk=k;
-	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	s.write=q;
-	return s.inflate_flush(r);
-
-      case DISTEXT:       // i: getting distance extra
-	j = get;
-
-	while(k<(j)){
-	  if(n!=0)r=Z_OK;
-	  else{
-
-	    s.bitb=b;s.bitk=k;
-	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	    s.write=q;
-	    return s.inflate_flush(r);
-	  }
-	  n--; b|=(z.next_in[p++]&0xff)<<k;
-	  k+=8;
-	}
-
-	dist += (b & inflate_mask[j]);
-
-	b>>=j;
-	k-=j;
-
-	mode = COPY;
-      case COPY:          // o: copying bytes in window, waiting for space
-        f = q - dist;
-        while(f < 0){     // modulo window size-"while" instead
-          f += s.end;     // of "if" handles invalid distances
-	}
-	while (len!=0){
-
-	  if(m==0){
-	    if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
-	    if(m==0){
-	      s.write=q; r=s.inflate_flush(r);
-	      q=s.write;m=q<s.read?s.read-q-1:s.end-q;
-
-	      if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
-
-	      if(m==0){
-		s.bitb=b;s.bitk=k;
-		z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-		s.write=q;
-		return s.inflate_flush(r);
-	      }  
-	    }
-	  }
-
-	  s.window[q++]=s.window[f++]; m--;
-
-	  if (f == s.end)
-            f = 0;
-	  len--;
-	}
-	mode = START;
-	break;
-      case LIT:           // o: got literal, waiting for output space
-	if(m==0){
-	  if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
-	  if(m==0){
-	    s.write=q; r=s.inflate_flush(r);
-	    q=s.write;m=q<s.read?s.read-q-1:s.end-q;
-
-	    if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
-	    if(m==0){
-	      s.bitb=b;s.bitk=k;
-	      z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	      s.write=q;
-	      return s.inflate_flush(r);
-	    }
-	  }
-	}
-	r=Z_OK;
-
-	s.window[q++]=(byte)lit; m--;
-
-	mode = START;
-	break;
-      case WASH:           // o: got eob, possibly more output
-	if (k > 7){        // return unused byte, if any
-	  k -= 8;
-	  n++;
-	  p--;             // can always return one
-	}
-
-	s.write=q; r=s.inflate_flush(r);
-	q=s.write;m=q<s.read?s.read-q-1:s.end-q;
-
-	if (s.read != s.write){
-	  s.bitb=b;s.bitk=k;
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  s.write=q;
-	  return s.inflate_flush(r);
-	}
-	mode = END;
-      case END:
-	r = Z_STREAM_END;
-	s.bitb=b;s.bitk=k;
-	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	s.write=q;
-	return s.inflate_flush(r);
-
-      case BADCODE:       // x: got error
-
-	r = Z_DATA_ERROR;
-
-	s.bitb=b;s.bitk=k;
-	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	s.write=q;
-	return s.inflate_flush(r);
-
-      default:
-	r = Z_STREAM_ERROR;
-
-	s.bitb=b;s.bitk=k;
-	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	s.write=q;
-	return s.inflate_flush(r);
-      }
-    }
-  }
-
-  void free(ZStream z){
-    //  ZFREE(z, c);
-  }
-
-  // Called with number of bytes left to write in window at least 258
-  // (the maximum string length) and number of input bytes available
-  // at least ten.  The ten bytes are six bytes for the longest length/
-  // distance pair plus four bytes for overloading the bit buffer.
-
-  int inflate_fast(int bl, int bd, 
-		   int[] tl, int tl_index,
-		   int[] td, int td_index,
-		   InfBlocks s, ZStream z){
-    int t;                // temporary pointer
-    int[] tp;             // temporary pointer
-    int tp_index;         // temporary pointer
-    int e;                // extra bits or operation
-    int b;                // bit buffer
-    int k;                // bits in bit buffer
-    int p;                // input data pointer
-    int n;                // bytes available there
-    int q;                // output window write pointer
-    int m;                // bytes to end of window or read pointer
-    int ml;               // mask for literal/length tree
-    int md;               // mask for distance tree
-    int c;                // bytes to copy
-    int d;                // distance back to copy from
-    int r;                // copy source pointer
-
-    int tp_index_t_3;     // (tp_index+t)*3
-
-    // load input, output, bit values
-    p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
-    q=s.write;m=q<s.read?s.read-q-1:s.end-q;
-
-    // initialize masks
-    ml = inflate_mask[bl];
-    md = inflate_mask[bd];
-
-    // do until not enough input or output space for fast loop
-    do {                          // assume called with m >= 258 && n >= 10
-      // get literal/length code
-      while(k<(20)){              // max bits for literal/length code
-	n--;
-	b|=(z.next_in[p++]&0xff)<<k;k+=8;
-      }
-
-      t= b&ml;
-      tp=tl; 
-      tp_index=tl_index;
-      tp_index_t_3=(tp_index+t)*3;
-      if ((e = tp[tp_index_t_3]) == 0){
-	b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
-
-	s.window[q++] = (byte)tp[tp_index_t_3+2];
-	m--;
-	continue;
-      }
-      do {
-
-	b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
-
-	if((e&16)!=0){
-	  e &= 15;
-	  c = tp[tp_index_t_3+2] + ((int)b & inflate_mask[e]);
-
-	  b>>=e; k-=e;
-
-	  // decode distance base of block to copy
-	  while(k<(15)){           // max bits for distance code
-	    n--;
-	    b|=(z.next_in[p++]&0xff)<<k;k+=8;
-	  }
-
-	  t= b&md;
-	  tp=td;
-	  tp_index=td_index;
-          tp_index_t_3=(tp_index+t)*3;
-	  e = tp[tp_index_t_3];
-
-	  do {
-
-	    b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
-
-	    if((e&16)!=0){
-	      // get extra bits to add to distance base
-	      e &= 15;
-	      while(k<(e)){         // get extra bits (up to 13)
-		n--;
-		b|=(z.next_in[p++]&0xff)<<k;k+=8;
-	      }
-
-	      d = tp[tp_index_t_3+2] + (b&inflate_mask[e]);
-
-	      b>>=(e); k-=(e);
-
-	      // do the copy
-	      m -= c;
-	      if (q >= d){                // offset before dest
-		//  just copy
-		r=q-d;
-		if(q-r>0 && 2>(q-r)){           
-		  s.window[q++]=s.window[r++]; // minimum count is three,
-		  s.window[q++]=s.window[r++]; // so unroll loop a little
-		  c-=2;
-		}
-		else{
-		  System.arraycopy(s.window, r, s.window, q, 2);
-		  q+=2; r+=2; c-=2;
-		}
-	      }
-	      else{                  // else offset after destination
-                r=q-d;
-                do{
-                  r+=s.end;          // force pointer in window
-                }while(r<0);         // covers invalid distances
-		e=s.end-r;
-		if(c>e){             // if source crosses,
-		  c-=e;              // wrapped copy
-		  if(q-r>0 && e>(q-r)){           
-		    do{s.window[q++] = s.window[r++];}
-		    while(--e!=0);
-		  }
-		  else{
-		    System.arraycopy(s.window, r, s.window, q, e);
-		    q+=e; r+=e; e=0;
-		  }
-		  r = 0;                  // copy rest from start of window
-		}
-
-	      }
-
-	      // copy all or what's left
-	      if(q-r>0 && c>(q-r)){           
-		do{s.window[q++] = s.window[r++];}
-		while(--c!=0);
-	      }
-	      else{
-		System.arraycopy(s.window, r, s.window, q, c);
-		q+=c; r+=c; c=0;
-	      }
-	      break;
-	    }
-	    else if((e&64)==0){
-	      t+=tp[tp_index_t_3+2];
-	      t+=(b&inflate_mask[e]);
-	      tp_index_t_3=(tp_index+t)*3;
-	      e=tp[tp_index_t_3];
-	    }
-	    else{
-	      z.msg = "invalid distance code";
-
-	      c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
-
-	      s.bitb=b;s.bitk=k;
-	      z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	      s.write=q;
-
-	      return Z_DATA_ERROR;
-	    }
-	  }
-	  while(true);
-	  break;
-	}
-
-	if((e&64)==0){
-	  t+=tp[tp_index_t_3+2];
-	  t+=(b&inflate_mask[e]);
-	  tp_index_t_3=(tp_index+t)*3;
-	  if((e=tp[tp_index_t_3])==0){
-
-	    b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
-
-	    s.window[q++]=(byte)tp[tp_index_t_3+2];
-	    m--;
-	    break;
-	  }
-	}
-	else if((e&32)!=0){
-
-	  c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
- 
-	  s.bitb=b;s.bitk=k;
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  s.write=q;
-
-	  return Z_STREAM_END;
-	}
-	else{
-	  z.msg="invalid literal/length code";
-
-	  c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
-
-	  s.bitb=b;s.bitk=k;
-	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-	  s.write=q;
-
-	  return Z_DATA_ERROR;
-	}
-      } 
-      while(true);
-    } 
-    while(m>=258 && n>= 10);
-
-    // not enough input or output--restore pointers and return
-    c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
-
-    s.bitb=b;s.bitk=k;
-    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
-    s.write=q;
-
-    return Z_OK;
-  }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfTree.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfTree.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,520 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
-/*
-Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-final class InfTree{
-
-  static final private int MANY=1440;
-
-  static final private int Z_OK=0;
-  static final private int Z_STREAM_END=1;
-  static final private int Z_NEED_DICT=2;
-  static final private int Z_ERRNO=-1;
-  static final private int Z_STREAM_ERROR=-2;
-  static final private int Z_DATA_ERROR=-3;
-  static final private int Z_MEM_ERROR=-4;
-  static final private int Z_BUF_ERROR=-5;
-  static final private int Z_VERSION_ERROR=-6;
-
-  static final int fixed_bl = 9;
-  static final int fixed_bd = 5;
-
-  static final int[] fixed_tl = {
-    96,7,256, 0,8,80, 0,8,16, 84,8,115,
-    82,7,31, 0,8,112, 0,8,48, 0,9,192,
-    80,7,10, 0,8,96, 0,8,32, 0,9,160,
-    0,8,0, 0,8,128, 0,8,64, 0,9,224,
-    80,7,6, 0,8,88, 0,8,24, 0,9,144,
-    83,7,59, 0,8,120, 0,8,56, 0,9,208,
-    81,7,17, 0,8,104, 0,8,40, 0,9,176,
-    0,8,8, 0,8,136, 0,8,72, 0,9,240,
-    80,7,4, 0,8,84, 0,8,20, 85,8,227,
-    83,7,43, 0,8,116, 0,8,52, 0,9,200,
-    81,7,13, 0,8,100, 0,8,36, 0,9,168,
-    0,8,4, 0,8,132, 0,8,68, 0,9,232,
-    80,7,8, 0,8,92, 0,8,28, 0,9,152,
-    84,7,83, 0,8,124, 0,8,60, 0,9,216,
-    82,7,23, 0,8,108, 0,8,44, 0,9,184,
-    0,8,12, 0,8,140, 0,8,76, 0,9,248,
-    80,7,3, 0,8,82, 0,8,18, 85,8,163,
-    83,7,35, 0,8,114, 0,8,50, 0,9,196,
-    81,7,11, 0,8,98, 0,8,34, 0,9,164,
-    0,8,2, 0,8,130, 0,8,66, 0,9,228,
-    80,7,7, 0,8,90, 0,8,26, 0,9,148,
-    84,7,67, 0,8,122, 0,8,58, 0,9,212,
-    82,7,19, 0,8,106, 0,8,42, 0,9,180,
-    0,8,10, 0,8,138, 0,8,74, 0,9,244,
-    80,7,5, 0,8,86, 0,8,22, 192,8,0,
-    83,7,51, 0,8,118, 0,8,54, 0,9,204,
-    81,7,15, 0,8,102, 0,8,38, 0,9,172,
-    0,8,6, 0,8,134, 0,8,70, 0,9,236,
-    80,7,9, 0,8,94, 0,8,30, 0,9,156,
-    84,7,99, 0,8,126, 0,8,62, 0,9,220,
-    82,7,27, 0,8,110, 0,8,46, 0,9,188,
-    0,8,14, 0,8,142, 0,8,78, 0,9,252,
-    96,7,256, 0,8,81, 0,8,17, 85,8,131,
-    82,7,31, 0,8,113, 0,8,49, 0,9,194,
-    80,7,10, 0,8,97, 0,8,33, 0,9,162,
-    0,8,1, 0,8,129, 0,8,65, 0,9,226,
-    80,7,6, 0,8,89, 0,8,25, 0,9,146,
-    83,7,59, 0,8,121, 0,8,57, 0,9,210,
-    81,7,17, 0,8,105, 0,8,41, 0,9,178,
-    0,8,9, 0,8,137, 0,8,73, 0,9,242,
-    80,7,4, 0,8,85, 0,8,21, 80,8,258,
-    83,7,43, 0,8,117, 0,8,53, 0,9,202,
-    81,7,13, 0,8,101, 0,8,37, 0,9,170,
-    0,8,5, 0,8,133, 0,8,69, 0,9,234,
-    80,7,8, 0,8,93, 0,8,29, 0,9,154,
-    84,7,83, 0,8,125, 0,8,61, 0,9,218,
-    82,7,23, 0,8,109, 0,8,45, 0,9,186,
-    0,8,13, 0,8,141, 0,8,77, 0,9,250,
-    80,7,3, 0,8,83, 0,8,19, 85,8,195,
-    83,7,35, 0,8,115, 0,8,51, 0,9,198,
-    81,7,11, 0,8,99, 0,8,35, 0,9,166,
-    0,8,3, 0,8,131, 0,8,67, 0,9,230,
-    80,7,7, 0,8,91, 0,8,27, 0,9,150,
-    84,7,67, 0,8,123, 0,8,59, 0,9,214,
-    82,7,19, 0,8,107, 0,8,43, 0,9,182,
-    0,8,11, 0,8,139, 0,8,75, 0,9,246,
-    80,7,5, 0,8,87, 0,8,23, 192,8,0,
-    83,7,51, 0,8,119, 0,8,55, 0,9,206,
-    81,7,15, 0,8,103, 0,8,39, 0,9,174,
-    0,8,7, 0,8,135, 0,8,71, 0,9,238,
-    80,7,9, 0,8,95, 0,8,31, 0,9,158,
-    84,7,99, 0,8,127, 0,8,63, 0,9,222,
-    82,7,27, 0,8,111, 0,8,47, 0,9,190,
-    0,8,15, 0,8,143, 0,8,79, 0,9,254,
-    96,7,256, 0,8,80, 0,8,16, 84,8,115,
-    82,7,31, 0,8,112, 0,8,48, 0,9,193,
-
-    80,7,10, 0,8,96, 0,8,32, 0,9,161,
-    0,8,0, 0,8,128, 0,8,64, 0,9,225,
-    80,7,6, 0,8,88, 0,8,24, 0,9,145,
-    83,7,59, 0,8,120, 0,8,56, 0,9,209,
-    81,7,17, 0,8,104, 0,8,40, 0,9,177,
-    0,8,8, 0,8,136, 0,8,72, 0,9,241,
-    80,7,4, 0,8,84, 0,8,20, 85,8,227,
-    83,7,43, 0,8,116, 0,8,52, 0,9,201,
-    81,7,13, 0,8,100, 0,8,36, 0,9,169,
-    0,8,4, 0,8,132, 0,8,68, 0,9,233,
-    80,7,8, 0,8,92, 0,8,28, 0,9,153,
-    84,7,83, 0,8,124, 0,8,60, 0,9,217,
-    82,7,23, 0,8,108, 0,8,44, 0,9,185,
-    0,8,12, 0,8,140, 0,8,76, 0,9,249,
-    80,7,3, 0,8,82, 0,8,18, 85,8,163,
-    83,7,35, 0,8,114, 0,8,50, 0,9,197,
-    81,7,11, 0,8,98, 0,8,34, 0,9,165,
-    0,8,2, 0,8,130, 0,8,66, 0,9,229,
-    80,7,7, 0,8,90, 0,8,26, 0,9,149,
-    84,7,67, 0,8,122, 0,8,58, 0,9,213,
-    82,7,19, 0,8,106, 0,8,42, 0,9,181,
-    0,8,10, 0,8,138, 0,8,74, 0,9,245,
-    80,7,5, 0,8,86, 0,8,22, 192,8,0,
-    83,7,51, 0,8,118, 0,8,54, 0,9,205,
-    81,7,15, 0,8,102, 0,8,38, 0,9,173,
-    0,8,6, 0,8,134, 0,8,70, 0,9,237,
-    80,7,9, 0,8,94, 0,8,30, 0,9,157,
-    84,7,99, 0,8,126, 0,8,62, 0,9,221,
-    82,7,27, 0,8,110, 0,8,46, 0,9,189,
-    0,8,14, 0,8,142, 0,8,78, 0,9,253,
-    96,7,256, 0,8,81, 0,8,17, 85,8,131,
-    82,7,31, 0,8,113, 0,8,49, 0,9,195,
-    80,7,10, 0,8,97, 0,8,33, 0,9,163,
-    0,8,1, 0,8,129, 0,8,65, 0,9,227,
-    80,7,6, 0,8,89, 0,8,25, 0,9,147,
-    83,7,59, 0,8,121, 0,8,57, 0,9,211,
-    81,7,17, 0,8,105, 0,8,41, 0,9,179,
-    0,8,9, 0,8,137, 0,8,73, 0,9,243,
-    80,7,4, 0,8,85, 0,8,21, 80,8,258,
-    83,7,43, 0,8,117, 0,8,53, 0,9,203,
-    81,7,13, 0,8,101, 0,8,37, 0,9,171,
-    0,8,5, 0,8,133, 0,8,69, 0,9,235,
-    80,7,8, 0,8,93, 0,8,29, 0,9,155,
-    84,7,83, 0,8,125, 0,8,61, 0,9,219,
-    82,7,23, 0,8,109, 0,8,45, 0,9,187,
-    0,8,13, 0,8,141, 0,8,77, 0,9,251,
-    80,7,3, 0,8,83, 0,8,19, 85,8,195,
-    83,7,35, 0,8,115, 0,8,51, 0,9,199,
-    81,7,11, 0,8,99, 0,8,35, 0,9,167,
-    0,8,3, 0,8,131, 0,8,67, 0,9,231,
-    80,7,7, 0,8,91, 0,8,27, 0,9,151,
-    84,7,67, 0,8,123, 0,8,59, 0,9,215,
-    82,7,19, 0,8,107, 0,8,43, 0,9,183,
-    0,8,11, 0,8,139, 0,8,75, 0,9,247,
-    80,7,5, 0,8,87, 0,8,23, 192,8,0,
-    83,7,51, 0,8,119, 0,8,55, 0,9,207,
-    81,7,15, 0,8,103, 0,8,39, 0,9,175,
-    0,8,7, 0,8,135, 0,8,71, 0,9,239,
-    80,7,9, 0,8,95, 0,8,31, 0,9,159,
-    84,7,99, 0,8,127, 0,8,63, 0,9,223,
-    82,7,27, 0,8,111, 0,8,47, 0,9,191,
-    0,8,15, 0,8,143, 0,8,79, 0,9,255
-  };
-  static final int[] fixed_td = {
-    80,5,1, 87,5,257, 83,5,17, 91,5,4097,
-    81,5,5, 89,5,1025, 85,5,65, 93,5,16385,
-    80,5,3, 88,5,513, 84,5,33, 92,5,8193,
-    82,5,9, 90,5,2049, 86,5,129, 192,5,24577,
-    80,5,2, 87,5,385, 83,5,25, 91,5,6145,
-    81,5,7, 89,5,1537, 85,5,97, 93,5,24577,
-    80,5,4, 88,5,769, 84,5,49, 92,5,12289,
-    82,5,13, 90,5,3073, 86,5,193, 192,5,24577
-  };
-
-  // Tables for deflate from PKZIP's appnote.txt.
-  static final int[] cplens = { // Copy lengths for literal codes 257..285
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
-  };
-
-  // see note #13 above about 258
-  static final int[] cplext = { // Extra bits for literal codes 257..285
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112  // 112==invalid
-  };
-
-  static final int[] cpdist = { // Copy offsets for distance codes 0..29
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577
-  };
-
-  static final int[] cpdext = { // Extra bits for distance codes
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-        12, 12, 13, 13};
-
-  // If BMAX needs to be larger than 16, then h and x[] should be uLong.
-  static final int BMAX=15;         // maximum bit length of any code
-
-  int[] hn = null;  // hufts used in space
-  int[] v = null;   // work area for huft_build 
-  int[] c = null;   // bit length count table
-  int[] r = null;   // table entry for structure assignment
-  int[] u = null;   // table stack
-  int[] x = null;   // bit offsets, then code stack
-
-  private int huft_build(int[] b, // code lengths in bits (all assumed <= BMAX)
-                         int bindex, 
-                         int n,   // number of codes (assumed <= 288)
-                         int s,   // number of simple-valued codes (0..s-1)
-                         int[] d, // list of base values for non-simple codes
-                         int[] e, // list of extra bits for non-simple codes
-                         int[] t, // result: starting table
-                         int[] m, // maximum lookup bits, returns actual
-                         int[] hp,// space for trees
-                         int[] hn,// hufts used in space
-                         int[] v  // working area: values in order of bit length
-                         ){
-    // Given a list of code lengths and a maximum table size, make a set of
-    // tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
-    // if the given code set is incomplete (the tables are still built in this
-    // case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
-    // lengths), or Z_MEM_ERROR if not enough memory.
-
-    int a;                       // counter for codes of length k
-    int f;                       // i repeats in table every f entries
-    int g;                       // maximum code length
-    int h;                       // table level
-    int i;                       // counter, current code
-    int j;                       // counter
-    int k;                       // number of bits in current code
-    int l;                       // bits per table (returned in m)
-    int mask;                    // (1 << w) - 1, to avoid cc -O bug on HP
-    int p;                       // pointer into c[], b[], or v[]
-    int q;                       // points to current table
-    int w;                       // bits before this table == (l * h)
-    int xp;                      // pointer into x
-    int y;                       // number of dummy codes added
-    int z;                       // number of entries in current table
-
-    // Generate counts for each bit length
-
-    p = 0; i = n;
-    do {
-      c[b[bindex+p]]++; p++; i--;   // assume all entries <= BMAX
-    }while(i!=0);
-
-    if(c[0] == n){                // null input--all zero length codes
-      t[0] = -1;
-      m[0] = 0;
-      return Z_OK;
-    }
-
-    // Find minimum and maximum length, bound *m by those
-    l = m[0];
-    for (j = 1; j <= BMAX; j++)
-      if(c[j]!=0) break;
-    k = j;                        // minimum code length
-    if(l < j){
-      l = j;
-    }
-    for (i = BMAX; i!=0; i--){
-      if(c[i]!=0) break;
-    }
-    g = i;                        // maximum code length
-    if(l > i){
-      l = i;
-    }
-    m[0] = l;
-
-    // Adjust last length count to fill out codes, if needed
-    for (y = 1 << j; j < i; j++, y <<= 1){
-      if ((y -= c[j]) < 0){
-        return Z_DATA_ERROR;
-      }
-    }
-    if ((y -= c[i]) < 0){
-      return Z_DATA_ERROR;
-    }
-    c[i] += y;
-
-    // Generate starting offsets into the value table for each length
-    x[1] = j = 0;
-    p = 1;  xp = 2;
-    while (--i!=0) {                 // note that i == g from above
-      x[xp] = (j += c[p]);
-      xp++;
-      p++;
-    }
-
-    // Make a table of values in order of bit lengths
-    i = 0; p = 0;
-    do {
-      if ((j = b[bindex+p]) != 0){
-        v[x[j]++] = i;
-      }
-      p++;
-    }
-    while (++i < n);
-    n = x[g];                     // set n to length of v
-
-    // Generate the Huffman codes and for each, make the table entries
-    x[0] = i = 0;                 // first Huffman code is zero
-    p = 0;                        // grab values in bit order
-    h = -1;                       // no tables yet--level -1
-    w = -l;                       // bits decoded == (l * h)
-    u[0] = 0;                     // just to keep compilers happy
-    q = 0;                        // ditto
-    z = 0;                        // ditto
-
-    // go through the bit lengths (k already is bits in shortest code)
-    for (; k <= g; k++){
-      a = c[k];
-      while (a--!=0){
-	// here i is the Huffman code of length k bits for value *p
-	// make tables up to required level
-        while (k > w + l){
-          h++;
-          w += l;                 // previous table always l bits
-	  // compute minimum size table less than or equal to l bits
-          z = g - w;
-          z = (z > l) ? l : z;        // table size upper limit
-          if((f=1<<(j=k-w))>a+1){     // try a k-w bit table
-                                      // too few codes for k-w bit table
-            f -= a + 1;               // deduct codes from patterns left
-            xp = k;
-            if(j < z){
-              while (++j < z){        // try smaller tables up to z bits
-                if((f <<= 1) <= c[++xp])
-                  break;              // enough codes to use up j bits
-                f -= c[xp];           // else deduct codes from patterns
-              }
-	    }
-          }
-          z = 1 << j;                 // table entries for j-bit table
-
-	  // allocate new table
-          if (hn[0] + z > MANY){       // (note: doesn't matter for fixed)
-            return Z_DATA_ERROR;       // overflow of MANY
-          }
-          u[h] = q = /*hp+*/ hn[0];   // DEBUG
-          hn[0] += z;
- 
-	  // connect to last table, if there is one
-	  if(h!=0){
-            x[h]=i;           // save pattern for backing up
-            r[0]=(byte)j;     // bits in this table
-            r[1]=(byte)l;     // bits to dump before this table
-            j=i>>>(w - l);
-            r[2] = (int)(q - u[h-1] - j);               // offset to this table
-            System.arraycopy(r, 0, hp, (u[h-1]+j)*3, 3); // connect to last table
-          }
-          else{
-            t[0] = q;               // first table is returned result
-	  }
-        }
-
-	// set up table entry in r
-        r[1] = (byte)(k - w);
-        if (p >= n){
-          r[0] = 128 + 64;      // out of values--invalid code
-	}
-        else if (v[p] < s){
-          r[0] = (byte)(v[p] < 256 ? 0 : 32 + 64);  // 256 is end-of-block
-          r[2] = v[p++];          // simple code is just the value
-        }
-        else{
-          r[0]=(byte)(e[v[p]-s]+16+64); // non-simple--look up in lists
-          r[2]=d[v[p++] - s];
-        }
-
-        // fill code-like entries with r
-        f=1<<(k-w);
-        for (j=i>>>w;j<z;j+=f){
-          System.arraycopy(r, 0, hp, (q+j)*3, 3);
-	}
-
-	// backwards increment the k-bit code i
-        for (j = 1 << (k - 1); (i & j)!=0; j >>>= 1){
-          i ^= j;
-	}
-        i ^= j;
-
-	// backup over finished tables
-        mask = (1 << w) - 1;      // needed on HP, cc -O bug
-        while ((i & mask) != x[h]){
-          h--;                    // don't need to update q
-          w -= l;
-          mask = (1 << w) - 1;
-        }
-      }
-    }
-    // Return Z_BUF_ERROR if we were given an incomplete table
-    return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
-  }
-
-  int inflate_trees_bits(int[] c,  // 19 code lengths
-                         int[] bb, // bits tree desired/actual depth
-                         int[] tb, // bits tree result
-                         int[] hp, // space for trees
-                         ZStream z // for messages
-                         ){
-    int result;
-    initWorkArea(19);
-    hn[0]=0;
-    result = huft_build(c, 0, 19, 19, null, null, tb, bb, hp, hn, v);
-
-    if(result == Z_DATA_ERROR){
-      z.msg = "oversubscribed dynamic bit lengths tree";
-    }
-    else if(result == Z_BUF_ERROR || bb[0] == 0){
-      z.msg = "incomplete dynamic bit lengths tree";
-      result = Z_DATA_ERROR;
-    }
-    return result;
-  }
-
-  int inflate_trees_dynamic(int nl,   // number of literal/length codes
-                            int nd,   // number of distance codes
-                            int[] c,  // that many (total) code lengths
-                            int[] bl, // literal desired/actual bit depth
-                            int[] bd, // distance desired/actual bit depth 
-                            int[] tl, // literal/length tree result
-                            int[] td, // distance tree result
-                            int[] hp, // space for trees
-                            ZStream z // for messages
-                            ){
-    int result;
-
-    // build literal/length tree
-    initWorkArea(288);
-    hn[0]=0;
-    result = huft_build(c, 0, nl, 257, cplens, cplext, tl, bl, hp, hn, v);
-    if (result != Z_OK || bl[0] == 0){
-      if(result == Z_DATA_ERROR){
-        z.msg = "oversubscribed literal/length tree";
-      }
-      else if (result != Z_MEM_ERROR){
-        z.msg = "incomplete literal/length tree";
-        result = Z_DATA_ERROR;
-      }
-      return result;
-    }
-
-    // build distance tree
-    initWorkArea(288);
-    result = huft_build(c, nl, nd, 0, cpdist, cpdext, td, bd, hp, hn, v);
-
-    if (result != Z_OK || (bd[0] == 0 && nl > 257)){
-      if (result == Z_DATA_ERROR){
-        z.msg = "oversubscribed distance tree";
-      }
-      else if (result == Z_BUF_ERROR) {
-        z.msg = "incomplete distance tree";
-        result = Z_DATA_ERROR;
-      }
-      else if (result != Z_MEM_ERROR){
-        z.msg = "empty distance tree with lengths";
-        result = Z_DATA_ERROR;
-      }
-      return result;
-    }
-
-    return Z_OK;
-  }
-
-  static int inflate_trees_fixed(int[] bl,  //literal desired/actual bit depth
-                                 int[] bd,  //distance desired/actual bit depth
-                                 int[][] tl,//literal/length tree result
-                                 int[][] td,//distance tree result 
-                                 ZStream z  //for memory allocation
-				 ){
-    bl[0]=fixed_bl;
-    bd[0]=fixed_bd;
-    tl[0]=fixed_tl;
-    td[0]=fixed_td;
-    return Z_OK;
-  }
-
-  private void initWorkArea(int vsize){
-    if(hn==null){
-      hn=new int[1];
-      v=new int[vsize];
-      c=new int[BMAX+1];
-      r=new int[3];
-      u=new int[BMAX];
-      x=new int[BMAX+1];
-    }
-    if(v.length<vsize){ v=new int[vsize]; }
-    for(int i=0; i<vsize; i++){v[i]=0;}
-    for(int i=0; i<BMAX+1; i++){c[i]=0;}
-    for(int i=0; i<3; i++){r[i]=0;}
-    System.arraycopy(c, 0, u, 0, BMAX);
-    System.arraycopy(c, 0, x, 0, BMAX+1);
-  }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Inflate.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Inflate.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,727 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; -*- */
-/*
-Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-final class Inflate{
-  
-  static final private int MAX_WBITS=15; // 32K LZ77 window
-
-  // preset dictionary flag in zlib header
-  static final private int PRESET_DICT=0x20;
-
-  static final int Z_NO_FLUSH=0;
-  static final int Z_PARTIAL_FLUSH=1;
-  static final int Z_SYNC_FLUSH=2;
-  static final int Z_FULL_FLUSH=3;
-  static final int Z_FINISH=4;
-
-  static final private int Z_DEFLATED=8;
-
-  static final private int Z_OK=0;
-  static final private int Z_STREAM_END=1;
-  static final private int Z_NEED_DICT=2;
-  static final private int Z_ERRNO=-1;
-  static final private int Z_STREAM_ERROR=-2;
-  static final private int Z_DATA_ERROR=-3;
-  static final private int Z_MEM_ERROR=-4;
-  static final private int Z_BUF_ERROR=-5;
-  static final private int Z_VERSION_ERROR=-6;
-
-  static final private int METHOD=0;   // waiting for method byte
-  static final private int FLAG=1;     // waiting for flag byte
-  static final private int DICT4=2;    // four dictionary check bytes to go
-  static final private int DICT3=3;    // three dictionary check bytes to go
-  static final private int DICT2=4;    // two dictionary check bytes to go
-  static final private int DICT1=5;    // one dictionary check byte to go
-  static final int DICT0=6;    // waiting for inflateSetDictionary
-  static final private int BLOCKS=7;   // decompressing blocks
-  static final private int CHECK4=8;   // four check bytes to go
-  static final private int CHECK3=9;   // three check bytes to go
-  static final private int CHECK2=10;  // two check bytes to go
-  static final private int CHECK1=11;  // one check byte to go
-  static final private int DONE=12;    // finished check, done
-  static final private int BAD=13;     // got an error--stay here
-
-  static final private int HEAD=14;
-  static final private int LENGTH=15;
-  static final private int TIME=16;
-  static final private int OS=17;
-  static final private int EXLEN=18;
-  static final private int EXTRA=19;
-  static final private int NAME=20;
-  static final private int COMMENT=21;
-  static final private int HCRC=22;
-  static final private int FLAGS=23;
-
-  int mode;                            // current inflate mode
-
-  // mode dependent information
-  int method;        // if FLAGS, method byte
-
-  // if CHECK, check values to compare
-  long was = -1;           // computed check value
-  long need;               // stream check value
-
-  // if BAD, inflateSync's marker bytes count
-  int marker;
-
-  // mode independent information
-  int  wrap;          // flag for no wrapper
-  int wbits;            // log2(window size)  (8..15, defaults to 15)
-
-  InfBlocks blocks;     // current inflate_blocks state
-
-  private final ZStream z;
-
-  private int flags; 
-
-  private int need_bytes = -1;
-  private byte[] crcbuf=new byte[4];
-
-  GZIPHeader gheader = null;
-
-  int inflateReset(){
-    if(z == null) return Z_STREAM_ERROR;
-    
-    z.total_in = z.total_out = 0;
-    z.msg = null;
-    this.mode = HEAD;
-    this.need_bytes = -1;
-    this.blocks.reset();
-    return Z_OK;
-  }
-
-  int inflateEnd(){
-    if(blocks != null){
-      blocks.free();
-    }
-    return Z_OK;
-  }
-
-  Inflate(ZStream z){
-    this.z=z;
-  }
-
-  int inflateInit(int w){
-    z.msg = null;
-    blocks = null;
-
-    // handle undocumented wrap option (no zlib header or check)
-    wrap = 0;
-    if(w < 0){
-      w = - w;
-    }
-    else {
-      wrap = (w >> 4) + 1;
-      if(w < 48)
-        w &= 15;
-    }
-
-    if(w<8 ||w>15){
-      inflateEnd();
-      return Z_STREAM_ERROR;
-    }
-    if(blocks != null && wbits != w){
-      blocks.free();
-      blocks=null;
-    }
-
-    // set window size
-    wbits=w;
-
-    this.blocks=new InfBlocks(z, 1<<w);
-
-    // reset state
-    inflateReset();
-
-    return Z_OK;
-  }
-
-  int inflate(int f){
-    int hold = 0;
-
-    int r;
-    int b;
-
-    if(z == null || z.next_in == null){
-      if(f == Z_FINISH && this.mode==HEAD)
-        return Z_OK; 
-      return Z_STREAM_ERROR;
-    }
-
-    f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
-    r = Z_BUF_ERROR;
-    while (true){
-
-      switch (this.mode){
-      case HEAD:
-        if(wrap==0){
-	  this.mode = BLOCKS;
-          break;
-        } 
-
-        try { r=readBytes(2, r, f); }
-        catch(Return e){ return e.r; }
-
-        if((wrap&2)!=0 && this.need == 0x8b1fL) {   // gzip header
-	  z.adler=new CRC32();
-          checksum(2, this.need);
-
-          if(gheader==null) 
-            gheader=new GZIPHeader();
-
-          this.mode = FLAGS;
-          break;
-        }
-
-        flags = 0;
-
-        this.method = ((int)this.need)&0xff;
-        b=((int)(this.need>>8))&0xff;
-
-        if((wrap&1)==0 ||  // check if zlib header allowed
-           (((this.method << 8)+b) % 31)!=0){
-          this.mode = BAD;
-          z.msg = "incorrect header check";
-          // since zlib 1.2, it is allowted to inflateSync for this case.
-          /*
-          this.marker = 5;       // can't try inflateSync
-          */
-          break;
-        }
-
-        if((this.method&0xf)!=Z_DEFLATED){
-          this.mode = BAD;
-          z.msg="unknown compression method";
-          // since zlib 1.2, it is allowted to inflateSync for this case.
-	  /*
-          this.marker = 5;       // can't try inflateSync
-	  */
-          break;
-        }
-
-        if((this.method>>4)+8>this.wbits){
-          this.mode = BAD;
-          z.msg="invalid window size";
-          // since zlib 1.2, it is allowted to inflateSync for this case.
-	  /*
-          this.marker = 5;       // can't try inflateSync
-	  */
-          break;
-        }
-
-        z.adler=new Adler32();
-
-        if((b&PRESET_DICT)==0){
-          this.mode = BLOCKS;
-          break;
-        }
-        this.mode = DICT4;
-      case DICT4:
-
-        if(z.avail_in==0)return r;r=f;
-
-        z.avail_in--; z.total_in++;
-        this.need=((z.next_in[z.next_in_index++]&0xff)<<24)&0xff000000L;
-        this.mode=DICT3;
-      case DICT3:
-
-        if(z.avail_in==0)return r;r=f;
-
-        z.avail_in--; z.total_in++;
-        this.need+=((z.next_in[z.next_in_index++]&0xff)<<16)&0xff0000L;
-        this.mode=DICT2;
-      case DICT2:
-
-        if(z.avail_in==0)return r;r=f;
-
-        z.avail_in--; z.total_in++;
-        this.need+=((z.next_in[z.next_in_index++]&0xff)<<8)&0xff00L;
-        this.mode=DICT1;
-      case DICT1:
-
-        if(z.avail_in==0)return r;r=f;
-
-        z.avail_in--; z.total_in++;
-        this.need += (z.next_in[z.next_in_index++]&0xffL);
-        z.adler.reset(this.need);
-        this.mode = DICT0;
-        return Z_NEED_DICT;
-      case DICT0:
-        this.mode = BAD;
-        z.msg = "need dictionary";
-        this.marker = 0;       // can try inflateSync
-        return Z_STREAM_ERROR;
-      case BLOCKS:
-        r = this.blocks.proc(r);
-        if(r == Z_DATA_ERROR){
-          this.mode = BAD;
-          this.marker = 0;     // can try inflateSync
-          break;
-        }
-        if(r == Z_OK){
-          r = f;
-        }
-        if(r != Z_STREAM_END){
-          return r;
-        }
-        r = f;
-        this.was=z.adler.getValue();
-        this.blocks.reset();
-        if(this.wrap==0){
-          this.mode=DONE;
-          break;
-        }
-        this.mode=CHECK4;
-      case CHECK4:
-
-        if(z.avail_in==0)return r;r=f;
-
-        z.avail_in--; z.total_in++;
-        this.need=((z.next_in[z.next_in_index++]&0xff)<<24)&0xff000000L;
-        this.mode=CHECK3;
-      case CHECK3:
-
-        if(z.avail_in==0)return r;r=f;
-
-        z.avail_in--; z.total_in++;
-        this.need+=((z.next_in[z.next_in_index++]&0xff)<<16)&0xff0000L;
-        this.mode = CHECK2;
-      case CHECK2:
-
-        if(z.avail_in==0)return r;r=f;
-
-        z.avail_in--; z.total_in++;
-        this.need+=((z.next_in[z.next_in_index++]&0xff)<<8)&0xff00L;
-        this.mode = CHECK1;
-      case CHECK1:
-
-        if(z.avail_in==0)return r;r=f;
-
-        z.avail_in--; z.total_in++;
-        this.need+=(z.next_in[z.next_in_index++]&0xffL);
-
-        if(flags!=0){  // gzip
-          this.need = ((this.need&0xff000000)>>24 | 
-                          (this.need&0x00ff0000)>>8 | 
-                          (this.need&0x0000ff00)<<8 | 
-                          (this.need&0x0000ffff)<<24)&0xffffffffL;
-        }
-
-        if(((int)(this.was)) != ((int)(this.need))){
-          z.msg = "incorrect data check";
-          // chack is delayed
-          /*
-          this.mode = BAD;
-          this.marker = 5;       // can't try inflateSync
-          break;
-	  */
-        }
-        else if(flags!=0 && gheader!=null){
-          gheader.crc = this.need; 
-        }
-
-        this.mode = LENGTH;
-      case LENGTH:
-        if (wrap!=0 && flags!=0) {
-
-          try { r=readBytes(4, r, f); }
-          catch(Return e){ return e.r; }
-
-          if(z.msg!=null && z.msg.equals("incorrect data check")){
-            this.mode = BAD;
-            this.marker = 5;       // can't try inflateSync
-            break;
-          }
-
-          if (this.need != (z.total_out & 0xffffffffL)) {
-            z.msg = "incorrect length check";
-            this.mode = BAD;
-            break;
-          }
-          z.msg = null;
-        }
-        else {
-          if(z.msg!=null && z.msg.equals("incorrect data check")){
-            this.mode = BAD;
-            this.marker = 5;       // can't try inflateSync
-            break;
-          }
-        }
-
-        this.mode = DONE;
-      case DONE:
-        return Z_STREAM_END;
-      case BAD:
-        return Z_DATA_ERROR;
-
-      case FLAGS:
-
-        try { r=readBytes(2, r, f); }
-        catch(Return e){ return e.r; }
-
-        flags = ((int)this.need)&0xffff;
-
-        if ((flags & 0xff) != Z_DEFLATED) {
-          z.msg = "unknown compression method";
-          this.mode = BAD; 
-          break;
-        }
-        if ((flags & 0xe000)!=0) {
-          z.msg = "unknown header flags set";
-          this.mode = BAD; 
-          break;
-        }
-
-        if ((flags & 0x0200)!=0){
-          checksum(2, this.need);
-        } 
-
-        this.mode = TIME;
-
-      case TIME:
-        try { r=readBytes(4, r, f); }
-        catch(Return e){ return e.r; }
-        if(gheader!=null)
-          gheader.time = this.need;
-        if ((flags & 0x0200)!=0){
-          checksum(4, this.need);
-        }
-        this.mode = OS;
-      case OS:
-        try { r=readBytes(2, r, f); }
-        catch(Return e){ return e.r; }
-        if(gheader!=null){
-          gheader.xflags = ((int)this.need)&0xff;
-          gheader.os = (((int)this.need)>>8)&0xff;
-        }
-        if ((flags & 0x0200)!=0){
-          checksum(2, this.need);
-        }
-        this.mode = EXLEN;
-      case EXLEN:
-        if ((flags & 0x0400)!=0) {
-          try { r=readBytes(2, r, f); }
-          catch(Return e){ return e.r; }
-          if(gheader!=null){
-            gheader.extra = new byte[((int)this.need)&0xffff];
-          }
-          if ((flags & 0x0200)!=0){
-            checksum(2, this.need);
-          }
-        }
-        else if(gheader!=null){
-          gheader.extra=null;
-        }
-        this.mode = EXTRA;
-
-      case EXTRA:
-        if ((flags & 0x0400)!=0) {
-          try { 
-            r=readBytes(r, f);
-            if(gheader!=null){
-              byte[] foo = tmp_array;
-              tmp_array=null;
-              if(foo.length == gheader.extra.length){
-                System.arraycopy(foo, 0, gheader.extra, 0, foo.length);
-	      }
-              else{
-                z.msg = "bad extra field length";
-                this.mode = BAD; 
-                break;
-	      }
-            }
-          }
-          catch(Return e){ return e.r; }
-        }
-        else if(gheader!=null){
-          gheader.extra=null;
-	}
-	this.mode = NAME;
-      case NAME:
-	if ((flags & 0x0800)!=0) {
-          try { 
-            r=readString(r, f);
-            if(gheader!=null){
-              gheader.name=tmp_array;
-            }
-            tmp_array=null;
-          }
-          catch(Return e){ return e.r; }
-        }
-        else if(gheader!=null){
-          gheader.name=null;
-	}
-        this.mode = COMMENT;
-      case COMMENT:
-        if ((flags & 0x1000)!=0) {
-          try { 
-            r=readString(r, f);
-            if(gheader!=null){
-              gheader.comment=tmp_array;
-            }
-            tmp_array=null;
-          }
-          catch(Return e){ return e.r; }
-        }
-        else if(gheader!=null){
-          gheader.comment=null;
-	}
-        this.mode = HCRC;
-      case HCRC:
-	if ((flags & 0x0200)!=0) {
-          try { r=readBytes(2, r, f); }
-          catch(Return e){ return e.r; }
-          if(gheader!=null){
-            gheader.hcrc=(int)(this.need&0xffff);
-          }
-          if(this.need != (z.adler.getValue()&0xffffL)){
-            this.mode = BAD;
-            z.msg = "header crc mismatch";
-            this.marker = 5;       // can't try inflateSync
-            break;
-          }
-        }
-        z.adler = new CRC32();
-
-        this.mode = BLOCKS;
-        break;
-      default:
-        return Z_STREAM_ERROR;
-      }
-    }
-  }
-
-  int inflateSetDictionary(byte[] dictionary, int dictLength){
-    if(z==null || (this.mode != DICT0 && this.wrap != 0)){
-      return Z_STREAM_ERROR;
-    }
-
-    int index=0;
-    int length = dictLength;
-
-    if(this.mode==DICT0){
-      long adler_need=z.adler.getValue();
-      z.adler.reset();
-      z.adler.update(dictionary, 0, dictLength);
-      if(z.adler.getValue()!=adler_need){
-        return Z_DATA_ERROR;
-      }
-    }
-
-    z.adler.reset();
-
-    if(length >= (1<<this.wbits)){
-      length = (1<<this.wbits)-1;
-      index=dictLength - length;
-    }
-    this.blocks.set_dictionary(dictionary, index, length);
-    this.mode = BLOCKS;
-    return Z_OK;
-  }
-
-  static private byte[] mark = {(byte)0, (byte)0, (byte)0xff, (byte)0xff};
-
-  int inflateSync(){
-    int n;       // number of bytes to look at
-    int p;       // pointer to bytes
-    int m;       // number of marker bytes found in a row
-    long r, w;   // temporaries to save total_in and total_out
-
-    // set up
-    if(z == null)
-      return Z_STREAM_ERROR;
-    if(this.mode != BAD){
-      this.mode = BAD;
-      this.marker = 0;
-    }
-    if((n=z.avail_in)==0)
-      return Z_BUF_ERROR;
-
-    p=z.next_in_index;
-    m=this.marker;
-    // search
-    while (n!=0 && m < 4){
-      if(z.next_in[p] == mark[m]){
-        m++;
-      }
-      else if(z.next_in[p]!=0){
-        m = 0;
-      }
-      else{
-        m = 4 - m;
-      }
-      p++; n--;
-    }
-
-    // restore
-    z.total_in += p-z.next_in_index;
-    z.next_in_index = p;
-    z.avail_in = n;
-    this.marker = m;
-
-    // return no joy or set up to restart on a new block
-    if(m != 4){
-      return Z_DATA_ERROR;
-    }
-    r=z.total_in;  w=z.total_out;
-    inflateReset();
-    z.total_in=r;  z.total_out = w;
-    this.mode = BLOCKS;
-
-    return Z_OK;
-  }
-
-  // Returns true if inflate is currently at the end of a block generated
-  // by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-  // implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
-  // but removes the length bytes of the resulting empty stored block. When
-  // decompressing, PPP checks that at the end of input packet, inflate is
-  // waiting for these length bytes.
-  int inflateSyncPoint(){
-    if(z == null || this.blocks == null)
-      return Z_STREAM_ERROR;
-    return this.blocks.sync_point();
-  }
-
-  private int readBytes(int n, int r, int f) throws Return{
-    if(need_bytes == -1){
-      need_bytes=n;
-      this.need=0;
-    }
-    while(need_bytes>0){
-      if(z.avail_in==0){ throw new Return(r); }; r=f;
-      z.avail_in--; z.total_in++;
-      this.need = this.need | 
-	((z.next_in[z.next_in_index++]&0xff)<<((n-need_bytes)*8));
-      need_bytes--;
-    }
-    if(n==2){
-      this.need&=0xffffL;
-    }
-    else if(n==4) {
-      this.need&=0xffffffffL;
-    }
-    need_bytes=-1;
-    return r;
-  }
-  class Return extends Exception{
-    int r;
-    Return(int r){this.r=r; }
-  }
-
-  private byte[] tmp_array;
-  private int readString(int r, int f) throws Return{
-    int b=0; 
-    byte[] arr = new byte[4092];
-    int at = 0;
-    do {
-      if(z.avail_in==0){ throw new Return(r); }; r=f;
-      z.avail_in--; z.total_in++;
-      b = z.next_in[z.next_in_index];
-      if(b!=0) arr = append(arr, z.next_in[z.next_in_index], at++);
-      z.adler.update(z.next_in, z.next_in_index, 1);
-      z.next_in_index++;
-    }while(b!=0);
-    
-    tmp_array = copy(arr, at);
-    
-    return r;
-  }
-
-  private int readBytes(int r, int f) throws Return{
-    int b=0; 
-    byte[] arr = new byte[4092];
-    int at = 0;
-    while(this.need>0){
-      if(z.avail_in==0){ throw new Return(r); }; r=f;
-      z.avail_in--; z.total_in++;
-      b = z.next_in[z.next_in_index];
-      arr = append(arr, z.next_in[z.next_in_index], at++);
-      z.adler.update(z.next_in, z.next_in_index, 1);
-      z.next_in_index++;
-      this.need--;
-    }
-    
-    tmp_array = copy(arr, at);
-    
-    return r;
-  }
-  
-  private static byte[] copy(byte[] arr, int len) {
-      byte[] ret = new byte[len];
-      org.apidesign.bck2brwsr.emul.lang.System.arraycopy(arr, 0, ret, 0, len);
-      return ret;
-  }
-  private static byte[] append(byte[] arr, byte b, int index) {
-      arr[index] = b;
-      return arr;
-  }
-
-  private void checksum(int n, long v){
-    for(int i=0; i<n; i++){
-      crcbuf[i]=(byte)(v&0xff);
-      v>>=8;
-    }
-    z.adler.update(crcbuf, 0, n);
-  }
-
-  public GZIPHeader getGZIPHeader(){
-    return gheader;
-  }
-
-  boolean inParsingHeader(){
-    switch(mode){
-      case HEAD:
-      case DICT4:
-      case DICT3:
-      case DICT2:
-      case DICT1:
-      case FLAGS:
-      case TIME:
-      case OS:
-      case EXLEN:
-      case EXTRA:
-      case NAME:
-      case COMMENT:
-      case HCRC:
-	return true;
-      default:
-	return false;
-    }
-  }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Inflater.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Inflater.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import java.util.zip.*;
-import java.io.IOException;
-
-/**
- * This class provides support for general purpose decompression using the
- * popular ZLIB compression library. The ZLIB compression library was
- * initially developed as part of the PNG graphics standard and is not
- * protected by patents. It is fully described in the specifications at
- * the <a href="package-summary.html#package_description">java.util.zip
- * package description</a>.
- *
- * <p>The following code fragment demonstrates a trivial compression
- * and decompression of a string using <tt>Deflater</tt> and
- * <tt>Inflater</tt>.
- *
- * <blockquote><pre>
- * try {
- *     // Encode a String into bytes
- *     String inputString = "blahblahblah\u20AC\u20AC";
- *     byte[] input = inputString.getBytes("UTF-8");
- *
- *     // Compress the bytes
- *     byte[] output = new byte[100];
- *     Deflater compresser = new Deflater();
- *     compresser.setInput(input);
- *     compresser.finish();
- *     int compressedDataLength = compresser.deflate(output);
- *
- *     // Decompress the bytes
- *     Inflater decompresser = new Inflater();
- *     decompresser.setInput(output, 0, compressedDataLength);
- *     byte[] result = new byte[100];
- *     int resultLength = decompresser.inflate(result);
- *     decompresser.end();
- *
- *     // Decode the bytes into a String
- *     String outputString = new String(result, 0, resultLength, "UTF-8");
- * } catch(java.io.UnsupportedEncodingException ex) {
- *     // handle
- * } catch (java.util.zip.DataFormatException ex) {
- *     // handle
- * }
- * </pre></blockquote>
- *
- * @see         Deflater
- * @author      David Connelly
- *
- */
-public
-class Inflater extends java.util.zip.Inflater {
-    private final boolean nowrap;
-    private JzLibInflater impl;
-    
-    /**
-     * Creates a new decompressor. If the parameter 'nowrap' is true then
-     * the ZLIB header and checksum fields will not be used. This provides
-     * compatibility with the compression format used by both GZIP and PKZIP.
-     * <p>
-     * Note: When using the 'nowrap' option it is also necessary to provide
-     * an extra "dummy" byte as input. This is required by the ZLIB native
-     * library in order to support certain optimizations.
-     *
-     * @param nowrap if true then support GZIP compatible compression
-     */
-    public Inflater(boolean nowrap) {
-        this.nowrap = nowrap;
-        reset();
-    }
-
-    /**
-     * Creates a new decompressor.
-     */
-    public Inflater() {
-        this(false);
-    }
-
-    /**
-     * Sets input data for decompression. Should be called whenever
-     * needsInput() returns true indicating that more input data is
-     * required.
-     * @param b the input data bytes
-     * @param off the start offset of the input data
-     * @param len the length of the input data
-     * @see Inflater#needsInput
-     */
-    public void setInput(byte[] b, int off, int len) {
-        if (b == null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-        impl.setInput(b, off, len, false);
-    }
-
-    /**
-     * Sets input data for decompression. Should be called whenever
-     * needsInput() returns true indicating that more input data is
-     * required.
-     * @param b the input data bytes
-     * @see Inflater#needsInput
-     */
-    public void setInput(byte[] b) {
-        setInput(b, 0, b.length);
-    }
-
-    /**
-     * Sets the preset dictionary to the given array of bytes. Should be
-     * called when inflate() returns 0 and needsDictionary() returns true
-     * indicating that a preset dictionary is required. The method getAdler()
-     * can be used to get the Adler-32 value of the dictionary needed.
-     * @param b the dictionary data bytes
-     * @param off the start offset of the data
-     * @param len the length of the data
-     * @see Inflater#needsDictionary
-     * @see Inflater#getAdler
-     */
-    public void setDictionary(byte[] b, int off, int len) {
-        if (b == null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-        byte[] arr;
-        if (off == 0) {
-            arr = b;
-        } else {
-            arr = new byte[len];
-            org.apidesign.bck2brwsr.emul.lang.System.arraycopy(b, off, arr, 0, len);
-        }
-        impl.setDictionary(arr, len);
-    }
-
-    /**
-     * Sets the preset dictionary to the given array of bytes. Should be
-     * called when inflate() returns 0 and needsDictionary() returns true
-     * indicating that a preset dictionary is required. The method getAdler()
-     * can be used to get the Adler-32 value of the dictionary needed.
-     * @param b the dictionary data bytes
-     * @see Inflater#needsDictionary
-     * @see Inflater#getAdler
-     */
-    public void setDictionary(byte[] b) {
-        impl.setDictionary(b, b.length);
-    }
-
-    /**
-     * Returns the total number of bytes remaining in the input buffer.
-     * This can be used to find out what bytes still remain in the input
-     * buffer after decompression has finished.
-     * @return the total number of bytes remaining in the input buffer
-     */
-    public int getRemaining() {
-        return impl.getAvailIn();
-    }
-
-    /**
-     * Returns true if no data remains in the input buffer. This can
-     * be used to determine if #setInput should be called in order
-     * to provide more input.
-     * @return true if no data remains in the input buffer
-     */
-    public boolean needsInput() {
-        return getRemaining() <= 0;
-    }
-
-    /**
-     * Returns true if a preset dictionary is needed for decompression.
-     * @return true if a preset dictionary is needed for decompression
-     * @see Inflater#setDictionary
-     */
-    public boolean needsDictionary() {
-        return impl.needDict();
-    }
-
-    /**
-     * Returns true if the end of the compressed data stream has been
-     * reached.
-     * @return true if the end of the compressed data stream has been
-     * reached
-     */
-    public boolean finished() {
-        return impl.finished();
-    }
-
-    /**
-     * Uncompresses bytes into specified buffer. Returns actual number
-     * of bytes uncompressed. A return value of 0 indicates that
-     * needsInput() or needsDictionary() should be called in order to
-     * determine if more input data or a preset dictionary is required.
-     * In the latter case, getAdler() can be used to get the Adler-32
-     * value of the dictionary required.
-     * @param b the buffer for the uncompressed data
-     * @param off the start offset of the data
-     * @param len the maximum number of uncompressed bytes
-     * @return the actual number of uncompressed bytes
-     * @exception DataFormatException if the compressed data format is invalid
-     * @see Inflater#needsInput
-     * @see Inflater#needsDictionary
-     */
-    public int inflate(byte[] b, int off, int len)
-        throws DataFormatException
-    {
-        if (b == null) {
-            throw new NullPointerException();
-        }
-        if (off < 0 || len < 0 || off > b.length - len) {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-        impl.setOutput(b, off, len);
-        int err = impl.inflate(JzLibInflater.Z_NO_FLUSH);
-        return impl.next_out_index - off;
-    }
-
-    /**
-     * Uncompresses bytes into specified buffer. Returns actual number
-     * of bytes uncompressed. A return value of 0 indicates that
-     * needsInput() or needsDictionary() should be called in order to
-     * determine if more input data or a preset dictionary is required.
-     * In the latter case, getAdler() can be used to get the Adler-32
-     * value of the dictionary required.
-     * @param b the buffer for the uncompressed data
-     * @return the actual number of uncompressed bytes
-     * @exception DataFormatException if the compressed data format is invalid
-     * @see Inflater#needsInput
-     * @see Inflater#needsDictionary
-     */
-    public int inflate(byte[] b) throws DataFormatException {
-        return inflate(b, 0, b.length);
-    }
-
-    /**
-     * Returns the ADLER-32 value of the uncompressed data.
-     * @return the ADLER-32 value of the uncompressed data
-     */
-    public int getAdler() {
-        return (int) impl.getAdler();
-    }
-
-    /**
-     * Returns the total number of compressed bytes input so far.
-     *
-     * <p>Since the number of bytes may be greater than
-     * Integer.MAX_VALUE, the {@link #getBytesRead()} method is now
-     * the preferred means of obtaining this information.</p>
-     *
-     * @return the total number of compressed bytes input so far
-     */
-    public int getTotalIn() {
-        return (int) getBytesRead();
-    }
-
-    /**
-     * Returns the total number of compressed bytes input so far.</p>
-     *
-     * @return the total (non-negative) number of compressed bytes input so far
-     * @since 1.5
-     */
-    public long getBytesRead() {
-        return impl.total_in;
-    }
-
-    /**
-     * Returns the total number of uncompressed bytes output so far.
-     *
-     * <p>Since the number of bytes may be greater than
-     * Integer.MAX_VALUE, the {@link #getBytesWritten()} method is now
-     * the preferred means of obtaining this information.</p>
-     *
-     * @return the total number of uncompressed bytes output so far
-     */
-    public int getTotalOut() {
-        return (int) getBytesWritten();
-    }
-
-    /**
-     * Returns the total number of uncompressed bytes output so far.</p>
-     *
-     * @return the total (non-negative) number of uncompressed bytes output so far
-     * @since 1.5
-     */
-    public long getBytesWritten() {
-        return impl.total_out;
-    }
-
-    /**
-     * Resets inflater so that a new set of input data can be processed.
-     */
-    public void reset() {
-        impl = new JzLibInflater(15, nowrap);
-    }
-
-    /**
-     * Closes the decompressor and discards any unprocessed input.
-     * This method should be called when the decompressor is no longer
-     * being used, but will also be called automatically by the finalize()
-     * method. Once this method is called, the behavior of the Inflater
-     * object is undefined.
-     */
-    public void end() {
-        impl.end();
-    }
-
-    /**
-     * Closes the decompressor when garbage is collected.
-     */
-    protected void finalize() {
-        end();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/JzLibInflater.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/JzLibInflater.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
-/*
-Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-final class JzLibInflater extends ZStream{
-
-  static final private int MAX_WBITS=15;        // 32K LZ77 window
-  static final private int DEF_WBITS=MAX_WBITS;
-
-  public static final int Z_NO_FLUSH=0;
-  static final private int Z_PARTIAL_FLUSH=1;
-  static final private int Z_SYNC_FLUSH=2;
-  static final private int Z_FULL_FLUSH=3;
-  static final private int Z_FINISH=4;
-
-  static final private int MAX_MEM_LEVEL=9;
-
-  static final private int Z_OK=0;
-  static final private int Z_STREAM_END=1;
-  static final private int Z_NEED_DICT=2;
-  static final private int Z_ERRNO=-1;
-  static final private int Z_STREAM_ERROR=-2;
-  static final private int Z_DATA_ERROR=-3;
-  static final private int Z_MEM_ERROR=-4;
-  static final private int Z_BUF_ERROR=-5;
-  static final private int Z_VERSION_ERROR=-6;
-
-  public JzLibInflater() {
-    super();
-    init();
-  }
-
-  public JzLibInflater(int w)  {
-    this(w, false);
-  }
-
-  public JzLibInflater(int w, boolean nowrap)  {
-    super();
-    int ret = init(w, nowrap);
-    if(ret!=Z_OK)
-      throw new IllegalStateException(ret+": "+msg);
-  }
-
-  private boolean finished = false;
-
-  public int init(){
-    return init(DEF_WBITS);
-  }
-
-  public int init(boolean nowrap){
-    return init(DEF_WBITS, nowrap);
-  }
-
-  public int init(int w){
-    return init(w, false);
-  }
-
-  public int init(int w, boolean nowrap){
-    finished = false;
-    istate=new Inflate(this);
-    return istate.inflateInit(nowrap?-w:w);
-  }
-
-  public int inflate(int f){
-    if(istate==null) return Z_STREAM_ERROR;
-    int ret = istate.inflate(f);
-    if(ret == Z_STREAM_END) 
-      finished = true;
-    return ret;
-  }
-
-  public int end(){
-    finished = true;
-    if(istate==null) return Z_STREAM_ERROR;
-    int ret=istate.inflateEnd();
-//    istate = null;
-    return ret;
-  }
-
-  public int sync(){
-    if(istate == null)
-      return Z_STREAM_ERROR;
-    return istate.inflateSync();
-  }
-
-  public int syncPoint(){
-    if(istate == null)
-      return Z_STREAM_ERROR;
-    return istate.inflateSyncPoint();
-  }
-
-  public int setDictionary(byte[] dictionary, int dictLength){
-    if(istate == null)
-      return Z_STREAM_ERROR;
-    return istate.inflateSetDictionary(dictionary, dictLength);
-  }
-
-  public boolean finished(){
-    return istate.mode==12 /*DONE*/;
-  }
-
-  public boolean needDict() {
-    return istate == null ? false : istate.mode == Inflate.DICT0;
-  }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZStream.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,253 +0,0 @@
-/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
-/*
-Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
- * This program is based on zlib-1.1.3, so all credit should go authors
- * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
- * and contributors of zlib.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import org.apidesign.bck2brwsr.emul.lang.System;
-
-/**
- * ZStream
- *
- * @deprecated  Not for public use in the future.
- */
-@Deprecated
-class ZStream{
-
-  static final private int MAX_WBITS=15;        // 32K LZ77 window
-  static final private int DEF_WBITS=MAX_WBITS;
-
-  static final private int Z_NO_FLUSH=0;
-  static final private int Z_PARTIAL_FLUSH=1;
-  static final private int Z_SYNC_FLUSH=2;
-  static final private int Z_FULL_FLUSH=3;
-  static final private int Z_FINISH=4;
-
-  static final private int MAX_MEM_LEVEL=9;
-
-  static final private int Z_OK=0;
-  static final private int Z_STREAM_END=1;
-  static final private int Z_NEED_DICT=2;
-  static final private int Z_ERRNO=-1;
-  static final private int Z_STREAM_ERROR=-2;
-  static final private int Z_DATA_ERROR=-3;
-  static final private int Z_MEM_ERROR=-4;
-  static final private int Z_BUF_ERROR=-5;
-  static final private int Z_VERSION_ERROR=-6;
-
-  public byte[] next_in;     // next input byte
-  public int next_in_index;
-  public int avail_in;       // number of bytes available at next_in
-  public long total_in;      // total nb of input bytes read so far
-
-  public byte[] next_out;    // next output byte should be put there
-  public int next_out_index;
-  public int avail_out;      // remaining free space at next_out
-  public long total_out;     // total nb of bytes output so far
-
-  public String msg;
-
-  Inflate istate; 
-
-  int data_type; // best guess about the data type: ascii or binary
-
-  Checksum adler;
-
-  public ZStream(){
-    this(new Adler32());
-  }
-
-  public ZStream(Checksum adler){
-    this.adler=adler;
-  }
-
-  public int inflateInit(){
-    return inflateInit(DEF_WBITS);
-  }
-  public int inflateInit(boolean nowrap){
-    return inflateInit(DEF_WBITS, nowrap);
-  }
-  public int inflateInit(int w){
-    return inflateInit(w, false);
-  }
-
-  public int inflateInit(int w, boolean nowrap){
-    istate=new Inflate(this);
-    return istate.inflateInit(nowrap?-w:w);
-  }
-
-  public int inflate(int f){
-    if(istate==null) return Z_STREAM_ERROR;
-    return istate.inflate(f);
-  }
-  public int inflateEnd(){
-    if(istate==null) return Z_STREAM_ERROR;
-    int ret=istate.inflateEnd();
-//    istate = null;
-    return ret;
-  }
-  
-  public int inflateSync(){
-    if(istate == null)
-      return Z_STREAM_ERROR;
-    return istate.inflateSync();
-  }
-  public int inflateSyncPoint(){
-    if(istate == null)
-      return Z_STREAM_ERROR;
-    return istate.inflateSyncPoint();
-  }
-  public int inflateSetDictionary(byte[] dictionary, int dictLength){
-    if(istate == null)
-      return Z_STREAM_ERROR;
-    return istate.inflateSetDictionary(dictionary, dictLength);
-  }
-  public boolean inflateFinished(){
-    return istate.mode==12 /*DONE*/;
-  }
-
-
-  public long getAdler(){
-    return adler.getValue();
-  }
-
-  public void free(){
-    next_in=null;
-    next_out=null;
-    msg=null;
-  }
-
-  public void setOutput(byte[] buf){
-    setOutput(buf, 0, buf.length); 
-  }
-
-  public void setOutput(byte[] buf, int off, int len){
-    next_out = buf;
-    next_out_index = off;
-    avail_out = len;
-  }
-
-  public void setInput(byte[] buf){
-    setInput(buf, 0, buf.length, false); 
-  }
-
-  public void setInput(byte[] buf, boolean append){
-    setInput(buf, 0, buf.length, append); 
-  }
-
-  public void setInput(byte[] buf, int off, int len, boolean append){
-    if(len<=0 && append && next_in!=null) return;
-
-    if(avail_in>0 && append){  
-      byte[] tmp = new byte[avail_in+len];
-      System.arraycopy(next_in, next_in_index, tmp, 0, avail_in);
-      System.arraycopy(buf, off, tmp, avail_in, len);
-      next_in=tmp;
-      next_in_index=0;
-      avail_in+=len;
-    }
-    else{
-      next_in=buf;
-      next_in_index=off;
-      avail_in=len;
-    }
-  }
-
-  public byte[] getNextIn(){
-    return next_in;
-  }
-
-  public void setNextIn(byte[] next_in){
-    this.next_in = next_in;
-  }
-
-  public int getNextInIndex(){
-    return next_in_index;
-  }
-
-  public void setNextInIndex(int next_in_index){
-    this.next_in_index = next_in_index;
-  }
-
-  public int getAvailIn(){
-    return avail_in;
-  }
-
-  public void setAvailIn(int avail_in){
-    this.avail_in = avail_in;
-  }
-
-  public byte[] getNextOut(){
-    return next_out;
-  }
-
-  public void setNextOut(byte[] next_out){
-    this.next_out = next_out;
-  }
-
-  public int getNextOutIndex(){
-    return next_out_index;
-  }
-
-  public void setNextOutIndex(int next_out_index){
-    this.next_out_index = next_out_index;
-  }
-
-  public int getAvailOut(){
-    return avail_out;
-
-  }
-
-  public void setAvailOut(int avail_out){
-    this.avail_out = avail_out;
-  }
-
-  public long getTotalOut(){
-    return total_out;
-  }
-
-  public long getTotalIn(){
-    return total_in;
-  }
-
-  public String getMessage(){
-    return msg;
-  }
-
-  /**
-   * Those methods are expected to be override by Inflater and Deflater.
-   * In the future, they will become abstract methods.
-   */ 
-  public int end(){ return Z_OK; }
-  public boolean finished(){ return false; }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZipConstants64.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZipConstants64.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-/*
- * This class defines the constants that are used by the classes
- * which manipulate Zip64 files.
- */
-
-public class ZipConstants64 {
-
-    /*
-     * ZIP64 constants
-     */
-    static final long ZIP64_ENDSIG = 0x06064b50L;  // "PK\006\006"
-    static final long ZIP64_LOCSIG = 0x07064b50L;  // "PK\006\007"
-    static final int  ZIP64_ENDHDR = 56;           // ZIP64 end header size
-    static final int  ZIP64_LOCHDR = 20;           // ZIP64 end loc header size
-    static final int  ZIP64_EXTHDR = 24;           // EXT header size
-    static final int  ZIP64_EXTID  = 0x0001;       // Extra field Zip64 header ID
-
-    static final int  ZIP64_MAGICCOUNT = 0xFFFF;
-    static final long ZIP64_MAGICVAL = 0xFFFFFFFFL;
-
-    /*
-     * Zip64 End of central directory (END) header field offsets
-     */
-    static final int  ZIP64_ENDLEN = 4;       // size of zip64 end of central dir
-    static final int  ZIP64_ENDVEM = 12;      // version made by
-    static final int  ZIP64_ENDVER = 14;      // version needed to extract
-    static final int  ZIP64_ENDNMD = 16;      // number of this disk
-    static final int  ZIP64_ENDDSK = 20;      // disk number of start
-    static final int  ZIP64_ENDTOD = 24;      // total number of entries on this disk
-    static final int  ZIP64_ENDTOT = 32;      // total number of entries
-    static final int  ZIP64_ENDSIZ = 40;      // central directory size in bytes
-    static final int  ZIP64_ENDOFF = 48;      // offset of first CEN header
-    static final int  ZIP64_ENDEXT = 56;      // zip64 extensible data sector
-
-    /*
-     * Zip64 End of central directory locator field offsets
-     */
-    static final int  ZIP64_LOCDSK = 4;       // disk number start
-    static final int  ZIP64_LOCOFF = 8;       // offset of zip64 end
-    static final int  ZIP64_LOCTOT = 16;      // total number of disks
-
-    /*
-     * Zip64 Extra local (EXT) header field offsets
-     */
-    static final int  ZIP64_EXTCRC = 4;       // uncompressed file crc-32 value
-    static final int  ZIP64_EXTSIZ = 8;       // compressed size, 8-byte
-    static final int  ZIP64_EXTLEN = 16;      // uncompressed size, 8-byte
-
-    /*
-     * Language encoding flag EFS
-     */
-    static final int EFS = 0x800;       // If this bit is set the filename and
-                                        // comment fields for this file must be
-                                        // encoded using UTF-8.
-
-    private ZipConstants64() {}
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZipInputStream.java
--- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZipInputStream.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,468 +0,0 @@
-/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package org.apidesign.bck2brwsr.emul.zip;
-
-import java.util.zip.*;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.EOFException;
-import java.io.PushbackInputStream;
-import static org.apidesign.bck2brwsr.emul.zip.ZipConstants64.*;
-import static java.util.zip.ZipInputStream.*;
-
-/**
- * This class implements an input stream filter for reading files in the
- * ZIP file format. Includes support for both compressed and uncompressed
- * entries.
- *
- * @author      David Connelly
- */
-public
-class ZipInputStream extends InflaterInputStream  {
-    private ZipEntry entry;
-    private int flag;
-    private CRC32 crc = new CRC32();
-    private long remaining;
-    private byte[] tmpbuf = new byte[512];
-
-    private static final int STORED = ZipEntry.STORED;
-    private static final int DEFLATED = ZipEntry.DEFLATED;
-
-    private boolean closed = false;
-    // this flag is set to true after EOF has reached for
-    // one entry
-    private boolean entryEOF = false;
-
-    /**
-     * Check to make sure that this stream has not been closed
-     */
-    private void ensureOpen() throws IOException {
-        if (closed) {
-            throw new IOException("Stream closed");
-        }
-    }
-
-    /**
-     * Creates a new ZIP input stream.
-     *
-     * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
-     * decode the entry names.
-     *
-     * @param in the actual input stream
-     */
-    public ZipInputStream(InputStream in) {
-//        this(in, "UTF-8");
-        super(new PushbackInputStream(in, 512), new Inflater(true), 512);
-        //usesDefaultInflater = true;
-        if(in == null) {
-            throw new NullPointerException("in is null");
-        }
-    }
-
-    /**
-     * Creates a new ZIP input stream.
-     *
-     * @param in the actual input stream
-     *
-     * @param charset
-     *        The {@linkplain java.nio.charset.Charset charset} to be
-     *        used to decode the ZIP entry name (ignored if the
-     *        <a href="package-summary.html#lang_encoding"> language
-     *        encoding bit</a> of the ZIP entry's general purpose bit
-     *        flag is set).
-     *
-     * @since 1.7
-     *
-    public ZipInputStream(InputStream in, Charset charset) {
-        super(new PushbackInputStream(in, 512), new Inflater(true), 512);
-        usesDefaultInflater = true;
-        if(in == null) {
-            throw new NullPointerException("in is null");
-        }
-        if (charset == null)
-            throw new NullPointerException("charset is null");
-        this.zc = ZipCoder.get(charset);
-    }
-    */
-
-    /**
-     * Reads the next ZIP file entry and positions the stream at the
-     * beginning of the entry data.
-     * @return the next ZIP file entry, or null if there are no more entries
-     * @exception ZipException if a ZIP file error has occurred
-     * @exception IOException if an I/O error has occurred
-     */
-    public ZipEntry getNextEntry() throws IOException {
-        ensureOpen();
-        if (entry != null) {
-            closeEntry();
-        }
-        crc.reset();
-        inf.reset();
-        if ((entry = readLOC()) == null) {
-            return null;
-        }
-        if (entry.getMethod() == STORED) {
-            remaining = entry.getSize();
-        }
-        entryEOF = false;
-        return entry;
-    }
-
-    /**
-     * Closes the current ZIP entry and positions the stream for reading the
-     * next entry.
-     * @exception ZipException if a ZIP file error has occurred
-     * @exception IOException if an I/O error has occurred
-     */
-    public void closeEntry() throws IOException {
-        ensureOpen();
-        while (read(tmpbuf, 0, tmpbuf.length) != -1) ;
-        entryEOF = true;
-    }
-
-    /**
-     * Returns 0 after EOF has reached for the current entry data,
-     * otherwise always return 1.
-     * <p>
-     * Programs should not count on this method to return the actual number
-     * of bytes that could be read without blocking.
-     *
-     * @return     1 before EOF and 0 after EOF has reached for current entry.
-     * @exception  IOException  if an I/O error occurs.
-     *
-     */
-    public int available() throws IOException {
-        ensureOpen();
-        if (entryEOF) {
-            return 0;
-        } else {
-            return 1;
-        }
-    }
-
-    /**
-     * Reads from the current ZIP entry into an array of bytes.
-     * If <code>len</code> is not zero, the method
-     * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
-     * @param b the buffer into which the data is read
-     * @param off the start offset in the destination array <code>b</code>
-     * @param len the maximum number of bytes read
-     * @return the actual number of bytes read, or -1 if the end of the
-     *         entry is reached
-     * @exception  NullPointerException if <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException if <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     * @exception ZipException if a ZIP file error has occurred
-     * @exception IOException if an I/O error has occurred
-     */
-    public int read(byte[] b, int off, int len) throws IOException {
-        ensureOpen();
-        if (off < 0 || len < 0 || off > b.length - len) {
-            throw new IndexOutOfBoundsException();
-        } else if (len == 0) {
-            return 0;
-        }
-
-        if (entry == null) {
-            return -1;
-        }
-        switch (entry.getMethod()) {
-        case DEFLATED:
-            len = super.read(b, off, len);
-            if (len == -1) {
-                readEnd(entry);
-                entryEOF = true;
-                entry = null;
-            } else {
-                crc.update(b, off, len);
-            }
-            return len;
-        case STORED:
-            if (remaining <= 0) {
-                entryEOF = true;
-                entry = null;
-                return -1;
-            }
-            if (len > remaining) {
-                len = (int)remaining;
-            }
-            len = in.read(b, off, len);
-            if (len == -1) {
-                throw new ZipException("unexpected EOF");
-            }
-            crc.update(b, off, len);
-            remaining -= len;
-            if (remaining == 0 && entry.getCrc() != crc.getValue()) {
-                throw new ZipException(
-                    "invalid entry CRC (expected 0x" + Long.toHexString(entry.getCrc()) +
-                    " but got 0x" + Long.toHexString(crc.getValue()) + ")");
-            }
-            return len;
-        default:
-            throw new ZipException("invalid compression method");
-        }
-    }
-
-    /**
-     * Skips specified number of bytes in the current ZIP entry.
-     * @param n the number of bytes to skip
-     * @return the actual number of bytes skipped
-     * @exception ZipException if a ZIP file error has occurred
-     * @exception IOException if an I/O error has occurred
-     * @exception IllegalArgumentException if n < 0
-     */
-    public long skip(long n) throws IOException {
-        if (n < 0) {
-            throw new IllegalArgumentException("negative skip length");
-        }
-        ensureOpen();
-        int max = (int)Math.min(n, Integer.MAX_VALUE);
-        int total = 0;
-        while (total < max) {
-            int len = max - total;
-            if (len > tmpbuf.length) {
-                len = tmpbuf.length;
-            }
-            len = read(tmpbuf, 0, len);
-            if (len == -1) {
-                entryEOF = true;
-                break;
-            }
-            total += len;
-        }
-        return total;
-    }
-
-    /**
-     * Closes this input stream and releases any system resources associated
-     * with the stream.
-     * @exception IOException if an I/O error has occurred
-     */
-    public void close() throws IOException {
-        if (!closed) {
-            super.close();
-            closed = true;
-        }
-    }
-
-    private byte[] b = new byte[256];
-
-    /*
-     * Reads local file (LOC) header for next entry.
-     */
-    private ZipEntry readLOC() throws IOException {
-        try {
-            readFully(tmpbuf, 0, LOCHDR);
-        } catch (EOFException e) {
-            return null;
-        }
-        if (get32(tmpbuf, 0) != LOCSIG) {
-            return null;
-        }
-        // get flag first, we need check EFS.
-        flag = get16(tmpbuf, LOCFLG);
-        // get the entry name and create the ZipEntry first
-        int len = get16(tmpbuf, LOCNAM);
-        int blen = b.length;
-        if (len > blen) {
-            do
-                blen = blen * 2;
-            while (len > blen);
-            b = new byte[blen];
-        }
-        readFully(b, 0, len);
-        // Force to use UTF-8 if the EFS bit is ON, even the cs is NOT UTF-8
-        ZipEntry e = createZipEntry(((flag & EFS) != 0)
-                                    ? toStringUTF8(b, len)
-                                    : toString(b, len));
-        // now get the remaining fields for the entry
-        if ((flag & 1) == 1) {
-            throw new ZipException("encrypted ZIP entry not supported");
-        }
-        e.setMethod(get16(tmpbuf, LOCHOW));
-        e.setTime(get32(tmpbuf, LOCTIM));
-        if ((flag & 8) == 8) {
-            /* "Data Descriptor" present */
-            if (e.getMethod() != DEFLATED) {
-                throw new ZipException(
-                        "only DEFLATED entries can have EXT descriptor");
-            }
-        } else {
-            e.setCrc(get32(tmpbuf, LOCCRC));
-            e.setCompressedSize(get32(tmpbuf, LOCSIZ));
-            e.setSize(get32(tmpbuf, LOCLEN));
-        }
-        len = get16(tmpbuf, LOCEXT);
-        if (len > 0) {
-            byte[] bb = new byte[len];
-            readFully(bb, 0, len);
-            e.setExtra(bb);
-            // extra fields are in "HeaderID(2)DataSize(2)Data... format
-            if (e.getCompressedSize() == ZIP64_MAGICVAL || e.getCompressedSize() == ZIP64_MAGICVAL) {
-                int off = 0;
-                while (off + 4 < len) {
-                    int sz = get16(bb, off + 2);
-                    if (get16(bb, off) == ZIP64_EXTID) {
-                        off += 4;
-                        // LOC extra zip64 entry MUST include BOTH original and
-                        // compressed file size fields
-                        if (sz < 16 || (off + sz) > len ) {
-                            // Invalid zip64 extra fields, simply skip. Even it's
-                            // rare, it's possible the entry size happens to be
-                            // the magic value and it "accidnetly" has some bytes
-                            // in extra match the id.
-                            return e;
-                        }
-                        e.setSize(get64(bb, off));
-                        e.setCompressedSize(get64(bb, off + 8));
-                        break;
-                    }
-                    off += (sz + 4);
-                }
-            }
-        }
-        return e;
-    }
-
-    /**
-     * Creates a new <code>ZipEntry</code> object for the specified
-     * entry name.
-     *
-     * @param name the ZIP file entry name
-     * @return the ZipEntry just created
-     */
-    protected ZipEntry createZipEntry(String name) {
-        return new ZipEntry(name);
-    }
-
-    /*
-     * Reads end of deflated entry as well as EXT descriptor if present.
-     */
-    private void readEnd(ZipEntry e) throws IOException {
-        int n = inf.getRemaining();
-        if (n > 0) {
-            ((PushbackInputStream)in).unread(buf, len - n, n);
-        }
-        if ((flag & 8) == 8) {
-            /* "Data Descriptor" present */
-            if (inf.getBytesWritten() > ZIP64_MAGICVAL ||
-                inf.getBytesRead() > ZIP64_MAGICVAL) {
-                // ZIP64 format
-                readFully(tmpbuf, 0, ZIP64_EXTHDR);
-                long sig = get32(tmpbuf, 0);
-                if (sig != EXTSIG) { // no EXTSIG present
-                    e.setCrc(sig);
-                    e.setCompressedSize(get64(tmpbuf, ZIP64_EXTSIZ - ZIP64_EXTCRC));
-                    e.setSize(get64(tmpbuf, ZIP64_EXTLEN - ZIP64_EXTCRC));
-                    ((PushbackInputStream)in).unread(
-                        tmpbuf, ZIP64_EXTHDR - ZIP64_EXTCRC - 1, ZIP64_EXTCRC);
-                } else {
-                    e.setCrc(get32(tmpbuf, ZIP64_EXTCRC));
-                    e.setCompressedSize(get64(tmpbuf, ZIP64_EXTSIZ));
-                    e.setSize(get64(tmpbuf, ZIP64_EXTLEN));
-                }
-            } else {
-                readFully(tmpbuf, 0, EXTHDR);
-                long sig = get32(tmpbuf, 0);
-                if (sig != EXTSIG) { // no EXTSIG present
-                    e.setCrc(sig);
-                    e.setCompressedSize(get32(tmpbuf, EXTSIZ - EXTCRC));
-                    e.setSize(get32(tmpbuf, EXTLEN - EXTCRC));
-                    ((PushbackInputStream)in).unread(
-                                               tmpbuf, EXTHDR - EXTCRC - 1, EXTCRC);
-                } else {
-                    e.setCrc(get32(tmpbuf, EXTCRC));
-                    e.setCompressedSize(get32(tmpbuf, EXTSIZ));
-                    e.setSize(get32(tmpbuf, EXTLEN));
-                }
-            }
-        }
-        if (e.getSize() != inf.getBytesWritten()) {
-            throw new ZipException(
-                "invalid entry size (expected " + e.getSize() +
-                " but got " + inf.getBytesWritten() + " bytes)");
-        }
-        if (e.getCompressedSize() != inf.getBytesRead()) {
-            throw new ZipException(
-                "invalid entry compressed size (expected " + e.getCompressedSize() +
-                " but got " + inf.getBytesRead() + " bytes)");
-        }
-        if (e.getCrc() != crc.getValue()) {
-            throw new ZipException(
-                "invalid entry CRC (expected 0x" + Long.toHexString(e.getCrc()) +
-                " but got 0x" + Long.toHexString(crc.getValue()) + ")");
-        }
-    }
-
-    /*
-     * Reads bytes, blocking until all bytes are read.
-     */
-    private void readFully(byte[] b, int off, int len) throws IOException {
-        while (len > 0) {
-            int n = in.read(b, off, len);
-            if (n == -1) {
-                throw new EOFException();
-            }
-            off += n;
-            len -= n;
-        }
-    }
-
-    /*
-     * Fetches unsigned 16-bit value from byte array at specified offset.
-     * The bytes are assumed to be in Intel (little-endian) byte order.
-     */
-    private static final int get16(byte b[], int off) {
-        return (b[off] & 0xff) | ((b[off+1] & 0xff) << 8);
-    }
-
-    /*
-     * Fetches unsigned 32-bit value from byte array at specified offset.
-     * The bytes are assumed to be in Intel (little-endian) byte order.
-     */
-    private static final long get32(byte b[], int off) {
-        return (get16(b, off) | ((long)get16(b, off+2) << 16)) & 0xffffffffL;
-    }
-
-    /*
-     * Fetches signed 64-bit value from byte array at specified offset.
-     * The bytes are assumed to be in Intel (little-endian) byte order.
-     */
-    private static final long get64(byte b[], int off) {
-        return get32(b, off) | (get32(b, off+4) << 32);
-    }
-
-    private static String toStringUTF8(byte[] arr, int len) {
-        return new String(arr, 0, len);
-    }
-    
-    private static String toString(byte[] b, int len) {
-        return new String(b, 0, len);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_Number.js
--- a/emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_Number.js	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,520 +0,0 @@
-// empty line needed here
-Number.prototype.add32 = function(x) { return (this + x) | 0; };
-Number.prototype.sub32 = function(x) { return (this - x) | 0; };
-Number.prototype.mul32 = function(x) { 
-    return (((this * (x >> 16)) << 16) + this * (x & 0xFFFF)) | 0;
-};
-Number.prototype.neg32 = function() { return (-this) | 0; };
-
-Number.prototype.toInt8 = function()  { return (this << 24) >> 24; };
-Number.prototype.toInt16 = function() { return (this << 16) >> 16; };
-
-var __m32 = 0xFFFFFFFF;
-
-Number.prototype.next32 = function(low) {
-  if (this === 0) {
-    return low;
-  }
-  var l = new Number(low);
-  l.hi = this | 0;
-  return l;
-};
-
-Number.prototype.high32 = function() { 
-    return this.hi ? this.hi : (Math.floor(this / (__m32+1))) | 0;
-};
-Number.prototype.toInt32 = function() { return this | 0; };
-Number.prototype.toFP = function() {
-    return this.hi ? this.hi * (__m32+1) + this : this;
-};
-Number.prototype.toLong = function() {
-    var hi = (this > __m32) ? (Math.floor(this / (__m32+1))) | 0 : 0;
-    return hi.next32(Math.floor(this % (__m32+1)));
-};
-
-Number.prototype.toExactString = function() {
-    if (this.hi) {
-        // check for Long.MIN_VALUE
-        if ((this.hi == (0x80000000 | 0)) && (this == 0)) {
-            return '-9223372036854775808';
-        }
-        var res = 0;
-        var a = [ 6,9,2,7,6,9,4,9,2,4 ];
-        var s = '';
-        var digit;
-        var neg = this.hi < 0;
-        if (neg) {
-            var x = this.neg64();
-            var hi = x.hi;
-            var low = x;
-        } else {
-            var hi = this.hi;
-            var low = this;
-        }
-        for (var i = 0; i < a.length; i++) {
-            res += hi * a[i];
-            var low_digit = low % 10;
-            digit = (res % 10) + low_digit;
-
-            low = Math.floor(low / 10);
-            res = Math.floor(res / 10);
-
-            if (digit >= 10) {
-                digit -= 10;
-                res++;
-            }
-            s = String(digit).concat(s);
-        }
-        s = String(res).concat(s).replace(/^0+/, '');
-        return (neg ? '-' : '').concat(s);
-    }
-    return String(this);
-};
-
-Number.prototype.add64 = function(x) {
-    var low = this + x;
-    carry = 0;
-    if (low > __m32) {
-        carry = 1;
-        low -= (__m32+1);
-    }
-    var hi = (this.high32() + x.high32() + carry) | 0;
-    return hi.next32(low);
-};
-
-Number.prototype.sub64 = function(x) {
-    var low = this - x;
-    carry = 0;
-    if (low < 0) {
-        carry = 1;
-        low += (__m32+1);
-    }
-    var hi = (this.high32() - x.high32() - carry) | 0;
-    return hi.next32(low);
-};
-
-Number.prototype.mul64 = function(x) {
-    var low = this.mul32(x);
-    low += (low < 0) ? (__m32+1) : 0;
-    // first count upper 32 bits of (this.low * x.low)
-    var hi_hi = 0;
-    var hi_low = 0;
-    var m = 1;
-    for (var i = 0; i < 32; i++) {
-        if (x & m) {
-            hi_hi += this >>> 16;
-            hi_low += this & 0xFFFF
-        }
-        hi_low >>= 1;
-        hi_low += (hi_hi & 1) ? 0x8000 : 0;
-        hi_hi >>= 1;
-        m <<= 1;
-    }
-    var hi = (hi_hi << 16) + hi_low;
-    
-    var m1 = this.high32().mul32(x);
-    var m2 = this.mul32(x.high32());
-    hi = hi.add32(m1).add32(m2);
-    
-    return hi.next32(low);
-};
-
-Number.prototype.and64 = function(x) {
-    var low = this & x;
-    low += (low < 0) ? (__m32+1) : 0;
-    if (this.hi && x.hi) {
-        var hi = this.hi & x.hi;
-        return hi.next32(low);
-    };
-    return low;
-};
-
-Number.prototype.or64 = function(x) {
-    var low = this | x;
-    low += (low < 0) ? (__m32+1) : 0;
-    if (this.hi || x.hi) {
-        var hi = this.hi | x.hi;
-        return hi.next32(low);
-    };
-    return low;
-};
-
-Number.prototype.xor64 = function(x) {
-    var low = this ^ x;
-    low += (low < 0) ? (__m32+1) : 0;
-    if (this.hi || x.hi) {
-        var hi = this.hi ^ x.hi;
-        return hi.next32(low);
-    };
-    return low;
-};
-
-Number.prototype.shl64 = function(x) {
-    if (x >= 32) {
-        var hi = this << (x - 32);
-        return hi.next32(0);
-    } else {
-        var hi = this.high32() << x;
-        var low_reminder = this >> (32 - x);
-        hi |= low_reminder;
-        var low = this << x;
-        low += (low < 0) ? (__m32+1) : 0;
-        return hi.next32(low);
-    }
-};
-
-Number.prototype.shr64 = function(x) {
-    if (x >= 32) {
-        var low = this.high32() >> (x - 32);
-        low += (low < 0) ? (__m32+1) : 0;
-        return low;
-    } else {
-        var low = this >> x;
-        var hi_reminder = this.high32() << (32 - x);
-        low |= hi_reminder;
-        low += (low < 0) ? (__m32+1) : 0;
-        var hi = this.high32() >> x;
-        return hi.next32(low);
-    }
-};
-
-Number.prototype.ushr64 = function(x) {
-    if (x >= 32) {
-        var low = this.high32() >>> (x - 32);
-        low += (low < 0) ? (__m32+1) : 0;
-        return low;
-    } else {
-        var low = this >>> x;
-        var hi_reminder = this.high32() << (32 - x);
-        low |= hi_reminder;
-        low += (low < 0) ? (__m32+1) : 0;
-        var hi = this.high32() >>> x;
-        return hi.next32(low);
-    }
-};
-
-Number.prototype.compare64 = function(x) {
-    if (this.high32() === x.high32()) {
-        return (this < x) ? -1 : ((this > x) ? 1 : 0);
-    }
-    return (this.high32() < x.high32()) ? -1 : 1;
-};
-
-Number.prototype.neg64 = function() {
-    var hi = this.high32();
-    var low = this;
-    if ((hi === 0) && (low < 0)) { return -low; }
-    hi = ~hi;
-    low = ~low;
-    low += (low < 0) ? (__m32+1) : 0;
-    var ret = hi.next32(low);
-    return ret.add64(1);
-};
-
-(function(numberPrototype) {
-    function __Int64(hi32, lo32) {
-        this.hi32 = hi32 | 0;
-        this.lo32 = lo32 | 0;
-
-        this.get32 = function(bitIndex) {
-            var v0;
-            var v1;
-            bitIndex += 32;
-            var selector = bitIndex >>> 5;
-            switch (selector) {
-                case 0:
-                    v0 = 0;
-                    v1 = this.lo32;
-                    break;
-                case 1:
-                    v0 = this.lo32;
-                    v1 = this.hi32;
-                    break;
-                case 2:
-                    v0 = this.hi32;
-                    v1 = 0;
-                    break
-                default:
-                    return 0;
-            }
-
-            var shift = bitIndex & 31;
-            if (shift === 0) {
-                return v0;
-            }
-
-            return (v1 << (32 - shift)) | (v0 >>> shift);
-        }
-
-        this.get16 = function(bitIndex) {
-            return this.get32(bitIndex) & 0xffff;
-        }
-
-        this.set16 = function(bitIndex, value) {
-            bitIndex += 32;
-            var shift = bitIndex & 15;
-            var svalue = (value & 0xffff) << shift; 
-            var smask = 0xffff << shift;
-            var selector = bitIndex >>> 4;
-            switch (selector) {
-                case 0:
-                    break;
-                case 1:
-                    this.lo32 = (this.lo32 & ~(smask >>> 16))
-                                    | (svalue >>> 16);
-                    break;
-                case 2:
-                    this.lo32 = (this.lo32 & ~smask) | svalue;
-                    break;
-                case 3:
-                    this.lo32 = (this.lo32 & ~(smask << 16))
-                                    | (svalue << 16);
-                    this.hi32 = (this.hi32 & ~(smask >>> 16))
-                                    | (svalue >>> 16);
-                    break;
-                case 4:
-                    this.hi32 = (this.hi32 & ~smask) | svalue;
-                    break;
-                case 5:
-                    this.hi32 = (this.hi32 & ~(smask << 16))
-                                    | (svalue << 16);
-                    break;
-            }
-        }
-
-        this.getDigit = function(index, shift) {
-            return this.get16((index << 4) - shift);
-        }
-
-        this.getTwoDigits = function(index, shift) {
-            return this.get32(((index - 1) << 4) - shift);
-        }
-
-        this.setDigit = function(index, shift, value) {
-            this.set16((index << 4) - shift, value);
-        }
-
-        this.countSignificantDigits = function() {
-            var sd;
-            var remaining;
-
-            if (this.hi32 === 0) {
-                if (this.lo32 === 0) {
-                    return 0;
-                }
-
-                sd = 2;
-                remaining = this.lo32;
-            } else {
-                sd = 4;
-                remaining = this.hi32;
-            }
-
-            if (remaining < 0) {
-                return sd;
-            }
-
-            return (remaining < 65536) ? sd - 1 : sd;
-        }
-        
-        this.toNumber = function() {
-            var lo32 = this.lo32;
-            if (lo32 < 0) {
-                lo32 += 0x100000000;
-            }
-
-            return this.hi32.next32(lo32);
-        }
-    }
-
-    function __countLeadingZeroes16(number) {
-        var nlz = 0;
-
-        if (number < 256) {
-            nlz += 8;
-            number <<= 8;
-        }
-
-        if (number < 4096) {
-            nlz += 4;
-            number <<= 4;
-        }
-
-        if (number < 16384) {
-            nlz += 2;
-            number <<= 2;
-        }
-
-        return (number < 32768) ? nlz + 1 : nlz;
-    }
-    
-    // q = u / v; r = u - q * v;
-    // v != 0
-    function __div64(q, r, u, v) {
-        var m = u.countSignificantDigits();
-        var n = v.countSignificantDigits();
-
-        q.hi32 = q.lo32 = 0;
-
-        if (n === 1) {
-            // v has single digit
-            var vd = v.getDigit(0, 0);
-            var carry = 0;
-            for (var i = m - 1; i >= 0; --i) {
-                var ui = (carry << 16) | u.getDigit(i, 0);
-                if (ui < 0) {
-                    ui += 0x100000000;
-                }
-                var qi = (ui / vd) | 0;
-                q.setDigit(i, 0, qi);
-                carry = ui - qi * vd;
-            }
-
-            r.hi32 = 0;
-            r.lo32 = carry;
-            return;
-        }
-
-        r.hi32 = u.hi32;  
-        r.lo32 = u.lo32;
-
-        if (m < n) {
-            return;
-        }
-
-        // Normalize
-        var nrm = __countLeadingZeroes16(v.getDigit(n - 1, 0));
-
-        var vd1 = v.getDigit(n - 1, nrm);                
-        var vd0 = v.getDigit(n - 2, nrm);
-        for (var j = m - n; j >= 0; --j) {
-            // Calculate qj estimate
-            var ud21 = r.getTwoDigits(j + n, nrm);
-            var ud2 = ud21 >>> 16;
-            if (ud21 < 0) {
-                ud21 += 0x100000000;
-            }
-
-            var qest = (ud2 === vd1) ? 0xFFFF : ((ud21 / vd1) | 0);
-            var rest = ud21 - qest * vd1;
-
-            // 0 <= (qest - qj) <= 2
-
-            // Refine qj estimate
-            var ud0 = r.getDigit(j + n - 2, nrm);
-            while ((qest * vd0) > ((rest * 0x10000) + ud0)) {
-                --qest;
-                rest += vd1;
-            }
-
-            // 0 <= (qest - qj) <= 1
-            
-            // Multiply and subtract
-            var carry = 0;
-            for (var i = 0; i < n; ++i) {
-                var vi = qest * v.getDigit(i, nrm);
-                var ui = r.getDigit(i + j, nrm) - carry - (vi & 0xffff);
-                r.setDigit(i + j, nrm, ui);
-                carry = (vi >>> 16) - (ui >> 16);
-            }
-            var uj = ud2 - carry;
-
-            if (uj < 0) {
-                // qest - qj = 1
-
-                // Add back
-                --qest;
-                var carry = 0;
-                for (var i = 0; i < n; ++i) {
-                    var ui = r.getDigit(i + j, nrm) + v.getDigit(i, nrm)
-                                 + carry;
-                    r.setDigit(i + j, nrm, ui);
-                    carry = ui >> 16;
-                }
-                uj += carry;
-            }
-
-            q.setDigit(j, 0, qest);
-            r.setDigit(j + n, nrm, uj);
-        }
-    }
-    
-    numberPrototype.div64 = function(x) {
-        var negateResult = false;
-        var u, v;
-        
-        if ((this.high32() & 0x80000000) != 0) {
-            u = this.neg64();
-            negateResult = !negateResult;
-        } else {
-            u = this;        
-        }
-
-        if ((x.high32() & 0x80000000) != 0) {
-            v = x.neg64();
-            negateResult = !negateResult;
-        } else {
-            v = x;
-        }
-
-        if ((v === 0) && (v.high32() === 0)) {
-            // TODO: throw
-        }
-
-        if (u.high32() === 0) {
-            if (v.high32() === 0) {
-                var result = (u / v) | 0;
-                return negateResult ? result.neg64() : result; 
-            }
-
-            return 0;
-        }
-
-        var u64 = new __Int64(u.high32(), u);
-        var v64 = new __Int64(v.high32(), v);
-        var q64 = new __Int64(0, 0);
-        var r64 = new __Int64(0, 0);
-
-        __div64(q64, r64, u64, v64);
-
-        var result = q64.toNumber();
-        return negateResult ? result.neg64() : result; 
-    }
-
-    numberPrototype.mod64 = function(x) {
-        var negateResult = false;
-        var u, v;
-        
-        if ((this.high32() & 0x80000000) != 0) {
-            u = this.neg64();
-            negateResult = !negateResult;
-        } else {
-            u = this;        
-        }
-
-        if ((x.high32() & 0x80000000) != 0) {
-            v = x.neg64();
-        } else {
-            v = x;
-        }
-
-        if ((v === 0) && (v.high32() === 0)) {
-            // TODO: throw
-        }
-
-        if (u.high32() === 0) {
-            var result = (v.high32() === 0) ? (u % v) : u;
-            return negateResult ? result.neg64() : result; 
-        }
-
-        var u64 = new __Int64(u.high32(), u);
-        var v64 = new __Int64(v.high32(), v);
-        var q64 = new __Int64(0, 0);
-        var r64 = new __Int64(0, 0);
-
-        __div64(q64, r64, u64, v64);
-
-        var result = r64.toNumber();
-        return negateResult ? result.neg64() : result; 
-    }
-})(Number.prototype);
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_String.js
--- a/emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_String.js	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-// initialize methods on arrays and String constants
-vm.java_lang_reflect_Array(false);
-vm.java_lang_String(false);
-
-Array.prototype.at = function(indx, value) {
-  if (indx < 0 || indx > this.length) {
-      var e = vm.java_lang_ArrayIndexOutOfBoundsException(true);
-      e.constructor.cons__VLjava_lang_String_2.call(e, indx.toString());
-      throw e;
-  }
-  if (arguments.length === 2) {
-      this[indx] = value;
-  }
-  return this[indx];
-};
-Array.prototype.getClass__Ljava_lang_Class_2 = function() {
-  return vm.java_lang_Class(false).defineArray__Ljava_lang_Class_2Ljava_lang_String_2(this.jvmName);
-};
-Array.prototype.clone__Ljava_lang_Object_2 = function() {
-  var s = this.length;
-  var ret = new Array(s);
-  for (var i = 0; i < s; i++) {
-      ret[i] = this[i];
-  }
-  ret.jvmName = this.jvmName;
-  return ret;
-};
diff -r 3392f250c784 -r ecbd252fd3a7 emul/mini/src/test/java/org/apidesign/bck2brwsr/emul/reflect/MethodImplTest.java
--- a/emul/mini/src/test/java/org/apidesign/bck2brwsr/emul/reflect/MethodImplTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.emul.reflect;
-
-import java.lang.reflect.Method;
-import java.util.Enumeration;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class MethodImplTest {
-    
-    public MethodImplTest() {
-    }
-    
-    public static String[] arr(String... arr) {
-        return arr;
-    }
-
-    @Test
-    public void testSignatureForMethodWithAnArray() throws NoSuchMethodException {
-        Method m = MethodImplTest.class.getMethod("arr", String[].class);
-        String sig = MethodImpl.toSignature(m);
-        int sep = sig.indexOf("__");
-        assert sep > 0 : "Separator found " + sig;
-        
-        Enumeration<Class> en = MethodImpl.signatureParser(sig.substring(sep + 2));
-        
-        assert en.nextElement() == m.getReturnType() : "Return type is the same";
-        assert en.nextElement() == m.getParameterTypes()[0] : "1st param type is the same";
-    }
-}
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 emul/pom.xml
--- a/emul/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>bck2brwsr</artifactId>
-    <groupId>org.apidesign</groupId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>emul.pom</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Emulation of Core Libraries</name>
-  <modules>
-    <module>mini</module>
-    <module>compact</module>
-  </modules>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 ide/editor/pom.xml
--- a/ide/editor/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/ide/editor/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -4,19 +4,19 @@
     <parent>
         <artifactId>ide</artifactId>
         <groupId>org.apidesign.bck2brwsr</groupId>
-        <version>0.3-SNAPSHOT</version>
+        <version>0.5-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apidesign.bck2brwsr.ide.editor</groupId>
     <artifactId>editor</artifactId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
     <packaging>nbm</packaging>
 
     <name>Editor Support for Bck2Brwsr</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <netbeans.version>RELEASE72</netbeans.version>
+        <netbeans.version>RELEASE73</netbeans.version>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
     </properties>
 
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apidesign.bck2brwsr</groupId>
             <artifactId>core</artifactId>
-            <version>0.3-SNAPSHOT</version>
+            <version>0.5-SNAPSHOT</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
diff -r 3392f250c784 -r ecbd252fd3a7 ide/pom.xml
--- a/ide/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/ide/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -4,11 +4,11 @@
   <parent>
     <artifactId>bck2brwsr</artifactId>
     <groupId>org.apidesign</groupId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>ide</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>IDE Support</name>
   <modules>
diff -r 3392f250c784 -r ecbd252fd3a7 javap/pom.xml
--- a/javap/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign</groupId>
-    <artifactId>bck2brwsr</artifactId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>javap</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <name>javap</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <build>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>2.5.1</version>
-              <configuration>
-                  <compilerArguments>
-                      <!--<bootclasspath>non-existing</bootclasspath>-->
-                  </compilerArguments>
-                 <source>1.6</source>
-                 <target>1.6</target>
-              </configuration>
-          </plugin>
-      </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>emul.mini</artifactId>
-      <version>0.3-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/AnnotationParser.java
--- a/javap/src/main/java/org/apidesign/javap/AnnotationParser.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.apidesign.javap;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/** An abstract parser for annotation definitions. Analyses the bytes and
- * performs some callbacks to the overriden parser methods.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class AnnotationParser {
-    private final boolean textual;
-    private final boolean iterateArray;
-    
-    protected AnnotationParser(boolean textual, boolean iterateArray) {
-        this.textual = textual;
-        this.iterateArray = iterateArray;
-    }
-
-    protected void visitAnnotationStart(String type, boolean top) throws IOException {
-    }
-
-    protected void visitAnnotationEnd(String type, boolean top) throws IOException {
-    }
-
-    protected void visitValueStart(String attrName, char type) throws IOException {
-    }
-
-    protected void visitValueEnd(String attrName, char type) throws IOException {
-    }
-
-    
-    protected void visitAttr(
-        String annoType, String attr, String attrType, String value
-    ) throws IOException {
-    }
-    
-    protected void visitEnumAttr(
-        String annoType, String attr, String attrType, String value
-    ) throws IOException {
-        visitAttr(annoType, attr, attrType, value);
-    }
-    
-    /** Initialize the parsing with constant pool from <code>cd</code>.
-     * 
-     * @param attr the attribute defining annotations
-     * @param cd constant pool
-     * @throws IOException in case I/O fails
-     */
-    public final void parse(byte[] attr, ClassData cd) throws IOException {
-        ByteArrayInputStream is = new ByteArrayInputStream(attr);
-        DataInputStream dis = new DataInputStream(is);
-        try {
-            read(dis, cd);
-        } finally {
-            is.close();
-        }
-    }
-    
-    private void read(DataInputStream dis, ClassData cd) throws IOException {
-    	int cnt = dis.readUnsignedShort();
-        for (int i = 0; i < cnt; i++) {
-            readAnno(dis, cd, true);
-        }
-    }
-
-    private void readAnno(DataInputStream dis, ClassData cd, boolean top) throws IOException {
-        int type = dis.readUnsignedShort();
-        String typeName = cd.StringValue(type);
-        visitAnnotationStart(typeName, top);
-    	int cnt = dis.readUnsignedShort();
-    	for (int i = 0; i < cnt; i++) {
-            String attrName = cd.StringValue(dis.readUnsignedShort());
-            readValue(dis, cd, typeName, attrName);
-        }
-        visitAnnotationEnd(typeName, top);
-        if (cnt == 0) {
-            visitAttr(typeName, null, null, null);
-        }
-    }
-
-    private void readValue(
-        DataInputStream dis, ClassData cd, String typeName, String attrName
-    ) throws IOException {
-        char type = (char)dis.readByte();
-        visitValueStart(attrName, type);
-        if (type == '@') {
-            readAnno(dis, cd, false);
-        } else if ("CFJZsSIDB".indexOf(type) >= 0) { // NOI18N
-            int primitive = dis.readUnsignedShort();
-            String val = cd.stringValue(primitive, textual);
-            String attrType;
-            if (type == 's') {
-                attrType = "Ljava_lang_String_2";
-                if (textual) {
-                    val = '"' + val + '"';
-                }
-            } else {
-                attrType = "" + type;
-            }
-            visitAttr(typeName, attrName, attrType, val);
-        } else if (type == 'c') {
-            int cls = dis.readUnsignedShort();
-        } else if (type == '[') {
-            int cnt = dis.readUnsignedShort();
-            for (int i = 0; i < cnt; i++) {
-                readValue(dis, cd, typeName, iterateArray ? attrName : null);
-            }
-        } else if (type == 'e') {
-            int enumT = dis.readUnsignedShort();
-            String attrType = cd.stringValue(enumT, textual);
-            int enumN = dis.readUnsignedShort();
-            String val = cd.stringValue(enumN, textual);
-            visitEnumAttr(typeName, attrName, attrType, val);
-        } else {
-            throw new IOException("Unknown type " + type);
-        }
-        visitValueEnd(attrName, type);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/AttrData.java
--- a/javap/src/main/java/org/apidesign/javap/AttrData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-
-package org.apidesign.javap;
-
-import java.io.*;
-
-/**
- * Reads and stores attribute information.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-class AttrData {
-    ClassData cls;
-    int name_cpx;
-    int datalen;
-    byte data[];
-
-    public AttrData (ClassData cls) {
-        this.cls=cls;
-    }
-
-    /**
-     * Reads unknown attribute.
-     */
-    public void read(int name_cpx, DataInputStream in) throws IOException {
-        this.name_cpx=name_cpx;
-        datalen=in.readInt();
-        data=new byte[datalen];
-        in.readFully(data);
-    }
-
-    /**
-     * Reads just the name of known attribute.
-     */
-    public void read(int name_cpx){
-        this.name_cpx=name_cpx;
-    }
-
-    /**
-     * Returns attribute name.
-     */
-    public String getAttrName(){
-        return cls.getString(name_cpx);
-    }
-
-    /**
-     * Returns attribute data.
-     */
-    public byte[] getData(){
-        return data;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/CPX.java
--- a/javap/src/main/java/org/apidesign/javap/CPX.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-/**
- * Stores constant pool entry information with one field.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-class CPX {
-    int cpx;
-
-    CPX (int cpx) {
-        this.cpx=cpx;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/CPX2.java
--- a/javap/src/main/java/org/apidesign/javap/CPX2.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-/**
- *  Stores constant pool entry information with two fields.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-class CPX2 {
-    int cpx1,cpx2;
-
-    CPX2 (int cpx1, int cpx2) {
-        this.cpx1=cpx1;
-        this.cpx2=cpx2;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/ClassData.java
--- a/javap/src/main/java/org/apidesign/javap/ClassData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,713 +0,0 @@
-/*
- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-import java.io.*;
-
-/**
- * Central data repository of the Java Disassembler.
- * Stores all the information in java class file.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-public final class ClassData implements RuntimeConstants {
-
-    private int magic;
-    private int minor_version;
-    private int major_version;
-    private int cpool_count;
-    private Object cpool[];
-    private int access;
-    private int this_class = 0;;
-    private int super_class;
-    private int interfaces_count;
-    private int[] interfaces = new int[0];;
-    private int fields_count;
-    private FieldData[] fields;
-    private int methods_count;
-    private MethodData[] methods;
-    private InnerClassData[] innerClasses;
-    private int attributes_count;
-    private AttrData[] attrs;
-    private String classname;
-    private String superclassname;
-    private int source_cpx=0;
-    private byte tags[];
-    private Hashtable indexHashAscii = new Hashtable();
-    private String pkgPrefix="";
-    private int pkgPrefixLen=0;
-
-    /**
-     * Read classfile to disassemble.
-     */
-    public ClassData(InputStream infile) throws IOException {
-        this.read(new DataInputStream(infile));
-    }
-
-    /**
-     * Reads and stores class file information.
-     */
-    public void read(DataInputStream in) throws IOException {
-        // Read the header
-        magic = in.readInt();
-        if (magic != JAVA_MAGIC) {
-            throw new ClassFormatError("wrong magic: " +
-                                       toHex(magic) + ", expected " +
-                                       toHex(JAVA_MAGIC));
-        }
-        minor_version = in.readShort();
-        major_version = in.readShort();
-        if (major_version != JAVA_VERSION) {
-        }
-
-        // Read the constant pool
-        readCP(in);
-        access = in.readUnsignedShort();
-        this_class = in.readUnsignedShort();
-        super_class = in.readUnsignedShort();
-
-        //Read interfaces.
-        interfaces_count = in.readUnsignedShort();
-        if(interfaces_count > 0){
-            interfaces = new int[interfaces_count];
-        }
-        for (int i = 0; i < interfaces_count; i++) {
-            interfaces[i]=in.readShort();
-        }
-
-        // Read the fields
-        readFields(in);
-
-        // Read the methods
-        readMethods(in);
-
-        // Read the attributes
-        attributes_count = in.readUnsignedShort();
-        attrs=new AttrData[attributes_count];
-        for (int k = 0; k < attributes_count; k++) {
-            int name_cpx=in.readUnsignedShort();
-            if (getTag(name_cpx)==CONSTANT_UTF8
-                && getString(name_cpx).equals("SourceFile")
-                ){      if (in.readInt()!=2)
-                    throw new ClassFormatError("invalid attr length");
-                source_cpx=in.readUnsignedShort();
-                AttrData attr=new AttrData(this);
-                attr.read(name_cpx);
-                attrs[k]=attr;
-
-            } else if (getTag(name_cpx)==CONSTANT_UTF8
-                       && getString(name_cpx).equals("InnerClasses")
-                       ){       int length=in.readInt();
-                       int num=in.readUnsignedShort();
-                       if (2+num*8 != length)
-                           throw new ClassFormatError("invalid attr length");
-                       innerClasses=new InnerClassData[num];
-                       for (int j = 0; j < num; j++) {
-                           InnerClassData innerClass=new InnerClassData(this);
-                           innerClass.read(in);
-                           innerClasses[j]=innerClass;
-                       }
-                       AttrData attr=new AttrData(this);
-                       attr.read(name_cpx);
-                       attrs[k]=attr;
-            } else {
-                AttrData attr=new AttrData(this);
-                attr.read(name_cpx, in);
-                attrs[k]=attr;
-            }
-        }
-        in.close();
-    } // end ClassData.read()
-
-    /**
-     * Reads and stores constant pool info.
-     */
-    void readCP(DataInputStream in) throws IOException {
-        cpool_count = in.readUnsignedShort();
-        tags = new byte[cpool_count];
-        cpool = new Object[cpool_count];
-        for (int i = 1; i < cpool_count; i++) {
-            byte tag = in.readByte();
-
-            switch(tags[i] = tag) {
-            case CONSTANT_UTF8:
-                String str=in.readUTF();
-                indexHashAscii.put(cpool[i] = str, new Integer(i));
-                break;
-            case CONSTANT_INTEGER:
-                cpool[i] = new Integer(in.readInt());
-                break;
-            case CONSTANT_FLOAT:
-                cpool[i] = new Float(in.readFloat());
-                break;
-            case CONSTANT_LONG:
-                cpool[i++] = new Long(in.readLong());
-                break;
-            case CONSTANT_DOUBLE:
-                cpool[i++] = new Double(in.readDouble());
-                break;
-            case CONSTANT_CLASS:
-            case CONSTANT_STRING:
-                cpool[i] = new CPX(in.readUnsignedShort());
-                break;
-
-            case CONSTANT_FIELD:
-            case CONSTANT_METHOD:
-            case CONSTANT_INTERFACEMETHOD:
-            case CONSTANT_NAMEANDTYPE:
-                cpool[i] = new CPX2(in.readUnsignedShort(), in.readUnsignedShort());
-                break;
-
-            case 0:
-            default:
-                throw new ClassFormatError("invalid constant type: " + (int)tags[i]);
-            }
-        }
-    }
-
-    /**
-     * Reads and strores field info.
-     */
-    protected void readFields(DataInputStream in) throws IOException {
-        int fields_count = in.readUnsignedShort();
-        fields=new FieldData[fields_count];
-        for (int k = 0; k < fields_count; k++) {
-            FieldData field=new FieldData(this);
-            field.read(in);
-            fields[k]=field;
-        }
-    }
-
-    /**
-     * Reads and strores Method info.
-     */
-    protected void readMethods(DataInputStream in) throws IOException {
-        int methods_count = in.readUnsignedShort();
-        methods=new MethodData[methods_count];
-        for (int k = 0; k < methods_count ; k++) {
-            MethodData method=new MethodData(this);
-            method.read(in);
-            methods[k]=method;
-        }
-    }
-
-    /**
-     * get a string
-     */
-    public String getString(int n) {
-        if (n == 0) {
-            return null; 
-        } else {
-            return (String)cpool[n];
-        }
-    }
-
-    /**
-     * get the type of constant given an index
-     */
-    public byte getTag(int n) {
-        try{
-            return tags[n];
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return (byte)100;
-        }
-    }
-
-    static final String hexString="0123456789ABCDEF";
-
-    public static char hexTable[]=hexString.toCharArray();
-
-    static String toHex(long val, int width) {
-        StringBuffer s = new StringBuffer();
-        for (int i=width-1; i>=0; i--)
-            s.append(hexTable[((int)(val>>(4*i)))&0xF]);
-        return "0x"+s.toString();
-    }
-
-    static String toHex(long val) {
-        int width;
-        for (width=16; width>0; width--) {
-            if ((val>>(width-1)*4)!=0) break;
-        }
-        return toHex(val, width);
-    }
-
-    static String toHex(int val) {
-        int width;
-        for (width=8; width>0; width--) {
-            if ((val>>(width-1)*4)!=0) break;
-        }
-        return toHex(val, width);
-    }
-
-    /**
-     * Returns the name of this class.
-     */
-    public String getClassName() {
-        String res=null;
-        if (this_class==0) {
-            return res;
-        }
-        int tcpx;
-        try {
-            if (tags[this_class]!=CONSTANT_CLASS) {
-                return res; //"<CP["+cpx+"] is not a Class> ";
-            }
-            tcpx=((CPX)cpool[this_class]).cpx;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return res; // "#"+cpx+"// invalid constant pool index";
-        } catch (Throwable e) {
-            return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
-        }
-
-        try {
-            return (String)(cpool[tcpx]);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return  res; // "class #"+scpx+"// invalid constant pool index";
-        } catch (ClassCastException e) {
-            return  res; // "class #"+scpx+"// invalid constant pool reference";
-        } catch (Throwable e) {
-            return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
-        }
-
-    }
-
-    /**
-     * Returns the name of class at perticular index.
-     */
-    public String getClassName(int cpx) {
-        String res="#"+cpx;
-        if (cpx==0) {
-            return res;
-        }
-        int scpx;
-        try {
-            if (tags[cpx]!=CONSTANT_CLASS) {
-                return res; //"<CP["+cpx+"] is not a Class> ";
-            }
-            scpx=((CPX)cpool[cpx]).cpx;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return res; // "#"+cpx+"// invalid constant pool index";
-        } catch (Throwable e) {
-            return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
-        }
-        res="#"+scpx;
-        try {
-            return (String)(cpool[scpx]);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return  res; // "class #"+scpx+"// invalid constant pool index";
-        } catch (ClassCastException e) {
-            return  res; // "class #"+scpx+"// invalid constant pool reference";
-        } catch (Throwable e) {
-            return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
-        }
-    }
-    
-    public int getAccessFlags() {
-        return access;
-    }
-
-    /**
-     * Returns true if it is a class
-     */
-    public boolean isClass() {
-        if((access & ACC_INTERFACE) == 0) return true;
-        return false;
-    }
-
-    /**
-     * Returns true if it is a interface.
-     */
-    public boolean isInterface(){
-        if((access & ACC_INTERFACE) != 0) return true;
-        return false;
-    }
-
-    /**
-     * Returns true if this member is public, false otherwise.
-     */
-    public boolean isPublic(){
-        return (access & ACC_PUBLIC) != 0;
-    }
-
-    /**
-     * Returns the access of this class or interface.
-     */
-    public String[] getAccess(){
-        Vector v = new Vector();
-        if ((access & ACC_PUBLIC)   !=0) v.addElement("public");
-        if ((access & ACC_FINAL)    !=0) v.addElement("final");
-        if ((access & ACC_ABSTRACT) !=0) v.addElement("abstract");
-        String[] accflags = new String[v.size()];
-        v.copyInto(accflags);
-        return accflags;
-    }
-
-    /**
-     * Returns list of innerclasses.
-     */
-    public InnerClassData[] getInnerClasses(){
-        return innerClasses;
-    }
-
-    /**
-     * Returns list of attributes.
-     */
-    final AttrData[] getAttributes(){
-        return attrs;
-    }
-    
-    public byte[] findAnnotationData(boolean classRetention) {
-        String n = classRetention ?
-            "RuntimeInvisibleAnnotations" : // NOI18N
-            "RuntimeVisibleAnnotations"; // NOI18N
-        return findAttr(n, attrs);
-    }
-
-    /**
-     * Returns true if superbit is set.
-     */
-    public boolean isSuperSet(){
-        if ((access & ACC_SUPER)   !=0) return true;
-        return false;
-    }
-
-    /**
-     * Returns super class name.
-     */
-    public String getSuperClassName(){
-        String res=null;
-        if (super_class==0) {
-            return res;
-        }
-        int scpx;
-        try {
-            if (tags[super_class]!=CONSTANT_CLASS) {
-                return res; //"<CP["+cpx+"] is not a Class> ";
-            }
-            scpx=((CPX)cpool[super_class]).cpx;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return res; // "#"+cpx+"// invalid constant pool index";
-        } catch (Throwable e) {
-            return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
-        }
-
-        try {
-            return (String)(cpool[scpx]);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return  res; // "class #"+scpx+"// invalid constant pool index";
-        } catch (ClassCastException e) {
-            return  res; // "class #"+scpx+"// invalid constant pool reference";
-        } catch (Throwable e) {
-            return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
-        }
-    }
-
-    /**
-     * Returns list of super interfaces.
-     */
-    public String[] getSuperInterfaces(){
-        String interfacenames[] = new String[interfaces.length];
-        int interfacecpx = -1;
-        for(int i = 0; i < interfaces.length; i++){
-            interfacecpx=((CPX)cpool[interfaces[i]]).cpx;
-            interfacenames[i] = (String)(cpool[interfacecpx]);
-        }
-        return interfacenames;
-    }
-
-    /**
-     * Returns string at prticular constant pool index.
-     */
-    public String getStringValue(int cpoolx) {
-        try {
-            return ((String)cpool[cpoolx]);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return "//invalid constant pool index:"+cpoolx;
-        } catch (ClassCastException e) {
-            return "//invalid constant pool ref:"+cpoolx;
-        }
-    }
-
-    /**
-     * Returns list of field info.
-     */
-    public  FieldData[] getFields(){
-        return fields;
-    }
-
-    /**
-     * Returns list of method info.
-     */
-    public  MethodData[] getMethods(){
-        return methods;
-    }
-
-    /**
-     * Returns constant pool entry at that index.
-     */
-    public CPX2 getCpoolEntry(int cpx){
-        return ((CPX2)(cpool[cpx]));
-    }
-
-    public Object getCpoolEntryobj(int cpx){
-        return (cpool[cpx]);
-    }
-
-    /**
-     * Returns index of this class.
-     */
-    public int getthis_cpx(){
-        return this_class;
-    }
-
-    /**
-     * Returns string at that index.
-     */
-    public String StringValue(int cpx) {
-        return stringValue(cpx, false);
-    }
-    public String stringValue(int cpx, boolean textual) {
-        return stringValue(cpx, textual, null);
-    }
-    public String stringValue(int cpx, String[] classRefs) {
-        return stringValue(cpx, true, classRefs);
-    }
-    private String stringValue(int cpx, boolean textual, String[] refs) {
-        if (cpx==0) return "#0";
-        int tag;
-        Object x;
-        String suffix="";
-        try {
-            tag=tags[cpx];
-            x=cpool[cpx];
-        } catch (IndexOutOfBoundsException e) {
-            return "<Incorrect CP index:"+cpx+">";
-        }
-
-        if (x==null) return "<NULL>";
-        switch (tag) {
-        case CONSTANT_UTF8: {
-            if (!textual) {
-                return (String)x;
-            }
-            StringBuilder sb=new StringBuilder();
-            String s=(String)x;
-            for (int k=0; k<s.length(); k++) {
-                char c=s.charAt(k);
-                switch (c) {
-                case '\\': sb.append('\\').append('\\'); break;
-                case '\t': sb.append('\\').append('t'); break;
-                case '\n': sb.append('\\').append('n'); break;
-                case '\r': sb.append('\\').append('r'); break;
-                case '\"': sb.append('\\').append('\"'); break;
-                default: sb.append(c);
-                }
-            }
-            return sb.toString();
-        }
-        case CONSTANT_DOUBLE: {
-            Double d=(Double)x;
-            String sd=d.toString();
-            if (textual) {
-                return sd;
-            }
-            return sd+"d";
-        }
-        case CONSTANT_FLOAT: {
-            Float f=(Float)x;
-            String sf=(f).toString();
-            if (textual) {
-                return sf;
-            }
-            return sf+"f";
-        }
-        case CONSTANT_LONG: {
-            Long ln = (Long)x;
-            if (textual) {
-                return ln.toString();
-            }
-            return ln.toString()+'l';
-        }
-        case CONSTANT_INTEGER: {
-            Integer in = (Integer)x;
-            return in.toString();
-        }
-        case CONSTANT_CLASS:
-            String jn = getClassName(cpx);
-            if (textual) {
-                if (refs != null) {
-                    refs[0] = jn;
-                }
-                return jn;
-            }
-            return javaName(jn);
-        case CONSTANT_STRING:
-            String sv = stringValue(((CPX)x).cpx, textual);
-            if (textual) {
-                return '"' + sv + '"';
-            } else {
-                return sv;
-            }
-        case CONSTANT_FIELD:
-        case CONSTANT_METHOD:
-        case CONSTANT_INTERFACEMETHOD:
-            //return getShortClassName(((CPX2)x).cpx1)+"."+StringValue(((CPX2)x).cpx2);
-             return javaName(getClassName(((CPX2)x).cpx1))+"."+StringValue(((CPX2)x).cpx2);
-
-        case CONSTANT_NAMEANDTYPE:
-            return getName(((CPX2)x).cpx1)+":"+StringValue(((CPX2)x).cpx2);
-        default:
-            return "UnknownTag"; //TBD
-        }
-    }
-
-    /**
-     * Returns resolved java type name.
-     */
-    public String javaName(String name) {
-        if( name==null) return "null";
-        int len=name.length();
-        if (len==0) return "\"\"";
-        int cc='/';
-    fullname: { // xxx/yyy/zzz
-            int cp;
-            for (int k=0; k<len; k += Character.charCount(cp)) {
-                cp=name.codePointAt(k);
-                if (cc=='/') {
-                    if (!isJavaIdentifierStart(cp)) break fullname;
-                } else if (cp!='/') {
-                    if (!isJavaIdentifierPart(cp)) break fullname;
-                }
-                cc=cp;
-            }
-            return name;
-        }
-        return "\""+name+"\"";
-    }
-
-    public String getName(int cpx) {
-        String res;
-        try {
-            return javaName((String)cpool[cpx]); //.replace('/','.');
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return "<invalid constant pool index:"+cpx+">";
-        } catch (ClassCastException e) {
-            return "<invalid constant pool ref:"+cpx+">";
-        }
-    }
-
-    /**
-     * Returns unqualified class name.
-     */
-    public String getShortClassName(int cpx) {
-        String classname=javaName(getClassName(cpx));
-        pkgPrefixLen=classname.lastIndexOf("/")+1;
-        if (pkgPrefixLen!=0) {
-            pkgPrefix=classname.substring(0,pkgPrefixLen);
-            if (classname.startsWith(pkgPrefix)) {
-                return classname.substring(pkgPrefixLen);
-            }
-        }
-        return classname;
-    }
-
-    /**
-     * Returns source file name.
-     */
-    public String getSourceName(){
-        return getName(source_cpx);
-    }
-
-    /**
-     * Returns package name.
-     */
-    public String getPkgName(){
-        String classname=getClassName(this_class);
-        pkgPrefixLen=classname.lastIndexOf("/")+1;
-        if (pkgPrefixLen!=0) {
-            pkgPrefix=classname.substring(0,pkgPrefixLen);
-            return("package  "+pkgPrefix.substring(0,pkgPrefixLen-1)+";\n");
-        }else return null;
-    }
-
-    /**
-     * Returns total constant pool entry count.
-     */
-    public int getCpoolCount(){
-        return cpool_count;
-    }
-
-    /**
-     * Returns minor version of class file.
-     */
-    public int getMinor_version(){
-        return minor_version;
-    }
-
-    /**
-     * Returns major version of class file.
-     */
-    public int getMajor_version(){
-        return major_version;
-    }
-
-    private boolean isJavaIdentifierStart(int cp) {
-        return ('a' <= cp && cp <= 'z') || ('A' <= cp && cp <= 'Z');
-    }
-
-    private boolean isJavaIdentifierPart(int cp) {
-        return isJavaIdentifierStart(cp) || ('0' <= cp && cp <= '9');
-    }
-
-    public String[] getNameAndType(int indx) {
-        return getNameAndType(indx, 0, new String[2]);
-    }
-    
-    private String[] getNameAndType(int indx, int at, String[] arr) {
-        CPX2 c2 = getCpoolEntry(indx);
-        arr[at] = StringValue(c2.cpx1);
-        arr[at + 1] = StringValue(c2.cpx2);
-        return arr;
-    }
-
-    public String[] getFieldInfoName(int indx) {
-        CPX2 c2 = getCpoolEntry(indx);
-        String[] arr = new String[3];
-        arr[0] = getClassName(c2.cpx1);
-        return getNameAndType(c2.cpx2, 1, arr);
-    }
-
-    static byte[] findAttr(String n, AttrData[] attrs) {
-        for (AttrData ad : attrs) {
-            if (n.equals(ad.getAttrName())) {
-                return ad.getData();
-            }
-        }
-        return null;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/Constants.java
--- a/javap/src/main/java/org/apidesign/javap/Constants.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,372 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-
-package org.apidesign.javap;
-
-/**
- * This interface defines constant that are used
- * throughout the compiler. It inherits from RuntimeConstants,
- * which is an autogenerated class that contains contstants
- * defined in the interpreter.
- */
-
-public
-interface Constants extends RuntimeConstants {
-
-     /**
-     * End of input
-     */
-    public static final int EOF = -1;
-
-   /*
-     * Flags
-     */
-    public static final int F_VERBOSE           = 1 << 0;
-    public static final int F_DUMP              = 1 << 1;
-    public static final int F_WARNINGS          = 1 << 2;
-    public static final int F_DEBUG             = 1 << 3;
-    public static final int F_OPTIMIZE          = 1 << 4;
-    public static final int F_DEPENDENCIES      = 1 << 5;
-
-    /*
-     * Type codes
-     */
-    public static final int TC_BOOLEAN   = 0;
-    public static final int TC_BYTE      = 1;
-    public static final int TC_CHAR      = 2;
-    public static final int TC_SHORT     = 3;
-    public static final int TC_INT       = 4;
-    public static final int TC_LONG      = 5;
-    public static final int TC_FLOAT     = 6;
-    public static final int TC_DOUBLE    = 7;
-    public static final int TC_NULL      = 8;
-    public static final int TC_ARRAY     = 9;
-    public static final int TC_CLASS     = 10;
-    public static final int TC_VOID      = 11;
-    public static final int TC_METHOD    = 12;
-    public static final int TC_ERROR     = 13;
-
-    /*
-     * Type Masks
-     */
-    public static final int TM_NULL      = 1 << TC_NULL;
-    public static final int TM_VOID      = 1 << TC_VOID;
-    public static final int TM_BOOLEAN   = 1 << TC_BOOLEAN;
-    public static final int TM_BYTE      = 1 << TC_BYTE;
-    public static final int TM_CHAR      = 1 << TC_CHAR;
-    public static final int TM_SHORT     = 1 << TC_SHORT;
-    public static final int TM_INT       = 1 << TC_INT;
-    public static final int TM_LONG      = 1 << TC_LONG;
-    public static final int TM_FLOAT     = 1 << TC_FLOAT;
-    public static final int TM_DOUBLE    = 1 << TC_DOUBLE;
-    public static final int TM_ARRAY     = 1 << TC_ARRAY;
-    public static final int TM_CLASS     = 1 << TC_CLASS;
-    public static final int TM_METHOD    = 1 << TC_METHOD;
-    public static final int TM_ERROR     = 1 << TC_ERROR;
-
-    public static final int TM_INT32     = TM_BYTE | TM_SHORT | TM_CHAR | TM_INT;
-    public static final int TM_NUM32     = TM_INT32 | TM_FLOAT;
-    public static final int TM_NUM64     = TM_LONG | TM_DOUBLE;
-    public static final int TM_INTEGER   = TM_INT32 | TM_LONG;
-    public static final int TM_REAL      = TM_FLOAT | TM_DOUBLE;
-    public static final int TM_NUMBER    = TM_INTEGER | TM_REAL;
-    public static final int TM_REFERENCE = TM_ARRAY | TM_CLASS | TM_NULL;
-
-    /*
-     * Class status
-     */
-    public static final int CS_UNDEFINED        = 0;
-    public static final int CS_UNDECIDED        = 1;
-    public static final int CS_BINARY           = 2;
-    public static final int CS_SOURCE           = 3;
-    public static final int CS_PARSED           = 4;
-    public static final int CS_COMPILED         = 5;
-    public static final int CS_NOTFOUND         = 6;
-
-    /*
-     * Attributes
-     */
-    public static final int ATT_ALL             = -1;
-    public static final int ATT_CODE            = 1;
-
-    /*
-     * Number of bits used in file offsets
-     */
-    public static final int OFFSETBITS          = 19;
-    public static final int MAXFILESIZE         = (1 << OFFSETBITS) - 1;
-    public static final int MAXLINENUMBER       = (1 << (32 - OFFSETBITS)) - 1;
-
-    /*
-     * Operators
-     */
-    public final int COMMA              = 0;
-    public final int ASSIGN             = 1;
-
-    public final int ASGMUL             = 2;
-    public final int ASGDIV             = 3;
-    public final int ASGREM             = 4;
-    public final int ASGADD             = 5;
-    public final int ASGSUB             = 6;
-    public final int ASGLSHIFT          = 7;
-    public final int ASGRSHIFT          = 8;
-    public final int ASGURSHIFT         = 9;
-    public final int ASGBITAND          = 10;
-    public final int ASGBITOR           = 11;
-    public final int ASGBITXOR          = 12;
-
-    public final int COND               = 13;
-    public final int OR                 = 14;
-    public final int AND                = 15;
-    public final int BITOR              = 16;
-    public final int BITXOR             = 17;
-    public final int BITAND             = 18;
-    public final int NE                 = 19;
-    public final int EQ                 = 20;
-    public final int GE                 = 21;
-    public final int GT                 = 22;
-    public final int LE                 = 23;
-    public final int LT                 = 24;
-    public final int INSTANCEOF         = 25;
-    public final int LSHIFT             = 26;
-    public final int RSHIFT             = 27;
-    public final int URSHIFT            = 28;
-    public final int ADD                = 29;
-    public final int SUB                = 30;
-    public final int DIV                = 31;
-    public final int REM                = 32;
-    public final int MUL                = 33;
-    public final int CAST               = 34;           // (x)y
-    public final int POS                = 35;           // +x
-    public final int NEG                = 36;           // -x
-    public final int NOT                = 37;
-    public final int BITNOT             = 38;
-    public final int PREINC             = 39;           // ++x
-    public final int PREDEC             = 40;           // --x
-    public final int NEWARRAY           = 41;
-    public final int NEWINSTANCE        = 42;
-    public final int NEWFROMNAME        = 43;
-    public final int POSTINC            = 44;           // x++
-    public final int POSTDEC            = 45;           // x--
-    public final int FIELD              = 46;
-    public final int METHOD             = 47;           // x(y)
-    public final int ARRAYACCESS        = 48;           // x[y]
-    public final int NEW                = 49;
-    public final int INC                = 50;
-    public final int DEC                = 51;
-
-    public final int CONVERT            = 55;           // implicit conversion
-    public final int EXPR               = 56;           // (x)
-    public final int ARRAY              = 57;           // {x, y, ...}
-    public final int GOTO               = 58;
-
-    /*
-     * Value tokens
-     */
-    public final int IDENT              = 60;
-    public final int BOOLEANVAL         = 61;
-    public final int BYTEVAL            = 62;
-    public final int CHARVAL            = 63;
-    public final int SHORTVAL           = 64;
-    public final int INTVAL                     = 65;
-    public final int LONGVAL            = 66;
-    public final int FLOATVAL           = 67;
-    public final int DOUBLEVAL          = 68;
-    public final int STRINGVAL          = 69;
-
-    /*
-     * Type keywords
-     */
-    public final int BYTE               = 70;
-    public final int CHAR               = 71;
-    public final int SHORT              = 72;
-    public final int INT                = 73;
-    public final int LONG               = 74;
-    public final int FLOAT              = 75;
-    public final int DOUBLE             = 76;
-    public final int VOID               = 77;
-    public final int BOOLEAN            = 78;
-
-    /*
-     * Expression keywords
-     */
-    public final int TRUE               = 80;
-    public final int FALSE              = 81;
-    public final int THIS               = 82;
-    public final int SUPER              = 83;
-    public final int NULL               = 84;
-
-    /*
-     * Statement keywords
-     */
-    public final int IF                 = 90;
-    public final int ELSE               = 91;
-    public final int FOR                = 92;
-    public final int WHILE              = 93;
-    public final int DO                 = 94;
-    public final int SWITCH             = 95;
-    public final int CASE               = 96;
-    public final int DEFAULT            = 97;
-    public final int BREAK              = 98;
-    public final int CONTINUE           = 99;
-    public final int RETURN             = 100;
-    public final int TRY                = 101;
-    public final int CATCH              = 102;
-    public final int FINALLY            = 103;
-    public final int THROW              = 104;
-    public final int STAT               = 105;
-    public final int EXPRESSION         = 106;
-    public final int DECLARATION        = 107;
-    public final int VARDECLARATION     = 108;
-
-    /*
-     * Declaration keywords
-     */
-    public final int IMPORT             = 110;
-    public final int CLASS              = 111;
-    public final int EXTENDS            = 112;
-    public final int IMPLEMENTS         = 113;
-    public final int INTERFACE          = 114;
-    public final int PACKAGE            = 115;
-
-    /*
-     * Modifier keywords
-     */
-    public final int PRIVATE    = 120;
-    public final int PUBLIC             = 121;
-    public final int PROTECTED  = 122;
-    public final int CONST              = 123;
-    public final int STATIC             = 124;
-    public final int TRANSIENT          = 125;
-    public final int SYNCHRONIZED       = 126;
-    public final int NATIVE             = 127;
-    public final int FINAL              = 128;
-    public final int VOLATILE   = 129;
-    public final int ABSTRACT   = 130;
-    public final int STRICT             = 165;
-
-    /*
-     * Punctuation
-     */
-    public final int SEMICOLON  = 135;
-    public final int COLON              = 136;
-    public final int QUESTIONMARK       = 137;
-    public final int LBRACE             = 138;
-    public final int RBRACE             = 139;
-    public final int LPAREN             = 140;
-    public final int RPAREN             = 141;
-    public final int LSQBRACKET = 142;
-    public final int RSQBRACKET = 143;
-    public final int THROWS     = 144;
-
-    /*
-     * Special tokens
-     */
-    public final int ERROR              = 145;          // an error
-    public final int COMMENT    = 146;          // not used anymore.
-    public final int TYPE               = 147;
-    public final int LENGTH             = 148;
-    public final int INLINERETURN       = 149;
-    public final int INLINEMETHOD       = 150;
-    public final int INLINENEWINSTANCE  = 151;
-
-    /*
-     * Added for jasm
-     */
-        public final int METHODREF      = 152;
-        public final int FIELDREF       = 153;
-    public final int STACK              = 154;
-    public final int LOCAL              = 155;
-    public final int CPINDEX    = 156;
-    public final int CPNAME             = 157;
-    public final int SIGN               = 158;
-    public final int BITS               = 159;
-    public final int INF                = 160;
-    public final int NAN                = 161;
-    public final int INNERCLASS = 162;
-    public final int OF         = 163;
-    public final int SYNTHETIC          = 164;
-// last used=165;
-
-   /*
-     * Operator precedence
-     */
-    public static final int opPrecedence[] = {
-        10,     11,     11,     11,     11,     11,     11,     11,     11,     11,
-        11,     11,     11,     12,     13,     14,     15,     16,     17,     18,
-        18,     19,     19,     19,     19,     19,     20,     20,     20,     21,
-        21,     22,     22,     22,     23,     24,     24,     24,     24,     24,
-        24,     25,     25,     26,     26,     26,     26,     26,     26
-    };
-
-    /*
-     * Operator names
-     */
-    public static final String opNames[] = {
-        ",",            "=",            "*=",           "/=",           "%=",
-        "+=",           "-=",           "<<=",          ">>=",          "<<<=",
-        "&=",           "|=",           "^=",           "?:",           "||",
-        "&&",           "|",            "^",            "&",            "!=",
-        "==",           ">=",           ">",            "<=",           "<",
-        "instanceof",   "<<",           ">>",           "<<<",          "+",
-        "-",            "/",            "%",            "*",            "cast",
-        "+",            "-",            "!",            "~",            "++",
-        "--",           "new",          "new",          "new",          "++",
-        "--",           "field",        "method",       "[]",           "new",
-        "++",           "--",           null,           null,           null,
-
-        "convert",      "expr",         "array",        "goto",         null,
-
-        "Identifier",   "Boolean",      "Byte",         "Char",         "Short",
-        "Integer",              "Long",         "Float",        "Double",       "String",
-
-        "byte",         "char",         "short",        "int",          "long",
-        "float",        "double",       "void",         "boolean",      null,
-
-        "true",         "false",        "this",         "super",        "null",
-        null,           null,           null,           null,           null,
-
-        "if",           "else",         "for",          "while",        "do",
-        "switch",       "case",         "default",      "break",        "continue",
-        "return",       "try",          "catch",        "finally",      "throw",
-        "stat",         "expression",   "declaration",  "declaration",  null,
-
-        "import",       "class",        "extends",      "implements",   "interface",
-        "package",      null,           null,           null,           null,
-
-        "private",      "public",       "protected",    "const",        "static",
-        "transient",    "synchronized", "native",       "final",        "volatile",
-        "abstract",     null,           null,           null,           null,
-
-        ";",            ":",            "?",            "{",            "}",
-        "(",            ")",            "[",            "]",            "throws",
-        "error",        "comment",      "type",         "length",       "inline-return",
-        "inline-method", "inline-new",
-        "method", "field", "stack", "locals", "CPINDEX", "CPName", "SIGN",
-        "bits", "INF", "NaN", "InnerClass", "of", "synthetic"
-    };
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/FieldData.java
--- a/javap/src/main/java/org/apidesign/javap/FieldData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-import java.io.*;
-
-/**
- * Strores field data informastion.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-
-public class FieldData implements RuntimeConstants  {
-
-    ClassData cls;
-    int access;
-    int name_index;
-    int descriptor_index;
-    int attributes_count;
-    int value_cpx=0;
-    boolean isSynthetic=false;
-    boolean isDeprecated=false;
-    Vector attrs;
-
-    public FieldData(ClassData cls){
-        this.cls=cls;
-    }
-
-    /**
-     * Read and store field info.
-     */
-    public void read(DataInputStream in) throws IOException {
-        access = in.readUnsignedShort();
-        name_index = in.readUnsignedShort();
-        descriptor_index = in.readUnsignedShort();
-        // Read the attributes
-        int attributes_count = in.readUnsignedShort();
-        attrs=new Vector(attributes_count);
-        for (int i = 0; i < attributes_count; i++) {
-            int attr_name_index=in.readUnsignedShort();
-            if (cls.getTag(attr_name_index)!=CONSTANT_UTF8) continue;
-            String attr_name=cls.getString(attr_name_index);
-            if (attr_name.equals("ConstantValue")){
-                if (in.readInt()!=2)
-                    throw new ClassFormatError("invalid ConstantValue attr length");
-                value_cpx=in.readUnsignedShort();
-                AttrData attr=new AttrData(cls);
-                attr.read(attr_name_index);
-                attrs.addElement(attr);
-            } else if (attr_name.equals("Synthetic")){
-                if (in.readInt()!=0)
-                    throw new ClassFormatError("invalid Synthetic attr length");
-                isSynthetic=true;
-                AttrData attr=new AttrData(cls);
-                attr.read(attr_name_index);
-                attrs.addElement(attr);
-            } else if (attr_name.equals("Deprecated")){
-                if (in.readInt()!=0)
-                    throw new ClassFormatError("invalid Synthetic attr length");
-                isDeprecated = true;
-                AttrData attr=new AttrData(cls);
-                attr.read(attr_name_index);
-                attrs.addElement(attr);
-            } else {
-                AttrData attr=new AttrData(cls);
-                attr.read(attr_name_index, in);
-                attrs.addElement(attr);
-            }
-        }
-
-    }  // end read
-
-    public boolean isStatic() {
-        return (access & ACC_STATIC) != 0;
-    }
-    
-    /**
-     * Returns access of a field.
-     */
-    public String[] getAccess(){
-        Vector v = new Vector();
-        if ((access & ACC_PUBLIC)   !=0) v.addElement("public");
-        if ((access & ACC_PRIVATE)   !=0) v.addElement("private");
-        if ((access & ACC_PROTECTED)   !=0) v.addElement("protected");
-        if ((access & ACC_STATIC)   !=0) v.addElement("static");
-        if ((access & ACC_FINAL)    !=0) v.addElement("final");
-        if ((access & ACC_VOLATILE) !=0) v.addElement("volatile");
-        if ((access & ACC_TRANSIENT) !=0) v.addElement("transient");
-        String[] accflags = new String[v.size()];
-        v.copyInto(accflags);
-        return accflags;
-    }
-
-    /**
-     * Returns name of a field.
-     */
-    public String getName(){
-        return cls.getStringValue(name_index);
-    }
-
-    /**
-     * Returns internal signature of a field
-     */
-    public String getInternalSig(){
-        return cls.getStringValue(descriptor_index);
-    }
-
-    /**
-     * Returns true if field is synthetic.
-     */
-    public boolean isSynthetic(){
-        return isSynthetic;
-    }
-
-    /**
-     * Returns true if field is deprecated.
-     */
-    public boolean isDeprecated(){
-        return isDeprecated;
-    }
-
-    /**
-     * Returns index of constant value in cpool.
-     */
-    public int getConstantValueIndex(){
-        return (value_cpx);
-    }
-
-    /**
-     * Returns list of attributes of field.
-     */
-    public Vector getAttributes(){
-        return attrs;
-    }
-
-    public byte[] findAnnotationData(boolean classRetention) {
-        String n = classRetention ?
-            "RuntimeInvisibleAnnotations" : // NOI18N
-            "RuntimeVisibleAnnotations"; // NOI18N
-        AttrData[] arr = new AttrData[attrs.size()];
-        attrs.copyInto(arr);
-        return ClassData.findAttr(n, arr);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/Hashtable.java
--- a/javap/src/main/java/org/apidesign/javap/Hashtable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.javap;
-
-/** A JavaScript optimized replacement for Hashtable.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class Hashtable {
-    private Object[] keys;
-    private Object[] values;
-
-    Hashtable(int i) {
-        this();
-    }
-
-    Hashtable(int i, double d) {
-        this();
-    }
-
-    Hashtable() {
-    }
-
-    synchronized void put(Object key, Object val) {
-        int[] where = { -1, -1 };
-        Object found = get(key, where);
-        if (where[0] != -1) {
-            // key exists
-            values[where[0]] = val;
-        } else {
-            if (where[1] != -1) {
-                // null found
-                keys[where[1]] = key;
-                values[where[1]] = val;
-            } else {
-                if (keys == null) {
-                    keys = new Object[11];
-                    values = new Object[11];
-                    keys[0] = key;
-                    values[0] = val;
-                } else {
-                    Object[] newKeys = new Object[keys.length * 2];
-                    Object[] newValues = new Object[values.length * 2];
-                    for (int i = 0; i < keys.length; i++) {
-                        newKeys[i] = keys[i];
-                        newValues[i] = values[i];
-                    }
-                    newKeys[keys.length] = key;
-                    newValues[keys.length] = val;
-                    keys = newKeys;
-                    values = newValues;
-                }
-            }
-        }
-    }
-
-    Object get(Object key) {
-        return get(key, null);
-    }
-    private synchronized Object get(Object key, int[] foundAndNull) {
-        if (keys == null) {
-            return null;
-        }
-        for (int i = 0; i < keys.length; i++) {
-            if (keys[i] == null) {
-                if (foundAndNull != null) {
-                    foundAndNull[1] = i;
-                }
-            } else if (keys[i].equals(key)) {
-                if (foundAndNull != null) {
-                    foundAndNull[0] = i;
-                }
-                return values[i];
-            }
-        }
-        return null;
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/InnerClassData.java
--- a/javap/src/main/java/org/apidesign/javap/InnerClassData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Strores InnerClass data informastion.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-class InnerClassData  implements RuntimeConstants {
-    ClassData cls;
-
-
-    int inner_class_info_index
-        ,outer_class_info_index
-        ,inner_name_index
-        ,access
-        ;
-
-    public InnerClassData(ClassData cls) {
-        this.cls=cls;
-
-    }
-
-    /**
-     * Read Innerclass attribute data.
-     */
-    public void read(DataInputStream in) throws IOException {
-        inner_class_info_index = in.readUnsignedShort();
-        outer_class_info_index = in.readUnsignedShort();
-        inner_name_index = in.readUnsignedShort();
-        access = in.readUnsignedShort();
-    }  // end read
-
-    /**
-     * Returns the access of this class or interface.
-     */
-    public String[] getAccess(){
-        Vector v = new Vector();
-        if ((access & ACC_PUBLIC)   !=0) v.addElement("public");
-        if ((access & ACC_FINAL)    !=0) v.addElement("final");
-        if ((access & ACC_ABSTRACT) !=0) v.addElement("abstract");
-        String[] accflags = new String[v.size()];
-        v.copyInto(accflags);
-        return accflags;
-    }
-
-} // end InnerClassData
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/LineNumData.java
--- a/javap/src/main/java/org/apidesign/javap/LineNumData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-import java.util.*;
-import java.io.*;
-
-/**
- * Strores LineNumberTable data information.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-class LineNumData {
-    short start_pc, line_number;
-
-    public LineNumData() {}
-
-    /**
-     * Read LineNumberTable attribute.
-     */
-    public LineNumData(DataInputStream in) throws IOException {
-        start_pc = in.readShort();
-        line_number=in.readShort();
-
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/LocVarData.java
--- a/javap/src/main/java/org/apidesign/javap/LocVarData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-import java.util.*;
-import java.io.*;
-
-/**
- * Strores LocalVariableTable data information.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-class LocVarData {
-    short start_pc, length, name_cpx, sig_cpx, slot;
-
-    public LocVarData() {
-    }
-
-    /**
-     * Read LocalVariableTable attribute.
-     */
-    public LocVarData(DataInputStream in) throws IOException {
-        start_pc = in.readShort();
-        length=in.readShort();
-        name_cpx=in.readShort();
-        sig_cpx=in.readShort();
-        slot=in.readShort();
-
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/MethodData.java
--- a/javap/src/main/java/org/apidesign/javap/MethodData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,394 +0,0 @@
-/*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package org.apidesign.javap;
-
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import static org.apidesign.javap.RuntimeConstants.*;
-
-/**
- * Strores method data informastion.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-public class MethodData {
-
-    ClassData cls;
-    int access;
-    int name_index;
-    int descriptor_index;
-    int attributes_count;
-    byte[] code;
-    Vector exception_table = new Vector(0);
-    Vector lin_num_tb = new Vector(0);
-    Vector loc_var_tb = new Vector(0);
-    StackMapTableData[] stackMapTable;
-    StackMapData[] stackMap;
-    int[] exc_index_table=null;
-    Vector attrs=new Vector(0);
-    Vector code_attrs=new Vector(0);
-    int max_stack,  max_locals;
-    boolean isSynthetic=false;
-    boolean isDeprecated=false;
-
-    public MethodData(ClassData cls){
-        this.cls=cls;
-    }
-
-    /**
-     * Read method info.
-     */
-    public void read(DataInputStream in) throws IOException {
-        access = in.readUnsignedShort();
-        name_index=in.readUnsignedShort();
-        descriptor_index =in.readUnsignedShort();
-        int attributes_count = in.readUnsignedShort();
-        for (int i = 0; i < attributes_count; i++) {
-            int attr_name_index=in.readUnsignedShort();
-
-        readAttr: {
-                if (cls.getTag(attr_name_index)==CONSTANT_UTF8) {
-                    String  attr_name=cls.getString(attr_name_index);
-                    if ( attr_name.equals("Code")){
-                        readCode (in);
-                        AttrData attr=new AttrData(cls);
-                        attr.read(attr_name_index);
-                        attrs.addElement(attr);
-                        break readAttr;
-                    } else if ( attr_name.equals("Exceptions")){
-                        readExceptions(in);
-                        AttrData attr=new AttrData(cls);
-                        attr.read(attr_name_index);
-                        attrs.addElement(attr);
-                        break readAttr;
-                    } else if (attr_name.equals("Synthetic")){
-                        if (in.readInt()!=0)
-                            throw new ClassFormatError("invalid Synthetic attr length");
-                        isSynthetic=true;
-                        AttrData attr=new AttrData(cls);
-                        attr.read(attr_name_index);
-                        attrs.addElement(attr);
-                        break readAttr;
-                    } else if (attr_name.equals("Deprecated")){
-                        if (in.readInt()!=0)
-                            throw new ClassFormatError("invalid Synthetic attr length");
-                        isDeprecated = true;
-                        AttrData attr=new AttrData(cls);
-                        attr.read(attr_name_index);
-                        attrs.addElement(attr);
-                        break readAttr;
-                    }
-                }
-                AttrData attr=new AttrData(cls);
-                attr.read(attr_name_index, in);
-                attrs.addElement(attr);
-            }
-        }
-    }
-
-    /**
-     * Read code attribute info.
-     */
-    public void readCode(DataInputStream in) throws IOException {
-
-        int attr_length = in.readInt();
-        max_stack=in.readUnsignedShort();
-        max_locals=in.readUnsignedShort();
-        int codelen=in.readInt();
-
-        code=new byte[codelen];
-        int totalread = 0;
-        while(totalread < codelen){
-            totalread += in.read(code, totalread, codelen-totalread);
-        }
-        //      in.read(code, 0, codelen);
-        int clen = 0;
-        readExceptionTable(in);
-        int code_attributes_count = in.readUnsignedShort();
-
-        for (int k = 0 ; k < code_attributes_count ; k++) {
-            int table_name_index=in.readUnsignedShort();
-            int table_name_tag=cls.getTag(table_name_index);
-            AttrData attr=new AttrData(cls);
-            if (table_name_tag==CONSTANT_UTF8) {
-                String table_name_tstr=cls.getString(table_name_index);
-                if (table_name_tstr.equals("LineNumberTable")) {
-                    readLineNumTable(in);
-                    attr.read(table_name_index);
-                } else if (table_name_tstr.equals("LocalVariableTable")) {
-                    readLocVarTable(in);
-                    attr.read(table_name_index);
-                } else if (table_name_tstr.equals("StackMapTable")) {
-                    readStackMapTable(in);
-                    attr.read(table_name_index);
-                } else if (table_name_tstr.equals("StackMap")) {
-                    readStackMap(in);
-                    attr.read(table_name_index);
-                } else {
-                    attr.read(table_name_index, in);
-                }
-                code_attrs.addElement(attr);
-                continue;
-            }
-
-            attr.read(table_name_index, in);
-            code_attrs.addElement(attr);
-        }
-    }
-
-    /**
-     * Read exception table info.
-     */
-    void readExceptionTable (DataInputStream in) throws IOException {
-        int exception_table_len=in.readUnsignedShort();
-        exception_table=new Vector(exception_table_len);
-        for (int l = 0; l < exception_table_len; l++) {
-            exception_table.addElement(new TrapData(in, l));
-        }
-    }
-
-    /**
-     * Read LineNumberTable attribute info.
-     */
-    void readLineNumTable (DataInputStream in) throws IOException {
-        int attr_len = in.readInt(); // attr_length
-        int lin_num_tb_len = in.readUnsignedShort();
-        lin_num_tb=new Vector(lin_num_tb_len);
-        for (int l = 0; l < lin_num_tb_len; l++) {
-            lin_num_tb.addElement(new LineNumData(in));
-        }
-    }
-
-    /**
-     * Read LocalVariableTable attribute info.
-     */
-    void readLocVarTable (DataInputStream in) throws IOException {
-        int attr_len=in.readInt(); // attr_length
-        int loc_var_tb_len = in.readUnsignedShort();
-        loc_var_tb = new Vector(loc_var_tb_len);
-        for (int l = 0; l < loc_var_tb_len; l++) {
-            loc_var_tb.addElement(new LocVarData(in));
-        }
-    }
-
-    /**
-     * Read Exception attribute info.
-     */
-    public void readExceptions(DataInputStream in) throws IOException {
-        int attr_len=in.readInt(); // attr_length in prog
-        int num_exceptions = in.readUnsignedShort();
-        exc_index_table=new int[num_exceptions];
-        for (int l = 0; l < num_exceptions; l++) {
-            int exc=in.readShort();
-            exc_index_table[l]=exc;
-        }
-    }
-
-    /**
-     * Read StackMapTable attribute info.
-     */
-    void readStackMapTable(DataInputStream in) throws IOException {
-        int attr_len = in.readInt();  //attr_length
-        int stack_map_tb_len = in.readUnsignedShort();
-        stackMapTable = new StackMapTableData[stack_map_tb_len];
-        for (int i=0; i<stack_map_tb_len; i++) {
-            stackMapTable[i] = StackMapTableData.getInstance(in, this);
-        }
-    }
-
-    /**
-     * Read StackMap attribute info.
-     */
-    void readStackMap(DataInputStream in) throws IOException {
-        int attr_len = in.readInt();  //attr_length
-        int stack_map_len = in.readUnsignedShort();
-        stackMap = new StackMapData[stack_map_len];
-        for (int i = 0; i<stack_map_len; i++) {
-            stackMap[i] = new StackMapData(in, this);
-        }
-    }
-
-    /**
-     * Return access of the method.
-     */
-    public int getAccess(){
-        return access;
-    }
-
-    /**
-     * Return name of the method.
-     */
-    public String getName(){
-        return cls.getStringValue(name_index);
-    }
-
-    /**
-     * Return internal siganature of the method.
-     */
-    public String getInternalSig(){
-        return cls.getStringValue(descriptor_index);
-    }
-
-    /**
-     * Return code attribute data of a method.
-     */
-    public byte[] getCode(){
-        return code;
-    }
-
-    /**
-     * Return LineNumberTable size.
-     */
-    public int getnumlines(){
-        return lin_num_tb.size();
-    }
-
-    /**
-     * Return LineNumberTable
-     */
-    public Vector getlin_num_tb(){
-        return lin_num_tb;
-    }
-
-    /**
-     * Return LocalVariableTable size.
-     */
-    public int getloc_var_tbsize(){
-        return loc_var_tb.size();
-    }
-
-
-    /**
-     * Return LocalVariableTable.
-     */
-    public Vector getloc_var_tb(){
-        return loc_var_tb;
-    }
-
-    /**
-     * Return StackMap.
-     */
-    public StackMapData[] getStackMap() {
-        return stackMap;
-    }
-
-    /**
-     * Return StackMapTable.
-     */
-    public StackMapTableData[] getStackMapTable() {
-        return stackMapTable;
-    }
-
-    public StackMapIterator createStackMapIterator() {
-        return new StackMapIterator(this);
-    }
-
-    /**
-     * Return true if method is static
-     */
-    public boolean isStatic(){
-        if ((access & ACC_STATIC)   !=0) return true;
-        return false;
-    }
-
-
-    /**
-     * Return max depth of operand stack.
-     */
-    public int getMaxStack(){
-        return  max_stack;
-    }
-
-
-    /**
-     * Return number of local variables.
-     */
-    public int getMaxLocals(){
-        return max_locals;
-    }
-
-
-    /**
-     * Return exception index table in Exception attribute.
-     */
-    public int []get_exc_index_table(){
-        return  exc_index_table;
-    }
-
-
-    /**
-     * Return exception table in code attributre.
-     */
-    public TrapDataIterator getTrapDataIterator(){
-        return new TrapDataIterator(exception_table);
-    }
-    
-
-    /**
-     * Return method attributes.
-     */
-    public Vector getAttributes(){
-        return attrs;
-    }
-
-
-    /**
-     * Return code attributes.
-     */
-    public Vector getCodeAttributes(){
-        return code_attrs;
-    }
-
-
-    /**
-     * Return true if method id synthetic.
-     */
-    public boolean isSynthetic(){
-        return isSynthetic;
-    }
-
-
-    /**
-     * Return true if method is deprecated.
-     */
-    public boolean isDeprecated(){
-        return isDeprecated;
-    }
-
-    public byte[] findAnnotationData(boolean classRetention) {
-        String n = classRetention ?
-            "RuntimeInvisibleAnnotations" : // NOI18N
-            "RuntimeVisibleAnnotations"; // NOI18N
-        AttrData[] arr = new AttrData[attrs.size()];
-        attrs.copyInto(arr);
-        return ClassData.findAttr(n, arr);
-    }
-
-    public boolean isConstructor() {
-        return "<init>".equals(getName());
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/RuntimeConstants.java
--- a/javap/src/main/java/org/apidesign/javap/RuntimeConstants.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,787 +0,0 @@
-/*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-public interface RuntimeConstants {
-
-    /* Signature Characters */
-    public static final char   SIGC_VOID                  = 'V';
-    public static final String SIG_VOID                   = "V";
-    public static final char   SIGC_BOOLEAN               = 'Z';
-    public static final String SIG_BOOLEAN                = "Z";
-    public static final char   SIGC_BYTE                  = 'B';
-    public static final String SIG_BYTE                   = "B";
-    public static final char   SIGC_CHAR                  = 'C';
-    public static final String SIG_CHAR                   = "C";
-    public static final char   SIGC_SHORT                 = 'S';
-    public static final String SIG_SHORT                  = "S";
-    public static final char   SIGC_INT                   = 'I';
-    public static final String SIG_INT                    = "I";
-    public static final char   SIGC_LONG                  = 'J';
-    public static final String SIG_LONG                   = "J";
-    public static final char   SIGC_FLOAT                 = 'F';
-    public static final String SIG_FLOAT                  = "F";
-    public static final char   SIGC_DOUBLE                = 'D';
-    public static final String SIG_DOUBLE                 = "D";
-    public static final char   SIGC_ARRAY                 = '[';
-    public static final String SIG_ARRAY                  = "[";
-    public static final char   SIGC_CLASS                 = 'L';
-    public static final String SIG_CLASS                  = "L";
-    public static final char   SIGC_METHOD                = '(';
-    public static final String SIG_METHOD                 = "(";
-    public static final char   SIGC_ENDCLASS              = ';';
-    public static final String SIG_ENDCLASS               = ";";
-    public static final char   SIGC_ENDMETHOD             = ')';
-    public static final String SIG_ENDMETHOD              = ")";
-    public static final char   SIGC_PACKAGE               = '/';
-    public static final String SIG_PACKAGE                = "/";
-
-    /* Class File Constants */
-    public static final int JAVA_MAGIC                   = 0xcafebabe;
-    public static final int JAVA_VERSION                 = 45;
-    public static final int JAVA_MINOR_VERSION           = 3;
-
-    /* Constant table */
-    public static final int CONSTANT_UTF8                = 1;
-    public static final int CONSTANT_UNICODE             = 2;
-    public static final int CONSTANT_INTEGER             = 3;
-    public static final int CONSTANT_FLOAT               = 4;
-    public static final int CONSTANT_LONG                = 5;
-    public static final int CONSTANT_DOUBLE              = 6;
-    public static final int CONSTANT_CLASS               = 7;
-    public static final int CONSTANT_STRING              = 8;
-    public static final int CONSTANT_FIELD               = 9;
-    public static final int CONSTANT_METHOD              = 10;
-    public static final int CONSTANT_INTERFACEMETHOD     = 11;
-    public static final int CONSTANT_NAMEANDTYPE         = 12;
-
-    /* Access Flags */
-    public static final int ACC_PUBLIC                   = 0x00000001;
-    public static final int ACC_PRIVATE                  = 0x00000002;
-    public static final int ACC_PROTECTED                = 0x00000004;
-    public static final int ACC_STATIC                   = 0x00000008;
-    public static final int ACC_FINAL                    = 0x00000010;
-    public static final int ACC_SYNCHRONIZED             = 0x00000020;
-    public static final int ACC_SUPER                        = 0x00000020;
-    public static final int ACC_VOLATILE                 = 0x00000040;
-    public static final int ACC_TRANSIENT                = 0x00000080;
-    public static final int ACC_NATIVE                   = 0x00000100;
-    public static final int ACC_INTERFACE                = 0x00000200;
-    public static final int ACC_ABSTRACT                 = 0x00000400;
-    public static final int ACC_STRICT                   = 0x00000800;
-    public static final int ACC_EXPLICIT                 = 0x00001000;
-    public static final int ACC_SYNTHETIC                = 0x00010000; // actually, this is an attribute
-
-    /* Type codes */
-    public static final int T_CLASS                      = 0x00000002;
-    public static final int T_BOOLEAN                    = 0x00000004;
-    public static final int T_CHAR                       = 0x00000005;
-    public static final int T_FLOAT                      = 0x00000006;
-    public static final int T_DOUBLE                     = 0x00000007;
-    public static final int T_BYTE                       = 0x00000008;
-    public static final int T_SHORT                      = 0x00000009;
-    public static final int T_INT                        = 0x0000000a;
-    public static final int T_LONG                       = 0x0000000b;
-
-    /* Type codes for StackMap attribute */
-    public static final int ITEM_Bogus      =0; // an unknown or uninitialized value
-    public static final int ITEM_Integer    =1; // a 32-bit integer
-    public static final int ITEM_Float      =2; // not used
-    public static final int ITEM_Double     =3; // not used
-    public static final int ITEM_Long       =4; // a 64-bit integer
-    public static final int ITEM_Null       =5; // the type of null
-    public static final int ITEM_InitObject =6; // "this" in constructor
-    public static final int ITEM_Object     =7; // followed by 2-byte index of class name
-    public static final int ITEM_NewObject  =8; // followed by 2-byte ref to "new"
-
-    /* Constants used in StackMapTable attribute */
-    public static final int SAME_FRAME_BOUND                  = 64;
-    public static final int SAME_LOCALS_1_STACK_ITEM_BOUND    = 128;
-    public static final int SAME_LOCALS_1_STACK_ITEM_EXTENDED = 247;
-    public static final int SAME_FRAME_EXTENDED               = 251;
-    public static final int FULL_FRAME                        = 255;
-
-    /* Opcodes */
-    public static final int opc_dead                     = -2;
-    public static final int opc_label                    = -1;
-    public static final int opc_nop                      = 0;
-    public static final int opc_aconst_null              = 1;
-    public static final int opc_iconst_m1                = 2;
-    public static final int opc_iconst_0                 = 3;
-    public static final int opc_iconst_1                 = 4;
-    public static final int opc_iconst_2                 = 5;
-    public static final int opc_iconst_3                 = 6;
-    public static final int opc_iconst_4                 = 7;
-    public static final int opc_iconst_5                 = 8;
-    public static final int opc_lconst_0                 = 9;
-    public static final int opc_lconst_1                 = 10;
-    public static final int opc_fconst_0                 = 11;
-    public static final int opc_fconst_1                 = 12;
-    public static final int opc_fconst_2                 = 13;
-    public static final int opc_dconst_0                 = 14;
-    public static final int opc_dconst_1                 = 15;
-    public static final int opc_bipush                   = 16;
-    public static final int opc_sipush                   = 17;
-    public static final int opc_ldc                      = 18;
-    public static final int opc_ldc_w                    = 19;
-    public static final int opc_ldc2_w                   = 20;
-    public static final int opc_iload                    = 21;
-    public static final int opc_lload                    = 22;
-    public static final int opc_fload                    = 23;
-    public static final int opc_dload                    = 24;
-    public static final int opc_aload                    = 25;
-    public static final int opc_iload_0                  = 26;
-    public static final int opc_iload_1                  = 27;
-    public static final int opc_iload_2                  = 28;
-    public static final int opc_iload_3                  = 29;
-    public static final int opc_lload_0                  = 30;
-    public static final int opc_lload_1                  = 31;
-    public static final int opc_lload_2                  = 32;
-    public static final int opc_lload_3                  = 33;
-    public static final int opc_fload_0                  = 34;
-    public static final int opc_fload_1                  = 35;
-    public static final int opc_fload_2                  = 36;
-    public static final int opc_fload_3                  = 37;
-    public static final int opc_dload_0                  = 38;
-    public static final int opc_dload_1                  = 39;
-    public static final int opc_dload_2                  = 40;
-    public static final int opc_dload_3                  = 41;
-    public static final int opc_aload_0                  = 42;
-    public static final int opc_aload_1                  = 43;
-    public static final int opc_aload_2                  = 44;
-    public static final int opc_aload_3                  = 45;
-    public static final int opc_iaload                   = 46;
-    public static final int opc_laload                   = 47;
-    public static final int opc_faload                   = 48;
-    public static final int opc_daload                   = 49;
-    public static final int opc_aaload                   = 50;
-    public static final int opc_baload                   = 51;
-    public static final int opc_caload                   = 52;
-    public static final int opc_saload                   = 53;
-    public static final int opc_istore                   = 54;
-    public static final int opc_lstore                   = 55;
-    public static final int opc_fstore                   = 56;
-    public static final int opc_dstore                   = 57;
-    public static final int opc_astore                   = 58;
-    public static final int opc_istore_0                 = 59;
-    public static final int opc_istore_1                 = 60;
-    public static final int opc_istore_2                 = 61;
-    public static final int opc_istore_3                 = 62;
-    public static final int opc_lstore_0                 = 63;
-    public static final int opc_lstore_1                 = 64;
-    public static final int opc_lstore_2                 = 65;
-    public static final int opc_lstore_3                 = 66;
-    public static final int opc_fstore_0                 = 67;
-    public static final int opc_fstore_1                 = 68;
-    public static final int opc_fstore_2                 = 69;
-    public static final int opc_fstore_3                 = 70;
-    public static final int opc_dstore_0                 = 71;
-    public static final int opc_dstore_1                 = 72;
-    public static final int opc_dstore_2                 = 73;
-    public static final int opc_dstore_3                 = 74;
-    public static final int opc_astore_0                 = 75;
-    public static final int opc_astore_1                 = 76;
-    public static final int opc_astore_2                 = 77;
-    public static final int opc_astore_3                 = 78;
-    public static final int opc_iastore                  = 79;
-    public static final int opc_lastore                  = 80;
-    public static final int opc_fastore                  = 81;
-    public static final int opc_dastore                  = 82;
-    public static final int opc_aastore                  = 83;
-    public static final int opc_bastore                  = 84;
-    public static final int opc_castore                  = 85;
-    public static final int opc_sastore                  = 86;
-    public static final int opc_pop                      = 87;
-    public static final int opc_pop2                     = 88;
-    public static final int opc_dup                      = 89;
-    public static final int opc_dup_x1                   = 90;
-    public static final int opc_dup_x2                   = 91;
-    public static final int opc_dup2                     = 92;
-    public static final int opc_dup2_x1                  = 93;
-    public static final int opc_dup2_x2                  = 94;
-    public static final int opc_swap                     = 95;
-    public static final int opc_iadd                     = 96;
-    public static final int opc_ladd                     = 97;
-    public static final int opc_fadd                     = 98;
-    public static final int opc_dadd                     = 99;
-    public static final int opc_isub                     = 100;
-    public static final int opc_lsub                     = 101;
-    public static final int opc_fsub                     = 102;
-    public static final int opc_dsub                     = 103;
-    public static final int opc_imul                     = 104;
-    public static final int opc_lmul                     = 105;
-    public static final int opc_fmul                     = 106;
-    public static final int opc_dmul                     = 107;
-    public static final int opc_idiv                     = 108;
-    public static final int opc_ldiv                     = 109;
-    public static final int opc_fdiv                     = 110;
-    public static final int opc_ddiv                     = 111;
-    public static final int opc_irem                     = 112;
-    public static final int opc_lrem                     = 113;
-    public static final int opc_frem                     = 114;
-    public static final int opc_drem                     = 115;
-    public static final int opc_ineg                     = 116;
-    public static final int opc_lneg                     = 117;
-    public static final int opc_fneg                     = 118;
-    public static final int opc_dneg                     = 119;
-    public static final int opc_ishl                     = 120;
-    public static final int opc_lshl                     = 121;
-    public static final int opc_ishr                     = 122;
-    public static final int opc_lshr                     = 123;
-    public static final int opc_iushr                    = 124;
-    public static final int opc_lushr                    = 125;
-    public static final int opc_iand                     = 126;
-    public static final int opc_land                     = 127;
-    public static final int opc_ior                      = 128;
-    public static final int opc_lor                      = 129;
-    public static final int opc_ixor                     = 130;
-    public static final int opc_lxor                     = 131;
-    public static final int opc_iinc                     = 132;
-    public static final int opc_i2l                      = 133;
-    public static final int opc_i2f                      = 134;
-    public static final int opc_i2d                      = 135;
-    public static final int opc_l2i                      = 136;
-    public static final int opc_l2f                      = 137;
-    public static final int opc_l2d                      = 138;
-    public static final int opc_f2i                      = 139;
-    public static final int opc_f2l                      = 140;
-    public static final int opc_f2d                      = 141;
-    public static final int opc_d2i                      = 142;
-    public static final int opc_d2l                      = 143;
-    public static final int opc_d2f                      = 144;
-    public static final int opc_i2b                      = 145;
-    public static final int opc_int2byte                 = 145;
-    public static final int opc_i2c                      = 146;
-    public static final int opc_int2char                 = 146;
-    public static final int opc_i2s                      = 147;
-    public static final int opc_int2short                = 147;
-    public static final int opc_lcmp                     = 148;
-    public static final int opc_fcmpl                    = 149;
-    public static final int opc_fcmpg                    = 150;
-    public static final int opc_dcmpl                    = 151;
-    public static final int opc_dcmpg                    = 152;
-    public static final int opc_ifeq                     = 153;
-    public static final int opc_ifne                     = 154;
-    public static final int opc_iflt                     = 155;
-    public static final int opc_ifge                     = 156;
-    public static final int opc_ifgt                     = 157;
-    public static final int opc_ifle                     = 158;
-    public static final int opc_if_icmpeq                = 159;
-    public static final int opc_if_icmpne                = 160;
-    public static final int opc_if_icmplt                = 161;
-    public static final int opc_if_icmpge                = 162;
-    public static final int opc_if_icmpgt                = 163;
-    public static final int opc_if_icmple                = 164;
-    public static final int opc_if_acmpeq                = 165;
-    public static final int opc_if_acmpne                = 166;
-    public static final int opc_goto                     = 167;
-    public static final int opc_jsr                      = 168;
-    public static final int opc_ret                      = 169;
-    public static final int opc_tableswitch              = 170;
-    public static final int opc_lookupswitch             = 171;
-    public static final int opc_ireturn                  = 172;
-    public static final int opc_lreturn                  = 173;
-    public static final int opc_freturn                  = 174;
-    public static final int opc_dreturn                  = 175;
-    public static final int opc_areturn                  = 176;
-    public static final int opc_return                   = 177;
-    public static final int opc_getstatic                = 178;
-    public static final int opc_putstatic                = 179;
-    public static final int opc_getfield                 = 180;
-    public static final int opc_putfield                 = 181;
-    public static final int opc_invokevirtual            = 182;
-    public static final int opc_invokenonvirtual         = 183;
-    public static final int opc_invokespecial            = 183;
-    public static final int opc_invokestatic             = 184;
-    public static final int opc_invokeinterface          = 185;
-//    public static final int opc_xxxunusedxxx             = 186;
-    public static final int opc_new                      = 187;
-    public static final int opc_newarray                 = 188;
-    public static final int opc_anewarray                = 189;
-    public static final int opc_arraylength              = 190;
-    public static final int opc_athrow                   = 191;
-    public static final int opc_checkcast                = 192;
-    public static final int opc_instanceof               = 193;
-    public static final int opc_monitorenter             = 194;
-    public static final int opc_monitorexit              = 195;
-    public static final int opc_wide                     = 196;
-    public static final int opc_multianewarray           = 197;
-    public static final int opc_ifnull                   = 198;
-    public static final int opc_ifnonnull                = 199;
-    public static final int opc_goto_w                   = 200;
-    public static final int opc_jsr_w                    = 201;
-        /* Pseudo-instructions */
-    public static final int opc_bytecode                 = 203;
-    public static final int opc_try                      = 204;
-    public static final int opc_endtry                   = 205;
-    public static final int opc_catch                    = 206;
-    public static final int opc_var                      = 207;
-    public static final int opc_endvar                   = 208;
-    public static final int opc_localsmap                = 209;
-    public static final int opc_stackmap                 = 210;
-        /* PicoJava prefixes */
-    public static final int opc_nonpriv                  = 254;
-    public static final int opc_priv                     = 255;
-
-        /* Wide instructions */
-    public static final int opc_iload_w         = (opc_wide<<8)|opc_iload;
-    public static final int opc_lload_w         = (opc_wide<<8)|opc_lload;
-    public static final int opc_fload_w         = (opc_wide<<8)|opc_fload;
-    public static final int opc_dload_w         = (opc_wide<<8)|opc_dload;
-    public static final int opc_aload_w         = (opc_wide<<8)|opc_aload;
-    public static final int opc_istore_w        = (opc_wide<<8)|opc_istore;
-    public static final int opc_lstore_w        = (opc_wide<<8)|opc_lstore;
-    public static final int opc_fstore_w        = (opc_wide<<8)|opc_fstore;
-    public static final int opc_dstore_w        = (opc_wide<<8)|opc_dstore;
-    public static final int opc_astore_w        = (opc_wide<<8)|opc_astore;
-    public static final int opc_ret_w           = (opc_wide<<8)|opc_ret;
-    public static final int opc_iinc_w          = (opc_wide<<8)|opc_iinc;
-
-    /* Opcode Names */
-  public static final String opcNamesTab[] = {
-        "nop",
-        "aconst_null",
-        "iconst_m1",
-        "iconst_0",
-        "iconst_1",
-        "iconst_2",
-        "iconst_3",
-        "iconst_4",
-        "iconst_5",
-        "lconst_0",
-        "lconst_1",
-        "fconst_0",
-        "fconst_1",
-        "fconst_2",
-        "dconst_0",
-        "dconst_1",
-        "bipush",
-        "sipush",
-        "ldc",
-        "ldc_w",
-        "ldc2_w",
-        "iload",
-        "lload",
-        "fload",
-        "dload",
-        "aload",
-        "iload_0",
-        "iload_1",
-        "iload_2",
-        "iload_3",
-        "lload_0",
-        "lload_1",
-        "lload_2",
-        "lload_3",
-        "fload_0",
-        "fload_1",
-        "fload_2",
-        "fload_3",
-        "dload_0",
-        "dload_1",
-        "dload_2",
-        "dload_3",
-        "aload_0",
-        "aload_1",
-        "aload_2",
-        "aload_3",
-        "iaload",
-        "laload",
-        "faload",
-        "daload",
-        "aaload",
-        "baload",
-        "caload",
-        "saload",
-        "istore",
-        "lstore",
-        "fstore",
-        "dstore",
-        "astore",
-        "istore_0",
-        "istore_1",
-        "istore_2",
-        "istore_3",
-        "lstore_0",
-        "lstore_1",
-        "lstore_2",
-        "lstore_3",
-        "fstore_0",
-        "fstore_1",
-        "fstore_2",
-        "fstore_3",
-        "dstore_0",
-        "dstore_1",
-        "dstore_2",
-        "dstore_3",
-        "astore_0",
-        "astore_1",
-        "astore_2",
-        "astore_3",
-        "iastore",
-        "lastore",
-        "fastore",
-        "dastore",
-        "aastore",
-        "bastore",
-        "castore",
-        "sastore",
-        "pop",
-        "pop2",
-        "dup",
-        "dup_x1",
-        "dup_x2",
-        "dup2",
-        "dup2_x1",
-        "dup2_x2",
-        "swap",
-        "iadd",
-        "ladd",
-        "fadd",
-        "dadd",
-        "isub",
-        "lsub",
-        "fsub",
-        "dsub",
-        "imul",
-        "lmul",
-        "fmul",
-        "dmul",
-        "idiv",
-        "ldiv",
-        "fdiv",
-        "ddiv",
-        "irem",
-        "lrem",
-        "frem",
-        "drem",
-        "ineg",
-        "lneg",
-        "fneg",
-        "dneg",
-        "ishl",
-        "lshl",
-        "ishr",
-        "lshr",
-        "iushr",
-        "lushr",
-        "iand",
-        "land",
-        "ior",
-        "lor",
-        "ixor",
-        "lxor",
-        "iinc",
-        "i2l",
-        "i2f",
-        "i2d",
-        "l2i",
-        "l2f",
-        "l2d",
-        "f2i",
-        "f2l",
-        "f2d",
-        "d2i",
-        "d2l",
-        "d2f",
-        "i2b",
-        "i2c",
-        "i2s",
-        "lcmp",
-        "fcmpl",
-        "fcmpg",
-        "dcmpl",
-        "dcmpg",
-        "ifeq",
-        "ifne",
-        "iflt",
-        "ifge",
-        "ifgt",
-        "ifle",
-        "if_icmpeq",
-        "if_icmpne",
-        "if_icmplt",
-        "if_icmpge",
-        "if_icmpgt",
-        "if_icmple",
-        "if_acmpeq",
-        "if_acmpne",
-        "goto",
-        "jsr",
-        "ret",
-        "tableswitch",
-        "lookupswitch",
-        "ireturn",
-        "lreturn",
-        "freturn",
-        "dreturn",
-        "areturn",
-        "return",
-        "getstatic",
-        "putstatic",
-        "getfield",
-        "putfield",
-        "invokevirtual",
-        "invokespecial", //     was "invokenonvirtual",
-        "invokestatic",
-        "invokeinterface",
-        "bytecode 186", //"xxxunusedxxx",
-        "new",
-        "newarray",
-        "anewarray",
-        "arraylength",
-        "athrow",
-        "checkcast",
-        "instanceof",
-        "monitorenter",
-        "monitorexit",
-         null, // "wide",
-        "multianewarray",
-        "ifnull",
-        "ifnonnull",
-        "goto_w",
-        "jsr_w",
-        "bytecode 202", // "breakpoint",
-        "bytecode",
-        "try",
-        "endtry",
-        "catch",
-        "var",
-        "endvar",
-        "locals_map",
-        "stack_map"
-  };
-
-    /* Opcode Lengths */
-  public static final int opcLengthsTab[] = {
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        2,
-        3,
-        2,
-        3,
-        3,
-        2,
-        2,
-        2,
-        2,
-        2,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        2,
-        2,
-        2,
-        2,
-        2,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        3,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        2,
-        99,
-        99,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        5,
-        0,
-        3,
-        2,
-        3,
-        1,
-        1,
-        3,
-        3,
-        1,
-        1,
-        0, // wide
-        4,
-        3,
-        3,
-        5,
-        5,
-        1,
-        1, 0, 0, 0, 0, 0 // pseudo
-  };
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/StackMapData.java
--- a/javap/src/main/java/org/apidesign/javap/StackMapData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-import java.util.*;
-import java.io.*;
-
-import static org.apidesign.javap.RuntimeConstants.*;
-
-/* represents one entry of StackMap attribute
- */
-class StackMapData {
-    final int offset;
-    final int[] locals;
-    final int[] stack;
-
-    StackMapData(int offset, int[] locals, int[] stack) {
-        this.offset = offset;
-        this.locals = locals;
-        this.stack = stack;
-    }
-
-    StackMapData(DataInputStream in, MethodData method) throws IOException {
-        offset = in.readUnsignedShort();
-        int local_size = in.readUnsignedShort();
-        locals = readTypeArray(in, local_size, method);
-        int stack_size = in.readUnsignedShort();
-        stack = readTypeArray(in, stack_size, method);
-    }
-
-    static final int[] readTypeArray(DataInputStream in, int length, MethodData method) throws IOException {
-        int[] types = new int[length];
-        for (int i=0; i<length; i++) {
-            types[i] = readType(in, method);
-        }
-        return types;
-    }
-
-    static final int readType(DataInputStream in, MethodData method) throws IOException {
-        int type = in.readUnsignedByte();
-        if (type == ITEM_Object || type == ITEM_NewObject) {
-            type = type | (in.readUnsignedShort()<<8);
-        }
-        return type;
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/StackMapIterator.java
--- a/javap/src/main/java/org/apidesign/javap/StackMapIterator.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package org.apidesign.javap;
-
-import static org.apidesign.javap.RuntimeConstants.ITEM_Integer;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Float;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Double;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Long;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Object;
-
-public final class StackMapIterator {
-    private final StackMapTableData[] stackMapTable;
-    private final TypeArray argTypes;
-    private final TypeArray localTypes;
-    private final TypeArray stackTypes;
-
-    private int nextFrameIndex;
-    private int lastFrameByteCodeOffset;
-
-    private int byteCodeOffset;
-
-    StackMapIterator(final MethodData methodData) {
-        this(methodData.getStackMapTable(),
-             methodData.getInternalSig(),
-             methodData.isStatic());
-    }
-
-    StackMapIterator(final StackMapTableData[] stackMapTable,
-                     final String methodSignature,
-                     final boolean isStaticMethod) {
-        this.stackMapTable = (stackMapTable != null)
-                                 ? stackMapTable
-                                 : new StackMapTableData[0];
-
-        argTypes = getArgTypes(methodSignature, isStaticMethod);
-        localTypes = new TypeArray();
-        stackTypes = new TypeArray();
-
-        localTypes.addAll(argTypes);
-
-        lastFrameByteCodeOffset = -1;
-        advanceBy(0);
-    }
-
-    public String getFrameAsString() {
-        return (nextFrameIndex == 0)
-                   ? StackMapTableData.toString("INITIAL", 0, null, null)
-                   : stackMapTable[nextFrameIndex - 1].toString();
-    }
-
-    public int getFrameIndex() {
-        return nextFrameIndex;
-    }
-
-    public TypeArray getFrameStack() {
-        return stackTypes;
-    }
-
-    public TypeArray getFrameLocals() {
-        return localTypes;
-    }
-
-    public TypeArray getArguments() {
-        return argTypes;
-    }
-
-    public void advanceBy(final int numByteCodes) {
-        if (numByteCodes < 0) {
-            throw new IllegalStateException("Forward only iterator");
-        }
-
-        byteCodeOffset += numByteCodes;
-        while ((nextFrameIndex < stackMapTable.length)
-                    && ((byteCodeOffset - lastFrameByteCodeOffset)
-                            >= (stackMapTable[nextFrameIndex].offsetDelta
-                                    + 1))) {
-            final StackMapTableData nextFrame = stackMapTable[nextFrameIndex];
-
-            lastFrameByteCodeOffset += nextFrame.offsetDelta + 1;
-            nextFrame.applyTo(localTypes, stackTypes);
-
-            ++nextFrameIndex;
-        }
-    }
-
-    public void advanceTo(final int nextByteCodeOffset) {
-        advanceBy(nextByteCodeOffset - byteCodeOffset);
-    }
-
-    private static TypeArray getArgTypes(final String methodSignature,
-                                         final boolean isStaticMethod) {
-        final TypeArray argTypes = new TypeArray();
-
-        if (!isStaticMethod) {
-            argTypes.add(ITEM_Object);
-        }
-
-        if (methodSignature.charAt(0) != '(') {
-            throw new IllegalArgumentException("Invalid method signature");
-        }
-
-        final int length = methodSignature.length();
-        boolean skipType = false;
-        int argType;
-        for (int i = 1; i < length; ++i) {
-            switch (methodSignature.charAt(i)) {
-                case 'B':
-                case 'C':
-                case 'S':
-                case 'Z':
-                case 'I':
-                    argType = ITEM_Integer;
-                    break;
-                case 'J':
-                    argType = ITEM_Long;
-                    break;
-                case 'F':
-                    argType = ITEM_Float;
-                    break;
-                case 'D':
-                    argType = ITEM_Double;
-                    break;
-                case 'L': {
-                    i = methodSignature.indexOf(';', i + 1);
-                    if (i == -1) {
-                        throw new IllegalArgumentException(
-                                      "Invalid method signature");
-                    }
-                    argType = ITEM_Object;
-                    break;
-                }
-                case ')':
-                    // not interested in the return value type
-                    return argTypes;
-                case '[':
-                    if (!skipType) {
-                        argTypes.add(ITEM_Object);
-                        skipType = true;
-                    }
-                    continue;
-
-                default:
-                    throw new IllegalArgumentException(
-                                  "Invalid method signature");
-            }
-
-            if (!skipType) {
-                argTypes.add(argType);
-            } else {
-                skipType = false;
-            }
-        }
-
-        return argTypes;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/StackMapTableData.java
--- a/javap/src/main/java/org/apidesign/javap/StackMapTableData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-import java.io.*;
-
-import static org.apidesign.javap.RuntimeConstants.*;
-
-/* represents one entry of StackMapTable attribute
- */
-abstract class StackMapTableData {
-    final int frameType;
-    int offsetDelta;
-
-    StackMapTableData(int frameType) {
-        this.frameType = frameType;
-    }
-
-    abstract void applyTo(TypeArray localTypes, TypeArray stackTypes);
-
-    protected static String toString(
-            final String frameType,
-            final int offset,
-            final int[] localTypes,
-            final int[] stackTypes) {
-        final StringBuilder sb = new StringBuilder(frameType);
-
-        sb.append("(off: +").append(offset);
-        if (localTypes != null) {
-            sb.append(", locals: ");
-            appendTypes(sb, localTypes);
-        }
-        if (stackTypes != null) {
-            sb.append(", stack: ");
-            appendTypes(sb, stackTypes);
-        }
-        sb.append(')');
-
-        return sb.toString();
-    }
-
-    private static void appendTypes(final StringBuilder sb, final int[] types) {
-        sb.append('[');
-        if (types.length > 0) {
-            sb.append(TypeArray.typeString(types[0]));
-            for (int i = 1; i < types.length; ++i) {
-                sb.append(", ");
-                sb.append(TypeArray.typeString(types[i]));
-            }
-        }
-        sb.append(']');
-    }
-
-    static class SameFrame extends StackMapTableData {
-        SameFrame(int frameType, int offsetDelta) {
-            super(frameType);
-            this.offsetDelta = offsetDelta;
-        }
-
-        @Override
-        void applyTo(TypeArray localTypes, TypeArray stackTypes) {
-            stackTypes.clear();
-        }
-
-        @Override
-        public String toString() {
-            return toString("SAME" + ((frameType == SAME_FRAME_EXTENDED)
-                                          ? "_FRAME_EXTENDED" : ""),
-                            offsetDelta,
-                            null, null);
-        }
-    }
-
-    static class SameLocals1StackItem extends StackMapTableData {
-        final int[] stack;
-        SameLocals1StackItem(int frameType, int offsetDelta, int[] stack) {
-            super(frameType);
-            this.offsetDelta = offsetDelta;
-            this.stack = stack;
-        }
-
-        @Override
-        void applyTo(TypeArray localTypes, TypeArray stackTypes) {
-            stackTypes.setAll(stack);
-        }
-
-        @Override
-        public String toString() {
-            return toString(
-                       "SAME_LOCALS_1_STACK_ITEM"
-                           + ((frameType == SAME_LOCALS_1_STACK_ITEM_EXTENDED)
-                                  ? "_EXTENDED" : ""),
-                       offsetDelta,
-                       null, stack);
-        }
-    }
-
-    static class ChopFrame extends StackMapTableData {
-        ChopFrame(int frameType, int offsetDelta) {
-            super(frameType);
-            this.offsetDelta = offsetDelta;
-        }
-
-        @Override
-        void applyTo(TypeArray localTypes, TypeArray stackTypes) {
-            localTypes.setSize(localTypes.getSize()
-                                   - (SAME_FRAME_EXTENDED - frameType));
-            stackTypes.clear();
-        }
-
-        @Override
-        public String toString() {
-            return toString("CHOP", offsetDelta, null, null);
-        }
-    }
-
-    static class AppendFrame extends StackMapTableData {
-        final int[] locals;
-        AppendFrame(int frameType, int offsetDelta, int[] locals) {
-            super(frameType);
-            this.offsetDelta = offsetDelta;
-            this.locals = locals;
-        }
-
-        @Override
-        void applyTo(TypeArray localTypes, TypeArray stackTypes) {
-            localTypes.addAll(locals);
-            stackTypes.clear();
-        }
-
-        @Override
-        public String toString() {
-            return toString("APPEND", offsetDelta, locals, null);
-        }
-    }
-
-    static class FullFrame extends StackMapTableData {
-        final int[] locals;
-        final int[] stack;
-        FullFrame(int offsetDelta, int[] locals, int[] stack) {
-            super(FULL_FRAME);
-            this.offsetDelta = offsetDelta;
-            this.locals = locals;
-            this.stack = stack;
-        }
-
-        @Override
-        void applyTo(TypeArray localTypes, TypeArray stackTypes) {
-            localTypes.setAll(locals);
-            stackTypes.setAll(stack);
-        }
-
-        @Override
-        public String toString() {
-            return toString("FULL", offsetDelta, locals, stack);
-        }
-    }
-
-    static StackMapTableData getInstance(DataInputStream in, MethodData method)
-                  throws IOException {
-        int frameType = in.readUnsignedByte();
-
-        if (frameType < SAME_FRAME_BOUND) {
-            // same_frame
-            return new SameFrame(frameType, frameType);
-        } else if (SAME_FRAME_BOUND <= frameType && frameType < SAME_LOCALS_1_STACK_ITEM_BOUND) {
-            // same_locals_1_stack_item_frame
-            // read additional single stack element
-            return new SameLocals1StackItem(frameType,
-                                            (frameType - SAME_FRAME_BOUND),
-                                            StackMapData.readTypeArray(in, 1, method));
-        } else if (frameType == SAME_LOCALS_1_STACK_ITEM_EXTENDED) {
-            // same_locals_1_stack_item_extended
-            return new SameLocals1StackItem(frameType,
-                                            in.readUnsignedShort(),
-                                            StackMapData.readTypeArray(in, 1, method));
-        } else if (SAME_LOCALS_1_STACK_ITEM_EXTENDED < frameType  && frameType < SAME_FRAME_EXTENDED) {
-            // chop_frame or same_frame_extended
-            return new ChopFrame(frameType, in.readUnsignedShort());
-        } else if (frameType == SAME_FRAME_EXTENDED) {
-            // chop_frame or same_frame_extended
-            return new SameFrame(frameType, in.readUnsignedShort());
-        } else if (SAME_FRAME_EXTENDED < frameType  && frameType < FULL_FRAME) {
-            // append_frame
-            return new AppendFrame(frameType, in.readUnsignedShort(),
-                                   StackMapData.readTypeArray(in, frameType - SAME_FRAME_EXTENDED, method));
-        } else if (frameType == FULL_FRAME) {
-            // full_frame
-            int offsetDelta = in.readUnsignedShort();
-            int locals_size = in.readUnsignedShort();
-            int[] locals = StackMapData.readTypeArray(in, locals_size, method);
-            int stack_size = in.readUnsignedShort();
-            int[] stack = StackMapData.readTypeArray(in, stack_size, method);
-            return new FullFrame(offsetDelta, locals, stack);
-        } else {
-            throw new ClassFormatError("unrecognized frame_type in StackMapTable");
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/TrapData.java
--- a/javap/src/main/java/org/apidesign/javap/TrapData.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.apidesign.javap;
-
-import java.io.*;
-
-/**
- * Stores exception table data in code attribute.
- *
- * @author  Sucheta Dambalkar (Adopted code from jdis)
- */
-public final class TrapData {
-  public final short start_pc;
-  public final short end_pc;
-  public final short handler_pc;
-  public final short catch_cpx;
-  final int num;
-
-
-    /**
-     * Read and store exception table data in code attribute.
-     */
-    TrapData(DataInputStream in, int num) throws IOException {
-        this.num=num;
-        start_pc = in.readShort();
-        end_pc=in.readShort();
-        handler_pc=in.readShort();
-        catch_cpx=in.readShort();
-    }
-
-    /**
-     * returns recommended identifier
-     */
-    public String ident() {
-        return "t"+num;
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/TrapDataIterator.java
--- a/javap/src/main/java/org/apidesign/javap/TrapDataIterator.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.javap;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class TrapDataIterator {
-    private final Hashtable exStart = new Hashtable();
-    private final Hashtable exStop = new Hashtable();
-    private TrapData[] current = new TrapData[10];
-    private int currentCount;
-    
-    TrapDataIterator(Vector exceptionTable) {
-        for (int i=0 ; i < exceptionTable.size(); i++) {
-            final TrapData td = (TrapData)exceptionTable.elementAt(i);
-            put(exStart, td.start_pc, td);
-            put(exStop, td.end_pc, td);
-        }
-    }
-    
-    private static void put(Hashtable h, short key, TrapData td) {
-        Short s = Short.valueOf((short)key);
-        Vector v = (Vector) h.get(s);
-        if (v == null) {
-            v = new Vector(1);
-            h.put(s, v);
-        }
-        v.add(td);
-    }
-    
-    private boolean processAll(Hashtable h, Short key, boolean add) {
-        boolean change = false;
-        Vector v = (Vector)h.get(key);
-        if (v != null) {
-            int s = v.size();
-            for (int i = 0; i < s; i++) {
-                TrapData td = (TrapData)v.elementAt(i);
-                if (add) {
-                    add(td);
-                    change = true;
-                } else {
-                    remove(td);
-                    change = true;
-                }
-            }
-        }
-        return change;
-    }
-    
-    public boolean advanceTo(int i) {
-        Short s = Short.valueOf((short)i);
-        boolean ch1 = processAll(exStart, s, true);
-        boolean ch2 = processAll(exStop, s, false);
-        return ch1 || ch2;
-    }
-
-    public boolean useTry() {
-        return currentCount > 0;
-    }
-
-    public TrapData[] current() {
-        TrapData[] copy = new TrapData[currentCount];
-        for (int i = 0; i < currentCount; i++) {
-            copy[i] = current[i];
-        }
-        return copy;
-    }
-
-    private void add(TrapData e) {
-        if (currentCount == current.length) {
-            TrapData[] data = new TrapData[currentCount * 2];
-            for (int i = 0; i < currentCount; i++) {
-                data[i] = current[i];
-            }
-            current = data;
-        }
-        current[currentCount++] = e;
-    }
-
-    private void remove(TrapData e) {
-        if (currentCount == 0) {
-            return;
-        }
-        int from = 0;
-        while (from < currentCount) {
-            if (e == current[from++]) {
-                break;
-            }
-        }
-        while (from < currentCount) {
-            current[from - 1] = current[from];
-            current[from] = null;
-            from++;
-        }
-        currentCount--;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/TypeArray.java
--- a/javap/src/main/java/org/apidesign/javap/TypeArray.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package org.apidesign.javap;
-
-import static org.apidesign.javap.RuntimeConstants.ITEM_Bogus;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Integer;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Float;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Double;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Long;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Null;
-import static org.apidesign.javap.RuntimeConstants.ITEM_InitObject;
-import static org.apidesign.javap.RuntimeConstants.ITEM_Object;
-import static org.apidesign.javap.RuntimeConstants.ITEM_NewObject;
-
-public final class TypeArray {
-    private static final int CAPACITY_INCREMENT = 16;
-
-    private int[] types;
-    private int size;
-
-    public TypeArray() {
-    }
-    
-    public TypeArray(final TypeArray initialTypes) {
-        setAll(initialTypes);
-    }
-
-    public void add(final int newType) {
-        ensureCapacity(size + 1);
-        types[size++] = newType;
-    }
-
-    public void addAll(final TypeArray newTypes) {
-        addAll(newTypes.types, 0, newTypes.size);
-    }
-
-    public void addAll(final int[] newTypes) {
-        addAll(newTypes, 0, newTypes.length);
-    }
-
-    public void addAll(final int[] newTypes,
-                       final int offset,
-                       final int count) {
-        if (count > 0) {
-            ensureCapacity(size + count);
-            arraycopy(newTypes, offset, types, size, count);
-            size += count;
-        }
-    }
-
-    public void set(final int index, final int newType) {
-        types[index] = newType;
-    }
-
-    public void setAll(final TypeArray newTypes) {
-        setAll(newTypes.types, 0, newTypes.size);
-    }
-
-    public void setAll(final int[] newTypes) {
-        setAll(newTypes, 0, newTypes.length);
-    }
-
-    public void setAll(final int[] newTypes,
-                       final int offset,
-                       final int count) {
-        if (count > 0) {
-            ensureCapacity(count);
-            arraycopy(newTypes, offset, types, 0, count);
-            size = count;
-        } else {
-            clear();
-        }
-    }
-
-    public void setSize(final int newSize) {
-        if (size != newSize) {
-            ensureCapacity(newSize);
-
-            for (int i = size; i < newSize; ++i) {
-                types[i] = 0;
-            }
-            size = newSize;
-        }
-    }
-
-    public void clear() {
-        size = 0;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public int get(final int index) {
-        return types[index];
-    }
-
-    public static String typeString(final int type) {
-        switch (type & 0xff) {
-            case ITEM_Bogus:
-                return "_top_";
-            case ITEM_Integer:
-                return "_int_";
-            case ITEM_Float:
-                return "_float_";
-            case ITEM_Double:
-                return "_double_";
-            case ITEM_Long:
-                return "_long_";
-            case ITEM_Null:
-                return "_null_";
-            case ITEM_InitObject: // UninitializedThis
-                return "_init_";
-            case ITEM_Object:
-                return "_object_";
-            case ITEM_NewObject: // Uninitialized
-                return "_new_";
-            default:
-                throw new IllegalArgumentException("Unknown type");
-        }
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("[");
-        if (size > 0) {
-            sb.append(typeString(types[0]));
-            for (int i = 1; i < size; ++i) {
-                sb.append(", ");
-                sb.append(typeString(types[i]));
-            }
-        }
-
-        return sb.append(']').toString();
-    }
-
-    private void ensureCapacity(final int minCapacity) {
-        if ((minCapacity == 0)
-                || (types != null) && (minCapacity <= types.length)) {
-            return;
-        }
-
-        final int newCapacity =
-                ((minCapacity + CAPACITY_INCREMENT - 1) / CAPACITY_INCREMENT)
-                    * CAPACITY_INCREMENT;
-        final int[] newTypes = new int[newCapacity];
-
-        if (size > 0) {
-            arraycopy(types, 0, newTypes, 0, size);
-        }
-
-        types = newTypes;
-    }
-
-    // no System.arraycopy
-    private void arraycopy(final int[] src, final int srcPos,
-                           final int[] dest, final int destPos,
-                           final int length) {
-        for (int i = 0; i < length; ++i) {
-            dest[destPos + i] = src[srcPos + i];
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javap/src/main/java/org/apidesign/javap/Vector.java
--- a/javap/src/main/java/org/apidesign/javap/Vector.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.javap;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
-
-/** A JavaScript ready replacement for java.util.Vector
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@JavaScriptPrototype(prototype = "new Array" )
-final class Vector {
-    private Object[] arr;
-    
-    Vector() {
-    }
-
-    Vector(int i) {
-    }
-
-    void add(Object objectType) {
-        addElement(objectType);
-    }
-    @JavaScriptBody(args = { "obj" }, body = 
-        "this.push(obj);"
-    )
-    void addElement(Object obj) {
-        final int s = size();
-        setSize(s + 1);
-        setElementAt(obj, s);
-    }
-
-    @JavaScriptBody(args = { }, body = 
-        "return this.length;"
-    )
-    int size() {
-        return arr == null ? 0 : arr.length;
-    }
-
-    @JavaScriptBody(args = { "newArr" }, body =
-        "for (var i = 0; i < this.length; i++) {\n"
-      + "  newArr[i] = this[i];\n"
-      + "}\n")
-    void copyInto(Object[] newArr) {
-        if (arr == null) {
-            return;
-        }
-        int min = Math.min(newArr.length, arr.length);
-        for (int i = 0; i < min; i++) {
-            newArr[i] = arr[i];
-        }
-    }
-
-    @JavaScriptBody(args = { "index" }, body =
-        "return this[index];"
-    )
-    Object elementAt(int index) {
-        return arr[index];
-    }
-
-    private void setSize(int len) {
-        Object[] newArr = new Object[len];
-        copyInto(newArr);
-        arr = newArr;
-    }
-
-    @JavaScriptBody(args = { "val", "index" }, body = 
-        "this[index] = val;"
-    )
-    void setElementAt(Object val, int index) {
-        arr[index] = val;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/pom.xml
--- a/javaquery/api/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apidesign.bck2brwsr</groupId>
     <artifactId>javaquery</artifactId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>javaquery.api</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <name>JavaQuery API</name>
   <url>http://maven.apache.org</url>
     <build>
@@ -23,6 +22,14 @@
                     <target>1.7</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <subpackages>org.apidesign.bck2brwsr.htmlpage.api</subpackages>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <properties>
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,51 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class ConvertTypes {
+    ConvertTypes() {
+    }
+    
+    public static String toString(Object object, String property) {
+        Object ret = getProperty(object, property);
+        return ret == null ? null : ret.toString();
+    }
+
+    public static double toDouble(Object object, String property) {
+        Object ret = getProperty(object, property);
+        return ret instanceof Number ? ((Number)ret).doubleValue() : Double.NaN;
+    }
+
+    public static int toInt(Object object, String property) {
+        Object ret = getProperty(object, property);
+        return ret instanceof Number ? ((Number)ret).intValue() : Integer.MIN_VALUE;
+    }
+    
+    @JavaScriptBody(args = { "object", "property" },
+        body = "var p = object[property]; return p ? p : null;"
+    )
+    private static Object getProperty(Object object, String property) {
+        return null;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Fri Mar 22 17:03:32 2013 +0100
@@ -46,6 +46,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.MirroredTypeException;
+import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic;
@@ -283,7 +284,19 @@
                                 }
                                 first = false;
                                 if (ve.asType() == stringType) {
-                                    params.append('"').append(id).append('"');
+                                    if (ve.getSimpleName().contentEquals("id")) {
+                                        params.append('"').append(id).append('"');
+                                        continue;
+                                    }
+                                    params.append("org.apidesign.bck2brwsr.htmlpage.ConvertTypes.toString(ev, \"");
+                                    params.append(ve.getSimpleName().toString());
+                                    params.append("\")");
+                                    continue;
+                                }
+                                if (processingEnv.getTypeUtils().getPrimitiveType(TypeKind.DOUBLE) == ve.asType()) {
+                                    params.append("org.apidesign.bck2brwsr.htmlpage.ConvertTypes.toDouble(ev, \"");
+                                    params.append(ve.getSimpleName().toString());
+                                    params.append("\")");
                                     continue;
                                 }
                                 String rn = ve.asType().toString();
@@ -296,7 +309,7 @@
                                     continue;
                                 }
                                 processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
-                                    "@On method can only accept String or " + className + " arguments",
+                                    "@On method can only accept String named 'id' or " + className + " arguments",
                                     ee
                                 );
                                 return false;
@@ -328,10 +341,10 @@
             }
             w.append("  }\n");
             if (dispatchCnt > 0) {
-                w.append("class OnDispatch implements Runnable {\n");
+                w.append("class OnDispatch implements OnHandler {\n");
                 w.append("  private final int dispatch;\n");
                 w.append("  OnDispatch(int d) { dispatch = d; }\n");
-                w.append("  public void run() {\n");
+                w.append("  public void onEvent(Object ev) {\n");
                 w.append("    switch (dispatch) {\n");
                 w.append(dispatch);
                 w.append("    }\n");
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Canvas.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Canvas.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Canvas.java	Fri Mar 22 17:03:32 2013 +0100
@@ -18,6 +18,7 @@
 package org.apidesign.bck2brwsr.htmlpage.api;
 
 import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import static org.apidesign.bck2brwsr.htmlpage.api.Element.getAttribute;
 
 /**
  *
@@ -34,7 +35,8 @@
     }
 
     public int getHeight() {
-        return (Integer) getAttribute(this, "height");
+       Object ret =  getAttribute(this, "height");
+       return (ret instanceof Number) ? ((Number)ret).intValue(): Integer.MIN_VALUE;
     }
     
     public void setWidth(int width) {
@@ -42,7 +44,8 @@
     }
 
     public int getWidth() {
-        return (Integer) getAttribute(this, "width");
+       Object ret =  getAttribute(this, "width");
+       return (ret instanceof Number) ? ((Number)ret).intValue(): Integer.MIN_VALUE;
     }
 
     @JavaScriptBody(
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Element.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Element.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Element.java	Fri Mar 22 17:03:32 2013 +0100
@@ -61,14 +61,18 @@
     
     /** Executes given runnable when user performs a "click" on the given
      * element.
+     * @param data an array of one element to fill with event parameter (if any)
      * @param r the runnable to execute, never null
      */
     @JavaScriptBody(
         args={ "ev", "r" },
         body="var e = window.document.getElementById(this._id());\n"
-           + "e[ev._id()] = function() { r.run__V(); };\n"
+           + "e[ev._id()] = function(ev) {\n"
+        + "  var d = ev ? ev : null;\n"
+        + "  r.onEvent__VLjava_lang_Object_2(d);\n"
+        + "};\n"
     )
-    final void on(OnEvent ev, Runnable r) {
+    final void on(OnEvent ev, OnHandler r) {
     }
 
     /** Shows alert message dialog in a browser.
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/GraphicsContext.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/GraphicsContext.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/GraphicsContext.java	Fri Mar 22 17:03:32 2013 +0100
@@ -134,7 +134,7 @@
     @JavaScriptBody(args = {"ctx", "img", "x", "y"}, body = "ctx.drawImage(img,x,y);")
     private native static void drawImageImpl(Object ctx, Object img, double x, double y);
 
-    @JavaScriptBody(args = {"style"}, body = "this._context().fillStyle=style;")
+    @JavaScriptBody(args = {"style"}, body = "this._context().fillStyle=style.valueOf();")
     public native void setFillStyle(String style);
 
     @JavaScriptBody(args = {}, body = "return this._context().fillStyle;")
@@ -155,7 +155,7 @@
     @JavaScriptBody(args = {"context","obj"}, body = "context.fillStyle=obj;")
     private native void setFillStyleImpl(Object context, Object obj);
 
-    @JavaScriptBody(args = {"style"}, body = "this._context().strokeStyle=style;")
+    @JavaScriptBody(args = {"style"}, body = "this._context().strokeStyle=style.valueOf();")
     public native void setStrokeStyle(String style);
 
     public void setStrokeStyle(LinearGradient style) {
@@ -174,7 +174,7 @@
     @JavaScriptBody(args = {"context","obj"}, body = "context.strokeStyle=obj;")
     private native void setStrokeStyleImpl(Object context, Object obj);
 
-    @JavaScriptBody(args = {"color"}, body = "this._context().shadowColor=color;")
+    @JavaScriptBody(args = {"color"}, body = "this._context().shadowColor=color.valueOf();")
     public native void setShadowColor(String color);
 
     @JavaScriptBody(args = {"blur"}, body = "this._context().shadowBlur=blur;")
@@ -204,19 +204,19 @@
     @JavaScriptBody(args = {}, body = "return this._context().lineCap;")
     public native String getLineCap();
 
-    @JavaScriptBody(args = {"style"}, body = "this._context().lineCap=style;")
+    @JavaScriptBody(args = {"style"}, body = "this._context().lineCap=style.valueOf();")
     public native void setLineCap(String style);
 
     @JavaScriptBody(args = {}, body = "return this._context().lineJoin;")
     public native String getLineJoin();
 
-    @JavaScriptBody(args = {"style"}, body = "this._context().lineJoin=style;")
+    @JavaScriptBody(args = {"style"}, body = "this._context().lineJoin=style.valueOf();")
     public native void setLineJoin(String style) ;
 
     @JavaScriptBody(args = {}, body = "return this._context().lineWidth;")
     public native double getLineWidth();
 
-    @JavaScriptBody(args = {"width"}, body = "this._context().lineJoin=width;")
+    @JavaScriptBody(args = {"width"}, body = "this._context().lineWidth=width;")
     public native void setLineWidth(double width);
 
     @JavaScriptBody(args = {}, body = "return this._context().miterLimit;")
@@ -228,19 +228,19 @@
     @JavaScriptBody(args = {}, body = "return this._context().font;")
     public native String getFont();
 
-    @JavaScriptBody(args = {"font"}, body = "this._context().font=font;")
+    @JavaScriptBody(args = {"font"}, body = "this._context().font=font.valueOf();")
     public native void setFont(String font);
 
     @JavaScriptBody(args = {}, body = "return this._context().textAlign;")
     public native String getTextAlign();
 
-    @JavaScriptBody(args = {"textalign"}, body = "this._context().textAlign=textalign;")
+    @JavaScriptBody(args = {"textalign"}, body = "this._context().textAlign=textalign.valueOf();")
     public native void setTextAlign(String textAlign);
 
     @JavaScriptBody(args = {}, body = "return this._context().textBaseline;")
     public native String getTextBaseline();
 
-    @JavaScriptBody(args = {"textbaseline"}, body = "this._context().textBaseline=textbaseline;")
+    @JavaScriptBody(args = {"textbaseline"}, body = "this._context().textBaseline=textbaseline.valueOf();")
     public native void setTextBaseline(String textbaseline);
 
     @JavaScriptBody(args = {"text", "x", "y"}, body = "this._context().fillText(text,x,y);")
@@ -306,7 +306,7 @@
     @JavaScriptBody(args = {}, body = "return this._context().globalAlpha;")
     public native double getGlobalAlpha();
 
-    @JavaScriptBody(args = {"operation"}, body = "this._context().globalCompositeOperation=operation;")
+    @JavaScriptBody(args = {"operation"}, body = "this._context().globalCompositeOperation=operation.valueOf();")
     public native void setGlobalCompositeOperation(String operation);
 
     @JavaScriptBody(args = {}, body = "return this._context().globalCompositeOperation;")
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/OnController.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/OnController.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/OnController.java	Fri Mar 22 17:03:32 2013 +0100
@@ -30,14 +30,33 @@
         this.arr = arr;
     }
     
+    /** Registers an event handler on associated {@link OnEvent}
+     * and {@link Element}
+     * 
+     * @param handler the handler to be called when the event occurs
+     */
+    public void perform(final OnHandler handler) {
+        for (Element e : arr) {
+            e.on(event, handler);
+        }
+    }
+    
     /** Registers a runnable to be performed on associated {@link OnEvent} 
      * and {@link Element}.
      * 
      * @see OnEvent#of
      */
-    public void perform(Runnable r) {
+    public void perform(final Runnable r) {
+        class W implements OnHandler {
+            @Override
+            public void onEvent(Object event) throws Exception {
+                r.run();
+            }
+        }
+        perform(new W());
+        OnHandler w = new W();
         for (Element e : arr) {
-            e.on(event, r);
+            e.on(event, w);
         }
     }
 }
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/OnHandler.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/OnHandler.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,33 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage.api;
+
+/** Handler to be called when an event in an HTML {@link Page} appears.
+ * @see OnEvent
+ * @see OnController
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public interface OnHandler {
+    /** Called when a DOM event appears
+     * 
+     * @param event the event as produced by the browser
+     * @throws Exception execution can throw exception
+     */
+    public void onEvent(Object event) throws Exception;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PageController.java
--- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PageController.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PageController.java	Fri Mar 22 17:03:32 2013 +0100
@@ -60,4 +60,9 @@
         }
         PAGE.PG_TITLE.setText(id);
     }
+    
+    @On(event = CLICK, id={ "pg.canvas" })
+    static void clickCanvas(String id, double layerX) {
+        PAGE.PG_CANVAS.setWidth((int) layerX);
+    }
 }
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ProcessPageTest.java
--- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ProcessPageTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ProcessPageTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -36,11 +36,12 @@
         assertNotNull(is, "Sample HTML page found");
         ProcessPage res = ProcessPage.readPage(is);
         final Set<String> ids = res.ids();
-        assertEquals(ids.size(), 3, "Three ids found: " + ids);
+        assertEquals(ids.size(), 4, "Four ids found: " + ids);
         
         assertEquals(res.tagNameForId("pg.title"), "title");
         assertEquals(res.tagNameForId("pg.button"), "button");
         assertEquals(res.tagNameForId("pg.text"), "input");
+        assertEquals(res.tagNameForId("pg.canvas"), "canvas");
     }
     
     @Test public void testCompileAndRunPageController() throws Exception {
@@ -53,11 +54,13 @@
             + "doc.title.innerHTML = 'nothing';\n"
             + "doc.text = new Object();\n"
             + "doc.text.value = 'something';\n"
+            + "doc.canvas = new Object();\n"
             + "doc.getElementById = function(id) {\n"
             + "    switch(id) {\n"
             + "      case 'pg.button': return doc.button;\n"
             + "      case 'pg.title': return doc.title;\n"
             + "      case 'pg.text': return doc.text;\n"
+            + "      case 'pg.canvas': return doc.canvas;\n"
             + "    }\n"
             + "    throw id;\n"
             + "  }\n"
@@ -92,11 +95,13 @@
             + "doc.title.innerHTML = 'nothing';\n"
             + "doc.text = new Object();\n"
             + "doc.text.value = 'something';\n"
+            + "doc.canvas = new Object();\n"
             + "doc.getElementById = function(id) {\n"
             + "    switch(id) {\n"
             + "      case 'pg.button': return doc.button;\n"
             + "      case 'pg.title': return doc.title;\n"
             + "      case 'pg.text': return doc.text;\n"
+            + "      case 'pg.canvas': return doc.canvas;\n"
             + "    }\n"
             + "    throw id;\n"
             + "  }\n"
@@ -123,12 +128,61 @@
         assertEquals(ret, "pg.title", "Title has been passed to the method argument");
     }
 
+    @Test public void clickWithArgumentAndParameterCalled() throws Exception {
+        StringBuilder sb = new StringBuilder();
+        sb.append(
+              "var window = new Object();\n"
+            + "var doc = new Object();\n"
+            + "var eventObject = new Object();\n"
+            + "eventObject.layerX = 100;\n"
+            + "doc.button = new Object();\n"
+            + "doc.title = new Object();\n"
+            + "doc.title.innerHTML = 'nothing';\n"
+            + "doc.text = new Object();\n"
+            + "doc.text.value = 'something';\n"
+            + "doc.canvas = new Object();\n"
+            + "doc.canvas.width = 200;\n"                
+            + "doc.getElementById = function(id) {\n"
+            + "    switch(id) {\n"
+            + "      case 'pg.button': return doc.button;\n"
+            + "      case 'pg.title': return doc.title;\n"
+            + "      case 'pg.text': return doc.text;\n"
+            + "      case 'pg.canvas': return doc.canvas;\n"
+            + "    }\n"
+            + "    throw id;\n"
+            + "  }\n"
+            + "\n"
+            + "function clickAndCheck() {\n"
+            + "  doc.canvas.onclick(eventObject);\n"
+            + "  return doc.canvas.width.toString();\n"
+            + "};\n"
+            + "\n"
+            + "window.document = doc;\n"
+        );
+        Invocable i = compileClass(sb, 
+            "org/apidesign/bck2brwsr/htmlpage/PageController"
+        );
+
+        Object ret = null;
+        try {
+            ret = i.invokeFunction("clickAndCheck");
+        } catch (ScriptException ex) {
+            fail("Execution failed in " + sb, ex);
+        } catch (NoSuchMethodException ex) {
+            fail("Cannot find method in " + sb, ex);
+        }
+       assertEquals(ret, "100", "layerX has been passed to the method argument");
+    }
+    
     static Invocable compileClass(StringBuilder sb, String... names) throws ScriptException, IOException {
         if (sb == null) {
             sb = new StringBuilder();
         }
         Bck2Brwsr.generate(sb, ProcessPageTest.class.getClassLoader(), names);
         sb.append("var vm = this.bck2brwsr();\n");
+        for (String c : names) {
+            sb.append("vm.loadClass('").append(c.replace('/', '.')).append("');\n");
+        }
         
         ScriptEngineManager sem = new ScriptEngineManager();
         ScriptEngine js = sem.getEngineByExtension("js");
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/api/src/test/resources/org/apidesign/bck2brwsr/htmlpage/TestPage.html
--- a/javaquery/api/src/test/resources/org/apidesign/bck2brwsr/htmlpage/TestPage.html	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/api/src/test/resources/org/apidesign/bck2brwsr/htmlpage/TestPage.html	Fri Mar 22 17:03:32 2013 +0100
@@ -26,5 +26,6 @@
     <body>
         New title: <input id="pg.text"/>
         <button id="pg.button">Change title!</button>
+        <canvas id="pg.canvas" width="100"/>
     </body>
 </html>
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/demo-calculator-dynamic/nbactions.xml
--- a/javaquery/demo-calculator-dynamic/nbactions.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/demo-calculator-dynamic/nbactions.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -23,7 +23,7 @@
             <actionName>run</actionName>
             <goals>
                 <goal>process-classes</goal>
-                <goal>org.apidesign.bck2brwsr:mojo:0.3-SNAPSHOT:brwsr</goal>
+                <goal>org.apidesign.bck2brwsr:mojo:0.5-SNAPSHOT:brwsr</goal>
             </goals>
         </action>
     </actions>
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/demo-calculator-dynamic/pom.xml
--- a/javaquery/demo-calculator-dynamic/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/demo-calculator-dynamic/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>demo.calculator</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JavaQuery Demo - Calculator</name>
@@ -19,7 +18,7 @@
             <plugin>
                 <groupId>org.apidesign.bck2brwsr</groupId>
                 <artifactId>mojo</artifactId>
-                <version>0.3-SNAPSHOT</version>
+                <version>0.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -62,6 +61,14 @@
            </configuration>
          </plugin>
          <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-javadoc-plugin</artifactId>
+           <version>2.9</version>
+           <configuration>
+             <skip>true</skip>
+           </configuration>
+         </plugin>
+         <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.4</version>
                 <executions>
@@ -86,13 +93,13 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>emul</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.5-SNAPSHOT</version>
       <classifier>rt</classifier>
     </dependency>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>javaquery.api</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -105,7 +112,7 @@
       <artifactId>vm4brwsr</artifactId>
       <classifier>js</classifier>
       <type>zip</type>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.5-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java
--- a/javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java	Fri Mar 22 17:03:32 2013 +0100
@@ -50,18 +50,18 @@
     }
     
     @On(event = CLICK, id= { "plus", "minus", "mul", "div" })
-    static void applyOp(Calculator c, String op) {
+    static void applyOp(Calculator c, String id) {
         c.setMemory(c.getDisplay());
-        c.setOperation(op);
+        c.setOperation(id);
         c.setDisplay(0);
     }
 
     @On(event = MOUSE_OVER, id= { "result" })
-    static void attemptingIn(Calculator c, String op) {
+    static void attemptingIn(Calculator c) {
         c.setHover(true);
     }
     @On(event = MOUSE_OUT, id= { "result" })
-    static void attemptingOut(Calculator c, String op) {
+    static void attemptingOut(Calculator c) {
         c.setHover(false);
     }
     
@@ -88,18 +88,18 @@
     }
     
     @On(event = CLICK, id={"n0", "n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9"}) 
-    static void addDigit(String digit, Calculator c) {
-        digit = digit.substring(1);
+    static void addDigit(String id, Calculator c) {
+        id = id.substring(1);
         
         double v = c.getDisplay();
         if (v == 0.0) {
-            c.setDisplay(Integer.parseInt(digit));
+            c.setDisplay(Integer.parseInt(id));
         } else {
             String txt = Double.toString(v);
             if (txt.endsWith(".0")) {
                 txt = txt.substring(0, txt.length() - 2);
             }
-            txt = txt + digit;
+            txt = txt + id;
             c.setDisplay(Double.parseDouble(txt));
         }
     }
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/demo-calculator/nbactions.xml
--- a/javaquery/demo-calculator/nbactions.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/demo-calculator/nbactions.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -23,7 +23,7 @@
             <actionName>run</actionName>
             <goals>
                 <goal>package</goal>
-                <goal>org.apidesign.bck2brwsr:mojo:0.3-SNAPSHOT:brwsr</goal>
+                <goal>org.apidesign.bck2brwsr:mojo:0.5-SNAPSHOT:brwsr</goal>
             </goals>
             <properties>
                 <skipTests>true</skipTests>
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/demo-calculator/pom.xml
--- a/javaquery/demo-calculator/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/demo-calculator/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>demo.static.calculator</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JavaQuery Demo - Calculator - Static Compilation</name>
@@ -19,10 +18,11 @@
             <plugin>
                 <groupId>org.apidesign.bck2brwsr</groupId>
                 <artifactId>mojo</artifactId>
-                <version>0.3-SNAPSHOT</version>
+                <version>0.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
+                            <goal>j2js</goal>
                             <goal>brwsr</goal>
                         </goals>
                     </execution>
@@ -30,6 +30,7 @@
                 <configuration>
                     <directory>${project.build.directory}/${project.build.finalName}-bck2brwsr/public_html/</directory>
                     <startpage>index.xhtml</startpage>
+                    <javascript>${project.build.directory}/bck2brwsr.js</javascript>
                 </configuration>
             </plugin>
          <plugin>
@@ -80,6 +81,14 @@
              <skip>true</skip>
            </configuration>
          </plugin>      
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-javadoc-plugin</artifactId>
+           <version>2.9</version>
+           <configuration>
+             <skip>true</skip>
+           </configuration>
+         </plugin>
       </plugins>
   </build>
 
@@ -87,21 +96,13 @@
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>emul</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.5-SNAPSHOT</version>
       <classifier>rt</classifier>
     </dependency>
     <dependency>
       <groupId>org.apidesign.bck2brwsr</groupId>
       <artifactId>javaquery.api</artifactId>
-      <version>0.3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>vm4brwsr</artifactId>
-      <classifier>js</classifier>
-      <type>zip</type>
-      <version>0.3-SNAPSHOT</version>
-      <scope>provided</scope>
+      <version>0.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/demo-calculator/src/main/assembly/bck2brwsr.xml
--- a/javaquery/demo-calculator/src/main/assembly/bck2brwsr.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/demo-calculator/src/main/assembly/bck2brwsr.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -37,15 +37,6 @@
             <include>*:rt</include>
         </includes>
     </dependencySet>
-    <dependencySet>
-        <useProjectArtifact>false</useProjectArtifact>
-        <scope>provided</scope>
-        <includes>
-            <include>*:js</include>
-        </includes>
-        <unpack>true</unpack>
-        <outputDirectory>/</outputDirectory>
-    </dependencySet>
   </dependencySets> 
   <files>
     <file>
@@ -53,6 +44,10 @@
       <outputDirectory>/</outputDirectory>
     </file>
     <file>
+      <source>${project.build.directory}/bck2brwsr.js</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
       <source>${project.build.directory}/classes/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml</source>
       <outputDirectory>/</outputDirectory>
       <destName>index.xhtml</destName>
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/demo-calculator/src/main/java/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calc.java
--- a/javaquery/demo-calculator/src/main/java/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calc.java	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/demo-calculator/src/main/java/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calc.java	Fri Mar 22 17:03:32 2013 +0100
@@ -49,18 +49,18 @@
     }
     
     @On(event = CLICK, id= { "plus", "minus", "mul", "div" })
-    static void applyOp(Calculator c, String op) {
+    static void applyOp(Calculator c, String id) {
         c.setMemory(c.getDisplay());
-        c.setOperation(op);
+        c.setOperation(id);
         c.setDisplay(0);
     }
 
     @On(event = MOUSE_OVER, id= { "result" })
-    static void attemptingIn(Calculator c, String op) {
+    static void attemptingIn(Calculator c) {
         c.setHover(true);
     }
     @On(event = MOUSE_OUT, id= { "result" })
-    static void attemptingOut(Calculator c, String op) {
+    static void attemptingOut(Calculator c) {
         c.setHover(false);
     }
     
@@ -87,18 +87,18 @@
     }
     
     @On(event = CLICK, id={"n0", "n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9"}) 
-    static void addDigit(String digit, Calculator c) {
-        digit = digit.substring(1);
+    static void addDigit(String id, Calculator c) {
+        id = id.substring(1);
         
         double v = c.getDisplay();
         if (v == 0.0) {
-            c.setDisplay(Integer.parseInt(digit));
+            c.setDisplay(Integer.parseInt(id));
         } else {
             String txt = Double.toString(v);
             if (txt.endsWith(".0")) {
                 txt = txt.substring(0, txt.length() - 2);
             }
-            txt = txt + digit;
+            txt = txt + id;
             c.setDisplay(Double.parseDouble(txt));
         }
     }
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml
--- a/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Fri Mar 22 17:03:32 2013 +0100
@@ -86,7 +86,7 @@
         <div data-bind="text: displayPreview"></div>
         <script src="bck2brwsr.js"/>
         <script>
-            var vm = bck2brwsr('demo.static.calculator-0.3-SNAPSHOT.jar');
+            var vm = bck2brwsr('demo.static.calculator-0.5-SNAPSHOT.jar');
             vm.loadClass('org.apidesign.bck2brwsr.demo.calc.staticcompilation.Calc');
         </script>
     </body>
diff -r 3392f250c784 -r ecbd252fd3a7 javaquery/pom.xml
--- a/javaquery/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/javaquery/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -4,11 +4,11 @@
   <parent>
     <artifactId>bck2brwsr</artifactId>
     <groupId>org.apidesign</groupId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.5-SNAPSHOT</version>
   </parent>
   <groupId>org.apidesign.bck2brwsr</groupId>
   <artifactId>javaquery</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JavaQuery API and Demo</name>
     <modules>
diff -r 3392f250c784 -r ecbd252fd3a7 launcher/pom.xml
--- a/launcher/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign</groupId>
-    <artifactId>bck2brwsr</artifactId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>launcher</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <name>Bck2Brwsr Launcher</name>
-  <url>http://maven.apache.org</url>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
-                <configuration>
-                    <excludePackageNames>org.apidesign.bck2brwsr.launcher.impl</excludePackageNames>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.grizzly</groupId>
-      <artifactId>grizzly-http-server</artifactId>
-      <version>2.2.19</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vm4brwsr</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,563 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.launcher;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apidesign.bck2brwsr.launcher.InvocationContext.Resource;
-import org.apidesign.vm4brwsr.Bck2Brwsr;
-import org.glassfish.grizzly.PortRange;
-import org.glassfish.grizzly.http.server.HttpHandler;
-import org.glassfish.grizzly.http.server.HttpServer;
-import org.glassfish.grizzly.http.server.NetworkListener;
-import org.glassfish.grizzly.http.server.Request;
-import org.glassfish.grizzly.http.server.Response;
-import org.glassfish.grizzly.http.server.ServerConfiguration;
-import org.glassfish.grizzly.http.util.HttpStatus;
-
-/**
- * Lightweight server to launch Bck2Brwsr applications and tests.
- * Supports execution in native browser as well as Java's internal 
- * execution engine.
- */
-final class Bck2BrwsrLauncher extends Launcher implements Closeable {
-    private static final Logger LOG = Logger.getLogger(Bck2BrwsrLauncher.class.getName());
-    private static final InvocationContext END = new InvocationContext(null, null, null);
-    private final Set<ClassLoader> loaders = new LinkedHashSet<>();
-    private final BlockingQueue<InvocationContext> methods = new LinkedBlockingQueue<>();
-    private long timeOut;
-    private final Res resources = new Res();
-    private final String cmd;
-    private Object[] brwsr;
-    private HttpServer server;
-    private CountDownLatch wait;
-    
-    public Bck2BrwsrLauncher(String cmd) {
-        this.cmd = cmd;
-    }
-    
-    @Override
-    InvocationContext runMethod(InvocationContext c) throws IOException {
-        loaders.add(c.clazz.getClassLoader());
-        methods.add(c);
-        try {
-            c.await(timeOut);
-        } catch (InterruptedException ex) {
-            throw new IOException(ex);
-        }
-        return c;
-    }
-    
-    public void setTimeout(long ms) {
-        timeOut = ms;
-    }
-    
-    public void addClassLoader(ClassLoader url) {
-        this.loaders.add(url);
-    }
-
-    public void showURL(String startpage) throws IOException {
-        if (!startpage.startsWith("/")) {
-            startpage = "/" + startpage;
-        }
-        HttpServer s = initServer(".", true);
-        int last = startpage.lastIndexOf('/');
-        String simpleName = startpage.substring(last);
-        s.getServerConfiguration().addHttpHandler(new Page(resources, startpage), simpleName);
-        s.getServerConfiguration().addHttpHandler(new Page(resources, null), "/");
-        try {
-            launchServerAndBrwsr(s, simpleName);
-        } catch (URISyntaxException | InterruptedException ex) {
-            throw new IOException(ex);
-        }
-    }
-
-    void showDirectory(File dir, String startpage) throws IOException {
-        if (!startpage.startsWith("/")) {
-            startpage = "/" + startpage;
-        }
-        HttpServer s = initServer(dir.getPath(), false);
-        try {
-            launchServerAndBrwsr(s, startpage);
-        } catch (URISyntaxException | InterruptedException ex) {
-            throw new IOException(ex);
-        }
-    }
-
-    @Override
-    public void initialize() throws IOException {
-        try {
-            executeInBrowser();
-        } catch (InterruptedException ex) {
-            final InterruptedIOException iio = new InterruptedIOException(ex.getMessage());
-            iio.initCause(ex);
-            throw iio;
-        } catch (Exception ex) {
-            if (ex instanceof IOException) {
-                throw (IOException)ex;
-            }
-            if (ex instanceof RuntimeException) {
-                throw (RuntimeException)ex;
-            }
-            throw new IOException(ex);
-        }
-    }
-    
-    private HttpServer initServer(String path, boolean addClasses) throws IOException {
-        HttpServer s = HttpServer.createSimpleServer(path, new PortRange(8080, 65535));
-
-        final ServerConfiguration conf = s.getServerConfiguration();
-        if (addClasses) {
-            conf.addHttpHandler(new VM(resources), "/bck2brwsr.js");
-            conf.addHttpHandler(new Classes(resources), "/classes/");
-        }
-        return s;
-    }
-    
-    private void executeInBrowser() throws InterruptedException, URISyntaxException, IOException {
-        wait = new CountDownLatch(1);
-        server = initServer(".", true);
-        final ServerConfiguration conf = server.getServerConfiguration();
-        
-        class DynamicResourceHandler extends HttpHandler {
-            private final InvocationContext ic;
-            public DynamicResourceHandler(InvocationContext ic) {
-                if (ic == null || ic.resources.isEmpty()) {
-                    throw new NullPointerException();
-                }
-                this.ic = ic;
-                for (Resource r : ic.resources) {
-                    conf.addHttpHandler(this, r.httpPath);
-                }
-            }
-
-            public void close() {
-                conf.removeHttpHandler(this);
-            }
-            
-            @Override
-            public void service(Request request, Response response) throws Exception {
-                for (Resource r : ic.resources) {
-                    if (r.httpPath.equals(request.getRequestURI())) {
-                        LOG.log(Level.INFO, "Serving HttpResource for {0}", request.getRequestURI());
-                        response.setContentType(r.httpType);
-                        copyStream(r.httpContent, response.getOutputStream(), null);
-                    }
-                }
-            }
-        }
-        
-        conf.addHttpHandler(new Page(resources, 
-            "org/apidesign/bck2brwsr/launcher/harness.xhtml"
-        ), "/execute");
-        
-        conf.addHttpHandler(new HttpHandler() {
-            int cnt;
-            List<InvocationContext> cases = new ArrayList<>();
-            DynamicResourceHandler prev;
-            @Override
-            public void service(Request request, Response response) throws Exception {
-                String id = request.getParameter("request");
-                String value = request.getParameter("result");
-                
-                
-                InvocationContext mi = null;
-                int caseNmbr = -1;
-                
-                if (id != null && value != null) {
-                    LOG.log(Level.INFO, "Received result for case {0} = {1}", new Object[]{id, value});
-                    value = decodeURL(value);
-                    int indx = Integer.parseInt(id);
-                    cases.get(indx).result(value, null);
-                    if (++indx < cases.size()) {
-                        mi = cases.get(indx);
-                        LOG.log(Level.INFO, "Re-executing case {0}", indx);
-                        caseNmbr = indx;
-                    }
-                } else {
-                    if (!cases.isEmpty()) {
-                        LOG.info("Re-executing test cases");
-                        mi = cases.get(0);
-                        caseNmbr = 0;
-                    }
-                }
-                
-                if (prev != null) {
-                    prev.close();
-                    prev = null;
-                }
-                
-                if (mi == null) {
-                    mi = methods.take();
-                    caseNmbr = cnt++;
-                }
-                if (mi == END) {
-                    response.getWriter().write("");
-                    wait.countDown();
-                    cnt = 0;
-                    LOG.log(Level.INFO, "End of data reached. Exiting.");
-                    return;
-                }
-                
-                if (!mi.resources.isEmpty()) {
-                    prev = new DynamicResourceHandler(mi);
-                }
-                
-                cases.add(mi);
-                final String cn = mi.clazz.getName();
-                final String mn = mi.methodName;
-                LOG.log(Level.INFO, "Request for {0} case. Sending {1}.{2}", new Object[]{caseNmbr, cn, mn});
-                response.getWriter().write("{"
-                    + "className: '" + cn + "', "
-                    + "methodName: '" + mn + "', "
-                    + "request: " + caseNmbr
-                );
-                if (mi.html != null) {
-                    response.getWriter().write(", html: '");
-                    response.getWriter().write(encodeJSON(mi.html));
-                    response.getWriter().write("'");
-                }
-                response.getWriter().write("}");
-            }
-        }, "/data");
-
-        this.brwsr = launchServerAndBrwsr(server, "/execute");
-    }
-    
-    private static String encodeJSON(String in) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < in.length(); i++) {
-            char ch = in.charAt(i);
-            if (ch < 32 || ch == '\'' || ch == '"') {
-                sb.append("\\u");
-                String hs = "0000" + Integer.toHexString(ch);
-                hs = hs.substring(hs.length() - 4);
-                sb.append(hs);
-            } else {
-                sb.append(ch);
-            }
-        }
-        return sb.toString();
-    }
-    
-    @Override
-    public void shutdown() throws IOException {
-        methods.offer(END);
-        for (;;) {
-            int prev = methods.size();
-            try {
-                if (wait != null && wait.await(timeOut, TimeUnit.MILLISECONDS)) {
-                    break;
-                }
-            } catch (InterruptedException ex) {
-                throw new IOException(ex);
-            }
-            if (prev == methods.size()) {
-                LOG.log(
-                    Level.WARNING, 
-                    "Timeout and no test has been executed meanwhile (at {0}). Giving up.", 
-                    methods.size()
-                );
-                break;
-            }
-            LOG.log(Level.INFO, 
-                "Timeout, but tests got from {0} to {1}. Trying again.", 
-                new Object[]{prev, methods.size()}
-            );
-        }
-        stopServerAndBrwsr(server, brwsr);
-    }
-    
-    static void copyStream(InputStream is, OutputStream os, String baseURL, String... params) throws IOException {
-        for (;;) {
-            int ch = is.read();
-            if (ch == -1) {
-                break;
-            }
-            if (ch == '$' && params.length > 0) {
-                int cnt = is.read() - '0';
-                if (cnt == 'U' - '0') {
-                    os.write(baseURL.getBytes("UTF-8"));
-                } else {
-                    if (cnt >= 0 && cnt < params.length) {
-                        os.write(params[cnt].getBytes("UTF-8"));
-                    } else {
-                        os.write('$');
-                        os.write(cnt + '0');
-                    }
-                }
-            } else {
-                os.write(ch);
-            }
-        }
-    }
-
-    private Object[] launchServerAndBrwsr(HttpServer server, final String page) throws IOException, URISyntaxException, InterruptedException {
-        server.start();
-        NetworkListener listener = server.getListeners().iterator().next();
-        int port = listener.getPort();
-        
-        URI uri = new URI("http://localhost:" + port + page);
-        LOG.log(Level.INFO, "Showing {0}", uri);
-        if (cmd == null) {
-            try {
-                LOG.log(Level.INFO, "Trying Desktop.browse on {0} {2} by {1}", new Object[] {
-                    System.getProperty("java.vm.name"),
-                    System.getProperty("java.vm.vendor"),
-                    System.getProperty("java.vm.version"),
-                });
-                java.awt.Desktop.getDesktop().browse(uri);
-                LOG.log(Level.INFO, "Desktop.browse successfully finished");
-                return null;
-            } catch (UnsupportedOperationException ex) {
-                LOG.log(Level.INFO, "Desktop.browse not supported: {0}", ex.getMessage());
-                LOG.log(Level.FINE, null, ex);
-            }
-        }
-        {
-            String cmdName = cmd == null ? "xdg-open" : cmd;
-            String[] cmdArr = { 
-                cmdName, uri.toString()
-            };
-            LOG.log(Level.INFO, "Launching {0}", Arrays.toString(cmdArr));
-            final Process process = Runtime.getRuntime().exec(cmdArr);
-            return new Object[] { process, null };
-        }
-    }
-    
-    private static String decodeURL(String s) {
-        for (;;) {
-            int pos = s.indexOf('%');
-            if (pos == -1) {
-                return s;
-            }
-            int i = Integer.parseInt(s.substring(pos + 1, pos + 2), 16);
-            s = s.substring(0, pos) + (char)i + s.substring(pos + 2);
-        }
-    }
-    
-    private void stopServerAndBrwsr(HttpServer server, Object[] brwsr) throws IOException {
-        if (brwsr == null) {
-            return;
-        }
-        Process process = (Process)brwsr[0];
-        
-        server.stop();
-        InputStream stdout = process.getInputStream();
-        InputStream stderr = process.getErrorStream();
-        drain("StdOut", stdout);
-        drain("StdErr", stderr);
-        process.destroy();
-        int res;
-        try {
-            res = process.waitFor();
-        } catch (InterruptedException ex) {
-            throw new IOException(ex);
-        }
-        LOG.log(Level.INFO, "Exit code: {0}", res);
-
-        deleteTree((File)brwsr[1]);
-    }
-    
-    private static void drain(String name, InputStream is) throws IOException {
-        int av = is.available();
-        if (av > 0) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("v== ").append(name).append(" ==v\n");
-            while (av-- > 0) {
-                sb.append((char)is.read());
-            }
-            sb.append("\n^== ").append(name).append(" ==^");
-            LOG.log(Level.INFO, sb.toString());
-        }
-    }
-
-    private void deleteTree(File file) {
-        if (file == null) {
-            return;
-        }
-        File[] arr = file.listFiles();
-        if (arr != null) {
-            for (File s : arr) {
-                deleteTree(s);
-            }
-        }
-        file.delete();
-    }
-
-    @Override
-    public void close() throws IOException {
-        shutdown();
-    }
-
-    private class Res implements Bck2Brwsr.Resources {
-        @Override
-        public InputStream get(String resource) throws IOException {
-            for (ClassLoader l : loaders) {
-                URL u = null;
-                Enumeration<URL> en = l.getResources(resource);
-                while (en.hasMoreElements()) {
-                    u = en.nextElement();
-                }
-                if (u != null) {
-                    return u.openStream();
-                }
-            }
-            throw new IOException("Can't find " + resource);
-        }
-    }
-
-    private static class Page extends HttpHandler {
-        private final String resource;
-        private final String[] args;
-        private final Res res;
-        
-        public Page(Res res, String resource, String... args) {
-            this.res = res;
-            this.resource = resource;
-            this.args = args.length == 0 ? new String[] { "$0" } : args;
-        }
-
-        @Override
-        public void service(Request request, Response response) throws Exception {
-            String r = resource;
-            if (r == null) {
-                r = request.getHttpHandlerPath();
-            }
-            if (r.startsWith("/")) {
-                r = r.substring(1);
-            }
-            String[] replace = {};
-            if (r.endsWith(".html")) {
-                response.setContentType("text/html");
-                LOG.info("Content type text/html");
-                replace = args;
-            }
-            if (r.endsWith(".xhtml")) {
-                response.setContentType("application/xhtml+xml");
-                LOG.info("Content type application/xhtml+xml");
-                replace = args;
-            }
-            OutputStream os = response.getOutputStream();
-            try (InputStream is = res.get(r)) {
-                copyStream(is, os, request.getRequestURL().toString(), replace);
-            } catch (IOException ex) {
-                response.setDetailMessage(ex.getLocalizedMessage());
-                response.setError();
-                response.setStatus(404);
-            }
-        }
-    }
-
-    private static class VM extends HttpHandler {
-        private final String bck2brwsr;
-
-        public VM(Res loader) throws IOException {
-            StringBuilder sb = new StringBuilder();
-            Bck2Brwsr.generate(sb, loader);
-            sb.append(
-                  "(function WrapperVM(global) {"
-                + "  function ldCls(res) {\n"
-                + "    var request = new XMLHttpRequest();\n"
-                + "    request.open('GET', '/classes/' + res, false);\n"
-                + "    request.send();\n"
-                + "    if (request.status !== 200) return null;\n"
-                + "    var arr = eval('(' + request.responseText + ')');\n"
-                + "    return arr;\n"
-                + "  }\n"
-                + "  var prevvm = global.bck2brwsr;\n"
-                + "  global.bck2brwsr = function() {\n"
-                + "    var args = Array.prototype.slice.apply(arguments);\n"
-                + "    args.unshift(ldCls);\n"
-                + "    return prevvm.apply(null, args);\n"
-                + "  };\n"
-                + "})(this);\n"
-            );
-            this.bck2brwsr = sb.toString();
-        }
-
-        @Override
-        public void service(Request request, Response response) throws Exception {
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("text/javascript");
-            response.getWriter().write(bck2brwsr);
-        }
-    }
-
-    private static class Classes extends HttpHandler {
-        private final Res loader;
-
-        public Classes(Res loader) {
-            this.loader = loader;
-        }
-
-        @Override
-        public void service(Request request, Response response) throws Exception {
-            String res = request.getHttpHandlerPath();
-            if (res.startsWith("/")) {
-                res = res.substring(1);
-            }
-            try (InputStream is = loader.get(res)) {
-                response.setContentType("text/javascript");
-                Writer w = response.getWriter();
-                w.append("[");
-                for (int i = 0;; i++) {
-                    int b = is.read();
-                    if (b == -1) {
-                        break;
-                    }
-                    if (i > 0) {
-                        w.append(", ");
-                    }
-                    if (i % 20 == 0) {
-                        w.write("\n");
-                    }
-                    if (b > 127) {
-                        b = b - 256;
-                    }
-                    w.append(Integer.toString(b));
-                }
-                w.append("\n]");
-            } catch (IOException ex) {
-                response.setStatus(HttpStatus.NOT_FOUND_404);
-                response.setError();
-                response.setDetailMessage(ex.getMessage());
-            }
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/InvocationContext.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/InvocationContext.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.launcher;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/** Represents individual method invocation, its context and its result.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class InvocationContext {
-    final CountDownLatch wait = new CountDownLatch(1);
-    final Class<?> clazz;
-    final String methodName;
-    private final Launcher launcher;
-    private String result;
-    private Throwable exception;
-    String html;
-    final List<Resource> resources = new ArrayList<>();
-
-    InvocationContext(Launcher launcher, Class<?> clazz, String methodName) {
-        this.launcher = launcher;
-        this.clazz = clazz;
-        this.methodName = methodName;
-    }
-    
-    /** An HTML fragment to be available for the execution. Useful primarily when
-     * executing in a browser via {@link Launcher#createBrowser(java.lang.String)}.
-     * @param html the html fragment
-     */
-    public void setHtmlFragment(String html) {
-        this.html = html;
-    }
-    
-    /** HTTP resource to be available during execution. An invocation may
-     * perform an HTTP query and obtain a resource relative to the page.
-     */
-    public void addHttpResource(String relativePath, String mimeType, InputStream content) {
-        if (relativePath == null || mimeType == null || content == null) {
-            throw new NullPointerException();
-        }
-        resources.add(new Resource(content, mimeType, relativePath));
-    }
-    
-    /** Invokes the associated method. 
-     * @return the textual result of the invocation
-     */
-    public String invoke() throws IOException {
-        launcher.runMethod(this);
-        return toString();
-    }
-    
-    /** Obtains textual result of the invocation.
-     * @return text representing the exception or result value
-     */
-    @Override
-    public String toString() {
-        if (exception != null) {
-            return exception.toString();
-        }
-        return result;
-    }
-    
-    /**
-     * @param timeOut
-     * @throws InterruptedException 
-     */
-    void await(long timeOut) throws InterruptedException {
-        wait.await(timeOut, TimeUnit.MILLISECONDS);
-    }
-    
-    void result(String r, Throwable e) {
-        this.result = r;
-        this.exception = e;
-        wait.countDown();
-    }
-
-
-    static final class Resource {
-        final InputStream httpContent;
-        final String httpType;
-        final String httpPath;
-
-        Resource(InputStream httpContent, String httpType, String httpPath) {
-            this.httpContent = httpContent;
-            this.httpType = httpType;
-            this.httpPath = httpPath;
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.launcher;
-
-import org.apidesign.bck2brwsr.launcher.impl.Console;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import org.apidesign.vm4brwsr.Bck2Brwsr;
-
-/**
- * Tests execution in Java's internal scripting engine.
- */
-final class JSLauncher extends Launcher {
-    private static final Logger LOG = Logger.getLogger(JSLauncher.class.getName());
-    private Set<ClassLoader> loaders = new LinkedHashSet<>();
-    private final Res resources = new Res();
-    private Invocable code;
-    private StringBuilder codeSeq;
-    private Object console;
-    
-    
-    @Override InvocationContext runMethod(InvocationContext mi) {
-        loaders.add(mi.clazz.getClassLoader());
-        try {
-            long time = System.currentTimeMillis();
-            LOG.log(Level.FINE, "Invoking {0}.{1}", new Object[]{mi.clazz.getName(), mi.methodName});
-            String res = code.invokeMethod(
-                console,
-                "invoke__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2",
-                mi.clazz.getName(), mi.methodName).toString();
-            time = System.currentTimeMillis() - time;
-            LOG.log(Level.FINE, "Resut of {0}.{1} = {2} in {3} ms", new Object[]{mi.clazz.getName(), mi.methodName, res, time});
-            mi.result(res, null);
-        } catch (ScriptException | NoSuchMethodException ex) {
-            mi.result(null, ex);
-        }
-        return mi;
-    }
-    
-    public void addClassLoader(ClassLoader url) {
-        this.loaders.add(url);
-    }
-
-    @Override
-    public void initialize() throws IOException {
-        try {
-            initRhino();
-        } catch (Exception ex) {
-            if (ex instanceof IOException) {
-                throw (IOException)ex;
-            }
-            if (ex instanceof RuntimeException) {
-                throw (RuntimeException)ex;
-            }
-            throw new IOException(ex);
-        }
-    }
-    
-    private void initRhino() throws IOException, ScriptException, NoSuchMethodException {
-        StringBuilder sb = new StringBuilder();
-        Bck2Brwsr.generate(sb, new Res());
-
-        ScriptEngineManager sem = new ScriptEngineManager();
-        ScriptEngine mach = sem.getEngineByExtension("js");
-
-        sb.append(
-              "\nvar vm = new bck2brwsr(org.apidesign.bck2brwsr.launcher.impl.Console.read);"
-            + "\nfunction initVM() { return vm; };"
-            + "\n");
-
-        Object res = mach.eval(sb.toString());
-        if (!(mach instanceof Invocable)) {
-            throw new IOException("It is invocable object: " + res);
-        }
-        code = (Invocable) mach;
-        codeSeq = sb;
-        
-        Object vm = code.invokeFunction("initVM");
-        console = code.invokeMethod(vm, "loadClass", Console.class.getName());
-    }
-
-    @Override
-    public void shutdown() throws IOException {
-    }
-
-    @Override
-    public String toString() {
-        return codeSeq.toString();
-    }
-    
-    private class Res implements Bck2Brwsr.Resources {
-        @Override
-        public InputStream get(String resource) throws IOException {
-            for (ClassLoader l : loaders) {
-                URL u = null;
-                Enumeration<URL> en = l.getResources(resource);
-                while (en.hasMoreElements()) {
-                    u = en.nextElement();
-                }
-                if (u != null) {
-                    return u.openStream();
-                }
-            }
-            throw new IOException("Can't find " + resource);
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.launcher;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.net.URLClassLoader;
-import org.apidesign.vm4brwsr.Bck2Brwsr;
-
-/** An abstraction for executing tests in a Bck2Brwsr virtual machine.
- * Either in {@linkm Launcher#createJavaScript JavaScript engine}, 
- * or in {@linkm Launcher#createBrowser external browser}.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public abstract class Launcher {
-
-    Launcher() {
-    }
-
-    /** Initializes the launcher. This may mean starting a web browser or
-     * initializing execution engine.
-     * @throws IOException if something goes wrong
-     */
-    public abstract void initialize() throws IOException;
-    
-    /** Shuts down the launcher.
-     * @throws IOException if something goes wrong
-     */
-    public abstract void shutdown() throws IOException;
-    
-    
-    /** Builds an invocation context. The context can later be customized
-     * and {@link InvocationContext#invoke() invoked}.
-     * 
-     * @param clazz the class to execute method from
-     * @param method the method to execute
-     * @return the context pointing to the selected method
-     */
-    public InvocationContext createInvocation(Class<?> clazz, String method) {
-        return new InvocationContext(this, clazz, method);
-    }
-    
-
-    /** Creates launcher that uses internal JavaScript engine (Rhino).
-     * @return the launcher
-     */
-    public static Launcher createJavaScript() {
-        final JSLauncher l = new JSLauncher();
-        l.addClassLoader(Bck2Brwsr.class.getClassLoader());
-        return l;
-    }
-    
-    /** Creates launcher that is using external browser.
-     * 
-     * @param cmd <code>null</code> to use <code>java.awt.Desktop</code> to show the launcher
-     *    or a string to execute in an external process (with a parameter to the URL)
-     * @return launcher executing in external browser.
-     */
-    public static Launcher createBrowser(String cmd) {
-        final Bck2BrwsrLauncher l = new Bck2BrwsrLauncher(cmd);
-        l.addClassLoader(Bck2Brwsr.class.getClassLoader());
-        l.setTimeout(180000);
-        return l;
-    }
-    
-    /** Starts an HTTP server which provides access to classes and resources
-     * available in the <code>classes</code> URL and shows a start page
-     * available as {@link ClassLoader#getResource(java.lang.String)} from the
-     * provide classloader. Opens a browser with URL showing the start page.
-     * 
-     * @param classes classloader offering access to classes and resources
-     * @param startpage page to show in the browser
-     * @return interface that allows one to stop the server
-     * @throws IOException if something goes wrong
-     */
-    public static Closeable showURL(URLClassLoader classes, String startpage) throws IOException {
-        Bck2BrwsrLauncher l = new Bck2BrwsrLauncher(null);
-        l.addClassLoader(classes);
-        l.showURL(startpage);
-        return l;
-    }
-    /** Starts an HTTP server which provides access to certain directory.
-     * The <code>startpage</code> should be relative location inside the root 
-     * driecotry
-     * Opens a browser with URL showing the start page.
-     * 
-     * @param directory the root directory on disk
-     * @praam startpage relative path from the root to the page
-     * @exception IOException if something goes wrong.
-     */
-    public static Closeable showDir(File directory, String startpage) throws IOException {
-        Bck2BrwsrLauncher l = new Bck2BrwsrLauncher(null);
-        l.showDirectory(directory, startpage);
-        return l;
-    }
-
-    abstract InvocationContext runMethod(InvocationContext c) throws IOException; 
-}
diff -r 3392f250c784 -r ecbd252fd3a7 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java
--- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,255 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.launcher.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.util.Enumeration;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class Console {
-    private Console() {
-    }
-    static {
-        turnAssetionStatusOn();
-    }
-    
-    @JavaScriptBody(args = {"id", "attr"}, body = 
-        "return window.document.getElementById(id)[attr].toString();")
-    private static native Object getAttr(String id, String attr);
-
-    @JavaScriptBody(args = {"id", "attr", "value"}, body = 
-        "window.document.getElementById(id)[attr] = value;")
-    private static native void setAttr(String id, String attr, Object value);
-    
-    @JavaScriptBody(args = {}, body = "return; window.close();")
-    private static native void closeWindow();
-
-    private static void log(String newText) {
-        String id = "bck2brwsr.result";
-        String attr = "value";
-        setAttr(id, attr, getAttr(id, attr) + "\n" + newText);
-        setAttr(id, "scrollTop", getAttr(id, "scrollHeight"));
-    }
-    
-    public static void execute() throws Exception {
-        String clazz = (String) getAttr("clazz", "value");
-        String method = (String) getAttr("method", "value");
-        Object res = invokeMethod(clazz, method);
-        setAttr("bck2brwsr.result", "value", res);
-    }
-
-    @JavaScriptBody(args = { "url", "callback", "arr" }, body = ""
-        + "var request = new XMLHttpRequest();\n"
-        + "request.open('GET', url, true);\n"
-        + "request.onreadystatechange = function() {\n"
-        + "  if (this.readyState!==4) return;\n"
-        + "  arr[0] = this.responseText;\n"
-        + "  callback.run__V();\n"
-        + "};"
-        + "request.send();"
-    )
-    private static native void loadText(String url, Runnable callback, String[] arr) throws IOException;
-    
-    public static void harness(String url) throws IOException {
-        log("Connecting to " + url);
-        Request r = new Request(url);
-    }
-    
-    private static class Request implements Runnable {
-        private final String[] arr = { null };
-        private final String url;
-
-        private Request(String url) throws IOException {
-            this.url = url;
-            loadText(url, this, arr);
-        }
-        
-        @Override
-        public void run() {
-            try {
-                String data = arr[0];
-                log("\nGot \"" + data + "\"");
-                
-                if (data == null) {
-                    log("Some error exiting");
-                    closeWindow();
-                    return;
-                }
-                
-                if (data.isEmpty()) {
-                    log("No data, exiting");
-                    closeWindow();
-                    return;
-                }
-                
-                Case c = Case.parseData(data);
-                if (c.getHtmlFragment() != null) {
-                    setAttr("bck2brwsr.fragment", "innerHTML", c.getHtmlFragment());
-                }
-                log("Invoking " + c.getClassName() + '.' + c.getMethodName() + " as request: " + c.getRequestId());
-
-                Object result = invokeMethod(c.getClassName(), c.getMethodName());
-                
-                setAttr("bck2brwsr.fragment", "innerHTML", "");
-                log("Result: " + result);
-                
-                result = encodeURL("" + result);
-                
-                log("Sending back: " + url + "?request=" + c.getRequestId() + "&result=" + result);
-                String u = url + "?request=" + c.getRequestId() + "&result=" + result;
-                
-                loadText(u, this, arr);
-                
-            } catch (Exception ex) {
-                log(ex.getClass().getName() + ":" + ex.getMessage());
-            }
-        }
-    }
-    
-    private static String encodeURL(String r) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < r.length(); i++) {
-            int ch = r.charAt(i);
-            if (ch < 32 || ch == '%' || ch == '+') {
-                sb.append("%").append(("0" + Integer.toHexString(ch)).substring(0, 2));
-            } else {
-                if (ch == 32) {
-                    sb.append("+");
-                } else {
-                    sb.append((char)ch);
-                }
-            }
-        }
-        return sb.toString();
-    }
-    
-    static String invoke(String clazz, String method) throws ClassNotFoundException, InvocationTargetException, IllegalAccessException, InstantiationException {
-        final Object r = invokeMethod(clazz, method);
-        return r == null ? "null" : r.toString().toString();
-    }
-
-    /** Helper method that inspects the classpath and loads given resource
-     * (usually a class file). Used while running tests in Rhino.
-     * 
-     * @param name resource name to find
-     * @return the array of bytes in the given resource
-     * @throws IOException I/O in case something goes wrong
-     */
-    public static byte[] read(String name) throws IOException {
-        URL u = null;
-        Enumeration<URL> en = Console.class.getClassLoader().getResources(name);
-        while (en.hasMoreElements()) {
-            u = en.nextElement();
-        }
-        if (u == null) {
-            throw new IOException("Can't find " + name);
-        }
-        try (InputStream is = u.openStream()) {
-            byte[] arr;
-            arr = new byte[is.available()];
-            int offset = 0;
-            while (offset < arr.length) {
-                int len = is.read(arr, offset, arr.length - offset);
-                if (len == -1) {
-                    throw new IOException("Can't read " + name);
-                }
-                offset += len;
-            }
-            return arr;
-        }
-    }
-   
-    private static Object invokeMethod(String clazz, String method) 
-    throws ClassNotFoundException, InvocationTargetException, 
-    SecurityException, IllegalAccessException, IllegalArgumentException,
-    InstantiationException {
-        Method found = null;
-        Class<?> c = Class.forName(clazz);
-        for (Method m : c.getMethods()) {
-            if (m.getName().equals(method)) {
-                found = m;
-            }
-        }
-        Object res;
-        if (found != null) {
-            try {
-                if ((found.getModifiers() & Modifier.STATIC) != 0) {
-                    res = found.invoke(null);
-                } else {
-                    res = found.invoke(c.newInstance());
-                }
-            } catch (Throwable ex) {
-                res = ex.getClass().getName() + ":" + ex.getMessage();
-            }
-        } else {
-            res = "Can't find method " + method + " in " + clazz;
-        }
-        return res;
-    }
-
-    @JavaScriptBody(args = {}, body = "vm.desiredAssertionStatus = true;")
-    private static void turnAssetionStatusOn() {
-    }
-    
-    private static final class Case {
-        private final Object data;
-
-        private Case(Object data) {
-            this.data = data;
-        }
-        
-        public static Case parseData(String s) {
-            return new Case(toJSON(s));
-        }
-        
-        public String getMethodName() {
-            return value("methodName", data);
-        }
-
-        public String getClassName() {
-            return value("className", data);
-        }
-        
-        public String getRequestId() {
-            return value("request", data);
-        }
-
-        public String getHtmlFragment() {
-            return value("html", data);
-        }
-        
-        @JavaScriptBody(args = "s", body = "return eval('(' + s + ')');")
-        private static native Object toJSON(String s);
-        
-        @JavaScriptBody(args = {"p", "d"}, body = 
-              "var v = d[p];\n"
-            + "if (typeof v === 'undefined') return null;\n"
-            + "return v.toString();"
-        )
-        private static native String value(String p, Object d);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml
--- a/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Back 2 Browser Bytecode Translator
-    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, version 2 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. Look for COPYING file in the top folder.
-    If not, see http://opensource.org/licenses/GPL-2.0.
-
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>Bck2Brwsr Harness</title>
-    </head>
-    <body>
-        <script src="/bck2brwsr.js"></script>
-        <script>
-            var vm = bck2brwsr();
-        </script>
-        
-        <h1>Bck2Brwsr Execution Harness</h1>
-        
-        <textarea id="bck2brwsr.result" rows="25" style="width: 100%;" disabled="">
-        </textarea>
-
-        <div id="bck2brwsr.fragment"/>
-        
-        <script type="text/javascript">
-            vm.loadClass('org.apidesign.bck2brwsr.launcher.impl.Console').harness__VLjava_lang_String_2('$U/../data');
-        </script>
-    </body>
-</html>
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/pom.xml
--- a/mojo/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign</groupId>
-    <artifactId>bck2brwsr</artifactId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>mojo</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <packaging>maven-plugin</packaging>
-  <name>Bck2Brwsr Maven Project</name>
-  <url>http://maven.apache.org</url>
-      <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <extractors>
-                        <extractor>java-annotations</extractor>
-                    </extractors>
-                    <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-                 </configuration>
-                <executions>
-                    <execution>
-                        <id>mojo-descriptor</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>descriptor</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-      </build>
-      
-<dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>3.0.4</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.0</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vm4brwsr</artifactId>
-      <version>0.3-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>emul.mini</artifactId>
-          <groupId>org.apidesign.bck2brwsr</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-core</artifactId>
-      <version>3.0.2</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>launcher</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-</dependencies>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/java/org/apidesign/bck2brwsr/mojo/BrswrMojo.java
--- a/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/BrswrMojo.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.mojo;
-
-import java.io.Closeable;
-import org.apache.maven.plugin.AbstractMojo;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apidesign.bck2brwsr.launcher.Launcher;
-
-/** Executes given HTML page in a browser. */
-@Mojo(name="brwsr", defaultPhase=LifecyclePhase.NONE)
-public class BrswrMojo extends AbstractMojo {
-    public BrswrMojo() {
-    }
-    /** Resource to show as initial page */
-    @Parameter
-    private String startpage;
-
-    @Parameter(defaultValue="${project}")
-    private MavenProject prj;
-    
-    /** Root of the class files */
-    @Parameter(defaultValue="${project.build.directory}/classes")
-    private File classes;
-    
-    /** Root of all pages, and files, etc. */
-    @Parameter
-    private File directory;
-
-    @Override
-    public void execute() throws MojoExecutionException {
-        if (startpage == null) {
-            throw new MojoExecutionException("You have to provide a start page");
-        }
-        
-        try {
-            Closeable httpServer;
-            if (directory != null) {
-                httpServer = Launcher.showDir(directory, startpage);
-            } else {
-                URLClassLoader url = buildClassLoader(classes, prj.getDependencyArtifacts());
-                try {
-                    httpServer = Launcher.showURL(url, startpage());
-                } catch (Exception ex) {
-                    throw new MojoExecutionException("Can't open " + startpage(), ex);
-                }
-            }
-            System.in.read();
-            httpServer.close();
-        } catch (IOException ex) {
-            throw new MojoExecutionException("Can't show the browser", ex);
-        }
-    }
-    
-    private String startpage() {
-        return startpage;
-    }
-
-    private static URLClassLoader buildClassLoader(File root, Collection<Artifact> deps) throws MalformedURLException {
-        List<URL> arr = new ArrayList<URL>();
-        arr.add(root.toURI().toURL());
-        for (Artifact a : deps) {
-            final File f = a.getFile();
-            if (f != null) {
-                arr.add(f.toURI().toURL());
-            }
-        }
-        return new URLClassLoader(arr.toArray(new URL[0]), BrswrMojo.class.getClassLoader());
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/java/org/apidesign/bck2brwsr/mojo/Java2JavaScript.java
--- a/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/Java2JavaScript.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.mojo;
-
-import org.apache.maven.plugin.AbstractMojo;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apidesign.vm4brwsr.Bck2Brwsr;
-
-/** Compiles classes into JavaScript. */
-@Mojo(name="j2js", defaultPhase=LifecyclePhase.PROCESS_CLASSES)
-public class Java2JavaScript extends AbstractMojo {
-    public Java2JavaScript() {
-    }
-    /** Root of the class files */
-    @Parameter(defaultValue="${project.build.directory}/classes")
-    private File classes;
-    /** File to generate. Defaults bootjava.js in the first non-empty 
-     package under the classes directory */
-    @Parameter
-    private File javascript;
-    
-    @Parameter(defaultValue="${project}")
-    private MavenProject prj;
-    
-    
-
-    @Override
-    public void execute() throws MojoExecutionException {
-        if (!classes.isDirectory()) {
-            throw new MojoExecutionException("Can't find " + classes);
-        }
-
-        if (javascript == null) {
-            javascript = new File(findNonEmptyFolder(classes), "bootjava.js");
-        }
-
-        List<String> arr = new ArrayList<String>();
-        long newest = collectAllClasses("", classes, arr);
-        
-        if (javascript.lastModified() > newest) {
-            return;
-        }
-
-        try {
-            URLClassLoader url = buildClassLoader(classes, prj.getDependencyArtifacts());
-            FileWriter w = new FileWriter(javascript);
-            Bck2Brwsr.generate(w, url, arr.toArray(new String[0]));
-            w.close();
-        } catch (IOException ex) {
-            throw new MojoExecutionException("Can't compile", ex);
-        }
-    }
-
-    private static File findNonEmptyFolder(File dir) throws MojoExecutionException {
-        if (!dir.isDirectory()) {
-            throw new MojoExecutionException("Not a directory " + dir);
-        }
-        File[] arr = dir.listFiles();
-        if (arr.length == 1 && arr[0].isDirectory()) {
-            return findNonEmptyFolder(arr[0]);
-        }
-        return dir;
-    }
-
-    private static long collectAllClasses(String prefix, File toCheck, List<String> arr) {
-        File[] files = toCheck.listFiles();
-        if (files != null) {
-            long newest = 0L;
-            for (File f : files) {
-                long lastModified = collectAllClasses(prefix + f.getName() + "/", f, arr);
-                if (newest < lastModified) {
-                    newest = lastModified;
-                }
-            }
-            return newest;
-        } else if (toCheck.getName().endsWith(".class")) {
-            arr.add(prefix.substring(0, prefix.length() - 7));
-            return toCheck.lastModified();
-        } else {
-            return 0L;
-        }
-    }
-
-    private static URLClassLoader buildClassLoader(File root, Collection<Artifact> deps) throws MalformedURLException {
-        List<URL> arr = new ArrayList<URL>();
-        arr.add(root.toURI().toURL());
-        for (Artifact a : deps) {
-            arr.add(a.getFile().toURI().toURL());
-        }
-        return new URLClassLoader(arr.toArray(new URL[0]), Java2JavaScript.class.getClassLoader());
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/META-INF/maven/archetype-metadata.xml
--- a/mojo/src/main/resources/META-INF/maven/archetype-metadata.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Back 2 Browser Bytecode Translator
-    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, version 2 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. Look for COPYING file in the top folder.
-    If not, see http://opensource.org/licenses/GPL-2.0.
-
--->
-<archetype-descriptor name="bck2brwsr">
-  <fileSets>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/App.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.xhtml</include>
-        <include>**/*.html</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/test/java</directory>
-      <includes>
-        <include>**/*Test.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" packaged="false">
-      <directory></directory>
-      <includes>
-        <include>nbactions.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory></directory>
-      <includes>
-        <include>bck2brwsr-assembly.xml</include>
-      </includes>
-    </fileSet>
-  </fileSets>    
-</archetype-descriptor>
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/archetype-resources/bck2brwsr-assembly.xml
--- a/mojo/src/main/resources/archetype-resources/bck2brwsr-assembly.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Back 2 Browser Bytecode Translator
-    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, version 2 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. Look for COPYING file in the top folder.
-    If not, see http://opensource.org/licenses/GPL-2.0.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  
-  <id>bck2brwsr</id>
-  <formats>
-      <format>zip</format>
-  </formats>
-  <baseDirectory>public_html</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-        <useProjectArtifact>false</useProjectArtifact>
-        <scope>runtime</scope>
-        <outputDirectory>lib</outputDirectory>
-        <includes>
-            <include>*:jar</include>
-            <include>*:rt</include>
-        </includes>
-    </dependencySet>
-    <dependencySet>
-        <useProjectArtifact>false</useProjectArtifact>
-        <scope>provided</scope>
-        <includes>
-            <include>*:js</include>
-        </includes>
-        <unpack>true</unpack>
-        <outputDirectory>/</outputDirectory>
-    </dependencySet>
-  </dependencySets> 
-  <files>
-    <file>
-      <source>${project.build.directory}/${project.build.finalName}.jar</source>
-      <outputDirectory>/</outputDirectory>
-    </file>
-    <file>
-      <source>${project.build.directory}/classes/${package.replace('.','/')}/index.html</source>
-      <outputDirectory>/</outputDirectory>
-      <destName>index.html</destName>
-    </file>
-  </files>
-
-</assembly>
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/archetype-resources/nbactions.xml
--- a/mojo/src/main/resources/archetype-resources/nbactions.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-    <action>
-        <actionName>run</actionName>
-        <goals>
-            <goal>process-classes</goal>
-            <goal>org.apidesign.bck2brwsr:mojo:0.3-SNAPSHOT:brwsr</goal>
-        </goals>
-    </action>
-</actions>
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/archetype-resources/pom.xml
--- a/mojo/src/main/resources/archetype-resources/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-  <packaging>jar</packaging>
-
-  <name>${artifactId}</name>
-
-  <repositories>
-      <repository>
-          <id>java.net</id>
-          <name>Java.net</name>
-          <url>https://maven.java.net/content/repositories/snapshots/</url>
-          <snapshots>
-              <enabled>true</enabled>
-          </snapshots>
-      </repository>
-      <repository>
-          <id>netbeans</id>
-          <name>NetBeans</name>
-          <url>http://bits.netbeans.org/maven2/</url>
-      </repository>
-  </repositories>
-  <pluginRepositories>
-      <pluginRepository>
-          <id>java.net</id>
-          <name>Local Maven repository of releases</name>
-          <url>https://maven.java.net/content/repositories/snapshots/</url>
-          <snapshots>
-              <enabled>true</enabled>
-          </snapshots>
-      </pluginRepository>
-  </pluginRepositories>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <build>
-      <plugins>
-            <plugin>
-                <groupId>org.apidesign.bck2brwsr</groupId>
-                <artifactId>mojo</artifactId>
-                <version>0.3-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>brwsr</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <startpage>${package.replace('.','/')}/index.html</startpage>
-                </configuration>
-            </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
-            <configuration>
-               <source>1.7</source>
-               <target>1.7</target>
-            </configuration>
-         </plugin>
-         <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-jar-plugin</artifactId>
-             <version>2.4</version>
-             <configuration>
-                 <archive>
-                     <manifest>
-                         <addClasspath>true</addClasspath>
-                         <classpathPrefix>lib/</classpathPrefix>
-                     </manifest>
-                 </archive>
-             </configuration>
-         </plugin>
-         <plugin>
-             <artifactId>maven-assembly-plugin</artifactId>
-             <version>2.4</version>
-             <executions>
-                 <execution>
-                     <id>distro-assembly</id>
-                     <phase>package</phase>
-                     <goals>
-                         <goal>single</goal>
-                     </goals>
-                     <configuration>
-                         <descriptors>
-                             <descriptor>bck2brwsr-assembly.xml</descriptor>
-                         </descriptors>
-                     </configuration>
-                 </execution>
-             </executions>                
-         </plugin>      
-      </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>emul</artifactId>
-      <version>0.3-SNAPSHOT</version>
-      <classifier>rt</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>javaquery.api</artifactId>
-      <version>0.3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>6.5.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>vm4brwsr</artifactId>
-      <classifier>js</classifier>
-      <type>zip</type>
-      <version>0.3-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apidesign.bck2brwsr</groupId>
-      <artifactId>vmtest</artifactId>
-      <version>0.3-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/archetype-resources/src/main/java/App.java
--- a/mojo/src/main/resources/archetype-resources/src/main/java/App.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-package ${package};
-
-import org.apidesign.bck2brwsr.htmlpage.api.*;
-import static org.apidesign.bck2brwsr.htmlpage.api.OnEvent.*;
-import org.apidesign.bck2brwsr.htmlpage.api.Page;
-import org.apidesign.bck2brwsr.htmlpage.api.Property;
-import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
-
-/** Edit the index.xhtml file. Use 'id' to name certain HTML elements.
- * Use this class to define behavior of the elements.
- */
-@Page(xhtml="index.html", className="Index", properties={
-    @Property(name="name", type=String.class)
-})
-public class App {
-    static {
-        Index model = new Index();
-        model.setName("World");
-        model.applyBindings();
-    }
-    
-    @On(event = CLICK, id="hello")
-    static void hello(Index m) {
-        GraphicsContext g = m.CANVAS.getContext();
-        g.clearRect(0, 0, 1000, 1000);
-        g.setFont("italic 40px Calibri");
-        g.fillText(m.getHelloMessage(), 10, 40);
-    }
-    
-    @ComputedProperty
-    static String helloMessage(String name) {
-        return "Hello " + name + "!";
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/archetype-resources/src/main/resources/index.html
--- a/mojo/src/main/resources/archetype-resources/src/main/resources/index.html	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>Bck2Brwsr's Hello World</title>
-    </head>
-    <body>
-        <h1 data-bind="text: helloMessage">Loading Bck2Brwsr's Hello World...</h1>
-        Your name: <input id='input' data-bind="value: name, valueUpdate: 'afterkeydown'"></input>
-        <button id="hello">Say Hello!</button>
-        <p>
-            <canvas id="canvas" width="300" height="50">
-            </canvas>
-        </p>
-
-        <script src="bck2brwsr.js"></script>
-        <script type="text/javascript">
-            var vm = bck2brwsr('${artifactId}-${version}.jar');
-            vm.loadClass('${package}.App');
-        </script>
-    </body>
-</html>
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/archetype-resources/src/test/java/AppTest.java
--- a/mojo/src/main/resources/archetype-resources/src/test/java/AppTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-package ${package};
-
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/** Demonstrating POJO testing of HTML page model. Runs in good old HotSpot
- * as it does not reference any HTML elements or browser functionality. Just
- * operates on the page model.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class AppTest {
-    private Index model;
-    
-
-    @BeforeMethod
-    public void initModel() {
-        model = new Index().applyBindings();
-    }
-
-    @Test public void testHelloMessage() {
-        model.setName("Joe");
-        assertEquals(model.getHelloMessage(), "Hello Joe!", "Cleared after pressing +");
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/archetype-resources/src/test/java/InconsistencyTest.java
--- a/mojo/src/main/resources/archetype-resources/src/test/java/InconsistencyTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-package ${package};
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/** Bck2brwsr cares about compatibility with real Java. Whatever API is
- * supported by bck2brwsr, it needs to behave the same way as when running
- * in HotSpot VM. 
- * <p>
- * There can be bugs, however. To help us fix them, we kindly ask you to 
- * write an "inconsistency" test. A test that compares behavior of the API
- * between real VM and bck2brwsr VM. This class is skeleton of such test.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class InconsistencyTest {
-    /** A method to demonstrate inconsistency between bck2brwsr and HotSpot.
-     * Make calls to an API that behaves strangely, return some result at
-     * the end. No need to use any <code>assert</code>.
-     * 
-     * @return value to compare between HotSpot and bck2brwsr
-     */
-    @Compare
-    public int checkStringHashCode() throws Exception {
-        return "Is string hashCode the same?".hashCode();
-    }
-
-    /** Factory method that creates a three tests for each method annotated with
-     * {@link org.apidesign.bck2brwsr.vmtest.Compare}. One executes the code in
-     * HotSpot, one in Rhino and the last one compares the results.
-     * 
-     * @see org.apidesign.bck2brwsr.vmtest.VMTest
-     */
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(InconsistencyTest.class);
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 mojo/src/main/resources/archetype-resources/src/test/java/IntegrationTest.java
--- a/mojo/src/main/resources/archetype-resources/src/test/java/IntegrationTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-package ${package};
-
-import org.apidesign.bck2brwsr.htmlpage.api.OnEvent;
-import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
-import org.apidesign.bck2brwsr.vmtest.HtmlFragment;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/** Sometimes it is useful to run tests inside of the real browser. 
- * To do that just annotate your method with {@link org.apidesign.bck2brwsr.vmtest.BrwsrTest}
- * and that is it. If your code references elements on the HTML page,
- * you can pass in an {@link org.apidesign.bck2brwsr.vmtest.HtmlFragment} which
- * will be made available on the page before your test starts.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class IntegrationTest {
-    
-    /** Write to testing code here. Use <code>assert</code> (but not TestNG's
-     * Assert, as TestNG is not compiled with target 1.6 yet).
-     */
-    @HtmlFragment(
-        "<h1 data-bind=\"text: helloMessage\">Loading Bck2Brwsr's Hello World...</h1>\n" +
-        "Your name: <input id='input' data-bind=\"value: name, valueUpdate: 'afterkeydown'\"></input>\n" +
-        "<button id=\"hello\">Say Hello!</button>\n" +
-        "<p>\n" +
-        "    <canvas id=\"canvas\" width=\"300\" height=\"50\"></canvas>\n" +
-        "</p>\n"
-    )
-    @BrwsrTest
-    public void modifyValueAssertChangeInModel() {
-        Index m = new Index();
-        m.setName("Joe Hacker");
-        m.applyBindings();
-        assert "Joe Hacker".equals(m.INPUT.getValue()) : "Value is really Joe Hacker: " + m.INPUT.getValue();
-        m.INPUT.setValue("Happy Joe");
-        m.triggerEvent(m.INPUT, OnEvent.CHANGE);
-        assert "Happy Joe".equals(m.getName()) : "Name property updated to Happy Joe: " + m.getName();
-    }
-
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(IntegrationTest.class);
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 pom.xml
--- a/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ b/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apidesign</groupId>
   <artifactId>bck2brwsr</artifactId>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Back 2 Browser</name>
   <parent>
@@ -12,17 +12,11 @@
     <version>3</version>
   </parent>  
   <modules>
-    <module>vm</module>
-    <module>emul</module>
-    <module>core</module>
     <module>dew</module>
-    <module>mojo</module>
     <module>javaquery</module>
-    <module>javap</module>
     <module>benchmarks</module>
-    <module>launcher</module>
-    <module>vmtest</module>
     <module>ide</module>
+    <module>rt</module>
   </modules>
   <licenses>
       <license>
@@ -39,6 +33,7 @@
       <connection>scm:hg:http://source.apidesign.org/hg/bck2brwsr</connection>
       <developerConnection>scm:hg:https://source.apidesign.org/hg/bck2brwsr</developerConnection>
       <url>http://source.apidesign.org/hg/bck2brwsr</url>
+    <tag>HEAD</tag>
   </scm>
   <repositories>
       <repository>
@@ -81,18 +76,25 @@
                   <header>COPYING</header>
                   <strictCheck>true</strictCheck>
                   <excludes>
-                       <exclude>emul/*/src/main/**</exclude>
-                       <exclude>javap/**</exclude>
                        <exclude>*</exclude>
                        <exclude>.*/**</exclude>
-                       <exclude>mojo/src/main/resources/archetype-resources/**</exclude>
+                       <exclude>rt/emul/*/src/main/**</exclude>
+                       <exclude>rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeParser.java</exclude>
+                       <exclude>rt/archetype/src/main/resources/archetype-resources/**</exclude>
+                       <exclude>rt/vmtest/src/test/resources/**</exclude>
                        <exclude>dew/src/main/resources/org/apidesign/bck2brwsr/dew/**</exclude>
-                       <exclude>vmtest/src/test/resources/**</exclude>
                        <exclude>javaquery/api/src/main/resources/org/apidesign/bck2brwsr/htmlpage/knockout*.js</exclude>
                   </excludes>
               </configuration>
           </plugin>
-      </plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-release-plugin</artifactId>
+              <version>2.4</version>
+              <configuration>
+                  <tag>release-${releaseVersion}</tag>
+              </configuration>
+          </plugin>      </plugins>
       <pluginManagement>
           <plugins>
               <plugin>
@@ -100,6 +102,23 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.13</version>
               </plugin>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+              </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
           </plugins>
       </pluginManagement>
   </build>
@@ -120,13 +139,13 @@
         <dependency>
           <groupId>org.netbeans.api</groupId>
           <artifactId>org-netbeans-modules-classfile</artifactId>
-          <version>RELEASE72</version>
+          <version>RELEASE73</version>
           <type>jar</type>
         </dependency>
         <dependency>
           <groupId>org.netbeans.api</groupId>
           <artifactId>org-openide-util-lookup</artifactId>
-          <version>RELEASE72</version>
+          <version>RELEASE73</version>
           <scope>compile</scope>
           <type>jar</type>
         </dependency>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>rt</artifactId>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>bck2brwsr-archetype-html-sample</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Bck2Brwsr Maven Archetype</name>
+  <description>
+      Creates a skeletal HTML page and associated Java controller class.
+      Runs in any browser (even without Java plugin) with the help of Bck2Brwsr
+      virtual machine.
+  </description>
+  <build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>2.3.2</version>
+              <configuration>
+                  <source>1.6</source>
+                  <target>1.6</target>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                  <skipTests>true</skipTests>
+              </configuration>
+              <executions>
+                  <execution>
+                      <id>test</id>
+                      <goals>
+                          <goal>test</goal>
+                      </goals>
+                      <phase>integration-test</phase>
+                      <configuration>
+                          <additionalClasspathElements>
+                              <additionalClasspathElement>${project.build.directory}/bck2brwsr-archetype-html-sample-${project.version}.jar</additionalClasspathElement>
+                          </additionalClasspathElements>
+                          <skipTests>false</skipTests>
+                      </configuration>
+                  </execution>
+                  
+              </executions>
+          </plugin>
+      </plugins>
+  </build>
+  <dependencies>
+      <dependency>
+          <groupId>org.testng</groupId>
+          <artifactId>testng</artifactId>
+          <scope>test</scope>
+      </dependency>
+  </dependencies>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/java/org/apidesign/bck2brwsr/archetype/package-info.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/java/org/apidesign/bck2brwsr/archetype/package-info.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,18 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.archetype;
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Back 2 Browser Bytecode Translator
+    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. Look for COPYING file in the top folder.
+    If not, see http://opensource.org/licenses/GPL-2.0.
+
+-->
+<archetype-descriptor name="Get Java Bck2Brwsr!">
+  <fileSets>
+    <fileSet filtered="true" packaged="true">
+      <directory>src/main/java</directory>
+      <includes>
+        <include>**/App.java</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="true" packaged="true">
+      <directory>src/main/resources</directory>
+      <includes>
+        <include>**/*.xhtml</include>
+        <include>**/*.html</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="true" packaged="true">
+      <directory>src/test/java</directory>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="false" packaged="false">
+      <directory></directory>
+      <includes>
+        <include>nbactions.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="true" packaged="false">
+      <directory></directory>
+      <includes>
+        <include>bck2brwsr-assembly.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>    
+</archetype-descriptor>
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/archetype-resources/bck2brwsr-assembly.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/archetype-resources/bck2brwsr-assembly.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+
+    Back 2 Browser Bytecode Translator
+    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. Look for COPYING file in the top folder.
+    If not, see http://opensource.org/licenses/GPL-2.0.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  
+  <id>bck2brwsr</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+  <baseDirectory>public_html</baseDirectory>
+  <dependencySets>
+    <dependencySet>
+        <useProjectArtifact>false</useProjectArtifact>
+        <scope>runtime</scope>
+        <outputDirectory>lib</outputDirectory>
+        <includes>
+            <include>*:jar</include>
+            <include>*:rt</include>
+        </includes>
+    </dependencySet>
+    <dependencySet>
+        <useProjectArtifact>false</useProjectArtifact>
+        <scope>provided</scope>
+        <includes>
+            <include>*:js</include>
+        </includes>
+        <unpack>true</unpack>
+        <outputDirectory>/</outputDirectory>
+    </dependencySet>
+  </dependencySets> 
+  <files>
+    <file>
+      <source>${project.build.directory}/${project.build.finalName}.jar</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>${project.build.directory}/classes/${package.replace('.','/')}/index.html</source>
+      <outputDirectory>/</outputDirectory>
+      <destName>index.html</destName>
+    </file>
+  </files>
+
+</assembly>
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/archetype-resources/nbactions.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/archetype-resources/nbactions.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+    <action>
+        <actionName>run</actionName>
+        <goals>
+            <goal>process-classes</goal>
+            <goal>org.apidesign.bck2brwsr:mojo:0.5-SNAPSHOT:brwsr</goal>
+        </goals>
+    </action>
+</actions>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/archetype-resources/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/archetype-resources/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>${groupId}</groupId>
+  <artifactId>${artifactId}</artifactId>
+  <version>${version}</version>
+  <packaging>jar</packaging>
+
+  <name>${artifactId}</name>
+
+  <repositories>
+      <repository>
+          <id>java.net</id>
+          <name>Java.net</name>
+          <url>https://maven.java.net/content/repositories/releases/</url>
+          <snapshots>
+              <enabled>true</enabled>
+          </snapshots>
+      </repository>
+      <repository>
+          <id>netbeans</id>
+          <name>NetBeans</name>
+          <url>http://bits.netbeans.org/maven2/</url>
+      </repository>
+  </repositories>
+  <pluginRepositories>
+      <pluginRepository>
+          <id>java.net</id>
+          <name>Java.net</name>
+          <url>https://maven.java.net/content/repositories/releases/</url>
+          <snapshots>
+              <enabled>true</enabled>
+          </snapshots>
+      </pluginRepository>
+  </pluginRepositories>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <build>
+      <plugins>
+            <plugin>
+                <groupId>org.apidesign.bck2brwsr</groupId>
+                <artifactId>mojo</artifactId>
+                <version>0.5-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>brwsr</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <startpage>${package.replace('.','/')}/index.html</startpage>
+                </configuration>
+            </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>2.3.2</version>
+            <configuration>
+               <source>1.7</source>
+               <target>1.7</target>
+            </configuration>
+         </plugin>
+         <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-jar-plugin</artifactId>
+             <version>2.4</version>
+             <configuration>
+                 <archive>
+                     <manifest>
+                         <addClasspath>true</addClasspath>
+                         <classpathPrefix>lib/</classpathPrefix>
+                     </manifest>
+                 </archive>
+             </configuration>
+         </plugin>
+         <plugin>
+             <artifactId>maven-assembly-plugin</artifactId>
+             <version>2.4</version>
+             <executions>
+                 <execution>
+                     <id>distro-assembly</id>
+                     <phase>package</phase>
+                     <goals>
+                         <goal>single</goal>
+                     </goals>
+                     <configuration>
+                         <descriptors>
+                             <descriptor>bck2brwsr-assembly.xml</descriptor>
+                         </descriptors>
+                     </configuration>
+                 </execution>
+             </executions>                
+         </plugin>      
+      </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apidesign.bck2brwsr</groupId>
+      <artifactId>emul</artifactId>
+      <version>0.5-SNAPSHOT</version>
+      <classifier>rt</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apidesign.bck2brwsr</groupId>
+      <artifactId>javaquery.api</artifactId>
+      <version>0.5-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>6.5.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apidesign.bck2brwsr</groupId>
+      <artifactId>vm4brwsr</artifactId>
+      <classifier>js</classifier>
+      <type>zip</type>
+      <version>0.5-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apidesign.bck2brwsr</groupId>
+      <artifactId>vmtest</artifactId>
+      <version>0.5-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/archetype-resources/src/main/java/App.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/archetype-resources/src/main/java/App.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,34 @@
+package ${package};
+
+import org.apidesign.bck2brwsr.htmlpage.api.*;
+import static org.apidesign.bck2brwsr.htmlpage.api.OnEvent.*;
+import org.apidesign.bck2brwsr.htmlpage.api.Page;
+import org.apidesign.bck2brwsr.htmlpage.api.Property;
+import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
+
+/** Edit the index.xhtml file. Use 'id' to name certain HTML elements.
+ * Use this class to define behavior of the elements.
+ */
+@Page(xhtml="index.html", className="Index", properties={
+    @Property(name="name", type=String.class)
+})
+public class App {
+    static {
+        Index model = new Index();
+        model.setName("World");
+        model.applyBindings();
+    }
+    
+    @On(event = CLICK, id="hello")
+    static void hello(Index m) {
+        GraphicsContext g = m.CANVAS.getContext();
+        g.clearRect(0, 0, 1000, 1000);
+        g.setFont("italic 40px Calibri");
+        g.fillText(m.getHelloMessage(), 10, 40);
+    }
+    
+    @ComputedProperty
+    static String helloMessage(String name) {
+        return "Hello " + name + "!";
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/archetype-resources/src/main/resources/index.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/archetype-resources/src/main/resources/index.html	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Bck2Brwsr's Hello World</title>
+    </head>
+    <body>
+        <h1 data-bind="text: helloMessage">Loading Bck2Brwsr's Hello World...</h1>
+        Your name: <input id='input' data-bind="value: name, valueUpdate: 'afterkeydown'"></input>
+        <button id="hello">Say Hello!</button>
+        <p>
+            <canvas id="canvas" width="300" height="50">
+            </canvas>
+        </p>
+
+        <script src="bck2brwsr.js"></script>
+        <script type="text/javascript">
+            var vm = bck2brwsr('${artifactId}-${version}.jar');
+            vm.loadClass('${package}.App');
+        </script>
+    </body>
+</html>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,26 @@
+package ${package};
+
+import static org.testng.Assert.*;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/** Demonstrating POJO testing of HTML page model. Runs in good old HotSpot
+ * as it does not reference any HTML elements or browser functionality. Just
+ * operates on the page model.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class AppTest {
+    private Index model;
+    
+
+    @BeforeMethod
+    public void initModel() {
+        model = new Index().applyBindings();
+    }
+
+    @Test public void testHelloMessage() {
+        model.setName("Joe");
+        assertEquals(model.getHelloMessage(), "Hello Joe!", "Cleared after pressing +");
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/archetype-resources/src/test/java/InconsistencyTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/archetype-resources/src/test/java/InconsistencyTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,40 @@
+package ${package};
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/** Bck2brwsr cares about compatibility with real Java. Whatever API is
+ * supported by bck2brwsr, it needs to behave the same way as when running
+ * in HotSpot VM. 
+ * <p>
+ * There can be bugs, however. To help us fix them, we kindly ask you to 
+ * write an "inconsistency" test. A test that compares behavior of the API
+ * between real VM and bck2brwsr VM. This class is skeleton of such test.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class InconsistencyTest {
+    /** A method to demonstrate inconsistency between bck2brwsr and HotSpot.
+     * Make calls to an API that behaves strangely, return some result at
+     * the end. No need to use any <code>assert</code>.
+     * 
+     * @return value to compare between HotSpot and bck2brwsr
+     */
+    @Compare
+    public int checkStringHashCode() throws Exception {
+        return "Is string hashCode the same?".hashCode();
+    }
+
+    /** Factory method that creates a three tests for each method annotated with
+     * {@link org.apidesign.bck2brwsr.vmtest.Compare}. One executes the code in
+     * HotSpot, one in Rhino and the last one compares the results.
+     * 
+     * @see org.apidesign.bck2brwsr.vmtest.VMTest
+     */
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(InconsistencyTest.class);
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/main/resources/archetype-resources/src/test/java/IntegrationTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/main/resources/archetype-resources/src/test/java/IntegrationTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,46 @@
+package ${package};
+
+import org.apidesign.bck2brwsr.htmlpage.api.OnEvent;
+import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
+import org.apidesign.bck2brwsr.vmtest.HtmlFragment;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/** Sometimes it is useful to run tests inside of the real browser. 
+ * To do that just annotate your method with {@link org.apidesign.bck2brwsr.vmtest.BrwsrTest}
+ * and that is it. If your code references elements on the HTML page,
+ * you can pass in an {@link org.apidesign.bck2brwsr.vmtest.HtmlFragment} which
+ * will be made available on the page before your test starts.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class IntegrationTest {
+    
+    /** Write to testing code here. Use <code>assert</code> (but not TestNG's
+     * Assert, as TestNG is not compiled with target 1.6 yet).
+     */
+    @HtmlFragment(
+        "<h1 data-bind=\"text: helloMessage\">Loading Bck2Brwsr's Hello World...</h1>\n" +
+        "Your name: <input id='input' data-bind=\"value: name, valueUpdate: 'afterkeydown'\"></input>\n" +
+        "<button id=\"hello\">Say Hello!</button>\n" +
+        "<p>\n" +
+        "    <canvas id=\"canvas\" width=\"300\" height=\"50\"></canvas>\n" +
+        "</p>\n"
+    )
+    @BrwsrTest
+    public void modifyValueAssertChangeInModel() {
+        Index m = new Index();
+        m.setName("Joe Hacker");
+        m.applyBindings();
+        assert "Joe Hacker".equals(m.INPUT.getValue()) : "Value is really Joe Hacker: " + m.INPUT.getValue();
+        m.INPUT.setValue("Happy Joe");
+        m.triggerEvent(m.INPUT, OnEvent.CHANGE);
+        assert "Happy Joe".equals(m.getName()) : "Name property updated to Happy Joe: " + m.getName();
+    }
+
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(IntegrationTest.class);
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/archetype/src/test/java/org/apidesign/bck2brwsr/archetype/ArchetypeVersionTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/archetype/src/test/java/org/apidesign/bck2brwsr/archetype/ArchetypeVersionTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,104 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.archetype;
+
+import java.net.URL;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathFactory;
+import org.testng.annotations.Test;
+import org.xml.sax.InputSource;
+import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ArchetypeVersionTest {
+    private String version;
+    
+    public ArchetypeVersionTest() {
+    }
+    
+    @BeforeClass public void readCurrentVersion() throws Exception {
+        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
+        URL u = l.getResource("META-INF/maven/org.apidesign.bck2brwsr/bck2brwsr-archetype-html-sample/pom.xml");
+        assertNotNull(u, "Own pom found: " + System.getProperty("java.class.path"));
+
+        final XPathFactory fact = XPathFactory.newInstance();
+        fact.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+
+        XPathExpression xp = fact.newXPath().compile("project/version/text()");
+        
+        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(u.openStream());
+        version = xp.evaluate(dom);
+
+        assertFalse(version.isEmpty(), "There should be some version string");
+    }
+    
+
+    @Test public void testComparePomDepsVersions() throws Exception {
+        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
+        URL r = l.getResource("archetype-resources/pom.xml");
+        assertNotNull(r, "Archetype pom found");
+        
+        final XPathFactory fact = XPathFactory.newInstance();
+        XPathExpression xp2 = fact.newXPath().compile(
+            "//version[../groupId/text() = 'org.apidesign.bck2brwsr']/text()"
+        );
+        
+        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
+        NodeList arch = (NodeList) xp2.evaluate(dom, XPathConstants.NODESET);
+
+        if (arch.getLength() < 3) {
+            fail("There should be at least three dependencies to bck2brwsr APIs: " + arch.getLength());
+        }
+        
+        for (int i = 0; i < arch.getLength(); i++) {
+            assertEquals(arch.item(i).getTextContent(), version, i + "th dependency needs to be on latest version of bck2brwsr");
+        }
+    }
+    
+    @Test public void testNbActions() throws Exception {
+        final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
+        URL r = l.getResource("archetype-resources/nbactions.xml");
+        assertNotNull(r, "Archetype nb file found");
+        
+        final XPathFactory fact = XPathFactory.newInstance();
+        XPathExpression xp2 = fact.newXPath().compile(
+            "//goal/text()"
+        );
+        
+        Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(r.openStream());
+        NodeList goals = (NodeList) xp2.evaluate(dom, XPathConstants.NODESET);
+        
+        for (int i = 0; i < goals.getLength(); i++) {
+            String s = goals.item(i).getTextContent();
+            if (s.contains("bck2brwsr")) {
+                String[] arr = s.split(":");
+                assertEquals(arr.length, 4, "Three :");
+                assertEquals(arr[2], version, "Proper version is used");
+            }
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/core/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/core/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>rt</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>core</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <name>Bck2Brwsr Native Annotations</name>
+  <url>http://maven.apache.org</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <excludePackageNames>org.apidesign.bck2brwsr.core.impl</excludePackageNames>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.netbeans.api</groupId>
+      <artifactId>org-openide-util-lookup</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+    <description>Contains esential annotations for associating JavaScript code with
+methods and classes.</description>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/core/src/main/java/org/apidesign/bck2brwsr/core/ExtraJavaScript.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/core/src/main/java/org/apidesign/bck2brwsr/core/ExtraJavaScript.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,38 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.core;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** A way to include pre-made JavaScript scripts and libraries.
+ * The {@link #resource()} is loaded into the JavaScript VM and its object
+ * can be referenced from the class annotated by this annotation.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
+public @interface ExtraJavaScript {
+    /** fully qualified location of a script to load. Start the path with slash. */
+    String resource();
+    /** should the class file still be processed or not? */
+    boolean processByteCode() default true;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptBody.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptBody.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,52 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.core;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Put this annotation on a method to provide its special implementation
+ * in JavaScript. This is a way to define <em>native</em> methods that 
+ * interact with the surrounding environment.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target({ ElementType.METHOD, ElementType.CONSTRUCTOR })
+public @interface JavaScriptBody {
+    /** Names of parameters for the method generated method that can
+     * be referenced from {@link #body()}.
+     * 
+     * @return array of the names of parameters for the method
+     *    in JavaScript
+     */
+    public String[] args();
+    
+    /** The actual body of the method in JavaScript. This string will be
+     * put into generated header (ends with '{') and footer (ends with '}').
+     * The body can reference provided arguments. In case of non-static
+     * instance method it may reference <code>this</code>. It can also 
+     * call methods and access fields - if 
+     * <a href="http://wiki.apidesign.org/wiki/Bck2BrwsrMangling">proper mangling</a> 
+     * is used. Methods that return some value should end with <code>return</code> 
+     * statement.
+     */
+    public String body();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptOnly.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptOnly.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,38 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.core;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Don't include given method in the generated JavaScript at all. Rather
+ * generate completely independent JavaScript code consisting of
+ * <code>"{@link #name()}" = "{@link #value()}"</code>.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target({ ElementType.METHOD })
+public @interface JavaScriptOnly {
+    /** name of the variable to assign given value to */
+    String name() default "";
+    /** value to assign to the {@link #name()} variable */
+    String value() default "";
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptPrototype.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/core/src/main/java/org/apidesign/bck2brwsr/core/JavaScriptPrototype.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,51 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.core;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Influence the inheritance of your class when converted to JavaScript.
+ * Sometimes one does not want
+ * to mimic the Java hierarchy, but modify it a bit. For example it makes
+ * sense to treat every (JavaScript) string literal as {@link String}.
+ * One can do it by making {@link String} subclass JavaScript <code>String</code>
+ * and use <code>String.prototype</code> as a container for all {@link String}
+ * methods.
+ * 
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target({ ElementType.TYPE })
+public @interface JavaScriptPrototype {
+    /** Expression that identifies the function where all methods
+     * should be added into. If this attribute is unspecified
+     * all methods are added to the same object specified by
+     * {@link #prototype()}.
+     * 
+     * @return name of function to contain methods found in given class
+     */
+    String container() default "";
+    /** Expression that defines the way to construct prototype for this
+     * class.
+     * @return expression to construct prototype
+     */
+    String prototype();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/core/src/main/java/org/apidesign/bck2brwsr/core/impl/JavaScriptProcesor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/core/src/main/java/org/apidesign/bck2brwsr/core/impl/JavaScriptProcesor.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,100 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.core.impl;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Completion;
+import javax.annotation.processing.Completions;
+import javax.annotation.processing.Messager;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeKind;
+import javax.tools.Diagnostic;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service = Processor.class)
+public final class JavaScriptProcesor extends AbstractProcessor {
+    @Override
+    public Set<String> getSupportedAnnotationTypes() {
+        Set<String> set = new HashSet<>();
+        set.add(JavaScriptBody.class.getName());
+        return set;
+    }
+    
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        final Messager msg = processingEnv.getMessager();
+        for (Element e : roundEnv.getElementsAnnotatedWith(JavaScriptBody.class)) {
+            if (e.getKind() != ElementKind.METHOD && e.getKind() != ElementKind.CONSTRUCTOR) {
+                continue;
+            }
+            ExecutableElement ee = (ExecutableElement)e;
+            List<? extends VariableElement> params = ee.getParameters();
+            
+            JavaScriptBody jsb = e.getAnnotation(JavaScriptBody.class);
+            if (jsb == null) {
+                continue;
+            }
+            String[] arr = jsb.args();
+            if (params.size() != arr.length) {
+                msg.printMessage(Diagnostic.Kind.ERROR, "Number of args arguments does not match real arguments!", e);
+            }
+            if (ee.getReturnType().getKind() == TypeKind.LONG) {
+                msg.printMessage(Diagnostic.Kind.WARNING, "Don't return long. Return double and convert it to long in Java code.", e);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Iterable<? extends Completion> getCompletions(Element e, 
+        AnnotationMirror annotation, ExecutableElement member, String userText
+    ) {
+        StringBuilder sb = new StringBuilder();
+        if (e.getKind() == ElementKind.METHOD && member.getSimpleName().contentEquals("args")) {
+            ExecutableElement ee = (ExecutableElement) e;
+            String sep = "";
+            sb.append("{ ");
+            for (VariableElement ve : ee.getParameters()) {
+                sb.append(sep).append('"').append(ve.getSimpleName())
+                    .append('"');
+                sep = ", ";
+            }
+            sb.append(" }");
+            return Collections.nCopies(1, Completions.of(sb.toString()));
+        }
+        return null;
+    }
+
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/brwsrtest/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/brwsrtest/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>emul.pom</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>brwsrtest</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <name>Tests Inside Real Browser</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <build>
+      <plugins>
+          <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-deploy-plugin</artifactId>
+           <version>2.7</version>
+           <configuration>
+             <skip>true</skip>
+           </configuration>
+         </plugin>      
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                  <systemPropertyVariables>
+                      <vmtest.js>brwsr</vmtest.js>
+                  </systemPropertyVariables>
+              </configuration>
+          </plugin>
+      </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vmtest</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/brwsrtest/src/test/java/org/apidesign/bck2brwsr/brwsrtest/DoubleBitsTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/brwsrtest/src/test/java/org/apidesign/bck2brwsr/brwsrtest/DoubleBitsTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,42 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.brwsrtest;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class DoubleBitsTest {
+
+    @Compare public String doubleToBits() {
+        long val = Double.doubleToLongBits(333.456);
+        return Long.toString(val);
+    }
+
+    @Compare public int floatToBits() {
+        return Float.floatToIntBits(333.456f);
+    }
+    
+    @Factory public static Object[] create() {
+        return VMTest.create(DoubleBitsTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>emul.pom</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>emul</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <name>Bck2Brwsr API Profile</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>emul.mini</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vmtest</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.netbeans.api</groupId>
+      <artifactId>org-openide-util-lookup</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>2.5.1</version>
+              <configuration>
+                  <compilerArguments>
+                      <bootclasspath>netbeans.ignore.jdk.bootclasspath</bootclasspath>
+                  </compilerArguments>
+                 <source>1.7</source>
+                 <target>1.7</target>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <configuration>
+                  <excludePackageNames>org.apidesign.bck2brwsr.emul.*</excludePackageNames>
+                  <skip>false</skip>
+                  <includeDependencySources>true</includeDependencySources>
+              </configuration>
+          </plugin>
+         <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>rt</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/rt.xml</descriptor>
+                            </descriptors>
+                            <finalName>bck2brwsr-${project.version}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>                
+            </plugin>      
+      </plugins>
+  </build>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/assembly/rt.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/assembly/rt.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>rt</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>true</useProjectArtifact>
+      <unpack>true</unpack>
+      <scope>provided</scope>
+      <unpackOptions>
+        <excludes>
+          <exclude>META-INF/maven/**</exclude>
+        </excludes>
+      </unpackOptions>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.outputDirectory}</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/ChangeListenerMap.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/ChangeListenerMap.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.beans;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EventListener;
+import java.util.EventListenerProxy;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * This is an abstract class that provides base functionality
+ * for the {@link PropertyChangeSupport PropertyChangeSupport} class
+ * and the {@link VetoableChangeSupport VetoableChangeSupport} class.
+ *
+ * @see PropertyChangeListenerMap
+ * @see VetoableChangeListenerMap
+ *
+ * @author Sergey A. Malenkov
+ */
+abstract class ChangeListenerMap<L extends EventListener> {
+    private Map<String, L[]> map;
+
+    /**
+     * Creates an array of listeners.
+     * This method can be optimized by using
+     * the same instance of the empty array
+     * when {@code length} is equal to {@code 0}.
+     *
+     * @param length  the array length
+     * @return        an array with specified length
+     */
+    protected abstract L[] newArray(int length);
+
+    /**
+     * Creates a proxy listener for the specified property.
+     *
+     * @param name      the name of the property to listen on
+     * @param listener  the listener to process events
+     * @return          a proxy listener
+     */
+    protected abstract L newProxy(String name, L listener);
+
+    /**
+     * Adds a listener to the list of listeners for the specified property.
+     * This listener is called as many times as it was added.
+     *
+     * @param name      the name of the property to listen on
+     * @param listener  the listener to process events
+     */
+    public final synchronized void add(String name, L listener) {
+        if (this.map == null) {
+            this.map = new HashMap<String, L[]>();
+        }
+        L[] array = this.map.get(name);
+        int size = (array != null)
+                ? array.length
+                : 0;
+
+        L[] clone = newArray(size + 1);
+        clone[size] = listener;
+        if (array != null) {
+            System.arraycopy(array, 0, clone, 0, size);
+        }
+        this.map.put(name, clone);
+    }
+
+    /**
+     * Removes a listener from the list of listeners for the specified property.
+     * If the listener was added more than once to the same event source,
+     * this listener will be notified one less time after being removed.
+     *
+     * @param name      the name of the property to listen on
+     * @param listener  the listener to process events
+     */
+    public final synchronized void remove(String name, L listener) {
+        if (this.map != null) {
+            L[] array = this.map.get(name);
+            if (array != null) {
+                for (int i = 0; i < array.length; i++) {
+                    if (listener.equals(array[i])) {
+                        int size = array.length - 1;
+                        if (size > 0) {
+                            L[] clone = newArray(size);
+                            System.arraycopy(array, 0, clone, 0, i);
+                            System.arraycopy(array, i + 1, clone, i, size - i);
+                            this.map.put(name, clone);
+                        }
+                        else {
+                            this.map.remove(name);
+                            if (this.map.isEmpty()) {
+                                this.map = null;
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the list of listeners for the specified property.
+     *
+     * @param name  the name of the property
+     * @return      the corresponding list of listeners
+     */
+    public final synchronized L[] get(String name) {
+        return (this.map != null)
+                ? this.map.get(name)
+                : null;
+    }
+
+    /**
+     * Sets new list of listeners for the specified property.
+     *
+     * @param name       the name of the property
+     * @param listeners  new list of listeners
+     */
+    public final void set(String name, L[] listeners) {
+        if (listeners != null) {
+            if (this.map == null) {
+                this.map = new HashMap<String, L[]>();
+            }
+            this.map.put(name, listeners);
+        }
+        else if (this.map != null) {
+            this.map.remove(name);
+            if (this.map.isEmpty()) {
+                this.map = null;
+            }
+        }
+    }
+
+    /**
+     * Returns all listeners in the map.
+     *
+     * @return an array of all listeners
+     */
+    public final synchronized L[] getListeners() {
+        if (this.map == null) {
+            return newArray(0);
+        }
+        List<L> list = new ArrayList<L>();
+
+        L[] listeners = this.map.get(null);
+        if (listeners != null) {
+            for (L listener : listeners) {
+                list.add(listener);
+            }
+        }
+        for (Entry<String, L[]> entry : this.map.entrySet()) {
+            String name = entry.getKey();
+            if (name != null) {
+                for (L listener : entry.getValue()) {
+                    list.add(newProxy(name, listener));
+                }
+            }
+        }
+        return list.toArray(newArray(list.size()));
+    }
+
+    /**
+     * Returns listeners that have been associated with the named property.
+     *
+     * @param name  the name of the property
+     * @return an array of listeners for the named property
+     */
+    public final L[] getListeners(String name) {
+        if (name != null) {
+            L[] listeners = get(name);
+            if (listeners != null) {
+                return listeners.clone();
+            }
+        }
+        return newArray(0);
+    }
+
+    /**
+     * Indicates whether the map contains
+     * at least one listener to be notified.
+     *
+     * @param name  the name of the property
+     * @return      {@code true} if at least one listener exists or
+     *              {@code false} otherwise
+     */
+    public final synchronized boolean hasListeners(String name) {
+        if (this.map == null) {
+            return false;
+        }
+        L[] array = this.map.get(null);
+        return (array != null) || ((name != null) && (null != this.map.get(name)));
+    }
+
+    /**
+     * Returns a set of entries from the map.
+     * Each entry is a pair consisted of the property name
+     * and the corresponding list of listeners.
+     *
+     * @return a set of entries from the map
+     */
+    public final Set<Entry<String, L[]>> getEntries() {
+        return (this.map != null)
+                ? this.map.entrySet()
+                : Collections.<Entry<String, L[]>>emptySet();
+    }
+
+    /**
+     * Extracts a real listener from the proxy listener.
+     * It is necessary because default proxy class is not serializable.
+     *
+     * @return a real listener
+     */
+    public final L extract(L listener) {
+        while (listener instanceof EventListenerProxy) {
+            EventListenerProxy<L> proxy = (EventListenerProxy<L>) listener;
+            listener = proxy.getListener();
+        }
+        return listener;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/IndexedPropertyChangeEvent.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/IndexedPropertyChangeEvent.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.beans;
+
+/**
+ * An "IndexedPropertyChange" event gets delivered whenever a component that
+ * conforms to the JavaBeans&trade; specification (a "bean") changes a bound
+ * indexed property. This class is an extension of <code>PropertyChangeEvent</code>
+ * but contains the index of the property that has changed.
+ * <P>
+ * Null values may be provided for the old and the new values if their
+ * true values are not known.
+ * <P>
+ * An event source may send a null object as the name to indicate that an
+ * arbitrary set of if its properties have changed.  In this case the
+ * old and new values should also be null.
+ *
+ * @since 1.5
+ * @author Mark Davidson
+ */
+public class IndexedPropertyChangeEvent extends PropertyChangeEvent {
+    private static final long serialVersionUID = -320227448495806870L;
+
+    private int index;
+
+    /**
+     * Constructs a new <code>IndexedPropertyChangeEvent</code> object.
+     *
+     * @param source  The bean that fired the event.
+     * @param propertyName  The programmatic name of the property that
+     *             was changed.
+     * @param oldValue      The old value of the property.
+     * @param newValue      The new value of the property.
+     * @param index index of the property element that was changed.
+     */
+    public IndexedPropertyChangeEvent(Object source, String propertyName,
+                                      Object oldValue, Object newValue,
+                                      int index) {
+        super (source, propertyName, oldValue, newValue);
+        this.index = index;
+    }
+
+    /**
+     * Gets the index of the property that was changed.
+     *
+     * @return The index specifying the property element that was
+     *         changed.
+     */
+    public int getIndex() {
+        return index;
+    }
+
+    void appendTo(StringBuilder sb) {
+        sb.append("; index=").append(getIndex());
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/PropertyChangeEvent.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/PropertyChangeEvent.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.beans;
+
+/**
+ * A "PropertyChange" event gets delivered whenever a bean changes a "bound"
+ * or "constrained" property.  A PropertyChangeEvent object is sent as an
+ * argument to the PropertyChangeListener and VetoableChangeListener methods.
+ * <P>
+ * Normally PropertyChangeEvents are accompanied by the name and the old
+ * and new value of the changed property.  If the new value is a primitive
+ * type (such as int or boolean) it must be wrapped as the
+ * corresponding java.lang.* Object type (such as Integer or Boolean).
+ * <P>
+ * Null values may be provided for the old and the new values if their
+ * true values are not known.
+ * <P>
+ * An event source may send a null object as the name to indicate that an
+ * arbitrary set of if its properties have changed.  In this case the
+ * old and new values should also be null.
+ */
+
+public class PropertyChangeEvent extends java.util.EventObject {
+    private static final long serialVersionUID = 7042693688939648123L;
+
+    /**
+     * Constructs a new <code>PropertyChangeEvent</code>.
+     *
+     * @param source  The bean that fired the event.
+     * @param propertyName  The programmatic name of the property
+     *          that was changed.
+     * @param oldValue  The old value of the property.
+     * @param newValue  The new value of the property.
+     */
+    public PropertyChangeEvent(Object source, String propertyName,
+                                     Object oldValue, Object newValue) {
+        super(source);
+        this.propertyName = propertyName;
+        this.newValue = newValue;
+        this.oldValue = oldValue;
+    }
+
+    /**
+     * Gets the programmatic name of the property that was changed.
+     *
+     * @return  The programmatic name of the property that was changed.
+     *          May be null if multiple properties have changed.
+     */
+    public String getPropertyName() {
+        return propertyName;
+    }
+
+    /**
+     * Gets the new value for the property, expressed as an Object.
+     *
+     * @return  The new value for the property, expressed as an Object.
+     *          May be null if multiple properties have changed.
+     */
+    public Object getNewValue() {
+        return newValue;
+    }
+
+    /**
+     * Gets the old value for the property, expressed as an Object.
+     *
+     * @return  The old value for the property, expressed as an Object.
+     *          May be null if multiple properties have changed.
+     */
+    public Object getOldValue() {
+        return oldValue;
+    }
+
+    /**
+     * Sets the propagationId object for the event.
+     *
+     * @param propagationId  The propagationId object for the event.
+     */
+    public void setPropagationId(Object propagationId) {
+        this.propagationId = propagationId;
+    }
+
+    /**
+     * The "propagationId" field is reserved for future use.  In Beans 1.0
+     * the sole requirement is that if a listener catches a PropertyChangeEvent
+     * and then fires a PropertyChangeEvent of its own, then it should
+     * make sure that it propagates the propagationId field from its
+     * incoming event to its outgoing event.
+     *
+     * @return the propagationId object associated with a bound/constrained
+     *          property update.
+     */
+    public Object getPropagationId() {
+        return propagationId;
+    }
+
+    /**
+     * name of the property that changed.  May be null, if not known.
+     * @serial
+     */
+    private String propertyName;
+
+    /**
+     * New value for property.  May be null if not known.
+     * @serial
+     */
+    private Object newValue;
+
+    /**
+     * Previous value for property.  May be null if not known.
+     * @serial
+     */
+    private Object oldValue;
+
+    /**
+     * Propagation ID.  May be null.
+     * @serial
+     * @see #getPropagationId
+     */
+    private Object propagationId;
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return a string representation of the object
+     *
+     * @since 1.7
+     */
+    public String toString() {
+        StringBuilder sb = new StringBuilder(getClass().getName());
+        sb.append("[propertyName=").append(getPropertyName());
+        appendTo(sb);
+        sb.append("; oldValue=").append(getOldValue());
+        sb.append("; newValue=").append(getNewValue());
+        sb.append("; propagationId=").append(getPropagationId());
+        sb.append("; source=").append(getSource());
+        return sb.append("]").toString();
+    }
+
+    void appendTo(StringBuilder sb) {
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/PropertyChangeListener.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/PropertyChangeListener.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.beans;
+
+/**
+ * A "PropertyChange" event gets fired whenever a bean changes a "bound"
+ * property.  You can register a PropertyChangeListener with a source
+ * bean so as to be notified of any bound property updates.
+ */
+
+public interface PropertyChangeListener extends java.util.EventListener {
+
+    /**
+     * This method gets called when a bound property is changed.
+     * @param evt A PropertyChangeEvent object describing the event source
+     *          and the property that has changed.
+     */
+
+    void propertyChange(PropertyChangeEvent evt);
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/PropertyChangeListenerProxy.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/PropertyChangeListenerProxy.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.beans;
+
+import java.util.EventListenerProxy;
+
+/**
+ * A class which extends the {@code EventListenerProxy}
+ * specifically for adding a {@code PropertyChangeListener}
+ * with a "bound" property.
+ * Instances of this class can be added
+ * as {@code PropertyChangeListener}s to a bean
+ * which supports firing property change events.
+ * <p>
+ * If the object has a {@code getPropertyChangeListeners} method
+ * then the array returned could be a mixture of {@code PropertyChangeListener}
+ * and {@code PropertyChangeListenerProxy} objects.
+ *
+ * @see java.util.EventListenerProxy
+ * @see PropertyChangeSupport#getPropertyChangeListeners
+ * @since 1.4
+ */
+public class PropertyChangeListenerProxy
+        extends EventListenerProxy<PropertyChangeListener>
+        implements PropertyChangeListener {
+
+    private final String propertyName;
+
+    /**
+     * Constructor which binds the {@code PropertyChangeListener}
+     * to a specific property.
+     *
+     * @param propertyName  the name of the property to listen on
+     * @param listener      the listener object
+     */
+    public PropertyChangeListenerProxy(String propertyName, PropertyChangeListener listener) {
+        super(listener);
+        this.propertyName = propertyName;
+    }
+
+    /**
+     * Forwards the property change event to the listener delegate.
+     *
+     * @param event  the property change event
+     */
+    public void propertyChange(PropertyChangeEvent event) {
+        getListener().propertyChange(event);
+    }
+
+    /**
+     * Returns the name of the named property associated with the listener.
+     *
+     * @return the name of the named property associated with the listener
+     */
+    public String getPropertyName() {
+        return this.propertyName;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/PropertyChangeSupport.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/PropertyChangeSupport.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,536 @@
+/*
+ * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.beans;
+
+import java.io.Serializable;
+import java.io.ObjectStreamField;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Map.Entry;
+
+/**
+ * This is a utility class that can be used by beans that support bound
+ * properties.  It manages a list of listeners and dispatches
+ * {@link PropertyChangeEvent}s to them.  You can use an instance of this class
+ * as a member field of your bean and delegate these types of work to it.
+ * The {@link PropertyChangeListener} can be registered for all properties
+ * or for a property specified by name.
+ * <p>
+ * Here is an example of {@code PropertyChangeSupport} usage that follows
+ * the rules and recommendations laid out in the JavaBeans&trade; specification:
+ * <pre>
+ * public class MyBean {
+ *     private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+ *
+ *     public void addPropertyChangeListener(PropertyChangeListener listener) {
+ *         this.pcs.addPropertyChangeListener(listener);
+ *     }
+ *
+ *     public void removePropertyChangeListener(PropertyChangeListener listener) {
+ *         this.pcs.removePropertyChangeListener(listener);
+ *     }
+ *
+ *     private String value;
+ *
+ *     public String getValue() {
+ *         return this.value;
+ *     }
+ *
+ *     public void setValue(String newValue) {
+ *         String oldValue = this.value;
+ *         this.value = newValue;
+ *         this.pcs.firePropertyChange("value", oldValue, newValue);
+ *     }
+ *
+ *     [...]
+ * }
+ * </pre>
+ * <p>
+ * A {@code PropertyChangeSupport} instance is thread-safe.
+ * <p>
+ * This class is serializable.  When it is serialized it will save
+ * (and restore) any listeners that are themselves serializable.  Any
+ * non-serializable listeners will be skipped during serialization.
+ *
+ * @see VetoableChangeSupport
+ */
+public class PropertyChangeSupport implements Serializable {
+    private PropertyChangeListenerMap map = new PropertyChangeListenerMap();
+
+    /**
+     * Constructs a <code>PropertyChangeSupport</code> object.
+     *
+     * @param sourceBean  The bean to be given as the source for any events.
+     */
+    public PropertyChangeSupport(Object sourceBean) {
+        if (sourceBean == null) {
+            throw new NullPointerException();
+        }
+        source = sourceBean;
+    }
+
+    /**
+     * Add a PropertyChangeListener to the listener list.
+     * The listener is registered for all properties.
+     * The same listener object may be added more than once, and will be called
+     * as many times as it is added.
+     * If <code>listener</code> is null, no exception is thrown and no action
+     * is taken.
+     *
+     * @param listener  The PropertyChangeListener to be added
+     */
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        if (listener == null) {
+            return;
+        }
+        if (listener instanceof PropertyChangeListenerProxy) {
+            PropertyChangeListenerProxy proxy =
+                   (PropertyChangeListenerProxy)listener;
+            // Call two argument add method.
+            addPropertyChangeListener(proxy.getPropertyName(),
+                                      proxy.getListener());
+        } else {
+            this.map.add(null, listener);
+        }
+    }
+
+    /**
+     * Remove a PropertyChangeListener from the listener list.
+     * This removes a PropertyChangeListener that was registered
+     * for all properties.
+     * If <code>listener</code> was added more than once to the same event
+     * source, it will be notified one less time after being removed.
+     * If <code>listener</code> is null, or was never added, no exception is
+     * thrown and no action is taken.
+     *
+     * @param listener  The PropertyChangeListener to be removed
+     */
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        if (listener == null) {
+            return;
+        }
+        if (listener instanceof PropertyChangeListenerProxy) {
+            PropertyChangeListenerProxy proxy =
+                    (PropertyChangeListenerProxy)listener;
+            // Call two argument remove method.
+            removePropertyChangeListener(proxy.getPropertyName(),
+                                         proxy.getListener());
+        } else {
+            this.map.remove(null, listener);
+        }
+    }
+
+    /**
+     * Returns an array of all the listeners that were added to the
+     * PropertyChangeSupport object with addPropertyChangeListener().
+     * <p>
+     * If some listeners have been added with a named property, then
+     * the returned array will be a mixture of PropertyChangeListeners
+     * and <code>PropertyChangeListenerProxy</code>s. If the calling
+     * method is interested in distinguishing the listeners then it must
+     * test each element to see if it's a
+     * <code>PropertyChangeListenerProxy</code>, perform the cast, and examine
+     * the parameter.
+     *
+     * <pre>
+     * PropertyChangeListener[] listeners = bean.getPropertyChangeListeners();
+     * for (int i = 0; i < listeners.length; i++) {
+     *   if (listeners[i] instanceof PropertyChangeListenerProxy) {
+     *     PropertyChangeListenerProxy proxy =
+     *                    (PropertyChangeListenerProxy)listeners[i];
+     *     if (proxy.getPropertyName().equals("foo")) {
+     *       // proxy is a PropertyChangeListener which was associated
+     *       // with the property named "foo"
+     *     }
+     *   }
+     * }
+     *</pre>
+     *
+     * @see PropertyChangeListenerProxy
+     * @return all of the <code>PropertyChangeListeners</code> added or an
+     *         empty array if no listeners have been added
+     * @since 1.4
+     */
+    public PropertyChangeListener[] getPropertyChangeListeners() {
+        return this.map.getListeners();
+    }
+
+    /**
+     * Add a PropertyChangeListener for a specific property.  The listener
+     * will be invoked only when a call on firePropertyChange names that
+     * specific property.
+     * The same listener object may be added more than once.  For each
+     * property,  the listener will be invoked the number of times it was added
+     * for that property.
+     * If <code>propertyName</code> or <code>listener</code> is null, no
+     * exception is thrown and no action is taken.
+     *
+     * @param propertyName  The name of the property to listen on.
+     * @param listener  The PropertyChangeListener to be added
+     */
+    public void addPropertyChangeListener(
+                String propertyName,
+                PropertyChangeListener listener) {
+        if (listener == null || propertyName == null) {
+            return;
+        }
+        listener = this.map.extract(listener);
+        if (listener != null) {
+            this.map.add(propertyName, listener);
+        }
+    }
+
+    /**
+     * Remove a PropertyChangeListener for a specific property.
+     * If <code>listener</code> was added more than once to the same event
+     * source for the specified property, it will be notified one less time
+     * after being removed.
+     * If <code>propertyName</code> is null,  no exception is thrown and no
+     * action is taken.
+     * If <code>listener</code> is null, or was never added for the specified
+     * property, no exception is thrown and no action is taken.
+     *
+     * @param propertyName  The name of the property that was listened on.
+     * @param listener  The PropertyChangeListener to be removed
+     */
+    public void removePropertyChangeListener(
+                String propertyName,
+                PropertyChangeListener listener) {
+        if (listener == null || propertyName == null) {
+            return;
+        }
+        listener = this.map.extract(listener);
+        if (listener != null) {
+            this.map.remove(propertyName, listener);
+        }
+    }
+
+    /**
+     * Returns an array of all the listeners which have been associated
+     * with the named property.
+     *
+     * @param propertyName  The name of the property being listened to
+     * @return all of the <code>PropertyChangeListeners</code> associated with
+     *         the named property.  If no such listeners have been added,
+     *         or if <code>propertyName</code> is null, an empty array is
+     *         returned.
+     * @since 1.4
+     */
+    public PropertyChangeListener[] getPropertyChangeListeners(String propertyName) {
+        return this.map.getListeners(propertyName);
+    }
+
+    /**
+     * Reports a bound property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * No event is fired if old and new values are equal and non-null.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #firePropertyChange(PropertyChangeEvent)} method.
+     *
+     * @param propertyName  the programmatic name of the property that was changed
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     */
+    public void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+            firePropertyChange(new PropertyChangeEvent(this.source, propertyName, oldValue, newValue));
+        }
+    }
+
+    /**
+     * Reports an integer bound property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * No event is fired if old and new values are equal.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #firePropertyChange(String, Object, Object)}  method.
+     *
+     * @param propertyName  the programmatic name of the property that was changed
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     */
+    public void firePropertyChange(String propertyName, int oldValue, int newValue) {
+        if (oldValue != newValue) {
+            firePropertyChange(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
+        }
+    }
+
+    /**
+     * Reports a boolean bound property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * No event is fired if old and new values are equal.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #firePropertyChange(String, Object, Object)}  method.
+     *
+     * @param propertyName  the programmatic name of the property that was changed
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     */
+    public void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) {
+        if (oldValue != newValue) {
+            firePropertyChange(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
+        }
+    }
+
+    /**
+     * Fires a property change event to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * No event is fired if the given event's old and new values are equal and non-null.
+     *
+     * @param event  the {@code PropertyChangeEvent} to be fired
+     */
+    public void firePropertyChange(PropertyChangeEvent event) {
+        Object oldValue = event.getOldValue();
+        Object newValue = event.getNewValue();
+        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+            String name = event.getPropertyName();
+
+            PropertyChangeListener[] common = this.map.get(null);
+            PropertyChangeListener[] named = (name != null)
+                        ? this.map.get(name)
+                        : null;
+
+            fire(common, event);
+            fire(named, event);
+        }
+    }
+
+    private static void fire(PropertyChangeListener[] listeners, PropertyChangeEvent event) {
+        if (listeners != null) {
+            for (PropertyChangeListener listener : listeners) {
+                listener.propertyChange(event);
+            }
+        }
+    }
+
+    /**
+     * Reports a bound indexed property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * No event is fired if old and new values are equal and non-null.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #firePropertyChange(PropertyChangeEvent)} method.
+     *
+     * @param propertyName  the programmatic name of the property that was changed
+     * @param index         the index of the property element that was changed
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     * @since 1.5
+     */
+    public void fireIndexedPropertyChange(String propertyName, int index, Object oldValue, Object newValue) {
+        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+            firePropertyChange(new IndexedPropertyChangeEvent(source, propertyName, oldValue, newValue, index));
+        }
+    }
+
+    /**
+     * Reports an integer bound indexed property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * No event is fired if old and new values are equal.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #fireIndexedPropertyChange(String, int, Object, Object)} method.
+     *
+     * @param propertyName  the programmatic name of the property that was changed
+     * @param index         the index of the property element that was changed
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     * @since 1.5
+     */
+    public void fireIndexedPropertyChange(String propertyName, int index, int oldValue, int newValue) {
+        if (oldValue != newValue) {
+            fireIndexedPropertyChange(propertyName, index, Integer.valueOf(oldValue), Integer.valueOf(newValue));
+        }
+    }
+
+    /**
+     * Reports a boolean bound indexed property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * No event is fired if old and new values are equal.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #fireIndexedPropertyChange(String, int, Object, Object)} method.
+     *
+     * @param propertyName  the programmatic name of the property that was changed
+     * @param index         the index of the property element that was changed
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     * @since 1.5
+     */
+    public void fireIndexedPropertyChange(String propertyName, int index, boolean oldValue, boolean newValue) {
+        if (oldValue != newValue) {
+            fireIndexedPropertyChange(propertyName, index, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
+        }
+    }
+
+    /**
+     * Check if there are any listeners for a specific property, including
+     * those registered on all properties.  If <code>propertyName</code>
+     * is null, only check for listeners registered on all properties.
+     *
+     * @param propertyName  the property name.
+     * @return true if there are one or more listeners for the given property
+     */
+    public boolean hasListeners(String propertyName) {
+        return this.map.hasListeners(propertyName);
+    }
+
+    /**
+     * @serialData Null terminated list of <code>PropertyChangeListeners</code>.
+     * <p>
+     * At serialization time we skip non-serializable listeners and
+     * only serialize the serializable listeners.
+     */
+    private void writeObject(ObjectOutputStream s) throws IOException {
+        Hashtable<String, PropertyChangeSupport> children = null;
+        PropertyChangeListener[] listeners = null;
+        synchronized (this.map) {
+            for (Entry<String, PropertyChangeListener[]> entry : this.map.getEntries()) {
+                String property = entry.getKey();
+                if (property == null) {
+                    listeners = entry.getValue();
+                } else {
+                    if (children == null) {
+                        children = new Hashtable<String, PropertyChangeSupport>();
+                    }
+                    PropertyChangeSupport pcs = new PropertyChangeSupport(this.source);
+                    pcs.map.set(null, entry.getValue());
+                    children.put(property, pcs);
+                }
+            }
+        }
+        ObjectOutputStream.PutField fields = s.putFields();
+        fields.put("children", children);
+        fields.put("source", this.source);
+        fields.put("propertyChangeSupportSerializedDataVersion", 2);
+        s.writeFields();
+
+        if (listeners != null) {
+            for (PropertyChangeListener l : listeners) {
+                if (l instanceof Serializable) {
+                    s.writeObject(l);
+                }
+            }
+        }
+        s.writeObject(null);
+    }
+
+    private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
+        this.map = new PropertyChangeListenerMap();
+
+        ObjectInputStream.GetField fields = s.readFields();
+
+        Hashtable<String, PropertyChangeSupport> children = (Hashtable<String, PropertyChangeSupport>) fields.get("children", null);
+        this.source = fields.get("source", null);
+        fields.get("propertyChangeSupportSerializedDataVersion", 2);
+
+        Object listenerOrNull;
+        while (null != (listenerOrNull = s.readObject())) {
+            this.map.add(null, (PropertyChangeListener)listenerOrNull);
+        }
+        if (children != null) {
+            for (Entry<String, PropertyChangeSupport> entry : children.entrySet()) {
+                for (PropertyChangeListener listener : entry.getValue().getPropertyChangeListeners()) {
+                    this.map.add(entry.getKey(), listener);
+                }
+            }
+        }
+    }
+
+    /**
+     * The object to be provided as the "source" for any generated events.
+     */
+    private Object source;
+
+    /**
+     * @serialField children                                   Hashtable
+     * @serialField source                                     Object
+     * @serialField propertyChangeSupportSerializedDataVersion int
+     */
+    private static final ObjectStreamField[] serialPersistentFields = {
+            new ObjectStreamField("children", Hashtable.class),
+            new ObjectStreamField("source", Object.class),
+            new ObjectStreamField("propertyChangeSupportSerializedDataVersion", Integer.TYPE)
+    };
+
+    /**
+     * Serialization version ID, so we're compatible with JDK 1.1
+     */
+    static final long serialVersionUID = 6401253773779951803L;
+
+    /**
+     * This is a {@link ChangeListenerMap ChangeListenerMap} implementation
+     * that works with {@link PropertyChangeListener PropertyChangeListener} objects.
+     */
+    private static final class PropertyChangeListenerMap extends ChangeListenerMap<PropertyChangeListener> {
+        private static final PropertyChangeListener[] EMPTY = {};
+
+        /**
+         * Creates an array of {@link PropertyChangeListener PropertyChangeListener} objects.
+         * This method uses the same instance of the empty array
+         * when {@code length} equals {@code 0}.
+         *
+         * @param length  the array length
+         * @return        an array with specified length
+         */
+        @Override
+        protected PropertyChangeListener[] newArray(int length) {
+            return (0 < length)
+                    ? new PropertyChangeListener[length]
+                    : EMPTY;
+        }
+
+        /**
+         * Creates a {@link PropertyChangeListenerProxy PropertyChangeListenerProxy}
+         * object for the specified property.
+         *
+         * @param name      the name of the property to listen on
+         * @param listener  the listener to process events
+         * @return          a {@code PropertyChangeListenerProxy} object
+         */
+        @Override
+        protected PropertyChangeListener newProxy(String name, PropertyChangeListener listener) {
+            return new PropertyChangeListenerProxy(name, listener);
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/PropertyVetoException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/PropertyVetoException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.beans;
+
+
+/**
+ * A PropertyVetoException is thrown when a proposed change to a
+ * property represents an unacceptable value.
+ */
+
+public
+class PropertyVetoException extends Exception {
+    private static final long serialVersionUID = 129596057694162164L;
+
+    /**
+     * Constructs a <code>PropertyVetoException</code> with a
+     * detailed message.
+     *
+     * @param mess Descriptive message
+     * @param evt A PropertyChangeEvent describing the vetoed change.
+     */
+    public PropertyVetoException(String mess, PropertyChangeEvent evt) {
+        super(mess);
+        this.evt = evt;
+    }
+
+     /**
+     * Gets the vetoed <code>PropertyChangeEvent</code>.
+     *
+     * @return A PropertyChangeEvent describing the vetoed change.
+     */
+    public PropertyChangeEvent getPropertyChangeEvent() {
+        return evt;
+    }
+
+    /**
+     * A PropertyChangeEvent describing the vetoed change.
+     * @serial
+     */
+    private PropertyChangeEvent evt;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/VetoableChangeListener.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/VetoableChangeListener.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 1996, 1997, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.beans;
+
+/**
+ * A VetoableChange event gets fired whenever a bean changes a "constrained"
+ * property.  You can register a VetoableChangeListener with a source bean
+ * so as to be notified of any constrained property updates.
+ */
+public interface VetoableChangeListener extends java.util.EventListener {
+    /**
+     * This method gets called when a constrained property is changed.
+     *
+     * @param     evt a <code>PropertyChangeEvent</code> object describing the
+     *                event source and the property that has changed.
+     * @exception PropertyVetoException if the recipient wishes the property
+     *              change to be rolled back.
+     */
+    void vetoableChange(PropertyChangeEvent evt)
+                                throws PropertyVetoException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/VetoableChangeListenerProxy.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/VetoableChangeListenerProxy.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.beans;
+
+import java.util.EventListenerProxy;
+
+/**
+ * A class which extends the {@code EventListenerProxy}
+ * specifically for adding a {@code VetoableChangeListener}
+ * with a "constrained" property.
+ * Instances of this class can be added
+ * as {@code VetoableChangeListener}s to a bean
+ * which supports firing vetoable change events.
+ * <p>
+ * If the object has a {@code getVetoableChangeListeners} method
+ * then the array returned could be a mixture of {@code VetoableChangeListener}
+ * and {@code VetoableChangeListenerProxy} objects.
+ *
+ * @see java.util.EventListenerProxy
+ * @see VetoableChangeSupport#getVetoableChangeListeners
+ * @since 1.4
+ */
+public class VetoableChangeListenerProxy
+        extends EventListenerProxy<VetoableChangeListener>
+        implements VetoableChangeListener {
+
+    private final String propertyName;
+
+    /**
+     * Constructor which binds the {@code VetoableChangeListener}
+     * to a specific property.
+     *
+     * @param propertyName  the name of the property to listen on
+     * @param listener      the listener object
+     */
+    public VetoableChangeListenerProxy(String propertyName, VetoableChangeListener listener) {
+        super(listener);
+        this.propertyName = propertyName;
+    }
+
+    /**
+    * Forwards the property change event to the listener delegate.
+    *
+    * @param event  the property change event
+    *
+    * @exception PropertyVetoException if the recipient wishes the property
+    *                                  change to be rolled back
+    */
+    public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException{
+        getListener().vetoableChange(event);
+    }
+
+    /**
+     * Returns the name of the named property associated with the listener.
+     *
+     * @return the name of the named property associated with the listener
+     */
+    public String getPropertyName() {
+        return this.propertyName;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/beans/VetoableChangeSupport.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/beans/VetoableChangeSupport.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,526 @@
+/*
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.beans;
+
+import java.io.Serializable;
+import java.io.ObjectStreamField;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Map.Entry;
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * This is a utility class that can be used by beans that support constrained
+ * properties.  It manages a list of listeners and dispatches
+ * {@link PropertyChangeEvent}s to them.  You can use an instance of this class
+ * as a member field of your bean and delegate these types of work to it.
+ * The {@link VetoableChangeListener} can be registered for all properties
+ * or for a property specified by name.
+ * <p>
+ * Here is an example of {@code VetoableChangeSupport} usage that follows
+ * the rules and recommendations laid out in the JavaBeans&trade; specification:
+ * <pre>
+ * public class MyBean {
+ *     private final VetoableChangeSupport vcs = new VetoableChangeSupport(this);
+ *
+ *     public void addVetoableChangeListener(VetoableChangeListener listener) {
+ *         this.vcs.addVetoableChangeListener(listener);
+ *     }
+ *
+ *     public void removeVetoableChangeListener(VetoableChangeListener listener) {
+ *         this.vcs.removeVetoableChangeListener(listener);
+ *     }
+ *
+ *     private String value;
+ *
+ *     public String getValue() {
+ *         return this.value;
+ *     }
+ *
+ *     public void setValue(String newValue) throws PropertyVetoException {
+ *         String oldValue = this.value;
+ *         this.vcs.fireVetoableChange("value", oldValue, newValue);
+ *         this.value = newValue;
+ *     }
+ *
+ *     [...]
+ * }
+ * </pre>
+ * <p>
+ * A {@code VetoableChangeSupport} instance is thread-safe.
+ * <p>
+ * This class is serializable.  When it is serialized it will save
+ * (and restore) any listeners that are themselves serializable.  Any
+ * non-serializable listeners will be skipped during serialization.
+ *
+ * @see PropertyChangeSupport
+ */
+public class VetoableChangeSupport implements Serializable {
+    private VetoableChangeListenerMap map = new VetoableChangeListenerMap();
+
+    /**
+     * Constructs a <code>VetoableChangeSupport</code> object.
+     *
+     * @param sourceBean  The bean to be given as the source for any events.
+     */
+    public VetoableChangeSupport(Object sourceBean) {
+        if (sourceBean == null) {
+            throw new NullPointerException();
+        }
+        source = sourceBean;
+    }
+
+    /**
+     * Add a VetoableChangeListener to the listener list.
+     * The listener is registered for all properties.
+     * The same listener object may be added more than once, and will be called
+     * as many times as it is added.
+     * If <code>listener</code> is null, no exception is thrown and no action
+     * is taken.
+     *
+     * @param listener  The VetoableChangeListener to be added
+     */
+    public void addVetoableChangeListener(VetoableChangeListener listener) {
+        if (listener == null) {
+            return;
+        }
+        if (listener instanceof VetoableChangeListenerProxy) {
+            VetoableChangeListenerProxy proxy =
+                    (VetoableChangeListenerProxy)listener;
+            // Call two argument add method.
+            addVetoableChangeListener(proxy.getPropertyName(),
+                                      proxy.getListener());
+        } else {
+            this.map.add(null, listener);
+        }
+    }
+
+    /**
+     * Remove a VetoableChangeListener from the listener list.
+     * This removes a VetoableChangeListener that was registered
+     * for all properties.
+     * If <code>listener</code> was added more than once to the same event
+     * source, it will be notified one less time after being removed.
+     * If <code>listener</code> is null, or was never added, no exception is
+     * thrown and no action is taken.
+     *
+     * @param listener  The VetoableChangeListener to be removed
+     */
+    public void removeVetoableChangeListener(VetoableChangeListener listener) {
+        if (listener == null) {
+            return;
+        }
+        if (listener instanceof VetoableChangeListenerProxy) {
+            VetoableChangeListenerProxy proxy =
+                    (VetoableChangeListenerProxy)listener;
+            // Call two argument remove method.
+            removeVetoableChangeListener(proxy.getPropertyName(),
+                                         proxy.getListener());
+        } else {
+            this.map.remove(null, listener);
+        }
+    }
+
+    /**
+     * Returns an array of all the listeners that were added to the
+     * VetoableChangeSupport object with addVetoableChangeListener().
+     * <p>
+     * If some listeners have been added with a named property, then
+     * the returned array will be a mixture of VetoableChangeListeners
+     * and <code>VetoableChangeListenerProxy</code>s. If the calling
+     * method is interested in distinguishing the listeners then it must
+     * test each element to see if it's a
+     * <code>VetoableChangeListenerProxy</code>, perform the cast, and examine
+     * the parameter.
+     *
+     * <pre>
+     * VetoableChangeListener[] listeners = bean.getVetoableChangeListeners();
+     * for (int i = 0; i < listeners.length; i++) {
+     *        if (listeners[i] instanceof VetoableChangeListenerProxy) {
+     *     VetoableChangeListenerProxy proxy =
+     *                    (VetoableChangeListenerProxy)listeners[i];
+     *     if (proxy.getPropertyName().equals("foo")) {
+     *       // proxy is a VetoableChangeListener which was associated
+     *       // with the property named "foo"
+     *     }
+     *   }
+     * }
+     *</pre>
+     *
+     * @see VetoableChangeListenerProxy
+     * @return all of the <code>VetoableChangeListeners</code> added or an
+     *         empty array if no listeners have been added
+     * @since 1.4
+     */
+    public VetoableChangeListener[] getVetoableChangeListeners(){
+        return this.map.getListeners();
+    }
+
+    /**
+     * Add a VetoableChangeListener for a specific property.  The listener
+     * will be invoked only when a call on fireVetoableChange names that
+     * specific property.
+     * The same listener object may be added more than once.  For each
+     * property,  the listener will be invoked the number of times it was added
+     * for that property.
+     * If <code>propertyName</code> or <code>listener</code> is null, no
+     * exception is thrown and no action is taken.
+     *
+     * @param propertyName  The name of the property to listen on.
+     * @param listener  The VetoableChangeListener to be added
+     */
+    public void addVetoableChangeListener(
+                                String propertyName,
+                VetoableChangeListener listener) {
+        if (listener == null || propertyName == null) {
+            return;
+        }
+        listener = this.map.extract(listener);
+        if (listener != null) {
+            this.map.add(propertyName, listener);
+        }
+    }
+
+    /**
+     * Remove a VetoableChangeListener for a specific property.
+     * If <code>listener</code> was added more than once to the same event
+     * source for the specified property, it will be notified one less time
+     * after being removed.
+     * If <code>propertyName</code> is null, no exception is thrown and no
+     * action is taken.
+     * If <code>listener</code> is null, or was never added for the specified
+     * property, no exception is thrown and no action is taken.
+     *
+     * @param propertyName  The name of the property that was listened on.
+     * @param listener  The VetoableChangeListener to be removed
+     */
+    public void removeVetoableChangeListener(
+                                String propertyName,
+                VetoableChangeListener listener) {
+        if (listener == null || propertyName == null) {
+            return;
+        }
+        listener = this.map.extract(listener);
+        if (listener != null) {
+            this.map.remove(propertyName, listener);
+        }
+    }
+
+    /**
+     * Returns an array of all the listeners which have been associated
+     * with the named property.
+     *
+     * @param propertyName  The name of the property being listened to
+     * @return all the <code>VetoableChangeListeners</code> associated with
+     *         the named property.  If no such listeners have been added,
+     *         or if <code>propertyName</code> is null, an empty array is
+     *         returned.
+     * @since 1.4
+     */
+    public VetoableChangeListener[] getVetoableChangeListeners(String propertyName) {
+        return this.map.getListeners(propertyName);
+    }
+
+    /**
+     * Reports a constrained property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * Any listener can throw a {@code PropertyVetoException} to veto the update.
+     * If one of the listeners vetoes the update, this method passes
+     * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
+     * to all listeners that already confirmed this update
+     * and throws the {@code PropertyVetoException} again.
+     * <p>
+     * No event is fired if old and new values are equal and non-null.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #fireVetoableChange(PropertyChangeEvent)} method.
+     *
+     * @param propertyName  the programmatic name of the property that is about to change
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     * @throws PropertyVetoException if one of listeners vetoes the property update
+     */
+    public void fireVetoableChange(String propertyName, Object oldValue, Object newValue)
+            throws PropertyVetoException {
+        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+            fireVetoableChange(new PropertyChangeEvent(this.source, propertyName, oldValue, newValue));
+        }
+    }
+
+    /**
+     * Reports an integer constrained property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * Any listener can throw a {@code PropertyVetoException} to veto the update.
+     * If one of the listeners vetoes the update, this method passes
+     * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
+     * to all listeners that already confirmed this update
+     * and throws the {@code PropertyVetoException} again.
+     * <p>
+     * No event is fired if old and new values are equal.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #fireVetoableChange(String, Object, Object)} method.
+     *
+     * @param propertyName  the programmatic name of the property that is about to change
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     * @throws PropertyVetoException if one of listeners vetoes the property update
+     */
+    public void fireVetoableChange(String propertyName, int oldValue, int newValue)
+            throws PropertyVetoException {
+        if (oldValue != newValue) {
+            fireVetoableChange(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
+        }
+    }
+
+    /**
+     * Reports a boolean constrained property update to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * Any listener can throw a {@code PropertyVetoException} to veto the update.
+     * If one of the listeners vetoes the update, this method passes
+     * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
+     * to all listeners that already confirmed this update
+     * and throws the {@code PropertyVetoException} again.
+     * <p>
+     * No event is fired if old and new values are equal.
+     * <p>
+     * This is merely a convenience wrapper around the more general
+     * {@link #fireVetoableChange(String, Object, Object)} method.
+     *
+     * @param propertyName  the programmatic name of the property that is about to change
+     * @param oldValue      the old value of the property
+     * @param newValue      the new value of the property
+     * @throws PropertyVetoException if one of listeners vetoes the property update
+     */
+    public void fireVetoableChange(String propertyName, boolean oldValue, boolean newValue)
+            throws PropertyVetoException {
+        if (oldValue != newValue) {
+            fireVetoableChange(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
+        }
+    }
+
+    /**
+     * Fires a property change event to listeners
+     * that have been registered to track updates of
+     * all properties or a property with the specified name.
+     * <p>
+     * Any listener can throw a {@code PropertyVetoException} to veto the update.
+     * If one of the listeners vetoes the update, this method passes
+     * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
+     * to all listeners that already confirmed this update
+     * and throws the {@code PropertyVetoException} again.
+     * <p>
+     * No event is fired if the given event's old and new values are equal and non-null.
+     *
+     * @param event  the {@code PropertyChangeEvent} to be fired
+     * @throws PropertyVetoException if one of listeners vetoes the property update
+     */
+    public void fireVetoableChange(PropertyChangeEvent event)
+            throws PropertyVetoException {
+        Object oldValue = event.getOldValue();
+        Object newValue = event.getNewValue();
+        if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+            String name = event.getPropertyName();
+
+            VetoableChangeListener[] common = this.map.get(null);
+            VetoableChangeListener[] named = (name != null)
+                        ? this.map.get(name)
+                        : null;
+
+            VetoableChangeListener[] listeners;
+            if (common == null) {
+                listeners = named;
+            }
+            else if (named == null) {
+                listeners = common;
+            }
+            else {
+                listeners = new VetoableChangeListener[common.length + named.length];
+                System.arraycopy(common, 0, listeners, 0, common.length);
+                System.arraycopy(named, 0, listeners, common.length, named.length);
+            }
+            if (listeners != null) {
+                int current = 0;
+                try {
+                    while (current < listeners.length) {
+                        listeners[current].vetoableChange(event);
+                        current++;
+                    }
+                }
+                catch (PropertyVetoException veto) {
+                    event = new PropertyChangeEvent(this.source, name, newValue, oldValue);
+                    for (int i = 0; i < current; i++) {
+                        try {
+                            listeners[i].vetoableChange(event);
+                        }
+                        catch (PropertyVetoException exception) {
+                            // ignore exceptions that occur during rolling back
+                        }
+                    }
+                    throw veto; // rethrow the veto exception
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if there are any listeners for a specific property, including
+     * those registered on all properties.  If <code>propertyName</code>
+     * is null, only check for listeners registered on all properties.
+     *
+     * @param propertyName  the property name.
+     * @return true if there are one or more listeners for the given property
+     */
+    public boolean hasListeners(String propertyName) {
+        return this.map.hasListeners(propertyName);
+    }
+
+    /**
+     * @serialData Null terminated list of <code>VetoableChangeListeners</code>.
+     * <p>
+     * At serialization time we skip non-serializable listeners and
+     * only serialize the serializable listeners.
+     */
+    private void writeObject(ObjectOutputStream s) throws IOException {
+        Hashtable<String, VetoableChangeSupport> children = null;
+        VetoableChangeListener[] listeners = null;
+        synchronized (this.map) {
+            for (Entry<String, VetoableChangeListener[]> entry : this.map.getEntries()) {
+                String property = entry.getKey();
+                if (property == null) {
+                    listeners = entry.getValue();
+                } else {
+                    if (children == null) {
+                        children = new Hashtable<String, VetoableChangeSupport>();
+                    }
+                    VetoableChangeSupport vcs = new VetoableChangeSupport(this.source);
+                    vcs.map.set(null, entry.getValue());
+                    children.put(property, vcs);
+                }
+            }
+        }
+        ObjectOutputStream.PutField fields = s.putFields();
+        fields.put("children", children);
+        fields.put("source", this.source);
+        fields.put("vetoableChangeSupportSerializedDataVersion", 2);
+        s.writeFields();
+
+        if (listeners != null) {
+            for (VetoableChangeListener l : listeners) {
+                if (l instanceof Serializable) {
+                    s.writeObject(l);
+                }
+            }
+        }
+        s.writeObject(null);
+    }
+
+    private void readObject(ObjectInputStream s) throws ClassNotFoundException, IOException {
+        this.map = new VetoableChangeListenerMap();
+
+        ObjectInputStream.GetField fields = s.readFields();
+
+        Hashtable<String, VetoableChangeSupport> children = (Hashtable<String, VetoableChangeSupport>) fields.get("children", null);
+        this.source = fields.get("source", null);
+        fields.get("vetoableChangeSupportSerializedDataVersion", 2);
+
+        Object listenerOrNull;
+        while (null != (listenerOrNull = s.readObject())) {
+            this.map.add(null, (VetoableChangeListener)listenerOrNull);
+        }
+        if (children != null) {
+            for (Entry<String, VetoableChangeSupport> entry : children.entrySet()) {
+                for (VetoableChangeListener listener : entry.getValue().getVetoableChangeListeners()) {
+                    this.map.add(entry.getKey(), listener);
+                }
+            }
+        }
+    }
+
+    /**
+     * The object to be provided as the "source" for any generated events.
+     */
+    private Object source;
+
+    /**
+     * @serialField children                                   Hashtable
+     * @serialField source                                     Object
+     * @serialField vetoableChangeSupportSerializedDataVersion int
+     */
+    private static final ObjectStreamField[] serialPersistentFields = {
+            new ObjectStreamField("children", Hashtable.class),
+            new ObjectStreamField("source", Object.class),
+            new ObjectStreamField("vetoableChangeSupportSerializedDataVersion", Integer.TYPE)
+    };
+
+    /**
+     * Serialization version ID, so we're compatible with JDK 1.1
+     */
+    static final long serialVersionUID = -5090210921595982017L;
+
+    /**
+     * This is a {@link ChangeListenerMap ChangeListenerMap} implementation
+     * that works with {@link VetoableChangeListener VetoableChangeListener} objects.
+     */
+    private static final class VetoableChangeListenerMap extends ChangeListenerMap<VetoableChangeListener> {
+        private static final VetoableChangeListener[] EMPTY = {};
+
+        /**
+         * Creates an array of {@link VetoableChangeListener VetoableChangeListener} objects.
+         * This method uses the same instance of the empty array
+         * when {@code length} equals {@code 0}.
+         *
+         * @param length  the array length
+         * @return        an array with specified length
+         */
+        @Override
+        protected VetoableChangeListener[] newArray(int length) {
+            return (0 < length)
+                    ? new VetoableChangeListener[length]
+                    : EMPTY;
+        }
+
+        /**
+         * Creates a {@link VetoableChangeListenerProxy VetoableChangeListenerProxy}
+         * object for the specified property.
+         *
+         * @param name      the name of the property to listen on
+         * @param listener  the listener to process events
+         * @return          a {@code VetoableChangeListenerProxy} object
+         */
+        @Override
+        protected VetoableChangeListener newProxy(String name, VetoableChangeListener listener) {
+            return new VetoableChangeListenerProxy(name, listener);
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/Bits.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/Bits.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Utility methods for packing/unpacking primitive values in/out of byte arrays
+ * using big-endian byte ordering.
+ */
+class Bits {
+
+    /*
+     * Methods for unpacking primitive values from byte arrays starting at
+     * given offsets.
+     */
+
+    static boolean getBoolean(byte[] b, int off) {
+        return b[off] != 0;
+    }
+
+    static char getChar(byte[] b, int off) {
+        return (char) ((b[off + 1] & 0xFF) +
+                       (b[off] << 8));
+    }
+
+    static short getShort(byte[] b, int off) {
+        return (short) ((b[off + 1] & 0xFF) +
+                        (b[off] << 8));
+    }
+
+    static int getInt(byte[] b, int off) {
+        return ((b[off + 3] & 0xFF)      ) +
+               ((b[off + 2] & 0xFF) <<  8) +
+               ((b[off + 1] & 0xFF) << 16) +
+               ((b[off    ]       ) << 24);
+    }
+
+    static float getFloat(byte[] b, int off) {
+        return Float.intBitsToFloat(getInt(b, off));
+    }
+
+    static long getLong(byte[] b, int off) {
+        return ((b[off + 7] & 0xFFL)      ) +
+               ((b[off + 6] & 0xFFL) <<  8) +
+               ((b[off + 5] & 0xFFL) << 16) +
+               ((b[off + 4] & 0xFFL) << 24) +
+               ((b[off + 3] & 0xFFL) << 32) +
+               ((b[off + 2] & 0xFFL) << 40) +
+               ((b[off + 1] & 0xFFL) << 48) +
+               (((long) b[off])      << 56);
+    }
+
+    static double getDouble(byte[] b, int off) {
+        return Double.longBitsToDouble(getLong(b, off));
+    }
+
+    /*
+     * Methods for packing primitive values into byte arrays starting at given
+     * offsets.
+     */
+
+    static void putBoolean(byte[] b, int off, boolean val) {
+        b[off] = (byte) (val ? 1 : 0);
+    }
+
+    static void putChar(byte[] b, int off, char val) {
+        b[off + 1] = (byte) (val      );
+        b[off    ] = (byte) (val >>> 8);
+    }
+
+    static void putShort(byte[] b, int off, short val) {
+        b[off + 1] = (byte) (val      );
+        b[off    ] = (byte) (val >>> 8);
+    }
+
+    static void putInt(byte[] b, int off, int val) {
+        b[off + 3] = (byte) (val       );
+        b[off + 2] = (byte) (val >>>  8);
+        b[off + 1] = (byte) (val >>> 16);
+        b[off    ] = (byte) (val >>> 24);
+    }
+
+    static void putFloat(byte[] b, int off, float val) {
+        putInt(b, off,  Float.floatToIntBits(val));
+    }
+
+    static void putLong(byte[] b, int off, long val) {
+        b[off + 7] = (byte) (val       );
+        b[off + 6] = (byte) (val >>>  8);
+        b[off + 5] = (byte) (val >>> 16);
+        b[off + 4] = (byte) (val >>> 24);
+        b[off + 3] = (byte) (val >>> 32);
+        b[off + 2] = (byte) (val >>> 40);
+        b[off + 1] = (byte) (val >>> 48);
+        b[off    ] = (byte) (val >>> 56);
+    }
+
+    static void putDouble(byte[] b, int off, double val) {
+        putLong(b, off, Double.doubleToLongBits(val));
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/BufferedOutputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/BufferedOutputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * The class implements a buffered output stream. By setting up such
+ * an output stream, an application can write bytes to the underlying
+ * output stream without necessarily causing a call to the underlying
+ * system for each byte written.
+ *
+ * @author  Arthur van Hoff
+ * @since   JDK1.0
+ */
+public
+class BufferedOutputStream extends FilterOutputStream {
+    /**
+     * The internal buffer where data is stored.
+     */
+    protected byte buf[];
+
+    /**
+     * The number of valid bytes in the buffer. This value is always
+     * in the range <tt>0</tt> through <tt>buf.length</tt>; elements
+     * <tt>buf[0]</tt> through <tt>buf[count-1]</tt> contain valid
+     * byte data.
+     */
+    protected int count;
+
+    /**
+     * Creates a new buffered output stream to write data to the
+     * specified underlying output stream.
+     *
+     * @param   out   the underlying output stream.
+     */
+    public BufferedOutputStream(OutputStream out) {
+        this(out, 8192);
+    }
+
+    /**
+     * Creates a new buffered output stream to write data to the
+     * specified underlying output stream with the specified buffer
+     * size.
+     *
+     * @param   out    the underlying output stream.
+     * @param   size   the buffer size.
+     * @exception IllegalArgumentException if size &lt;= 0.
+     */
+    public BufferedOutputStream(OutputStream out, int size) {
+        super(out);
+        if (size <= 0) {
+            throw new IllegalArgumentException("Buffer size <= 0");
+        }
+        buf = new byte[size];
+    }
+
+    /** Flush the internal buffer */
+    private void flushBuffer() throws IOException {
+        if (count > 0) {
+            out.write(buf, 0, count);
+            count = 0;
+        }
+    }
+
+    /**
+     * Writes the specified byte to this buffered output stream.
+     *
+     * @param      b   the byte to be written.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public synchronized void write(int b) throws IOException {
+        if (count >= buf.length) {
+            flushBuffer();
+        }
+        buf[count++] = (byte)b;
+    }
+
+    /**
+     * Writes <code>len</code> bytes from the specified byte array
+     * starting at offset <code>off</code> to this buffered output stream.
+     *
+     * <p> Ordinarily this method stores bytes from the given array into this
+     * stream's buffer, flushing the buffer to the underlying output stream as
+     * needed.  If the requested length is at least as large as this stream's
+     * buffer, however, then this method will flush the buffer and write the
+     * bytes directly to the underlying output stream.  Thus redundant
+     * <code>BufferedOutputStream</code>s will not copy data unnecessarily.
+     *
+     * @param      b     the data.
+     * @param      off   the start offset in the data.
+     * @param      len   the number of bytes to write.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public synchronized void write(byte b[], int off, int len) throws IOException {
+        if (len >= buf.length) {
+            /* If the request length exceeds the size of the output buffer,
+               flush the output buffer and then write the data directly.
+               In this way buffered streams will cascade harmlessly. */
+            flushBuffer();
+            out.write(b, off, len);
+            return;
+        }
+        if (len > buf.length - count) {
+            flushBuffer();
+        }
+        System.arraycopy(b, off, buf, count, len);
+        count += len;
+    }
+
+    /**
+     * Flushes this buffered output stream. This forces any buffered
+     * output bytes to be written out to the underlying output stream.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public synchronized void flush() throws IOException {
+        flushBuffer();
+        out.flush();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/BufferedReader.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/BufferedReader.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,523 @@
+/*
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+
+
+/**
+ * Reads text from a character-input stream, buffering characters so as to
+ * provide for the efficient reading of characters, arrays, and lines.
+ *
+ * <p> The buffer size may be specified, or the default size may be used.  The
+ * default is large enough for most purposes.
+ *
+ * <p> In general, each read request made of a Reader causes a corresponding
+ * read request to be made of the underlying character or byte stream.  It is
+ * therefore advisable to wrap a BufferedReader around any Reader whose read()
+ * operations may be costly, such as FileReaders and InputStreamReaders.  For
+ * example,
+ *
+ * <pre>
+ * BufferedReader in
+ *   = new BufferedReader(new FileReader("foo.in"));
+ * </pre>
+ *
+ * will buffer the input from the specified file.  Without buffering, each
+ * invocation of read() or readLine() could cause bytes to be read from the
+ * file, converted into characters, and then returned, which can be very
+ * inefficient.
+ *
+ * <p> Programs that use DataInputStreams for textual input can be localized by
+ * replacing each DataInputStream with an appropriate BufferedReader.
+ *
+ * @see FileReader
+ * @see InputStreamReader
+ * @see java.nio.file.Files#newBufferedReader
+ *
+ * @author      Mark Reinhold
+ * @since       JDK1.1
+ */
+
+public class BufferedReader extends Reader {
+
+    private Reader in;
+
+    private char cb[];
+    private int nChars, nextChar;
+
+    private static final int INVALIDATED = -2;
+    private static final int UNMARKED = -1;
+    private int markedChar = UNMARKED;
+    private int readAheadLimit = 0; /* Valid only when markedChar > 0 */
+
+    /** If the next character is a line feed, skip it */
+    private boolean skipLF = false;
+
+    /** The skipLF flag when the mark was set */
+    private boolean markedSkipLF = false;
+
+    private static int defaultCharBufferSize = 8192;
+    private static int defaultExpectedLineLength = 80;
+
+    /**
+     * Creates a buffering character-input stream that uses an input buffer of
+     * the specified size.
+     *
+     * @param  in   A Reader
+     * @param  sz   Input-buffer size
+     *
+     * @exception  IllegalArgumentException  If sz is <= 0
+     */
+    public BufferedReader(Reader in, int sz) {
+        super(in);
+        if (sz <= 0)
+            throw new IllegalArgumentException("Buffer size <= 0");
+        this.in = in;
+        cb = new char[sz];
+        nextChar = nChars = 0;
+    }
+
+    /**
+     * Creates a buffering character-input stream that uses a default-sized
+     * input buffer.
+     *
+     * @param  in   A Reader
+     */
+    public BufferedReader(Reader in) {
+        this(in, defaultCharBufferSize);
+    }
+
+    /** Checks to make sure that the stream has not been closed */
+    private void ensureOpen() throws IOException {
+        if (in == null)
+            throw new IOException("Stream closed");
+    }
+
+    /**
+     * Fills the input buffer, taking the mark into account if it is valid.
+     */
+    private void fill() throws IOException {
+        int dst;
+        if (markedChar <= UNMARKED) {
+            /* No mark */
+            dst = 0;
+        } else {
+            /* Marked */
+            int delta = nextChar - markedChar;
+            if (delta >= readAheadLimit) {
+                /* Gone past read-ahead limit: Invalidate mark */
+                markedChar = INVALIDATED;
+                readAheadLimit = 0;
+                dst = 0;
+            } else {
+                if (readAheadLimit <= cb.length) {
+                    /* Shuffle in the current buffer */
+                    System.arraycopy(cb, markedChar, cb, 0, delta);
+                    markedChar = 0;
+                    dst = delta;
+                } else {
+                    /* Reallocate buffer to accommodate read-ahead limit */
+                    char ncb[] = new char[readAheadLimit];
+                    System.arraycopy(cb, markedChar, ncb, 0, delta);
+                    cb = ncb;
+                    markedChar = 0;
+                    dst = delta;
+                }
+                nextChar = nChars = delta;
+            }
+        }
+
+        int n;
+        do {
+            n = in.read(cb, dst, cb.length - dst);
+        } while (n == 0);
+        if (n > 0) {
+            nChars = dst + n;
+            nextChar = dst;
+        }
+    }
+
+    /**
+     * Reads a single character.
+     *
+     * @return The character read, as an integer in the range
+     *         0 to 65535 (<tt>0x00-0xffff</tt>), or -1 if the
+     *         end of the stream has been reached
+     * @exception  IOException  If an I/O error occurs
+     */
+    public int read() throws IOException {
+        synchronized (lock) {
+            ensureOpen();
+            for (;;) {
+                if (nextChar >= nChars) {
+                    fill();
+                    if (nextChar >= nChars)
+                        return -1;
+                }
+                if (skipLF) {
+                    skipLF = false;
+                    if (cb[nextChar] == '\n') {
+                        nextChar++;
+                        continue;
+                    }
+                }
+                return cb[nextChar++];
+            }
+        }
+    }
+
+    /**
+     * Reads characters into a portion of an array, reading from the underlying
+     * stream if necessary.
+     */
+    private int read1(char[] cbuf, int off, int len) throws IOException {
+        if (nextChar >= nChars) {
+            /* If the requested length is at least as large as the buffer, and
+               if there is no mark/reset activity, and if line feeds are not
+               being skipped, do not bother to copy the characters into the
+               local buffer.  In this way buffered streams will cascade
+               harmlessly. */
+            if (len >= cb.length && markedChar <= UNMARKED && !skipLF) {
+                return in.read(cbuf, off, len);
+            }
+            fill();
+        }
+        if (nextChar >= nChars) return -1;
+        if (skipLF) {
+            skipLF = false;
+            if (cb[nextChar] == '\n') {
+                nextChar++;
+                if (nextChar >= nChars)
+                    fill();
+                if (nextChar >= nChars)
+                    return -1;
+            }
+        }
+        int n = Math.min(len, nChars - nextChar);
+        System.arraycopy(cb, nextChar, cbuf, off, n);
+        nextChar += n;
+        return n;
+    }
+
+    /**
+     * Reads characters into a portion of an array.
+     *
+     * <p> This method implements the general contract of the corresponding
+     * <code>{@link Reader#read(char[], int, int) read}</code> method of the
+     * <code>{@link Reader}</code> class.  As an additional convenience, it
+     * attempts to read as many characters as possible by repeatedly invoking
+     * the <code>read</code> method of the underlying stream.  This iterated
+     * <code>read</code> continues until one of the following conditions becomes
+     * true: <ul>
+     *
+     *   <li> The specified number of characters have been read,
+     *
+     *   <li> The <code>read</code> method of the underlying stream returns
+     *   <code>-1</code>, indicating end-of-file, or
+     *
+     *   <li> The <code>ready</code> method of the underlying stream
+     *   returns <code>false</code>, indicating that further input requests
+     *   would block.
+     *
+     * </ul> If the first <code>read</code> on the underlying stream returns
+     * <code>-1</code> to indicate end-of-file then this method returns
+     * <code>-1</code>.  Otherwise this method returns the number of characters
+     * actually read.
+     *
+     * <p> Subclasses of this class are encouraged, but not required, to
+     * attempt to read as many characters as possible in the same fashion.
+     *
+     * <p> Ordinarily this method takes characters from this stream's character
+     * buffer, filling it from the underlying stream as necessary.  If,
+     * however, the buffer is empty, the mark is not valid, and the requested
+     * length is at least as large as the buffer, then this method will read
+     * characters directly from the underlying stream into the given array.
+     * Thus redundant <code>BufferedReader</code>s will not copy data
+     * unnecessarily.
+     *
+     * @param      cbuf  Destination buffer
+     * @param      off   Offset at which to start storing characters
+     * @param      len   Maximum number of characters to read
+     *
+     * @return     The number of characters read, or -1 if the end of the
+     *             stream has been reached
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    public int read(char cbuf[], int off, int len) throws IOException {
+        synchronized (lock) {
+            ensureOpen();
+            if ((off < 0) || (off > cbuf.length) || (len < 0) ||
+                ((off + len) > cbuf.length) || ((off + len) < 0)) {
+                throw new IndexOutOfBoundsException();
+            } else if (len == 0) {
+                return 0;
+            }
+
+            int n = read1(cbuf, off, len);
+            if (n <= 0) return n;
+            while ((n < len) && in.ready()) {
+                int n1 = read1(cbuf, off + n, len - n);
+                if (n1 <= 0) break;
+                n += n1;
+            }
+            return n;
+        }
+    }
+
+    /**
+     * Reads a line of text.  A line is considered to be terminated by any one
+     * of a line feed ('\n'), a carriage return ('\r'), or a carriage return
+     * followed immediately by a linefeed.
+     *
+     * @param      ignoreLF  If true, the next '\n' will be skipped
+     *
+     * @return     A String containing the contents of the line, not including
+     *             any line-termination characters, or null if the end of the
+     *             stream has been reached
+     *
+     * @see        java.io.LineNumberReader#readLine()
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    String readLine(boolean ignoreLF) throws IOException {
+        StringBuffer s = null;
+        int startChar;
+
+        synchronized (lock) {
+            ensureOpen();
+            boolean omitLF = ignoreLF || skipLF;
+
+        bufferLoop:
+            for (;;) {
+
+                if (nextChar >= nChars)
+                    fill();
+                if (nextChar >= nChars) { /* EOF */
+                    if (s != null && s.length() > 0)
+                        return s.toString();
+                    else
+                        return null;
+                }
+                boolean eol = false;
+                char c = 0;
+                int i;
+
+                /* Skip a leftover '\n', if necessary */
+                if (omitLF && (cb[nextChar] == '\n'))
+                    nextChar++;
+                skipLF = false;
+                omitLF = false;
+
+            charLoop:
+                for (i = nextChar; i < nChars; i++) {
+                    c = cb[i];
+                    if ((c == '\n') || (c == '\r')) {
+                        eol = true;
+                        break charLoop;
+                    }
+                }
+
+                startChar = nextChar;
+                nextChar = i;
+
+                if (eol) {
+                    String str;
+                    if (s == null) {
+                        str = new String(cb, startChar, i - startChar);
+                    } else {
+                        s.append(cb, startChar, i - startChar);
+                        str = s.toString();
+                    }
+                    nextChar++;
+                    if (c == '\r') {
+                        skipLF = true;
+                    }
+                    return str;
+                }
+
+                if (s == null)
+                    s = new StringBuffer(defaultExpectedLineLength);
+                s.append(cb, startChar, i - startChar);
+            }
+        }
+    }
+
+    /**
+     * Reads a line of text.  A line is considered to be terminated by any one
+     * of a line feed ('\n'), a carriage return ('\r'), or a carriage return
+     * followed immediately by a linefeed.
+     *
+     * @return     A String containing the contents of the line, not including
+     *             any line-termination characters, or null if the end of the
+     *             stream has been reached
+     *
+     * @exception  IOException  If an I/O error occurs
+     *
+     * @see java.nio.file.Files#readAllLines
+     */
+    public String readLine() throws IOException {
+        return readLine(false);
+    }
+
+    /**
+     * Skips characters.
+     *
+     * @param  n  The number of characters to skip
+     *
+     * @return    The number of characters actually skipped
+     *
+     * @exception  IllegalArgumentException  If <code>n</code> is negative.
+     * @exception  IOException  If an I/O error occurs
+     */
+    public long skip(long n) throws IOException {
+        if (n < 0L) {
+            throw new IllegalArgumentException("skip value is negative");
+        }
+        synchronized (lock) {
+            ensureOpen();
+            long r = n;
+            while (r > 0) {
+                if (nextChar >= nChars)
+                    fill();
+                if (nextChar >= nChars) /* EOF */
+                    break;
+                if (skipLF) {
+                    skipLF = false;
+                    if (cb[nextChar] == '\n') {
+                        nextChar++;
+                    }
+                }
+                long d = nChars - nextChar;
+                if (r <= d) {
+                    nextChar += r;
+                    r = 0;
+                    break;
+                }
+                else {
+                    r -= d;
+                    nextChar = nChars;
+                }
+            }
+            return n - r;
+        }
+    }
+
+    /**
+     * Tells whether this stream is ready to be read.  A buffered character
+     * stream is ready if the buffer is not empty, or if the underlying
+     * character stream is ready.
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    public boolean ready() throws IOException {
+        synchronized (lock) {
+            ensureOpen();
+
+            /*
+             * If newline needs to be skipped and the next char to be read
+             * is a newline character, then just skip it right away.
+             */
+            if (skipLF) {
+                /* Note that in.ready() will return true if and only if the next
+                 * read on the stream will not block.
+                 */
+                if (nextChar >= nChars && in.ready()) {
+                    fill();
+                }
+                if (nextChar < nChars) {
+                    if (cb[nextChar] == '\n')
+                        nextChar++;
+                    skipLF = false;
+                }
+            }
+            return (nextChar < nChars) || in.ready();
+        }
+    }
+
+    /**
+     * Tells whether this stream supports the mark() operation, which it does.
+     */
+    public boolean markSupported() {
+        return true;
+    }
+
+    /**
+     * Marks the present position in the stream.  Subsequent calls to reset()
+     * will attempt to reposition the stream to this point.
+     *
+     * @param readAheadLimit   Limit on the number of characters that may be
+     *                         read while still preserving the mark. An attempt
+     *                         to reset the stream after reading characters
+     *                         up to this limit or beyond may fail.
+     *                         A limit value larger than the size of the input
+     *                         buffer will cause a new buffer to be allocated
+     *                         whose size is no smaller than limit.
+     *                         Therefore large values should be used with care.
+     *
+     * @exception  IllegalArgumentException  If readAheadLimit is < 0
+     * @exception  IOException  If an I/O error occurs
+     */
+    public void mark(int readAheadLimit) throws IOException {
+        if (readAheadLimit < 0) {
+            throw new IllegalArgumentException("Read-ahead limit < 0");
+        }
+        synchronized (lock) {
+            ensureOpen();
+            this.readAheadLimit = readAheadLimit;
+            markedChar = nextChar;
+            markedSkipLF = skipLF;
+        }
+    }
+
+    /**
+     * Resets the stream to the most recent mark.
+     *
+     * @exception  IOException  If the stream has never been marked,
+     *                          or if the mark has been invalidated
+     */
+    public void reset() throws IOException {
+        synchronized (lock) {
+            ensureOpen();
+            if (markedChar < 0)
+                throw new IOException((markedChar == INVALIDATED)
+                                      ? "Mark invalid"
+                                      : "Stream not marked");
+            nextChar = markedChar;
+            skipLF = markedSkipLF;
+        }
+    }
+
+    public void close() throws IOException {
+        synchronized (lock) {
+            if (in == null)
+                return;
+            in.close();
+            in = null;
+            cb = null;
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ByteArrayOutputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ByteArrayOutputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import java.util.Arrays;
+
+/**
+ * This class implements an output stream in which the data is
+ * written into a byte array. The buffer automatically grows as data
+ * is written to it.
+ * The data can be retrieved using <code>toByteArray()</code> and
+ * <code>toString()</code>.
+ * <p>
+ * Closing a <tt>ByteArrayOutputStream</tt> has no effect. The methods in
+ * this class can be called after the stream has been closed without
+ * generating an <tt>IOException</tt>.
+ *
+ * @author  Arthur van Hoff
+ * @since   JDK1.0
+ */
+
+public class ByteArrayOutputStream extends OutputStream {
+
+    /**
+     * The buffer where data is stored.
+     */
+    protected byte buf[];
+
+    /**
+     * The number of valid bytes in the buffer.
+     */
+    protected int count;
+
+    /**
+     * Creates a new byte array output stream. The buffer capacity is
+     * initially 32 bytes, though its size increases if necessary.
+     */
+    public ByteArrayOutputStream() {
+        this(32);
+    }
+
+    /**
+     * Creates a new byte array output stream, with a buffer capacity of
+     * the specified size, in bytes.
+     *
+     * @param   size   the initial size.
+     * @exception  IllegalArgumentException if size is negative.
+     */
+    public ByteArrayOutputStream(int size) {
+        if (size < 0) {
+            throw new IllegalArgumentException("Negative initial size: "
+                                               + size);
+        }
+        buf = new byte[size];
+    }
+
+    /**
+     * Increases the capacity if necessary to ensure that it can hold
+     * at least the number of elements specified by the minimum
+     * capacity argument.
+     *
+     * @param minCapacity the desired minimum capacity
+     * @throws OutOfMemoryError if {@code minCapacity < 0}.  This is
+     * interpreted as a request for the unsatisfiably large capacity
+     * {@code (long) Integer.MAX_VALUE + (minCapacity - Integer.MAX_VALUE)}.
+     */
+    private void ensureCapacity(int minCapacity) {
+        // overflow-conscious code
+        if (minCapacity - buf.length > 0)
+            grow(minCapacity);
+    }
+
+    /**
+     * Increases the capacity to ensure that it can hold at least the
+     * number of elements specified by the minimum capacity argument.
+     *
+     * @param minCapacity the desired minimum capacity
+     */
+    private void grow(int minCapacity) {
+        // overflow-conscious code
+        int oldCapacity = buf.length;
+        int newCapacity = oldCapacity << 1;
+        if (newCapacity - minCapacity < 0)
+            newCapacity = minCapacity;
+        if (newCapacity < 0) {
+            if (minCapacity < 0) // overflow
+                throw new OutOfMemoryError();
+            newCapacity = Integer.MAX_VALUE;
+        }
+        buf = Arrays.copyOf(buf, newCapacity);
+    }
+
+    /**
+     * Writes the specified byte to this byte array output stream.
+     *
+     * @param   b   the byte to be written.
+     */
+    public synchronized void write(int b) {
+        ensureCapacity(count + 1);
+        buf[count] = (byte) b;
+        count += 1;
+    }
+
+    /**
+     * Writes <code>len</code> bytes from the specified byte array
+     * starting at offset <code>off</code> to this byte array output stream.
+     *
+     * @param   b     the data.
+     * @param   off   the start offset in the data.
+     * @param   len   the number of bytes to write.
+     */
+    public synchronized void write(byte b[], int off, int len) {
+        if ((off < 0) || (off > b.length) || (len < 0) ||
+            ((off + len) - b.length > 0)) {
+            throw new IndexOutOfBoundsException();
+        }
+        ensureCapacity(count + len);
+        System.arraycopy(b, off, buf, count, len);
+        count += len;
+    }
+
+    /**
+     * Writes the complete contents of this byte array output stream to
+     * the specified output stream argument, as if by calling the output
+     * stream's write method using <code>out.write(buf, 0, count)</code>.
+     *
+     * @param      out   the output stream to which to write the data.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public synchronized void writeTo(OutputStream out) throws IOException {
+        out.write(buf, 0, count);
+    }
+
+    /**
+     * Resets the <code>count</code> field of this byte array output
+     * stream to zero, so that all currently accumulated output in the
+     * output stream is discarded. The output stream can be used again,
+     * reusing the already allocated buffer space.
+     *
+     * @see     java.io.ByteArrayInputStream#count
+     */
+    public synchronized void reset() {
+        count = 0;
+    }
+
+    /**
+     * Creates a newly allocated byte array. Its size is the current
+     * size of this output stream and the valid contents of the buffer
+     * have been copied into it.
+     *
+     * @return  the current contents of this output stream, as a byte array.
+     * @see     java.io.ByteArrayOutputStream#size()
+     */
+    public synchronized byte toByteArray()[] {
+        return Arrays.copyOf(buf, count);
+    }
+
+    /**
+     * Returns the current size of the buffer.
+     *
+     * @return  the value of the <code>count</code> field, which is the number
+     *          of valid bytes in this output stream.
+     * @see     java.io.ByteArrayOutputStream#count
+     */
+    public synchronized int size() {
+        return count;
+    }
+
+    /**
+     * Converts the buffer's contents into a string decoding bytes using the
+     * platform's default character set. The length of the new <tt>String</tt>
+     * is a function of the character set, and hence may not be equal to the
+     * size of the buffer.
+     *
+     * <p> This method always replaces malformed-input and unmappable-character
+     * sequences with the default replacement string for the platform's
+     * default character set. The {@linkplain java.nio.charset.CharsetDecoder}
+     * class should be used when more control over the decoding process is
+     * required.
+     *
+     * @return String decoded from the buffer's contents.
+     * @since  JDK1.1
+     */
+    public synchronized String toString() {
+        return new String(buf, 0, count);
+    }
+
+    /**
+     * Converts the buffer's contents into a string by decoding the bytes using
+     * the specified {@link java.nio.charset.Charset charsetName}. The length of
+     * the new <tt>String</tt> is a function of the charset, and hence may not be
+     * equal to the length of the byte array.
+     *
+     * <p> This method always replaces malformed-input and unmappable-character
+     * sequences with this charset's default replacement string. The {@link
+     * java.nio.charset.CharsetDecoder} class should be used when more control
+     * over the decoding process is required.
+     *
+     * @param  charsetName  the name of a supported
+     *              {@linkplain java.nio.charset.Charset </code>charset<code>}
+     * @return String decoded from the buffer's contents.
+     * @exception  UnsupportedEncodingException
+     *             If the named charset is not supported
+     * @since   JDK1.1
+     */
+    public synchronized String toString(String charsetName)
+        throws UnsupportedEncodingException
+    {
+        return new String(buf, 0, count, charsetName);
+    }
+
+    /**
+     * Creates a newly allocated string. Its size is the current size of
+     * the output stream and the valid contents of the buffer have been
+     * copied into it. Each character <i>c</i> in the resulting string is
+     * constructed from the corresponding element <i>b</i> in the byte
+     * array such that:
+     * <blockquote><pre>
+     *     c == (char)(((hibyte &amp; 0xff) &lt;&lt; 8) | (b &amp; 0xff))
+     * </pre></blockquote>
+     *
+     * @deprecated This method does not properly convert bytes into characters.
+     * As of JDK&nbsp;1.1, the preferred way to do this is via the
+     * <code>toString(String enc)</code> method, which takes an encoding-name
+     * argument, or the <code>toString()</code> method, which uses the
+     * platform's default character encoding.
+     *
+     * @param      hibyte    the high byte of each resulting Unicode character.
+     * @return     the current contents of the output stream, as a string.
+     * @see        java.io.ByteArrayOutputStream#size()
+     * @see        java.io.ByteArrayOutputStream#toString(String)
+     * @see        java.io.ByteArrayOutputStream#toString()
+     */
+    @Deprecated
+    public synchronized String toString(int hibyte) {
+        return new String(buf, hibyte, 0, count);
+    }
+
+    /**
+     * Closing a <tt>ByteArrayOutputStream</tt> has no effect. The methods in
+     * this class can be called after the stream has been closed without
+     * generating an <tt>IOException</tt>.
+     * <p>
+     *
+     */
+    public void close() throws IOException {
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/DataOutput.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/DataOutput.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,354 @@
+/*
+ * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * The <code>DataOutput</code> interface provides
+ * for converting data from any of the Java
+ * primitive types to a series of bytes and
+ * writing these bytes to a binary stream.
+ * There is  also a facility for converting
+ * a <code>String</code> into
+ * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
+ * format and writing the resulting series
+ * of bytes.
+ * <p>
+ * For all the methods in this interface that
+ * write bytes, it is generally true that if
+ * a byte cannot be written for any reason,
+ * an <code>IOException</code> is thrown.
+ *
+ * @author  Frank Yellin
+ * @see     java.io.DataInput
+ * @see     java.io.DataOutputStream
+ * @since   JDK1.0
+ */
+public
+interface DataOutput {
+    /**
+     * Writes to the output stream the eight
+     * low-order bits of the argument <code>b</code>.
+     * The 24 high-order  bits of <code>b</code>
+     * are ignored.
+     *
+     * @param      b   the byte to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void write(int b) throws IOException;
+
+    /**
+     * Writes to the output stream all the bytes in array <code>b</code>.
+     * If <code>b</code> is <code>null</code>,
+     * a <code>NullPointerException</code> is thrown.
+     * If <code>b.length</code> is zero, then
+     * no bytes are written. Otherwise, the byte
+     * <code>b[0]</code> is written first, then
+     * <code>b[1]</code>, and so on; the last byte
+     * written is <code>b[b.length-1]</code>.
+     *
+     * @param      b   the data.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void write(byte b[]) throws IOException;
+
+    /**
+     * Writes <code>len</code> bytes from array
+     * <code>b</code>, in order,  to
+     * the output stream.  If <code>b</code>
+     * is <code>null</code>, a <code>NullPointerException</code>
+     * is thrown.  If <code>off</code> is negative,
+     * or <code>len</code> is negative, or <code>off+len</code>
+     * is greater than the length of the array
+     * <code>b</code>, then an <code>IndexOutOfBoundsException</code>
+     * is thrown.  If <code>len</code> is zero,
+     * then no bytes are written. Otherwise, the
+     * byte <code>b[off]</code> is written first,
+     * then <code>b[off+1]</code>, and so on; the
+     * last byte written is <code>b[off+len-1]</code>.
+     *
+     * @param      b     the data.
+     * @param      off   the start offset in the data.
+     * @param      len   the number of bytes to write.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void write(byte b[], int off, int len) throws IOException;
+
+    /**
+     * Writes a <code>boolean</code> value to this output stream.
+     * If the argument <code>v</code>
+     * is <code>true</code>, the value <code>(byte)1</code>
+     * is written; if <code>v</code> is <code>false</code>,
+     * the  value <code>(byte)0</code> is written.
+     * The byte written by this method may
+     * be read by the <code>readBoolean</code>
+     * method of interface <code>DataInput</code>,
+     * which will then return a <code>boolean</code>
+     * equal to <code>v</code>.
+     *
+     * @param      v   the boolean to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeBoolean(boolean v) throws IOException;
+
+    /**
+     * Writes to the output stream the eight low-
+     * order bits of the argument <code>v</code>.
+     * The 24 high-order bits of <code>v</code>
+     * are ignored. (This means  that <code>writeByte</code>
+     * does exactly the same thing as <code>write</code>
+     * for an integer argument.) The byte written
+     * by this method may be read by the <code>readByte</code>
+     * method of interface <code>DataInput</code>,
+     * which will then return a <code>byte</code>
+     * equal to <code>(byte)v</code>.
+     *
+     * @param      v   the byte value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeByte(int v) throws IOException;
+
+    /**
+     * Writes two bytes to the output
+     * stream to represent the value of the argument.
+     * The byte values to be written, in the  order
+     * shown, are: <p>
+     * <pre><code>
+     * (byte)(0xff &amp; (v &gt;&gt; 8))
+     * (byte)(0xff &amp; v)
+     * </code> </pre> <p>
+     * The bytes written by this method may be
+     * read by the <code>readShort</code> method
+     * of interface <code>DataInput</code> , which
+     * will then return a <code>short</code> equal
+     * to <code>(short)v</code>.
+     *
+     * @param      v   the <code>short</code> value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeShort(int v) throws IOException;
+
+    /**
+     * Writes a <code>char</code> value, which
+     * is comprised of two bytes, to the
+     * output stream.
+     * The byte values to be written, in the  order
+     * shown, are:
+     * <p><pre><code>
+     * (byte)(0xff &amp; (v &gt;&gt; 8))
+     * (byte)(0xff &amp; v)
+     * </code></pre><p>
+     * The bytes written by this method may be
+     * read by the <code>readChar</code> method
+     * of interface <code>DataInput</code> , which
+     * will then return a <code>char</code> equal
+     * to <code>(char)v</code>.
+     *
+     * @param      v   the <code>char</code> value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeChar(int v) throws IOException;
+
+    /**
+     * Writes an <code>int</code> value, which is
+     * comprised of four bytes, to the output stream.
+     * The byte values to be written, in the  order
+     * shown, are:
+     * <p><pre><code>
+     * (byte)(0xff &amp; (v &gt;&gt; 24))
+     * (byte)(0xff &amp; (v &gt;&gt; 16))
+     * (byte)(0xff &amp; (v &gt;&gt; &#32; &#32;8))
+     * (byte)(0xff &amp; v)
+     * </code></pre><p>
+     * The bytes written by this method may be read
+     * by the <code>readInt</code> method of interface
+     * <code>DataInput</code> , which will then
+     * return an <code>int</code> equal to <code>v</code>.
+     *
+     * @param      v   the <code>int</code> value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeInt(int v) throws IOException;
+
+    /**
+     * Writes a <code>long</code> value, which is
+     * comprised of eight bytes, to the output stream.
+     * The byte values to be written, in the  order
+     * shown, are:
+     * <p><pre><code>
+     * (byte)(0xff &amp; (v &gt;&gt; 56))
+     * (byte)(0xff &amp; (v &gt;&gt; 48))
+     * (byte)(0xff &amp; (v &gt;&gt; 40))
+     * (byte)(0xff &amp; (v &gt;&gt; 32))
+     * (byte)(0xff &amp; (v &gt;&gt; 24))
+     * (byte)(0xff &amp; (v &gt;&gt; 16))
+     * (byte)(0xff &amp; (v &gt;&gt;  8))
+     * (byte)(0xff &amp; v)
+     * </code></pre><p>
+     * The bytes written by this method may be
+     * read by the <code>readLong</code> method
+     * of interface <code>DataInput</code> , which
+     * will then return a <code>long</code> equal
+     * to <code>v</code>.
+     *
+     * @param      v   the <code>long</code> value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeLong(long v) throws IOException;
+
+    /**
+     * Writes a <code>float</code> value,
+     * which is comprised of four bytes, to the output stream.
+     * It does this as if it first converts this
+     * <code>float</code> value to an <code>int</code>
+     * in exactly the manner of the <code>Float.floatToIntBits</code>
+     * method  and then writes the <code>int</code>
+     * value in exactly the manner of the  <code>writeInt</code>
+     * method.  The bytes written by this method
+     * may be read by the <code>readFloat</code>
+     * method of interface <code>DataInput</code>,
+     * which will then return a <code>float</code>
+     * equal to <code>v</code>.
+     *
+     * @param      v   the <code>float</code> value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeFloat(float v) throws IOException;
+
+    /**
+     * Writes a <code>double</code> value,
+     * which is comprised of eight bytes, to the output stream.
+     * It does this as if it first converts this
+     * <code>double</code> value to a <code>long</code>
+     * in exactly the manner of the <code>Double.doubleToLongBits</code>
+     * method  and then writes the <code>long</code>
+     * value in exactly the manner of the  <code>writeLong</code>
+     * method. The bytes written by this method
+     * may be read by the <code>readDouble</code>
+     * method of interface <code>DataInput</code>,
+     * which will then return a <code>double</code>
+     * equal to <code>v</code>.
+     *
+     * @param      v   the <code>double</code> value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeDouble(double v) throws IOException;
+
+    /**
+     * Writes a string to the output stream.
+     * For every character in the string
+     * <code>s</code>,  taken in order, one byte
+     * is written to the output stream.  If
+     * <code>s</code> is <code>null</code>, a <code>NullPointerException</code>
+     * is thrown.<p>  If <code>s.length</code>
+     * is zero, then no bytes are written. Otherwise,
+     * the character <code>s[0]</code> is written
+     * first, then <code>s[1]</code>, and so on;
+     * the last character written is <code>s[s.length-1]</code>.
+     * For each character, one byte is written,
+     * the low-order byte, in exactly the manner
+     * of the <code>writeByte</code> method . The
+     * high-order eight bits of each character
+     * in the string are ignored.
+     *
+     * @param      s   the string of bytes to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeBytes(String s) throws IOException;
+
+    /**
+     * Writes every character in the string <code>s</code>,
+     * to the output stream, in order,
+     * two bytes per character. If <code>s</code>
+     * is <code>null</code>, a <code>NullPointerException</code>
+     * is thrown.  If <code>s.length</code>
+     * is zero, then no characters are written.
+     * Otherwise, the character <code>s[0]</code>
+     * is written first, then <code>s[1]</code>,
+     * and so on; the last character written is
+     * <code>s[s.length-1]</code>. For each character,
+     * two bytes are actually written, high-order
+     * byte first, in exactly the manner of the
+     * <code>writeChar</code> method.
+     *
+     * @param      s   the string value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeChars(String s) throws IOException;
+
+    /**
+     * Writes two bytes of length information
+     * to the output stream, followed
+     * by the
+     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
+     * representation
+     * of  every character in the string <code>s</code>.
+     * If <code>s</code> is <code>null</code>,
+     * a <code>NullPointerException</code> is thrown.
+     * Each character in the string <code>s</code>
+     * is converted to a group of one, two, or
+     * three bytes, depending on the value of the
+     * character.<p>
+     * If a character <code>c</code>
+     * is in the range <code>&#92;u0001</code> through
+     * <code>&#92;u007f</code>, it is represented
+     * by one byte:<p>
+     * <pre>(byte)c </pre>  <p>
+     * If a character <code>c</code> is <code>&#92;u0000</code>
+     * or is in the range <code>&#92;u0080</code>
+     * through <code>&#92;u07ff</code>, then it is
+     * represented by two bytes, to be written
+     * in the order shown:<p> <pre><code>
+     * (byte)(0xc0 | (0x1f &amp; (c &gt;&gt; 6)))
+     * (byte)(0x80 | (0x3f &amp; c))
+     *  </code></pre>  <p> If a character
+     * <code>c</code> is in the range <code>&#92;u0800</code>
+     * through <code>uffff</code>, then it is
+     * represented by three bytes, to be written
+     * in the order shown:<p> <pre><code>
+     * (byte)(0xe0 | (0x0f &amp; (c &gt;&gt; 12)))
+     * (byte)(0x80 | (0x3f &amp; (c &gt;&gt;  6)))
+     * (byte)(0x80 | (0x3f &amp; c))
+     *  </code></pre>  <p> First,
+     * the total number of bytes needed to represent
+     * all the characters of <code>s</code> is
+     * calculated. If this number is larger than
+     * <code>65535</code>, then a <code>UTFDataFormatException</code>
+     * is thrown. Otherwise, this length is written
+     * to the output stream in exactly the manner
+     * of the <code>writeShort</code> method;
+     * after this, the one-, two-, or three-byte
+     * representation of each character in the
+     * string <code>s</code> is written.<p>  The
+     * bytes written by this method may be read
+     * by the <code>readUTF</code> method of interface
+     * <code>DataInput</code> , which will then
+     * return a <code>String</code> equal to <code>s</code>.
+     *
+     * @param      s   the string value to be written.
+     * @throws     IOException  if an I/O error occurs.
+     */
+    void writeUTF(String s) throws IOException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/DataOutputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/DataOutputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,416 @@
+/*
+ * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * A data output stream lets an application write primitive Java data
+ * types to an output stream in a portable way. An application can
+ * then use a data input stream to read the data back in.
+ *
+ * @author  unascribed
+ * @see     java.io.DataInputStream
+ * @since   JDK1.0
+ */
+public
+class DataOutputStream extends FilterOutputStream implements DataOutput {
+    /**
+     * The number of bytes written to the data output stream so far.
+     * If this counter overflows, it will be wrapped to Integer.MAX_VALUE.
+     */
+    protected int written;
+
+    /**
+     * bytearr is initialized on demand by writeUTF
+     */
+    private byte[] bytearr = null;
+
+    /**
+     * Creates a new data output stream to write data to the specified
+     * underlying output stream. The counter <code>written</code> is
+     * set to zero.
+     *
+     * @param   out   the underlying output stream, to be saved for later
+     *                use.
+     * @see     java.io.FilterOutputStream#out
+     */
+    public DataOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    /**
+     * Increases the written counter by the specified value
+     * until it reaches Integer.MAX_VALUE.
+     */
+    private void incCount(int value) {
+        int temp = written + value;
+        if (temp < 0) {
+            temp = Integer.MAX_VALUE;
+        }
+        written = temp;
+    }
+
+    /**
+     * Writes the specified byte (the low eight bits of the argument
+     * <code>b</code>) to the underlying output stream. If no exception
+     * is thrown, the counter <code>written</code> is incremented by
+     * <code>1</code>.
+     * <p>
+     * Implements the <code>write</code> method of <code>OutputStream</code>.
+     *
+     * @param      b   the <code>byte</code> to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public synchronized void write(int b) throws IOException {
+        out.write(b);
+        incCount(1);
+    }
+
+    /**
+     * Writes <code>len</code> bytes from the specified byte array
+     * starting at offset <code>off</code> to the underlying output stream.
+     * If no exception is thrown, the counter <code>written</code> is
+     * incremented by <code>len</code>.
+     *
+     * @param      b     the data.
+     * @param      off   the start offset in the data.
+     * @param      len   the number of bytes to write.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public synchronized void write(byte b[], int off, int len)
+        throws IOException
+    {
+        out.write(b, off, len);
+        incCount(len);
+    }
+
+    /**
+     * Flushes this data output stream. This forces any buffered output
+     * bytes to be written out to the stream.
+     * <p>
+     * The <code>flush</code> method of <code>DataOutputStream</code>
+     * calls the <code>flush</code> method of its underlying output stream.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     * @see        java.io.OutputStream#flush()
+     */
+    public void flush() throws IOException {
+        out.flush();
+    }
+
+    /**
+     * Writes a <code>boolean</code> to the underlying output stream as
+     * a 1-byte value. The value <code>true</code> is written out as the
+     * value <code>(byte)1</code>; the value <code>false</code> is
+     * written out as the value <code>(byte)0</code>. If no exception is
+     * thrown, the counter <code>written</code> is incremented by
+     * <code>1</code>.
+     *
+     * @param      v   a <code>boolean</code> value to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public final void writeBoolean(boolean v) throws IOException {
+        out.write(v ? 1 : 0);
+        incCount(1);
+    }
+
+    /**
+     * Writes out a <code>byte</code> to the underlying output stream as
+     * a 1-byte value. If no exception is thrown, the counter
+     * <code>written</code> is incremented by <code>1</code>.
+     *
+     * @param      v   a <code>byte</code> value to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public final void writeByte(int v) throws IOException {
+        out.write(v);
+        incCount(1);
+    }
+
+    /**
+     * Writes a <code>short</code> to the underlying output stream as two
+     * bytes, high byte first. If no exception is thrown, the counter
+     * <code>written</code> is incremented by <code>2</code>.
+     *
+     * @param      v   a <code>short</code> to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public final void writeShort(int v) throws IOException {
+        out.write((v >>> 8) & 0xFF);
+        out.write((v >>> 0) & 0xFF);
+        incCount(2);
+    }
+
+    /**
+     * Writes a <code>char</code> to the underlying output stream as a
+     * 2-byte value, high byte first. If no exception is thrown, the
+     * counter <code>written</code> is incremented by <code>2</code>.
+     *
+     * @param      v   a <code>char</code> value to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public final void writeChar(int v) throws IOException {
+        out.write((v >>> 8) & 0xFF);
+        out.write((v >>> 0) & 0xFF);
+        incCount(2);
+    }
+
+    /**
+     * Writes an <code>int</code> to the underlying output stream as four
+     * bytes, high byte first. If no exception is thrown, the counter
+     * <code>written</code> is incremented by <code>4</code>.
+     *
+     * @param      v   an <code>int</code> to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public final void writeInt(int v) throws IOException {
+        out.write((v >>> 24) & 0xFF);
+        out.write((v >>> 16) & 0xFF);
+        out.write((v >>>  8) & 0xFF);
+        out.write((v >>>  0) & 0xFF);
+        incCount(4);
+    }
+
+    private byte writeBuffer[] = new byte[8];
+
+    /**
+     * Writes a <code>long</code> to the underlying output stream as eight
+     * bytes, high byte first. In no exception is thrown, the counter
+     * <code>written</code> is incremented by <code>8</code>.
+     *
+     * @param      v   a <code>long</code> to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public final void writeLong(long v) throws IOException {
+        writeBuffer[0] = (byte)(v >>> 56);
+        writeBuffer[1] = (byte)(v >>> 48);
+        writeBuffer[2] = (byte)(v >>> 40);
+        writeBuffer[3] = (byte)(v >>> 32);
+        writeBuffer[4] = (byte)(v >>> 24);
+        writeBuffer[5] = (byte)(v >>> 16);
+        writeBuffer[6] = (byte)(v >>>  8);
+        writeBuffer[7] = (byte)(v >>>  0);
+        out.write(writeBuffer, 0, 8);
+        incCount(8);
+    }
+
+    /**
+     * Converts the float argument to an <code>int</code> using the
+     * <code>floatToIntBits</code> method in class <code>Float</code>,
+     * and then writes that <code>int</code> value to the underlying
+     * output stream as a 4-byte quantity, high byte first. If no
+     * exception is thrown, the counter <code>written</code> is
+     * incremented by <code>4</code>.
+     *
+     * @param      v   a <code>float</code> value to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     * @see        java.lang.Float#floatToIntBits(float)
+     */
+    public final void writeFloat(float v) throws IOException {
+        writeInt(Float.floatToIntBits(v));
+    }
+
+    /**
+     * Converts the double argument to a <code>long</code> using the
+     * <code>doubleToLongBits</code> method in class <code>Double</code>,
+     * and then writes that <code>long</code> value to the underlying
+     * output stream as an 8-byte quantity, high byte first. If no
+     * exception is thrown, the counter <code>written</code> is
+     * incremented by <code>8</code>.
+     *
+     * @param      v   a <code>double</code> value to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     * @see        java.lang.Double#doubleToLongBits(double)
+     */
+    public final void writeDouble(double v) throws IOException {
+        writeLong(Double.doubleToLongBits(v));
+    }
+
+    /**
+     * Writes out the string to the underlying output stream as a
+     * sequence of bytes. Each character in the string is written out, in
+     * sequence, by discarding its high eight bits. If no exception is
+     * thrown, the counter <code>written</code> is incremented by the
+     * length of <code>s</code>.
+     *
+     * @param      s   a string of bytes to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public final void writeBytes(String s) throws IOException {
+        int len = s.length();
+        for (int i = 0 ; i < len ; i++) {
+            out.write((byte)s.charAt(i));
+        }
+        incCount(len);
+    }
+
+    /**
+     * Writes a string to the underlying output stream as a sequence of
+     * characters. Each character is written to the data output stream as
+     * if by the <code>writeChar</code> method. If no exception is
+     * thrown, the counter <code>written</code> is incremented by twice
+     * the length of <code>s</code>.
+     *
+     * @param      s   a <code>String</code> value to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.DataOutputStream#writeChar(int)
+     * @see        java.io.FilterOutputStream#out
+     */
+    public final void writeChars(String s) throws IOException {
+        int len = s.length();
+        for (int i = 0 ; i < len ; i++) {
+            int v = s.charAt(i);
+            out.write((v >>> 8) & 0xFF);
+            out.write((v >>> 0) & 0xFF);
+        }
+        incCount(len * 2);
+    }
+
+    /**
+     * Writes a string to the underlying output stream using
+     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
+     * encoding in a machine-independent manner.
+     * <p>
+     * First, two bytes are written to the output stream as if by the
+     * <code>writeShort</code> method giving the number of bytes to
+     * follow. This value is the number of bytes actually written out,
+     * not the length of the string. Following the length, each character
+     * of the string is output, in sequence, using the modified UTF-8 encoding
+     * for the character. If no exception is thrown, the counter
+     * <code>written</code> is incremented by the total number of
+     * bytes written to the output stream. This will be at least two
+     * plus the length of <code>str</code>, and at most two plus
+     * thrice the length of <code>str</code>.
+     *
+     * @param      str   a string to be written.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public final void writeUTF(String str) throws IOException {
+        writeUTF(str, this);
+    }
+
+    /**
+     * Writes a string to the specified DataOutput using
+     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
+     * encoding in a machine-independent manner.
+     * <p>
+     * First, two bytes are written to out as if by the <code>writeShort</code>
+     * method giving the number of bytes to follow. This value is the number of
+     * bytes actually written out, not the length of the string. Following the
+     * length, each character of the string is output, in sequence, using the
+     * modified UTF-8 encoding for the character. If no exception is thrown, the
+     * counter <code>written</code> is incremented by the total number of
+     * bytes written to the output stream. This will be at least two
+     * plus the length of <code>str</code>, and at most two plus
+     * thrice the length of <code>str</code>.
+     *
+     * @param      str   a string to be written.
+     * @param      out   destination to write to
+     * @return     The number of bytes written out.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    static int writeUTF(String str, DataOutput out) throws IOException {
+        int strlen = str.length();
+        int utflen = 0;
+        int c, count = 0;
+
+        /* use charAt instead of copying String to char array */
+        for (int i = 0; i < strlen; i++) {
+            c = str.charAt(i);
+            if ((c >= 0x0001) && (c <= 0x007F)) {
+                utflen++;
+            } else if (c > 0x07FF) {
+                utflen += 3;
+            } else {
+                utflen += 2;
+            }
+        }
+
+        if (utflen > 65535)
+            throw new UTFDataFormatException(
+                "encoded string too long: " + utflen + " bytes");
+
+        byte[] bytearr = null;
+        if (out instanceof DataOutputStream) {
+            DataOutputStream dos = (DataOutputStream)out;
+            if(dos.bytearr == null || (dos.bytearr.length < (utflen+2)))
+                dos.bytearr = new byte[(utflen*2) + 2];
+            bytearr = dos.bytearr;
+        } else {
+            bytearr = new byte[utflen+2];
+        }
+
+        bytearr[count++] = (byte) ((utflen >>> 8) & 0xFF);
+        bytearr[count++] = (byte) ((utflen >>> 0) & 0xFF);
+
+        int i=0;
+        for (i=0; i<strlen; i++) {
+           c = str.charAt(i);
+           if (!((c >= 0x0001) && (c <= 0x007F))) break;
+           bytearr[count++] = (byte) c;
+        }
+
+        for (;i < strlen; i++){
+            c = str.charAt(i);
+            if ((c >= 0x0001) && (c <= 0x007F)) {
+                bytearr[count++] = (byte) c;
+
+            } else if (c > 0x07FF) {
+                bytearr[count++] = (byte) (0xE0 | ((c >> 12) & 0x0F));
+                bytearr[count++] = (byte) (0x80 | ((c >>  6) & 0x3F));
+                bytearr[count++] = (byte) (0x80 | ((c >>  0) & 0x3F));
+            } else {
+                bytearr[count++] = (byte) (0xC0 | ((c >>  6) & 0x1F));
+                bytearr[count++] = (byte) (0x80 | ((c >>  0) & 0x3F));
+            }
+        }
+        out.write(bytearr, 0, utflen+2);
+        return utflen + 2;
+    }
+
+    /**
+     * Returns the current value of the counter <code>written</code>,
+     * the number of bytes written to this data output stream so far.
+     * If the counter overflows, it will be wrapped to Integer.MAX_VALUE.
+     *
+     * @return  the value of the <code>written</code> field.
+     * @see     java.io.DataOutputStream#written
+     */
+    public final int size() {
+        return written;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/Externalizable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/Externalizable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import java.io.ObjectOutput;
+import java.io.ObjectInput;
+
+/**
+ * Only the identity of the class of an Externalizable instance is
+ * written in the serialization stream and it is the responsibility
+ * of the class to save and restore the contents of its instances.
+ *
+ * The writeExternal and readExternal methods of the Externalizable
+ * interface are implemented by a class to give the class complete
+ * control over the format and contents of the stream for an object
+ * and its supertypes. These methods must explicitly
+ * coordinate with the supertype to save its state. These methods supersede
+ * customized implementations of writeObject and readObject methods.<br>
+ *
+ * Object Serialization uses the Serializable and Externalizable
+ * interfaces.  Object persistence mechanisms can use them as well.  Each
+ * object to be stored is tested for the Externalizable interface. If
+ * the object supports Externalizable, the writeExternal method is called. If the
+ * object does not support Externalizable and does implement
+ * Serializable, the object is saved using
+ * ObjectOutputStream. <br> When an Externalizable object is
+ * reconstructed, an instance is created using the public no-arg
+ * constructor, then the readExternal method called.  Serializable
+ * objects are restored by reading them from an ObjectInputStream.<br>
+ *
+ * An Externalizable instance can designate a substitution object via
+ * the writeReplace and readResolve methods documented in the Serializable
+ * interface.<br>
+ *
+ * @author  unascribed
+ * @see java.io.ObjectOutputStream
+ * @see java.io.ObjectInputStream
+ * @see java.io.ObjectOutput
+ * @see java.io.ObjectInput
+ * @see java.io.Serializable
+ * @since   JDK1.1
+ */
+public interface Externalizable extends java.io.Serializable {
+    /**
+     * The object implements the writeExternal method to save its contents
+     * by calling the methods of DataOutput for its primitive values or
+     * calling the writeObject method of ObjectOutput for objects, strings,
+     * and arrays.
+     *
+     * @serialData Overriding methods should use this tag to describe
+     *             the data layout of this Externalizable object.
+     *             List the sequence of element types and, if possible,
+     *             relate the element to a public/protected field and/or
+     *             method of this Externalizable class.
+     *
+     * @param out the stream to write the object to
+     * @exception IOException Includes any I/O exceptions that may occur
+     */
+    void writeExternal(ObjectOutput out) throws IOException;
+
+    /**
+     * The object implements the readExternal method to restore its
+     * contents by calling the methods of DataInput for primitive
+     * types and readObject for objects, strings and arrays.  The
+     * readExternal method must read the values in the same sequence
+     * and with the same types as were written by writeExternal.
+     *
+     * @param in the stream to read data from in order to restore the object
+     * @exception IOException if I/O errors occur
+     * @exception ClassNotFoundException If the class for an object being
+     *              restored cannot be found.
+     */
+    void readExternal(ObjectInput in) throws IOException, ClassNotFoundException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/FilterOutputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/FilterOutputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * This class is the superclass of all classes that filter output
+ * streams. These streams sit on top of an already existing output
+ * stream (the <i>underlying</i> output stream) which it uses as its
+ * basic sink of data, but possibly transforming the data along the
+ * way or providing additional functionality.
+ * <p>
+ * The class <code>FilterOutputStream</code> itself simply overrides
+ * all methods of <code>OutputStream</code> with versions that pass
+ * all requests to the underlying output stream. Subclasses of
+ * <code>FilterOutputStream</code> may further override some of these
+ * methods as well as provide additional methods and fields.
+ *
+ * @author  Jonathan Payne
+ * @since   JDK1.0
+ */
+public
+class FilterOutputStream extends OutputStream {
+    /**
+     * The underlying output stream to be filtered.
+     */
+    protected OutputStream out;
+
+    /**
+     * Creates an output stream filter built on top of the specified
+     * underlying output stream.
+     *
+     * @param   out   the underlying output stream to be assigned to
+     *                the field <tt>this.out</tt> for later use, or
+     *                <code>null</code> if this instance is to be
+     *                created without an underlying stream.
+     */
+    public FilterOutputStream(OutputStream out) {
+        this.out = out;
+    }
+
+    /**
+     * Writes the specified <code>byte</code> to this output stream.
+     * <p>
+     * The <code>write</code> method of <code>FilterOutputStream</code>
+     * calls the <code>write</code> method of its underlying output stream,
+     * that is, it performs <tt>out.write(b)</tt>.
+     * <p>
+     * Implements the abstract <tt>write</tt> method of <tt>OutputStream</tt>.
+     *
+     * @param      b   the <code>byte</code>.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public void write(int b) throws IOException {
+        out.write(b);
+    }
+
+    /**
+     * Writes <code>b.length</code> bytes to this output stream.
+     * <p>
+     * The <code>write</code> method of <code>FilterOutputStream</code>
+     * calls its <code>write</code> method of three arguments with the
+     * arguments <code>b</code>, <code>0</code>, and
+     * <code>b.length</code>.
+     * <p>
+     * Note that this method does not call the one-argument
+     * <code>write</code> method of its underlying stream with the single
+     * argument <code>b</code>.
+     *
+     * @param      b   the data to be written.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#write(byte[], int, int)
+     */
+    public void write(byte b[]) throws IOException {
+        write(b, 0, b.length);
+    }
+
+    /**
+     * Writes <code>len</code> bytes from the specified
+     * <code>byte</code> array starting at offset <code>off</code> to
+     * this output stream.
+     * <p>
+     * The <code>write</code> method of <code>FilterOutputStream</code>
+     * calls the <code>write</code> method of one argument on each
+     * <code>byte</code> to output.
+     * <p>
+     * Note that this method does not call the <code>write</code> method
+     * of its underlying input stream with the same arguments. Subclasses
+     * of <code>FilterOutputStream</code> should provide a more efficient
+     * implementation of this method.
+     *
+     * @param      b     the data.
+     * @param      off   the start offset in the data.
+     * @param      len   the number of bytes to write.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#write(int)
+     */
+    public void write(byte b[], int off, int len) throws IOException {
+        if ((off | len | (b.length - (len + off)) | (off + len)) < 0)
+            throw new IndexOutOfBoundsException();
+
+        for (int i = 0 ; i < len ; i++) {
+            write(b[off + i]);
+        }
+    }
+
+    /**
+     * Flushes this output stream and forces any buffered output bytes
+     * to be written out to the stream.
+     * <p>
+     * The <code>flush</code> method of <code>FilterOutputStream</code>
+     * calls the <code>flush</code> method of its underlying output stream.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#out
+     */
+    public void flush() throws IOException {
+        out.flush();
+    }
+
+    /**
+     * Closes this output stream and releases any system resources
+     * associated with the stream.
+     * <p>
+     * The <code>close</code> method of <code>FilterOutputStream</code>
+     * calls its <code>flush</code> method, and then calls the
+     * <code>close</code> method of its underlying output stream.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterOutputStream#flush()
+     * @see        java.io.FilterOutputStream#out
+     */
+    public void close() throws IOException {
+        try {
+          flush();
+        } catch (IOException ignored) {
+        }
+        out.close();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/Flushable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/Flushable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import java.io.IOException;
+
+/**
+ * A <tt>Flushable</tt> is a destination of data that can be flushed.  The
+ * flush method is invoked to write any buffered output to the underlying
+ * stream.
+ *
+ * @since 1.5
+ */
+
+public interface Flushable {
+
+    /**
+     * Flushes this stream by writing any buffered output to the underlying
+     * stream.
+     *
+     * @throws IOException If an I/O error occurs
+     */
+    void flush() throws IOException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/InputStreamReader.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/InputStreamReader.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+
+/**
+ * An InputStreamReader is a bridge from byte streams to character streams: It
+ * reads bytes and decodes them into characters using a specified {@link
+ * java.nio.charset.Charset <code>charset</code>}.  The charset that it uses
+ * may be specified by name or may be given explicitly, or the platform's
+ * default charset may be accepted.
+ *
+ * <p> Each invocation of one of an InputStreamReader's read() methods may
+ * cause one or more bytes to be read from the underlying byte-input stream.
+ * To enable the efficient conversion of bytes to characters, more bytes may
+ * be read ahead from the underlying stream than are necessary to satisfy the
+ * current read operation.
+ *
+ * <p> For top efficiency, consider wrapping an InputStreamReader within a
+ * BufferedReader.  For example:
+ *
+ * <pre>
+ * BufferedReader in
+ *   = new BufferedReader(new InputStreamReader(System.in));
+ * </pre>
+ *
+ * @see BufferedReader
+ * @see InputStream
+ * @see java.nio.charset.Charset
+ *
+ * @author      Mark Reinhold
+ * @since       JDK1.1
+ */
+
+public class InputStreamReader extends Reader {
+
+    /**
+     * Creates an InputStreamReader that uses the default charset.
+     *
+     * @param  in   An InputStream
+     */
+    public InputStreamReader(InputStream in) {
+        super(in);
+    }
+
+    /**
+     * Creates an InputStreamReader that uses the named charset.
+     *
+     * @param  in
+     *         An InputStream
+     *
+     * @param  charsetName
+     *         The name of a supported
+     *         {@link java.nio.charset.Charset </code>charset<code>}
+     *
+     * @exception  UnsupportedEncodingException
+     *             If the named charset is not supported
+     */
+    public InputStreamReader(InputStream in, String charsetName)
+        throws UnsupportedEncodingException
+    {
+        super(in);
+        if (!charsetName.toUpperCase().equals("UTF-8")) {
+            throw new UnsupportedEncodingException(charsetName);
+        }
+    }
+
+    /**
+     * Creates an InputStreamReader that uses the given charset. </p>
+     *
+     * @param  in       An InputStream
+     * @param  cs       A charset
+     *
+     * @since 1.4
+     * @spec JSR-51
+     */
+/* XXX:
+    public InputStreamReader(InputStream in, Charset cs) {
+        super(in);
+        if (cs == null)
+            throw new NullPointerException("charset");
+        sd = StreamDecoder.forInputStreamReader(in, this, cs);
+    }
+*/
+    /**
+     * Creates an InputStreamReader that uses the given charset decoder.  </p>
+     *
+     * @param  in       An InputStream
+     * @param  dec      A charset decoder
+     *
+     * @since 1.4
+     * @spec JSR-51
+     */
+/* XXX:
+    public InputStreamReader(InputStream in, CharsetDecoder dec) {
+        super(in);
+        if (dec == null)
+            throw new NullPointerException("charset decoder");
+        sd = StreamDecoder.forInputStreamReader(in, this, dec);
+    }
+*/
+    
+    /**
+     * Returns the name of the character encoding being used by this stream.
+     *
+     * <p> If the encoding has an historical name then that name is returned;
+     * otherwise the encoding's canonical name is returned.
+     *
+     * <p> If this instance was created with the {@link
+     * #InputStreamReader(InputStream, String)} constructor then the returned
+     * name, being unique for the encoding, may differ from the name passed to
+     * the constructor. This method will return <code>null</code> if the
+     * stream has been closed.
+     * </p>
+     * @return The historical name of this encoding, or
+     *         <code>null</code> if the stream has been closed
+     *
+     * @see java.nio.charset.Charset
+     *
+     * @revised 1.4
+     * @spec JSR-51
+     */
+    public String getEncoding() {
+        return "UTF-8";
+    }
+
+    /**
+     * Reads a single character.
+     *
+     * @return The character read, or -1 if the end of the stream has been
+     *         reached
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    public int read() throws IOException {
+        final InputStream is = (InputStream)lock;
+        int c = is.read();
+        if (c == -1) {
+            return -1;
+        }
+        c = (int) c & 0xff;
+        switch (c >> 4) {
+            case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
+                /* 0xxxxxxx*/
+                return c;
+            case 12: case 13: {
+                /* 110x xxxx   10xx xxxx*/
+                int char2 = (int) is.read();
+                if ((char2 & 0xC0) != 0x80)
+                    throw new UTFDataFormatException("malformed input");
+                return (((c & 0x1F) << 6) | (char2 & 0x3F));
+            }
+            case 14: {
+                /* 1110 xxxx  10xx xxxx  10xx xxxx */
+                int char2 = is.read();
+                int char3 = is.read();
+                if (((char2 & 0xC0) != 0x80) || ((char3 & 0xC0) != 0x80))
+                    throw new UTFDataFormatException("malformed input");
+                return (((c    & 0x0F) << 12) |
+                       ((char2 & 0x3F) << 6)  |
+                       ((char3 & 0x3F) << 0));
+            }
+            default:
+                /* 10xx xxxx,  1111 xxxx */
+                throw new UTFDataFormatException("malformed input");
+        }
+    }
+    
+    /**
+     * Reads characters into a portion of an array.
+     *
+     * @param      cbuf     Destination buffer
+     * @param      offset   Offset at which to start storing characters
+     * @param      length   Maximum number of characters to read
+     *
+     * @return     The number of characters read, or -1 if the end of the
+     *             stream has been reached
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    public int read(char cbuf[], int offset, int length) throws IOException {
+        for (int i = 0; i < length; i++) {
+            int ch = read();
+            if (ch == -1) {
+                if (i == 0) return -1;
+                return i;
+            }
+            cbuf[offset++] = (char) ch;
+        }
+        return length;
+    }
+
+    /**
+     * Tells whether this stream is ready to be read.  An InputStreamReader is
+     * ready if its input buffer is not empty, or if bytes are available to be
+     * read from the underlying byte stream.
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    public boolean ready() throws IOException {
+        return ((InputStream)lock).available() > 0;
+    }
+
+    public void close() throws IOException {
+        ((InputStream)lock).close();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/InvalidClassException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/InvalidClassException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Thrown when the Serialization runtime detects one of the following
+ * problems with a Class.
+ * <UL>
+ * <LI> The serial version of the class does not match that of the class
+ *      descriptor read from the stream
+ * <LI> The class contains unknown datatypes
+ * <LI> The class does not have an accessible no-arg constructor
+ * </UL>
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public class InvalidClassException extends ObjectStreamException {
+
+    private static final long serialVersionUID = -4333316296251054416L;
+
+    /**
+     * Name of the invalid class.
+     *
+     * @serial Name of the invalid class.
+     */
+    public String classname;
+
+    /**
+     * Report an InvalidClassException for the reason specified.
+     *
+     * @param reason  String describing the reason for the exception.
+     */
+    public InvalidClassException(String reason) {
+        super(reason);
+    }
+
+    /**
+     * Constructs an InvalidClassException object.
+     *
+     * @param cname   a String naming the invalid class.
+     * @param reason  a String describing the reason for the exception.
+     */
+    public InvalidClassException(String cname, String reason) {
+        super(reason);
+        classname = cname;
+    }
+
+    /**
+     * Produce the message and include the classname, if present.
+     */
+    public String getMessage() {
+        if (classname == null)
+            return super.getMessage();
+        else
+            return classname + "; " + super.getMessage();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/InvalidObjectException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/InvalidObjectException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Indicates that one or more deserialized objects failed validation
+ * tests.  The argument should provide the reason for the failure.
+ *
+ * @see ObjectInputValidation
+ * @since JDK1.1
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public class InvalidObjectException extends ObjectStreamException {
+
+    private static final long serialVersionUID = 3233174318281839583L;
+
+    /**
+     * Constructs an <code>InvalidObjectException</code>.
+     * @param reason Detailed message explaining the reason for the failure.
+     *
+     * @see ObjectInputValidation
+     */
+    public  InvalidObjectException(String reason) {
+        super(reason);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/NotActiveException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/NotActiveException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Thrown when serialization or deserialization is not active.
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public class NotActiveException extends ObjectStreamException {
+
+    private static final long serialVersionUID = -3893467273049808895L;
+
+    /**
+     * Constructor to create a new NotActiveException with the reason given.
+     *
+     * @param reason  a String describing the reason for the exception.
+     */
+    public NotActiveException(String reason) {
+        super(reason);
+    }
+
+    /**
+     * Constructor to create a new NotActiveException without a reason.
+     */
+    public NotActiveException() {
+        super();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/NotSerializableException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/NotSerializableException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Thrown when an instance is required to have a Serializable interface.
+ * The serialization runtime or the class of the instance can throw
+ * this exception. The argument should be the name of the class.
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public class NotSerializableException extends ObjectStreamException {
+
+    private static final long serialVersionUID = 2906642554793891381L;
+
+    /**
+     * Constructs a NotSerializableException object with message string.
+     *
+     * @param classname Class of the instance being serialized/deserialized.
+     */
+    public NotSerializableException(String classname) {
+        super(classname);
+    }
+
+    /**
+     *  Constructs a NotSerializableException object.
+     */
+    public NotSerializableException() {
+        super();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectInput.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectInput.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * ObjectInput extends the DataInput interface to include the reading of
+ * objects. DataInput includes methods for the input of primitive types,
+ * ObjectInput extends that interface to include objects, arrays, and Strings.
+ *
+ * @author  unascribed
+ * @see java.io.InputStream
+ * @see java.io.ObjectOutputStream
+ * @see java.io.ObjectInputStream
+ * @since   JDK1.1
+ */
+public interface ObjectInput extends DataInput, AutoCloseable {
+    /**
+     * Read and return an object. The class that implements this interface
+     * defines where the object is "read" from.
+     *
+     * @return the object read from the stream
+     * @exception java.lang.ClassNotFoundException If the class of a serialized
+     *      object cannot be found.
+     * @exception IOException If any of the usual Input/Output
+     * related exceptions occur.
+     */
+    public Object readObject()
+        throws ClassNotFoundException, IOException;
+
+    /**
+     * Reads a byte of data. This method will block if no input is
+     * available.
+     * @return  the byte read, or -1 if the end of the
+     *          stream is reached.
+     * @exception IOException If an I/O error has occurred.
+     */
+    public int read() throws IOException;
+
+    /**
+     * Reads into an array of bytes.  This method will
+     * block until some input is available.
+     * @param b the buffer into which the data is read
+     * @return  the actual number of bytes read, -1 is
+     *          returned when the end of the stream is reached.
+     * @exception IOException If an I/O error has occurred.
+     */
+    public int read(byte b[]) throws IOException;
+
+    /**
+     * Reads into an array of bytes.  This method will
+     * block until some input is available.
+     * @param b the buffer into which the data is read
+     * @param off the start offset of the data
+     * @param len the maximum number of bytes read
+     * @return  the actual number of bytes read, -1 is
+     *          returned when the end of the stream is reached.
+     * @exception IOException If an I/O error has occurred.
+     */
+    public int read(byte b[], int off, int len) throws IOException;
+
+    /**
+     * Skips n bytes of input.
+     * @param n the number of bytes to be skipped
+     * @return  the actual number of bytes skipped.
+     * @exception IOException If an I/O error has occurred.
+     */
+    public long skip(long n) throws IOException;
+
+    /**
+     * Returns the number of bytes that can be read
+     * without blocking.
+     * @return the number of available bytes.
+     * @exception IOException If an I/O error has occurred.
+     */
+    public int available() throws IOException;
+
+    /**
+     * Closes the input stream. Must be called
+     * to release any resources associated with
+     * the stream.
+     * @exception IOException If an I/O error has occurred.
+     */
+    public void close() throws IOException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,3357 @@
+/*
+ * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashMap;
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * An ObjectInputStream deserializes primitive data and objects previously
+ * written using an ObjectOutputStream.
+ *
+ * <p>ObjectOutputStream and ObjectInputStream can provide an application with
+ * persistent storage for graphs of objects when used with a FileOutputStream
+ * and FileInputStream respectively.  ObjectInputStream is used to recover
+ * those objects previously serialized. Other uses include passing objects
+ * between hosts using a socket stream or for marshaling and unmarshaling
+ * arguments and parameters in a remote communication system.
+ *
+ * <p>ObjectInputStream ensures that the types of all objects in the graph
+ * created from the stream match the classes present in the Java Virtual
+ * Machine.  Classes are loaded as required using the standard mechanisms.
+ *
+ * <p>Only objects that support the java.io.Serializable or
+ * java.io.Externalizable interface can be read from streams.
+ *
+ * <p>The method <code>readObject</code> is used to read an object from the
+ * stream.  Java's safe casting should be used to get the desired type.  In
+ * Java, strings and arrays are objects and are treated as objects during
+ * serialization. When read they need to be cast to the expected type.
+ *
+ * <p>Primitive data types can be read from the stream using the appropriate
+ * method on DataInput.
+ *
+ * <p>The default deserialization mechanism for objects restores the contents
+ * of each field to the value and type it had when it was written.  Fields
+ * declared as transient or static are ignored by the deserialization process.
+ * References to other objects cause those objects to be read from the stream
+ * as necessary.  Graphs of objects are restored correctly using a reference
+ * sharing mechanism.  New objects are always allocated when deserializing,
+ * which prevents existing objects from being overwritten.
+ *
+ * <p>Reading an object is analogous to running the constructors of a new
+ * object.  Memory is allocated for the object and initialized to zero (NULL).
+ * No-arg constructors are invoked for the non-serializable classes and then
+ * the fields of the serializable classes are restored from the stream starting
+ * with the serializable class closest to java.lang.object and finishing with
+ * the object's most specific class.
+ *
+ * <p>For example to read from a stream as written by the example in
+ * ObjectOutputStream:
+ * <br>
+ * <pre>
+ *      FileInputStream fis = new FileInputStream("t.tmp");
+ *      ObjectInputStream ois = new ObjectInputStream(fis);
+ *
+ *      int i = ois.readInt();
+ *      String today = (String) ois.readObject();
+ *      Date date = (Date) ois.readObject();
+ *
+ *      ois.close();
+ * </pre>
+ *
+ * <p>Classes control how they are serialized by implementing either the
+ * java.io.Serializable or java.io.Externalizable interfaces.
+ *
+ * <p>Implementing the Serializable interface allows object serialization to
+ * save and restore the entire state of the object and it allows classes to
+ * evolve between the time the stream is written and the time it is read.  It
+ * automatically traverses references between objects, saving and restoring
+ * entire graphs.
+ *
+ * <p>Serializable classes that require special handling during the
+ * serialization and deserialization process should implement the following
+ * methods:<p>
+ *
+ * <pre>
+ * private void writeObject(java.io.ObjectOutputStream stream)
+ *     throws IOException;
+ * private void readObject(java.io.ObjectInputStream stream)
+ *     throws IOException, ClassNotFoundException;
+ * private void readObjectNoData()
+ *     throws ObjectStreamException;
+ * </pre>
+ *
+ * <p>The readObject method is responsible for reading and restoring the state
+ * of the object for its particular class using data written to the stream by
+ * the corresponding writeObject method.  The method does not need to concern
+ * itself with the state belonging to its superclasses or subclasses.  State is
+ * restored by reading data from the ObjectInputStream for the individual
+ * fields and making assignments to the appropriate fields of the object.
+ * Reading primitive data types is supported by DataInput.
+ *
+ * <p>Any attempt to read object data which exceeds the boundaries of the
+ * custom data written by the corresponding writeObject method will cause an
+ * OptionalDataException to be thrown with an eof field value of true.
+ * Non-object reads which exceed the end of the allotted data will reflect the
+ * end of data in the same way that they would indicate the end of the stream:
+ * bytewise reads will return -1 as the byte read or number of bytes read, and
+ * primitive reads will throw EOFExceptions.  If there is no corresponding
+ * writeObject method, then the end of default serialized data marks the end of
+ * the allotted data.
+ *
+ * <p>Primitive and object read calls issued from within a readExternal method
+ * behave in the same manner--if the stream is already positioned at the end of
+ * data written by the corresponding writeExternal method, object reads will
+ * throw OptionalDataExceptions with eof set to true, bytewise reads will
+ * return -1, and primitive reads will throw EOFExceptions.  Note that this
+ * behavior does not hold for streams written with the old
+ * <code>ObjectStreamConstants.PROTOCOL_VERSION_1</code> protocol, in which the
+ * end of data written by writeExternal methods is not demarcated, and hence
+ * cannot be detected.
+ *
+ * <p>The readObjectNoData method is responsible for initializing the state of
+ * the object for its particular class in the event that the serialization
+ * stream does not list the given class as a superclass of the object being
+ * deserialized.  This may occur in cases where the receiving party uses a
+ * different version of the deserialized instance's class than the sending
+ * party, and the receiver's version extends classes that are not extended by
+ * the sender's version.  This may also occur if the serialization stream has
+ * been tampered; hence, readObjectNoData is useful for initializing
+ * deserialized objects properly despite a "hostile" or incomplete source
+ * stream.
+ *
+ * <p>Serialization does not read or assign values to the fields of any object
+ * that does not implement the java.io.Serializable interface.  Subclasses of
+ * Objects that are not serializable can be serializable. In this case the
+ * non-serializable class must have a no-arg constructor to allow its fields to
+ * be initialized.  In this case it is the responsibility of the subclass to
+ * save and restore the state of the non-serializable class. It is frequently
+ * the case that the fields of that class are accessible (public, package, or
+ * protected) or that there are get and set methods that can be used to restore
+ * the state.
+ *
+ * <p>Any exception that occurs while deserializing an object will be caught by
+ * the ObjectInputStream and abort the reading process.
+ *
+ * <p>Implementing the Externalizable interface allows the object to assume
+ * complete control over the contents and format of the object's serialized
+ * form.  The methods of the Externalizable interface, writeExternal and
+ * readExternal, are called to save and restore the objects state.  When
+ * implemented by a class they can write and read their own state using all of
+ * the methods of ObjectOutput and ObjectInput.  It is the responsibility of
+ * the objects to handle any versioning that occurs.
+ *
+ * <p>Enum constants are deserialized differently than ordinary serializable or
+ * externalizable objects.  The serialized form of an enum constant consists
+ * solely of its name; field values of the constant are not transmitted.  To
+ * deserialize an enum constant, ObjectInputStream reads the constant name from
+ * the stream; the deserialized constant is then obtained by calling the static
+ * method <code>Enum.valueOf(Class, String)</code> with the enum constant's
+ * base type and the received constant name as arguments.  Like other
+ * serializable or externalizable objects, enum constants can function as the
+ * targets of back references appearing subsequently in the serialization
+ * stream.  The process by which enum constants are deserialized cannot be
+ * customized: any class-specific readObject, readObjectNoData, and readResolve
+ * methods defined by enum types are ignored during deserialization.
+ * Similarly, any serialPersistentFields or serialVersionUID field declarations
+ * are also ignored--all enum types have a fixed serialVersionUID of 0L.
+ *
+ * @author      Mike Warres
+ * @author      Roger Riggs
+ * @see java.io.DataInput
+ * @see java.io.ObjectOutputStream
+ * @see java.io.Serializable
+ * @see <a href="../../../platform/serialization/spec/input.html"> Object Serialization Specification, Section 3, Object Input Classes</a>
+ * @since   JDK1.1
+ */
+public class ObjectInputStream
+    extends InputStream implements ObjectInput, ObjectStreamConstants
+{
+    /** handle value representing null */
+    private static final int NULL_HANDLE = -1;
+
+    /** marker for unshared objects in internal handle table */
+    private static final Object unsharedMarker = new Object();
+
+    /** table mapping primitive type names to corresponding class objects */
+    private static final HashMap<String, Class<?>> primClasses
+        = new HashMap<>(8, 1.0F);
+    static {
+        primClasses.put("boolean", boolean.class);
+        primClasses.put("byte", byte.class);
+        primClasses.put("char", char.class);
+        primClasses.put("short", short.class);
+        primClasses.put("int", int.class);
+        primClasses.put("long", long.class);
+        primClasses.put("float", float.class);
+        primClasses.put("double", double.class);
+        primClasses.put("void", void.class);
+    }
+
+    /** filter stream for handling block data conversion */
+    private final BlockDataInputStream bin;
+    /** validation callback list */
+    private final ValidationList vlist;
+    /** recursion depth */
+    private int depth;
+    /** whether stream is closed */
+    private boolean closed;
+
+    /** wire handle -> obj/exception map */
+    private final HandleTable handles;
+    /** scratch field for passing handle values up/down call stack */
+    private int passHandle = NULL_HANDLE;
+    /** flag set when at end of field value block with no TC_ENDBLOCKDATA */
+    private boolean defaultDataEnd = false;
+
+    /** buffer for reading primitive field values */
+    private byte[] primVals;
+
+    /** if true, invoke readObjectOverride() instead of readObject() */
+    private final boolean enableOverride;
+    /** if true, invoke resolveObject() */
+    private boolean enableResolve;
+
+    /**
+     * Context during upcalls to class-defined readObject methods; holds
+     * object currently being deserialized and descriptor for current class.
+     * Null when not during readObject upcall.
+     */
+    private Object curContext;
+
+    /**
+     * Creates an ObjectInputStream that reads from the specified InputStream.
+     * A serialization stream header is read from the stream and verified.
+     * This constructor will block until the corresponding ObjectOutputStream
+     * has written and flushed the header.
+     *
+     * <p>If a security manager is installed, this constructor will check for
+     * the "enableSubclassImplementation" SerializablePermission when invoked
+     * directly or indirectly by the constructor of a subclass which overrides
+     * the ObjectInputStream.readFields or ObjectInputStream.readUnshared
+     * methods.
+     *
+     * @param   in input stream to read from
+     * @throws  StreamCorruptedException if the stream header is incorrect
+     * @throws  IOException if an I/O error occurs while reading stream header
+     * @throws  SecurityException if untrusted subclass illegally overrides
+     *          security-sensitive methods
+     * @throws  NullPointerException if <code>in</code> is <code>null</code>
+     * @see     ObjectInputStream#ObjectInputStream()
+     * @see     ObjectInputStream#readFields()
+     * @see     ObjectOutputStream#ObjectOutputStream(OutputStream)
+     */
+    public ObjectInputStream(InputStream in) throws IOException {
+        verifySubclass();
+        bin = new BlockDataInputStream(in);
+        handles = new HandleTable(10);
+        vlist = new ValidationList();
+        enableOverride = false;
+        readStreamHeader();
+        bin.setBlockDataMode(true);
+    }
+
+    /**
+     * Provide a way for subclasses that are completely reimplementing
+     * ObjectInputStream to not have to allocate private data just used by this
+     * implementation of ObjectInputStream.
+     *
+     * <p>If there is a security manager installed, this method first calls the
+     * security manager's <code>checkPermission</code> method with the
+     * <code>SerializablePermission("enableSubclassImplementation")</code>
+     * permission to ensure it's ok to enable subclassing.
+     *
+     * @throws  SecurityException if a security manager exists and its
+     *          <code>checkPermission</code> method denies enabling
+     *          subclassing.
+     * @see SecurityManager#checkPermission
+     * @see java.io.SerializablePermission
+     */
+    protected ObjectInputStream() throws IOException, SecurityException {
+        throw new SecurityException();
+    }
+
+    /**
+     * Read an object from the ObjectInputStream.  The class of the object, the
+     * signature of the class, and the values of the non-transient and
+     * non-static fields of the class and all of its supertypes are read.
+     * Default deserializing for a class can be overriden using the writeObject
+     * and readObject methods.  Objects referenced by this object are read
+     * transitively so that a complete equivalent graph of objects is
+     * reconstructed by readObject.
+     *
+     * <p>The root object is completely restored when all of its fields and the
+     * objects it references are completely restored.  At this point the object
+     * validation callbacks are executed in order based on their registered
+     * priorities. The callbacks are registered by objects (in the readObject
+     * special methods) as they are individually restored.
+     *
+     * <p>Exceptions are thrown for problems with the InputStream and for
+     * classes that should not be deserialized.  All exceptions are fatal to
+     * the InputStream and leave it in an indeterminate state; it is up to the
+     * caller to ignore or recover the stream state.
+     *
+     * @throws  ClassNotFoundException Class of a serialized object cannot be
+     *          found.
+     * @throws  InvalidClassException Something is wrong with a class used by
+     *          serialization.
+     * @throws  StreamCorruptedException Control information in the
+     *          stream is inconsistent.
+     * @throws  OptionalDataException Primitive data was found in the
+     *          stream instead of objects.
+     * @throws  IOException Any of the usual Input/Output related exceptions.
+     */
+    public final Object readObject()
+        throws IOException, ClassNotFoundException
+    {
+        throw new IOException();
+    }
+
+    /**
+     * This method is called by trusted subclasses of ObjectOutputStream that
+     * constructed ObjectOutputStream using the protected no-arg constructor.
+     * The subclass is expected to provide an override method with the modifier
+     * "final".
+     *
+     * @return  the Object read from the stream.
+     * @throws  ClassNotFoundException Class definition of a serialized object
+     *          cannot be found.
+     * @throws  OptionalDataException Primitive data was found in the stream
+     *          instead of objects.
+     * @throws  IOException if I/O errors occurred while reading from the
+     *          underlying stream
+     * @see #ObjectInputStream()
+     * @see #readObject()
+     * @since 1.2
+     */
+    protected Object readObjectOverride()
+        throws IOException, ClassNotFoundException
+    {
+        return null;
+    }
+
+    /**
+     * Reads an "unshared" object from the ObjectInputStream.  This method is
+     * identical to readObject, except that it prevents subsequent calls to
+     * readObject and readUnshared from returning additional references to the
+     * deserialized instance obtained via this call.  Specifically:
+     * <ul>
+     *   <li>If readUnshared is called to deserialize a back-reference (the
+     *       stream representation of an object which has been written
+     *       previously to the stream), an ObjectStreamException will be
+     *       thrown.
+     *
+     *   <li>If readUnshared returns successfully, then any subsequent attempts
+     *       to deserialize back-references to the stream handle deserialized
+     *       by readUnshared will cause an ObjectStreamException to be thrown.
+     * </ul>
+     * Deserializing an object via readUnshared invalidates the stream handle
+     * associated with the returned object.  Note that this in itself does not
+     * always guarantee that the reference returned by readUnshared is unique;
+     * the deserialized object may define a readResolve method which returns an
+     * object visible to other parties, or readUnshared may return a Class
+     * object or enum constant obtainable elsewhere in the stream or through
+     * external means. If the deserialized object defines a readResolve method
+     * and the invocation of that method returns an array, then readUnshared
+     * returns a shallow clone of that array; this guarantees that the returned
+     * array object is unique and cannot be obtained a second time from an
+     * invocation of readObject or readUnshared on the ObjectInputStream,
+     * even if the underlying data stream has been manipulated.
+     *
+     * <p>ObjectInputStream subclasses which override this method can only be
+     * constructed in security contexts possessing the
+     * "enableSubclassImplementation" SerializablePermission; any attempt to
+     * instantiate such a subclass without this permission will cause a
+     * SecurityException to be thrown.
+     *
+     * @return  reference to deserialized object
+     * @throws  ClassNotFoundException if class of an object to deserialize
+     *          cannot be found
+     * @throws  StreamCorruptedException if control information in the stream
+     *          is inconsistent
+     * @throws  ObjectStreamException if object to deserialize has already
+     *          appeared in stream
+     * @throws  OptionalDataException if primitive data is next in stream
+     * @throws  IOException if an I/O error occurs during deserialization
+     * @since   1.4
+     */
+    public Object readUnshared() throws IOException, ClassNotFoundException {
+        // if nested read, passHandle contains handle of enclosing object
+        int outerHandle = passHandle;
+        try {
+            Object obj = readObject0(true);
+            handles.markDependency(outerHandle, passHandle);
+            ClassNotFoundException ex = handles.lookupException(passHandle);
+            if (ex != null) {
+                throw ex;
+            }
+            if (depth == 0) {
+                vlist.doCallbacks();
+            }
+            return obj;
+        } finally {
+            passHandle = outerHandle;
+            if (closed && depth == 0) {
+                clear();
+            }
+        }
+    }
+
+    /**
+     * Read the non-static and non-transient fields of the current class from
+     * this stream.  This may only be called from the readObject method of the
+     * class being deserialized. It will throw the NotActiveException if it is
+     * called otherwise.
+     *
+     * @throws  ClassNotFoundException if the class of a serialized object
+     *          could not be found.
+     * @throws  IOException if an I/O error occurs.
+     * @throws  NotActiveException if the stream is not currently reading
+     *          objects.
+     */
+    public void defaultReadObject()
+        throws IOException, ClassNotFoundException
+    {
+        if (curContext == null) {
+            throw new NotActiveException("not in call to readObject");
+        }
+        Object curObj = null; // curContext.getObj();
+        ObjectStreamClass curDesc = null; // curContext.getDesc();
+        bin.setBlockDataMode(false);
+        defaultReadFields(curObj, curDesc);
+        bin.setBlockDataMode(true);
+        if (!curDesc.hasWriteObjectData()) {
+            /*
+             * Fix for 4360508: since stream does not contain terminating
+             * TC_ENDBLOCKDATA tag, set flag so that reading code elsewhere
+             * knows to simulate end-of-custom-data behavior.
+             */
+            defaultDataEnd = true;
+        }
+        ClassNotFoundException ex = handles.lookupException(passHandle);
+        if (ex != null) {
+            throw ex;
+        }
+    }
+
+    /**
+     * Reads the persistent fields from the stream and makes them available by
+     * name.
+     *
+     * @return  the <code>GetField</code> object representing the persistent
+     *          fields of the object being deserialized
+     * @throws  ClassNotFoundException if the class of a serialized object
+     *          could not be found.
+     * @throws  IOException if an I/O error occurs.
+     * @throws  NotActiveException if the stream is not currently reading
+     *          objects.
+     * @since 1.2
+     */
+    public ObjectInputStream.GetField readFields()
+        throws IOException, ClassNotFoundException
+    {
+        if (curContext == null) {
+            throw new NotActiveException("not in call to readObject");
+        }
+        Object curObj = null; // curContext.getObj();
+        ObjectStreamClass curDesc = null; // curContext.getDesc();
+        bin.setBlockDataMode(false);
+        GetFieldImpl getField = new GetFieldImpl(curDesc);
+        getField.readFields();
+        bin.setBlockDataMode(true);
+        if (!curDesc.hasWriteObjectData()) {
+            /*
+             * Fix for 4360508: since stream does not contain terminating
+             * TC_ENDBLOCKDATA tag, set flag so that reading code elsewhere
+             * knows to simulate end-of-custom-data behavior.
+             */
+            defaultDataEnd = true;
+        }
+
+        return getField;
+    }
+
+    /**
+     * Register an object to be validated before the graph is returned.  While
+     * similar to resolveObject these validations are called after the entire
+     * graph has been reconstituted.  Typically, a readObject method will
+     * register the object with the stream so that when all of the objects are
+     * restored a final set of validations can be performed.
+     *
+     * @param   obj the object to receive the validation callback.
+     * @param   prio controls the order of callbacks;zero is a good default.
+     *          Use higher numbers to be called back earlier, lower numbers for
+     *          later callbacks. Within a priority, callbacks are processed in
+     *          no particular order.
+     * @throws  NotActiveException The stream is not currently reading objects
+     *          so it is invalid to register a callback.
+     * @throws  InvalidObjectException The validation object is null.
+     */
+    public void registerValidation(ObjectInputValidation obj, int prio)
+        throws NotActiveException, InvalidObjectException
+    {
+        if (depth == 0) {
+            throw new NotActiveException("stream inactive");
+        }
+        vlist.register(obj, prio);
+    }
+
+    /**
+     * Load the local class equivalent of the specified stream class
+     * description.  Subclasses may implement this method to allow classes to
+     * be fetched from an alternate source.
+     *
+     * <p>The corresponding method in <code>ObjectOutputStream</code> is
+     * <code>annotateClass</code>.  This method will be invoked only once for
+     * each unique class in the stream.  This method can be implemented by
+     * subclasses to use an alternate loading mechanism but must return a
+     * <code>Class</code> object. Once returned, if the class is not an array
+     * class, its serialVersionUID is compared to the serialVersionUID of the
+     * serialized class, and if there is a mismatch, the deserialization fails
+     * and an {@link InvalidClassException} is thrown.
+     *
+     * <p>The default implementation of this method in
+     * <code>ObjectInputStream</code> returns the result of calling
+     * <pre>
+     *     Class.forName(desc.getName(), false, loader)
+     * </pre>
+     * where <code>loader</code> is determined as follows: if there is a
+     * method on the current thread's stack whose declaring class was
+     * defined by a user-defined class loader (and was not a generated to
+     * implement reflective invocations), then <code>loader</code> is class
+     * loader corresponding to the closest such method to the currently
+     * executing frame; otherwise, <code>loader</code> is
+     * <code>null</code>. If this call results in a
+     * <code>ClassNotFoundException</code> and the name of the passed
+     * <code>ObjectStreamClass</code> instance is the Java language keyword
+     * for a primitive type or void, then the <code>Class</code> object
+     * representing that primitive type or void will be returned
+     * (e.g., an <code>ObjectStreamClass</code> with the name
+     * <code>"int"</code> will be resolved to <code>Integer.TYPE</code>).
+     * Otherwise, the <code>ClassNotFoundException</code> will be thrown to
+     * the caller of this method.
+     *
+     * @param   desc an instance of class <code>ObjectStreamClass</code>
+     * @return  a <code>Class</code> object corresponding to <code>desc</code>
+     * @throws  IOException any of the usual Input/Output exceptions.
+     * @throws  ClassNotFoundException if class of a serialized object cannot
+     *          be found.
+     */
+    protected Class<?> resolveClass(ObjectStreamClass desc)
+        throws IOException, ClassNotFoundException
+    {
+        String name = desc.getName();
+        try {
+            return Class.forName(name, false, latestUserDefinedLoader());
+        } catch (ClassNotFoundException ex) {
+            Class<?> cl = primClasses.get(name);
+            if (cl != null) {
+                return cl;
+            } else {
+                throw ex;
+            }
+        }
+    }
+
+    /**
+     * Returns a proxy class that implements the interfaces named in a proxy
+     * class descriptor; subclasses may implement this method to read custom
+     * data from the stream along with the descriptors for dynamic proxy
+     * classes, allowing them to use an alternate loading mechanism for the
+     * interfaces and the proxy class.
+     *
+     * <p>This method is called exactly once for each unique proxy class
+     * descriptor in the stream.
+     *
+     * <p>The corresponding method in <code>ObjectOutputStream</code> is
+     * <code>annotateProxyClass</code>.  For a given subclass of
+     * <code>ObjectInputStream</code> that overrides this method, the
+     * <code>annotateProxyClass</code> method in the corresponding subclass of
+     * <code>ObjectOutputStream</code> must write any data or objects read by
+     * this method.
+     *
+     * <p>The default implementation of this method in
+     * <code>ObjectInputStream</code> returns the result of calling
+     * <code>Proxy.getProxyClass</code> with the list of <code>Class</code>
+     * objects for the interfaces that are named in the <code>interfaces</code>
+     * parameter.  The <code>Class</code> object for each interface name
+     * <code>i</code> is the value returned by calling
+     * <pre>
+     *     Class.forName(i, false, loader)
+     * </pre>
+     * where <code>loader</code> is that of the first non-<code>null</code>
+     * class loader up the execution stack, or <code>null</code> if no
+     * non-<code>null</code> class loaders are on the stack (the same class
+     * loader choice used by the <code>resolveClass</code> method).  Unless any
+     * of the resolved interfaces are non-public, this same value of
+     * <code>loader</code> is also the class loader passed to
+     * <code>Proxy.getProxyClass</code>; if non-public interfaces are present,
+     * their class loader is passed instead (if more than one non-public
+     * interface class loader is encountered, an
+     * <code>IllegalAccessError</code> is thrown).
+     * If <code>Proxy.getProxyClass</code> throws an
+     * <code>IllegalArgumentException</code>, <code>resolveProxyClass</code>
+     * will throw a <code>ClassNotFoundException</code> containing the
+     * <code>IllegalArgumentException</code>.
+     *
+     * @param interfaces the list of interface names that were
+     *                deserialized in the proxy class descriptor
+     * @return  a proxy class for the specified interfaces
+     * @throws        IOException any exception thrown by the underlying
+     *                <code>InputStream</code>
+     * @throws        ClassNotFoundException if the proxy class or any of the
+     *                named interfaces could not be found
+     * @see ObjectOutputStream#annotateProxyClass(Class)
+     * @since 1.3
+     */
+    protected Class<?> resolveProxyClass(String[] interfaces)
+        throws IOException, ClassNotFoundException
+    {
+        ClassLoader latestLoader = latestUserDefinedLoader();
+        ClassLoader nonPublicLoader = null;
+        boolean hasNonPublicInterface = false;
+
+        // define proxy in class loader of non-public interface(s), if any
+        Class[] classObjs = new Class[interfaces.length];
+        for (int i = 0; i < interfaces.length; i++) {
+            Class cl = Class.forName(interfaces[i], false, latestLoader);
+            if ((cl.getModifiers() & Modifier.PUBLIC) == 0) {
+                if (hasNonPublicInterface) {
+                    if (nonPublicLoader != cl.getClassLoader()) {
+                        throw new IllegalAccessError(
+                            "conflicting non-public interface class loaders");
+                    }
+                } else {
+                    nonPublicLoader = cl.getClassLoader();
+                    hasNonPublicInterface = true;
+                }
+            }
+            classObjs[i] = cl;
+        }
+        try {
+            return Proxy.getProxyClass(
+                hasNonPublicInterface ? nonPublicLoader : latestLoader,
+                classObjs);
+        } catch (IllegalArgumentException e) {
+            throw new ClassNotFoundException(null, e);
+        }
+    }
+
+    /**
+     * This method will allow trusted subclasses of ObjectInputStream to
+     * substitute one object for another during deserialization. Replacing
+     * objects is disabled until enableResolveObject is called. The
+     * enableResolveObject method checks that the stream requesting to resolve
+     * object can be trusted. Every reference to serializable objects is passed
+     * to resolveObject.  To insure that the private state of objects is not
+     * unintentionally exposed only trusted streams may use resolveObject.
+     *
+     * <p>This method is called after an object has been read but before it is
+     * returned from readObject.  The default resolveObject method just returns
+     * the same object.
+     *
+     * <p>When a subclass is replacing objects it must insure that the
+     * substituted object is compatible with every field where the reference
+     * will be stored.  Objects whose type is not a subclass of the type of the
+     * field or array element abort the serialization by raising an exception
+     * and the object is not be stored.
+     *
+     * <p>This method is called only once when each object is first
+     * encountered.  All subsequent references to the object will be redirected
+     * to the new object.
+     *
+     * @param   obj object to be substituted
+     * @return  the substituted object
+     * @throws  IOException Any of the usual Input/Output exceptions.
+     */
+    protected Object resolveObject(Object obj) throws IOException {
+        return obj;
+    }
+
+    /**
+     * Enable the stream to allow objects read from the stream to be replaced.
+     * When enabled, the resolveObject method is called for every object being
+     * deserialized.
+     *
+     * <p>If <i>enable</i> is true, and there is a security manager installed,
+     * this method first calls the security manager's
+     * <code>checkPermission</code> method with the
+     * <code>SerializablePermission("enableSubstitution")</code> permission to
+     * ensure it's ok to enable the stream to allow objects read from the
+     * stream to be replaced.
+     *
+     * @param   enable true for enabling use of <code>resolveObject</code> for
+     *          every object being deserialized
+     * @return  the previous setting before this method was invoked
+     * @throws  SecurityException if a security manager exists and its
+     *          <code>checkPermission</code> method denies enabling the stream
+     *          to allow objects read from the stream to be replaced.
+     * @see SecurityManager#checkPermission
+     * @see java.io.SerializablePermission
+     */
+    protected boolean enableResolveObject(boolean enable)
+        throws SecurityException
+    {
+        throw new SecurityException();
+    }
+
+    /**
+     * The readStreamHeader method is provided to allow subclasses to read and
+     * verify their own stream headers. It reads and verifies the magic number
+     * and version number.
+     *
+     * @throws  IOException if there are I/O errors while reading from the
+     *          underlying <code>InputStream</code>
+     * @throws  StreamCorruptedException if control information in the stream
+     *          is inconsistent
+     */
+    protected void readStreamHeader()
+        throws IOException, StreamCorruptedException
+    {
+        short s0 = bin.readShort();
+        short s1 = bin.readShort();
+        if (s0 != STREAM_MAGIC || s1 != STREAM_VERSION) {
+            throw new StreamCorruptedException(
+                String.format("invalid stream header: %04X%04X", s0, s1));
+        }
+    }
+
+    /**
+     * Read a class descriptor from the serialization stream.  This method is
+     * called when the ObjectInputStream expects a class descriptor as the next
+     * item in the serialization stream.  Subclasses of ObjectInputStream may
+     * override this method to read in class descriptors that have been written
+     * in non-standard formats (by subclasses of ObjectOutputStream which have
+     * overridden the <code>writeClassDescriptor</code> method).  By default,
+     * this method reads class descriptors according to the format defined in
+     * the Object Serialization specification.
+     *
+     * @return  the class descriptor read
+     * @throws  IOException If an I/O error has occurred.
+     * @throws  ClassNotFoundException If the Class of a serialized object used
+     *          in the class descriptor representation cannot be found
+     * @see java.io.ObjectOutputStream#writeClassDescriptor(java.io.ObjectStreamClass)
+     * @since 1.3
+     */
+    protected ObjectStreamClass readClassDescriptor()
+        throws IOException, ClassNotFoundException
+    {
+        ObjectStreamClass desc = new ObjectStreamClass();
+        desc.readNonProxy(this);
+        return desc;
+    }
+
+    /**
+     * Reads a byte of data. This method will block if no input is available.
+     *
+     * @return  the byte read, or -1 if the end of the stream is reached.
+     * @throws  IOException If an I/O error has occurred.
+     */
+    public int read() throws IOException {
+        return bin.read();
+    }
+
+    /**
+     * Reads into an array of bytes.  This method will block until some input
+     * is available. Consider using java.io.DataInputStream.readFully to read
+     * exactly 'length' bytes.
+     *
+     * @param   buf the buffer into which the data is read
+     * @param   off the start offset of the data
+     * @param   len the maximum number of bytes read
+     * @return  the actual number of bytes read, -1 is returned when the end of
+     *          the stream is reached.
+     * @throws  IOException If an I/O error has occurred.
+     * @see java.io.DataInputStream#readFully(byte[],int,int)
+     */
+    public int read(byte[] buf, int off, int len) throws IOException {
+        if (buf == null) {
+            throw new NullPointerException();
+        }
+        int endoff = off + len;
+        if (off < 0 || len < 0 || endoff > buf.length || endoff < 0) {
+            throw new IndexOutOfBoundsException();
+        }
+        return bin.read(buf, off, len, false);
+    }
+
+    /**
+     * Returns the number of bytes that can be read without blocking.
+     *
+     * @return  the number of available bytes.
+     * @throws  IOException if there are I/O errors while reading from the
+     *          underlying <code>InputStream</code>
+     */
+    public int available() throws IOException {
+        return bin.available();
+    }
+
+    /**
+     * Closes the input stream. Must be called to release any resources
+     * associated with the stream.
+     *
+     * @throws  IOException If an I/O error has occurred.
+     */
+    public void close() throws IOException {
+        /*
+         * Even if stream already closed, propagate redundant close to
+         * underlying stream to stay consistent with previous implementations.
+         */
+        closed = true;
+        if (depth == 0) {
+            clear();
+        }
+        bin.close();
+    }
+
+    /**
+     * Reads in a boolean.
+     *
+     * @return  the boolean read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public boolean readBoolean() throws IOException {
+        return bin.readBoolean();
+    }
+
+    /**
+     * Reads an 8 bit byte.
+     *
+     * @return  the 8 bit byte read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public byte readByte() throws IOException  {
+        return bin.readByte();
+    }
+
+    /**
+     * Reads an unsigned 8 bit byte.
+     *
+     * @return  the 8 bit byte read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public int readUnsignedByte()  throws IOException {
+        return bin.readUnsignedByte();
+    }
+
+    /**
+     * Reads a 16 bit char.
+     *
+     * @return  the 16 bit char read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public char readChar()  throws IOException {
+        return bin.readChar();
+    }
+
+    /**
+     * Reads a 16 bit short.
+     *
+     * @return  the 16 bit short read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public short readShort()  throws IOException {
+        return bin.readShort();
+    }
+
+    /**
+     * Reads an unsigned 16 bit short.
+     *
+     * @return  the 16 bit short read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public int readUnsignedShort() throws IOException {
+        return bin.readUnsignedShort();
+    }
+
+    /**
+     * Reads a 32 bit int.
+     *
+     * @return  the 32 bit integer read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public int readInt()  throws IOException {
+        return bin.readInt();
+    }
+
+    /**
+     * Reads a 64 bit long.
+     *
+     * @return  the read 64 bit long.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public long readLong()  throws IOException {
+        return bin.readLong();
+    }
+
+    /**
+     * Reads a 32 bit float.
+     *
+     * @return  the 32 bit float read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public float readFloat() throws IOException {
+        return bin.readFloat();
+    }
+
+    /**
+     * Reads a 64 bit double.
+     *
+     * @return  the 64 bit double read.
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public double readDouble() throws IOException {
+        return bin.readDouble();
+    }
+
+    /**
+     * Reads bytes, blocking until all bytes are read.
+     *
+     * @param   buf the buffer into which the data is read
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public void readFully(byte[] buf) throws IOException {
+        bin.readFully(buf, 0, buf.length, false);
+    }
+
+    /**
+     * Reads bytes, blocking until all bytes are read.
+     *
+     * @param   buf the buffer into which the data is read
+     * @param   off the start offset of the data
+     * @param   len the maximum number of bytes to read
+     * @throws  EOFException If end of file is reached.
+     * @throws  IOException If other I/O error has occurred.
+     */
+    public void readFully(byte[] buf, int off, int len) throws IOException {
+        int endoff = off + len;
+        if (off < 0 || len < 0 || endoff > buf.length || endoff < 0) {
+            throw new IndexOutOfBoundsException();
+        }
+        bin.readFully(buf, off, len, false);
+    }
+
+    /**
+     * Skips bytes.
+     *
+     * @param   len the number of bytes to be skipped
+     * @return  the actual number of bytes skipped.
+     * @throws  IOException If an I/O error has occurred.
+     */
+    public int skipBytes(int len) throws IOException {
+        return bin.skipBytes(len);
+    }
+
+    /**
+     * Reads in a line that has been terminated by a \n, \r, \r\n or EOF.
+     *
+     * @return  a String copy of the line.
+     * @throws  IOException if there are I/O errors while reading from the
+     *          underlying <code>InputStream</code>
+     * @deprecated This method does not properly convert bytes to characters.
+     *          see DataInputStream for the details and alternatives.
+     */
+    @Deprecated
+    public String readLine() throws IOException {
+        return bin.readLine();
+    }
+
+    /**
+     * Reads a String in
+     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
+     * format.
+     *
+     * @return  the String.
+     * @throws  IOException if there are I/O errors while reading from the
+     *          underlying <code>InputStream</code>
+     * @throws  UTFDataFormatException if read bytes do not represent a valid
+     *          modified UTF-8 encoding of a string
+     */
+    public String readUTF() throws IOException {
+        return bin.readUTF();
+    }
+
+    /**
+     * Provide access to the persistent fields read from the input stream.
+     */
+    public static abstract class GetField {
+
+        /**
+         * Get the ObjectStreamClass that describes the fields in the stream.
+         *
+         * @return  the descriptor class that describes the serializable fields
+         */
+        public abstract ObjectStreamClass getObjectStreamClass();
+
+        /**
+         * Return true if the named field is defaulted and has no value in this
+         * stream.
+         *
+         * @param  name the name of the field
+         * @return true, if and only if the named field is defaulted
+         * @throws IOException if there are I/O errors while reading from
+         *         the underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if <code>name</code> does not
+         *         correspond to a serializable field
+         */
+        public abstract boolean defaulted(String name) throws IOException;
+
+        /**
+         * Get the value of the named boolean field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>boolean</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract boolean get(String name, boolean val)
+            throws IOException;
+
+        /**
+         * Get the value of the named byte field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>byte</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract byte get(String name, byte val) throws IOException;
+
+        /**
+         * Get the value of the named char field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>char</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract char get(String name, char val) throws IOException;
+
+        /**
+         * Get the value of the named short field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>short</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract short get(String name, short val) throws IOException;
+
+        /**
+         * Get the value of the named int field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>int</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract int get(String name, int val) throws IOException;
+
+        /**
+         * Get the value of the named long field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>long</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract long get(String name, long val) throws IOException;
+
+        /**
+         * Get the value of the named float field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>float</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract float get(String name, float val) throws IOException;
+
+        /**
+         * Get the value of the named double field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>double</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract double get(String name, double val) throws IOException;
+
+        /**
+         * Get the value of the named Object field from the persistent field.
+         *
+         * @param  name the name of the field
+         * @param  val the default value to use if <code>name</code> does not
+         *         have a value
+         * @return the value of the named <code>Object</code> field
+         * @throws IOException if there are I/O errors while reading from the
+         *         underlying <code>InputStream</code>
+         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         not serializable or if the field type is incorrect
+         */
+        public abstract Object get(String name, Object val) throws IOException;
+    }
+
+    /**
+     * Verifies that this (possibly subclass) instance can be constructed
+     * without violating security constraints: the subclass must not override
+     * security-sensitive non-final methods, or else the
+     * "enableSubclassImplementation" SerializablePermission is checked.
+     */
+    private void verifySubclass() {
+        Class cl = getClass();
+        if (cl == ObjectInputStream.class) {
+            return;
+        }
+        throw new SecurityException();
+    }
+
+    /**
+     * Clears internal data structures.
+     */
+    private void clear() {
+        handles.clear();
+        vlist.clear();
+    }
+
+    /**
+     * Underlying readObject implementation.
+     */
+    private Object readObject0(boolean unshared) throws IOException {
+        boolean oldMode = bin.getBlockDataMode();
+        if (oldMode) {
+            int remain = bin.currentBlockRemaining();
+            if (remain > 0) {
+                throw new OptionalDataException(remain);
+            } else if (defaultDataEnd) {
+                /*
+                 * Fix for 4360508: stream is currently at the end of a field
+                 * value block written via default serialization; since there
+                 * is no terminating TC_ENDBLOCKDATA tag, simulate
+                 * end-of-custom-data behavior explicitly.
+                 */
+                throw new OptionalDataException(true);
+            }
+            bin.setBlockDataMode(false);
+        }
+
+        byte tc;
+        while ((tc = bin.peekByte()) == TC_RESET) {
+            bin.readByte();
+            handleReset();
+        }
+
+        depth++;
+        try {
+            switch (tc) {
+                case TC_NULL:
+                    return readNull();
+
+                case TC_REFERENCE:
+                    return readHandle(unshared);
+
+                case TC_CLASS:
+                    return readClass(unshared);
+
+                case TC_CLASSDESC:
+                case TC_PROXYCLASSDESC:
+                    return readClassDesc(unshared);
+
+                case TC_STRING:
+                case TC_LONGSTRING:
+                    return checkResolve(readString(unshared));
+
+                case TC_ARRAY:
+                    return checkResolve(readArray(unshared));
+
+                case TC_ENUM:
+                    return checkResolve(readEnum(unshared));
+
+                case TC_OBJECT:
+                    return checkResolve(readOrdinaryObject(unshared));
+
+                case TC_EXCEPTION:
+                    IOException ex = readFatalException();
+                    throw new WriteAbortedException("writing aborted", ex);
+
+                case TC_BLOCKDATA:
+                case TC_BLOCKDATALONG:
+                    if (oldMode) {
+                        bin.setBlockDataMode(true);
+                        bin.peek();             // force header read
+                        throw new OptionalDataException(
+                            bin.currentBlockRemaining());
+                    } else {
+                        throw new StreamCorruptedException(
+                            "unexpected block data");
+                    }
+
+                case TC_ENDBLOCKDATA:
+                    if (oldMode) {
+                        throw new OptionalDataException(true);
+                    } else {
+                        throw new StreamCorruptedException(
+                            "unexpected end of block data");
+                    }
+
+                default:
+                    throw new StreamCorruptedException(
+                        String.format("invalid type code: %02X", tc));
+            }
+        } finally {
+            depth--;
+            bin.setBlockDataMode(oldMode);
+        }
+    }
+
+    /**
+     * If resolveObject has been enabled and given object does not have an
+     * exception associated with it, calls resolveObject to determine
+     * replacement for object, and updates handle table accordingly.  Returns
+     * replacement object, or echoes provided object if no replacement
+     * occurred.  Expects that passHandle is set to given object's handle prior
+     * to calling this method.
+     */
+    private Object checkResolve(Object obj) throws IOException {
+        if (!enableResolve || handles.lookupException(passHandle) != null) {
+            return obj;
+        }
+        Object rep = resolveObject(obj);
+        if (rep != obj) {
+            handles.setObject(passHandle, rep);
+        }
+        return rep;
+    }
+
+    /**
+     * Reads string without allowing it to be replaced in stream.  Called from
+     * within ObjectStreamClass.read().
+     */
+    String readTypeString() throws IOException {
+        int oldHandle = passHandle;
+        try {
+            byte tc = bin.peekByte();
+            switch (tc) {
+                case TC_NULL:
+                    return (String) readNull();
+
+                case TC_REFERENCE:
+                    return (String) readHandle(false);
+
+                case TC_STRING:
+                case TC_LONGSTRING:
+                    return readString(false);
+
+                default:
+                    throw new StreamCorruptedException(
+                        String.format("invalid type code: %02X", tc));
+            }
+        } finally {
+            passHandle = oldHandle;
+        }
+    }
+
+    /**
+     * Reads in null code, sets passHandle to NULL_HANDLE and returns null.
+     */
+    private Object readNull() throws IOException {
+        if (bin.readByte() != TC_NULL) {
+            throw new InternalError();
+        }
+        passHandle = NULL_HANDLE;
+        return null;
+    }
+
+    /**
+     * Reads in object handle, sets passHandle to the read handle, and returns
+     * object associated with the handle.
+     */
+    private Object readHandle(boolean unshared) throws IOException {
+        if (bin.readByte() != TC_REFERENCE) {
+            throw new InternalError();
+        }
+        passHandle = bin.readInt() - baseWireHandle;
+        if (passHandle < 0 || passHandle >= handles.size()) {
+            throw new StreamCorruptedException(
+                String.format("invalid handle value: %08X", passHandle +
+                baseWireHandle));
+        }
+        if (unshared) {
+            // REMIND: what type of exception to throw here?
+            throw new InvalidObjectException(
+                "cannot read back reference as unshared");
+        }
+
+        Object obj = handles.lookupObject(passHandle);
+        if (obj == unsharedMarker) {
+            // REMIND: what type of exception to throw here?
+            throw new InvalidObjectException(
+                "cannot read back reference to unshared object");
+        }
+        return obj;
+    }
+
+    /**
+     * Reads in and returns class object.  Sets passHandle to class object's
+     * assigned handle.  Returns null if class is unresolvable (in which case a
+     * ClassNotFoundException will be associated with the class' handle in the
+     * handle table).
+     */
+    private Class readClass(boolean unshared) throws IOException {
+        if (bin.readByte() != TC_CLASS) {
+            throw new InternalError();
+        }
+        ObjectStreamClass desc = readClassDesc(false);
+        Class cl = desc.forClass();
+        passHandle = handles.assign(unshared ? unsharedMarker : cl);
+
+        ClassNotFoundException resolveEx = desc.getResolveException();
+        if (resolveEx != null) {
+            handles.markException(passHandle, resolveEx);
+        }
+
+        handles.finish(passHandle);
+        return cl;
+    }
+
+    /**
+     * Reads in and returns (possibly null) class descriptor.  Sets passHandle
+     * to class descriptor's assigned handle.  If class descriptor cannot be
+     * resolved to a class in the local VM, a ClassNotFoundException is
+     * associated with the class descriptor's handle.
+     */
+    private ObjectStreamClass readClassDesc(boolean unshared)
+        throws IOException
+    {
+        byte tc = bin.peekByte();
+        switch (tc) {
+            case TC_NULL:
+                return (ObjectStreamClass) readNull();
+
+            case TC_REFERENCE:
+                return (ObjectStreamClass) readHandle(unshared);
+
+            case TC_PROXYCLASSDESC:
+                return readProxyDesc(unshared);
+
+            case TC_CLASSDESC:
+                return readNonProxyDesc(unshared);
+
+            default:
+                throw new StreamCorruptedException(
+                    String.format("invalid type code: %02X", tc));
+        }
+    }
+
+    /**
+     * Reads in and returns class descriptor for a dynamic proxy class.  Sets
+     * passHandle to proxy class descriptor's assigned handle.  If proxy class
+     * descriptor cannot be resolved to a class in the local VM, a
+     * ClassNotFoundException is associated with the descriptor's handle.
+     */
+    private ObjectStreamClass readProxyDesc(boolean unshared)
+        throws IOException
+    {
+        if (bin.readByte() != TC_PROXYCLASSDESC) {
+            throw new InternalError();
+        }
+
+        ObjectStreamClass desc = new ObjectStreamClass();
+        int descHandle = handles.assign(unshared ? unsharedMarker : desc);
+        passHandle = NULL_HANDLE;
+
+        int numIfaces = bin.readInt();
+        String[] ifaces = new String[numIfaces];
+        for (int i = 0; i < numIfaces; i++) {
+            ifaces[i] = bin.readUTF();
+        }
+
+        Class cl = null;
+        ClassNotFoundException resolveEx = null;
+        bin.setBlockDataMode(true);
+        try {
+            if ((cl = resolveProxyClass(ifaces)) == null) {
+                resolveEx = new ClassNotFoundException("null class");
+            }
+        } catch (ClassNotFoundException ex) {
+            resolveEx = ex;
+        }
+        skipCustomData();
+
+        desc.initProxy(cl, resolveEx, readClassDesc(false));
+
+        handles.finish(descHandle);
+        passHandle = descHandle;
+        return desc;
+    }
+
+    /**
+     * Reads in and returns class descriptor for a class that is not a dynamic
+     * proxy class.  Sets passHandle to class descriptor's assigned handle.  If
+     * class descriptor cannot be resolved to a class in the local VM, a
+     * ClassNotFoundException is associated with the descriptor's handle.
+     */
+    private ObjectStreamClass readNonProxyDesc(boolean unshared)
+        throws IOException
+    {
+        if (bin.readByte() != TC_CLASSDESC) {
+            throw new InternalError();
+        }
+
+        ObjectStreamClass desc = new ObjectStreamClass();
+        int descHandle = handles.assign(unshared ? unsharedMarker : desc);
+        passHandle = NULL_HANDLE;
+
+        ObjectStreamClass readDesc = null;
+        try {
+            readDesc = readClassDescriptor();
+        } catch (ClassNotFoundException ex) {
+            throw (IOException) new InvalidClassException(
+                "failed to read class descriptor").initCause(ex);
+        }
+
+        Class cl = null;
+        ClassNotFoundException resolveEx = null;
+        bin.setBlockDataMode(true);
+        try {
+            if ((cl = resolveClass(readDesc)) == null) {
+                resolveEx = new ClassNotFoundException("null class");
+            }
+        } catch (ClassNotFoundException ex) {
+            resolveEx = ex;
+        }
+        skipCustomData();
+
+        desc.initNonProxy(readDesc, cl, resolveEx, readClassDesc(false));
+
+        handles.finish(descHandle);
+        passHandle = descHandle;
+        return desc;
+    }
+
+    /**
+     * Reads in and returns new string.  Sets passHandle to new string's
+     * assigned handle.
+     */
+    private String readString(boolean unshared) throws IOException {
+        String str;
+        byte tc = bin.readByte();
+        switch (tc) {
+            case TC_STRING:
+                str = bin.readUTF();
+                break;
+
+            case TC_LONGSTRING:
+                str = bin.readLongUTF();
+                break;
+
+            default:
+                throw new StreamCorruptedException(
+                    String.format("invalid type code: %02X", tc));
+        }
+        passHandle = handles.assign(unshared ? unsharedMarker : str);
+        handles.finish(passHandle);
+        return str;
+    }
+
+    /**
+     * Reads in and returns array object, or null if array class is
+     * unresolvable.  Sets passHandle to array's assigned handle.
+     */
+    private Object readArray(boolean unshared) throws IOException {
+        if (bin.readByte() != TC_ARRAY) {
+            throw new InternalError();
+        }
+
+        ObjectStreamClass desc = readClassDesc(false);
+        int len = bin.readInt();
+
+        Object array = null;
+        Class cl, ccl = null;
+        if ((cl = desc.forClass()) != null) {
+            ccl = cl.getComponentType();
+            array = Array.newInstance(ccl, len);
+        }
+
+        int arrayHandle = handles.assign(unshared ? unsharedMarker : array);
+        ClassNotFoundException resolveEx = desc.getResolveException();
+        if (resolveEx != null) {
+            handles.markException(arrayHandle, resolveEx);
+        }
+
+        if (ccl == null) {
+            for (int i = 0; i < len; i++) {
+                readObject0(false);
+            }
+        } else if (ccl.isPrimitive()) {
+            if (ccl == Integer.TYPE) {
+                bin.readInts((int[]) array, 0, len);
+            } else if (ccl == Byte.TYPE) {
+                bin.readFully((byte[]) array, 0, len, true);
+            } else if (ccl == Long.TYPE) {
+                bin.readLongs((long[]) array, 0, len);
+            } else if (ccl == Float.TYPE) {
+                bin.readFloats((float[]) array, 0, len);
+            } else if (ccl == Double.TYPE) {
+                bin.readDoubles((double[]) array, 0, len);
+            } else if (ccl == Short.TYPE) {
+                bin.readShorts((short[]) array, 0, len);
+            } else if (ccl == Character.TYPE) {
+                bin.readChars((char[]) array, 0, len);
+            } else if (ccl == Boolean.TYPE) {
+                bin.readBooleans((boolean[]) array, 0, len);
+            } else {
+                throw new InternalError();
+            }
+        } else {
+            Object[] oa = (Object[]) array;
+            for (int i = 0; i < len; i++) {
+                oa[i] = readObject0(false);
+                handles.markDependency(arrayHandle, passHandle);
+            }
+        }
+
+        handles.finish(arrayHandle);
+        passHandle = arrayHandle;
+        return array;
+    }
+
+    /**
+     * Reads in and returns enum constant, or null if enum type is
+     * unresolvable.  Sets passHandle to enum constant's assigned handle.
+     */
+    private Enum readEnum(boolean unshared) throws IOException {
+        if (bin.readByte() != TC_ENUM) {
+            throw new InternalError();
+        }
+
+        ObjectStreamClass desc = readClassDesc(false);
+        if (!desc.isEnum()) {
+            throw new InvalidClassException("non-enum class: " + desc);
+        }
+
+        int enumHandle = handles.assign(unshared ? unsharedMarker : null);
+        ClassNotFoundException resolveEx = desc.getResolveException();
+        if (resolveEx != null) {
+            handles.markException(enumHandle, resolveEx);
+        }
+
+        String name = readString(false);
+        Enum en = null;
+        Class cl = desc.forClass();
+        if (cl != null) {
+            try {
+                en = Enum.valueOf(cl, name);
+            } catch (IllegalArgumentException ex) {
+                throw (IOException) new InvalidObjectException(
+                    "enum constant " + name + " does not exist in " +
+                    cl).initCause(ex);
+            }
+            if (!unshared) {
+                handles.setObject(enumHandle, en);
+            }
+        }
+
+        handles.finish(enumHandle);
+        passHandle = enumHandle;
+        return en;
+    }
+
+    /**
+     * Reads and returns "ordinary" (i.e., not a String, Class,
+     * ObjectStreamClass, array, or enum constant) object, or null if object's
+     * class is unresolvable (in which case a ClassNotFoundException will be
+     * associated with object's handle).  Sets passHandle to object's assigned
+     * handle.
+     */
+    private Object readOrdinaryObject(boolean unshared)
+        throws IOException
+    {
+        if (bin.readByte() != TC_OBJECT) {
+            throw new InternalError();
+        }
+
+        ObjectStreamClass desc = readClassDesc(false);
+        desc.checkDeserialize();
+
+        Object obj;
+        try {
+            obj = desc.isInstantiable() ? desc.newInstance() : null;
+        } catch (Exception ex) {
+            throw (IOException) new InvalidClassException(
+                desc.forClass().getName(),
+                "unable to create instance").initCause(ex);
+        }
+
+        passHandle = handles.assign(unshared ? unsharedMarker : obj);
+        ClassNotFoundException resolveEx = desc.getResolveException();
+        if (resolveEx != null) {
+            handles.markException(passHandle, resolveEx);
+        }
+
+        if (desc.isExternalizable()) {
+            readExternalData((Externalizable) obj, desc);
+        } else {
+            readSerialData(obj, desc);
+        }
+
+        handles.finish(passHandle);
+
+        if (obj != null &&
+            handles.lookupException(passHandle) == null &&
+            desc.hasReadResolveMethod())
+        {
+            Object rep = desc.invokeReadResolve(obj);
+            if (unshared && rep.getClass().isArray()) {
+                rep = cloneArray(rep);
+            }
+            if (rep != obj) {
+                handles.setObject(passHandle, obj = rep);
+            }
+        }
+
+        return obj;
+    }
+
+    /**
+     * If obj is non-null, reads externalizable data by invoking readExternal()
+     * method of obj; otherwise, attempts to skip over externalizable data.
+     * Expects that passHandle is set to obj's handle before this method is
+     * called.
+     */
+    private void readExternalData(Externalizable obj, ObjectStreamClass desc)
+        throws IOException
+    {
+        Object oldContext = curContext;
+        curContext = null;
+        try {
+            boolean blocked = desc.hasBlockExternalData();
+            if (blocked) {
+                bin.setBlockDataMode(true);
+            }
+            if (obj != null) {
+                try {
+                    obj.readExternal(this);
+                } catch (ClassNotFoundException ex) {
+                    /*
+                     * In most cases, the handle table has already propagated
+                     * a CNFException to passHandle at this point; this mark
+                     * call is included to address cases where the readExternal
+                     * method has cons'ed and thrown a new CNFException of its
+                     * own.
+                     */
+                     handles.markException(passHandle, ex);
+                }
+            }
+            if (blocked) {
+                skipCustomData();
+            }
+        } finally {
+            curContext = oldContext;
+        }
+        /*
+         * At this point, if the externalizable data was not written in
+         * block-data form and either the externalizable class doesn't exist
+         * locally (i.e., obj == null) or readExternal() just threw a
+         * CNFException, then the stream is probably in an inconsistent state,
+         * since some (or all) of the externalizable data may not have been
+         * consumed.  Since there's no "correct" action to take in this case,
+         * we mimic the behavior of past serialization implementations and
+         * blindly hope that the stream is in sync; if it isn't and additional
+         * externalizable data remains in the stream, a subsequent read will
+         * most likely throw a StreamCorruptedException.
+         */
+    }
+
+    /**
+     * Reads (or attempts to skip, if obj is null or is tagged with a
+     * ClassNotFoundException) instance data for each serializable class of
+     * object in stream, from superclass to subclass.  Expects that passHandle
+     * is set to obj's handle before this method is called.
+     */
+    private void readSerialData(Object obj, ObjectStreamClass desc)
+        throws IOException
+    {
+        ObjectStreamClass.ClassDataSlot[] slots = desc.getClassDataLayout();
+        for (int i = 0; i < slots.length; i++) {
+            ObjectStreamClass slotDesc = slots[i].desc;
+
+            if (slots[i].hasData) {
+                if (obj != null &&
+                    slotDesc.hasReadObjectMethod() &&
+                    handles.lookupException(passHandle) == null)
+                {
+                    Object oldContext = curContext;
+
+                    try {
+                        curContext = null; //new SerialCallbackContext(obj, slotDesc);
+
+                        bin.setBlockDataMode(true);
+                        slotDesc.invokeReadObject(obj, this);
+                    } catch (ClassNotFoundException ex) {
+                        /*
+                         * In most cases, the handle table has already
+                         * propagated a CNFException to passHandle at this
+                         * point; this mark call is included to address cases
+                         * where the custom readObject method has cons'ed and
+                         * thrown a new CNFException of its own.
+                         */
+                        handles.markException(passHandle, ex);
+                    } finally {
+                        //curContext.setUsed();
+                        curContext = oldContext;
+                    }
+
+                    /*
+                     * defaultDataEnd may have been set indirectly by custom
+                     * readObject() method when calling defaultReadObject() or
+                     * readFields(); clear it to restore normal read behavior.
+                     */
+                    defaultDataEnd = false;
+                } else {
+                    defaultReadFields(obj, slotDesc);
+                }
+                if (slotDesc.hasWriteObjectData()) {
+                    skipCustomData();
+                } else {
+                    bin.setBlockDataMode(false);
+                }
+            } else {
+                if (obj != null &&
+                    slotDesc.hasReadObjectNoDataMethod() &&
+                    handles.lookupException(passHandle) == null)
+                {
+                    slotDesc.invokeReadObjectNoData(obj);
+                }
+            }
+        }
+    }
+
+    /**
+     * Skips over all block data and objects until TC_ENDBLOCKDATA is
+     * encountered.
+     */
+    private void skipCustomData() throws IOException {
+        int oldHandle = passHandle;
+        for (;;) {
+            if (bin.getBlockDataMode()) {
+                bin.skipBlockData();
+                bin.setBlockDataMode(false);
+            }
+            switch (bin.peekByte()) {
+                case TC_BLOCKDATA:
+                case TC_BLOCKDATALONG:
+                    bin.setBlockDataMode(true);
+                    break;
+
+                case TC_ENDBLOCKDATA:
+                    bin.readByte();
+                    passHandle = oldHandle;
+                    return;
+
+                default:
+                    readObject0(false);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Reads in values of serializable fields declared by given class
+     * descriptor.  If obj is non-null, sets field values in obj.  Expects that
+     * passHandle is set to obj's handle before this method is called.
+     */
+    private void defaultReadFields(Object obj, ObjectStreamClass desc)
+        throws IOException
+    {
+        // REMIND: is isInstance check necessary?
+        Class cl = desc.forClass();
+        if (cl != null && obj != null && !cl.isInstance(obj)) {
+            throw new ClassCastException();
+        }
+
+        int primDataSize = desc.getPrimDataSize();
+        if (primVals == null || primVals.length < primDataSize) {
+            primVals = new byte[primDataSize];
+        }
+        bin.readFully(primVals, 0, primDataSize, false);
+        if (obj != null) {
+            desc.setPrimFieldValues(obj, primVals);
+        }
+
+        int objHandle = passHandle;
+        ObjectStreamField[] fields = desc.getFields(false);
+        Object[] objVals = new Object[desc.getNumObjFields()];
+        int numPrimFields = fields.length - objVals.length;
+        for (int i = 0; i < objVals.length; i++) {
+            ObjectStreamField f = fields[numPrimFields + i];
+            objVals[i] = readObject0(f.isUnshared());
+            if (f.getField() != null) {
+                handles.markDependency(objHandle, passHandle);
+            }
+        }
+        if (obj != null) {
+            desc.setObjFieldValues(obj, objVals);
+        }
+        passHandle = objHandle;
+    }
+
+    /**
+     * Reads in and returns IOException that caused serialization to abort.
+     * All stream state is discarded prior to reading in fatal exception.  Sets
+     * passHandle to fatal exception's handle.
+     */
+    private IOException readFatalException() throws IOException {
+        if (bin.readByte() != TC_EXCEPTION) {
+            throw new InternalError();
+        }
+        clear();
+        return (IOException) readObject0(false);
+    }
+
+    /**
+     * If recursion depth is 0, clears internal data structures; otherwise,
+     * throws a StreamCorruptedException.  This method is called when a
+     * TC_RESET typecode is encountered.
+     */
+    private void handleReset() throws StreamCorruptedException {
+        if (depth > 0) {
+            throw new StreamCorruptedException(
+                "unexpected reset; recursion depth: " + depth);
+        }
+        clear();
+    }
+
+    /**
+     * Converts specified span of bytes into float values.
+     */
+    // REMIND: remove once hotspot inlines Float.intBitsToFloat
+    private static native void bytesToFloats(byte[] src, int srcpos,
+                                             float[] dst, int dstpos,
+                                             int nfloats);
+
+    /**
+     * Converts specified span of bytes into double values.
+     */
+    // REMIND: remove once hotspot inlines Double.longBitsToDouble
+    private static native void bytesToDoubles(byte[] src, int srcpos,
+                                              double[] dst, int dstpos,
+                                              int ndoubles);
+
+    /**
+     * Returns the first non-null class loader (not counting class loaders of
+     * generated reflection implementation classes) up the execution stack, or
+     * null if only code from the null class loader is on the stack.  This
+     * method is also called via reflection by the following RMI-IIOP class:
+     *
+     *     com.sun.corba.se.internal.util.JDKClassLoader
+     *
+     * This method should not be removed or its signature changed without
+     * corresponding modifications to the above class.
+     */
+    // REMIND: change name to something more accurate?
+    private static native ClassLoader latestUserDefinedLoader();
+
+    /**
+     * Default GetField implementation.
+     */
+    private class GetFieldImpl extends GetField {
+
+        /** class descriptor describing serializable fields */
+        private final ObjectStreamClass desc;
+        /** primitive field values */
+        private final byte[] primVals;
+        /** object field values */
+        private final Object[] objVals;
+        /** object field value handles */
+        private final int[] objHandles;
+
+        /**
+         * Creates GetFieldImpl object for reading fields defined in given
+         * class descriptor.
+         */
+        GetFieldImpl(ObjectStreamClass desc) {
+            this.desc = desc;
+            primVals = new byte[desc.getPrimDataSize()];
+            objVals = new Object[desc.getNumObjFields()];
+            objHandles = new int[objVals.length];
+        }
+
+        public ObjectStreamClass getObjectStreamClass() {
+            return desc;
+        }
+
+        public boolean defaulted(String name) throws IOException {
+            return (getFieldOffset(name, null) < 0);
+        }
+
+        public boolean get(String name, boolean val) throws IOException {
+            int off = getFieldOffset(name, Boolean.TYPE);
+            return (off >= 0) ? Bits.getBoolean(primVals, off) : val;
+        }
+
+        public byte get(String name, byte val) throws IOException {
+            int off = getFieldOffset(name, Byte.TYPE);
+            return (off >= 0) ? primVals[off] : val;
+        }
+
+        public char get(String name, char val) throws IOException {
+            int off = getFieldOffset(name, Character.TYPE);
+            return (off >= 0) ? Bits.getChar(primVals, off) : val;
+        }
+
+        public short get(String name, short val) throws IOException {
+            int off = getFieldOffset(name, Short.TYPE);
+            return (off >= 0) ? Bits.getShort(primVals, off) : val;
+        }
+
+        public int get(String name, int val) throws IOException {
+            int off = getFieldOffset(name, Integer.TYPE);
+            return (off >= 0) ? Bits.getInt(primVals, off) : val;
+        }
+
+        public float get(String name, float val) throws IOException {
+            int off = getFieldOffset(name, Float.TYPE);
+            return (off >= 0) ? Bits.getFloat(primVals, off) : val;
+        }
+
+        public long get(String name, long val) throws IOException {
+            int off = getFieldOffset(name, Long.TYPE);
+            return (off >= 0) ? Bits.getLong(primVals, off) : val;
+        }
+
+        public double get(String name, double val) throws IOException {
+            int off = getFieldOffset(name, Double.TYPE);
+            return (off >= 0) ? Bits.getDouble(primVals, off) : val;
+        }
+
+        public Object get(String name, Object val) throws IOException {
+            int off = getFieldOffset(name, Object.class);
+            if (off >= 0) {
+                int objHandle = objHandles[off];
+                handles.markDependency(passHandle, objHandle);
+                return (handles.lookupException(objHandle) == null) ?
+                    objVals[off] : null;
+            } else {
+                return val;
+            }
+        }
+
+        /**
+         * Reads primitive and object field values from stream.
+         */
+        void readFields() throws IOException {
+            bin.readFully(primVals, 0, primVals.length, false);
+
+            int oldHandle = passHandle;
+            ObjectStreamField[] fields = desc.getFields(false);
+            int numPrimFields = fields.length - objVals.length;
+            for (int i = 0; i < objVals.length; i++) {
+                objVals[i] =
+                    readObject0(fields[numPrimFields + i].isUnshared());
+                objHandles[i] = passHandle;
+            }
+            passHandle = oldHandle;
+        }
+
+        /**
+         * Returns offset of field with given name and type.  A specified type
+         * of null matches all types, Object.class matches all non-primitive
+         * types, and any other non-null type matches assignable types only.
+         * If no matching field is found in the (incoming) class
+         * descriptor but a matching field is present in the associated local
+         * class descriptor, returns -1.  Throws IllegalArgumentException if
+         * neither incoming nor local class descriptor contains a match.
+         */
+        private int getFieldOffset(String name, Class type) {
+            ObjectStreamField field = desc.getField(name, type);
+            if (field != null) {
+                return field.getOffset();
+            } else if (desc.getLocalDesc().getField(name, type) != null) {
+                return -1;
+            } else {
+                throw new IllegalArgumentException("no such field " + name +
+                                                   " with type " + type);
+            }
+        }
+    }
+
+    /**
+     * Prioritized list of callbacks to be performed once object graph has been
+     * completely deserialized.
+     */
+    private static class ValidationList {
+
+
+        /**
+         * Creates new (empty) ValidationList.
+         */
+        ValidationList() {
+        }
+
+        /**
+         * Registers callback.  Throws InvalidObjectException if callback
+         * object is null.
+         */
+        void register(ObjectInputValidation obj, int priority)
+            throws InvalidObjectException
+        {
+            if (obj == null) {
+                throw new InvalidObjectException("null callback");
+            }
+            throw new InvalidObjectException("Does not work.");
+        }
+
+        /**
+         * Invokes all registered callbacks and clears the callback list.
+         * Callbacks with higher priorities are called first; those with equal
+         * priorities may be called in any order.  If any of the callbacks
+         * throws an InvalidObjectException, the callback process is terminated
+         * and the exception propagated upwards.
+         */
+        void doCallbacks() throws InvalidObjectException {
+        }
+
+        /**
+         * Resets the callback list to its initial (empty) state.
+         */
+        public void clear() {
+        }
+    }
+
+    /**
+     * Input stream supporting single-byte peek operations.
+     */
+    private static class PeekInputStream extends InputStream {
+
+        /** underlying stream */
+        private final InputStream in;
+        /** peeked byte */
+        private int peekb = -1;
+
+        /**
+         * Creates new PeekInputStream on top of given underlying stream.
+         */
+        PeekInputStream(InputStream in) {
+            this.in = in;
+        }
+
+        /**
+         * Peeks at next byte value in stream.  Similar to read(), except
+         * that it does not consume the read value.
+         */
+        int peek() throws IOException {
+            return (peekb >= 0) ? peekb : (peekb = in.read());
+        }
+
+        public int read() throws IOException {
+            if (peekb >= 0) {
+                int v = peekb;
+                peekb = -1;
+                return v;
+            } else {
+                return in.read();
+            }
+        }
+
+        public int read(byte[] b, int off, int len) throws IOException {
+            if (len == 0) {
+                return 0;
+            } else if (peekb < 0) {
+                return in.read(b, off, len);
+            } else {
+                b[off++] = (byte) peekb;
+                len--;
+                peekb = -1;
+                int n = in.read(b, off, len);
+                return (n >= 0) ? (n + 1) : 1;
+            }
+        }
+
+        void readFully(byte[] b, int off, int len) throws IOException {
+            int n = 0;
+            while (n < len) {
+                int count = read(b, off + n, len - n);
+                if (count < 0) {
+                    throw new EOFException();
+                }
+                n += count;
+            }
+        }
+
+        public long skip(long n) throws IOException {
+            if (n <= 0) {
+                return 0;
+            }
+            int skipped = 0;
+            if (peekb >= 0) {
+                peekb = -1;
+                skipped++;
+                n--;
+            }
+            return skipped + skip(n);
+        }
+
+        public int available() throws IOException {
+            return in.available() + ((peekb >= 0) ? 1 : 0);
+        }
+
+        public void close() throws IOException {
+            in.close();
+        }
+    }
+
+    /**
+     * Input stream with two modes: in default mode, inputs data written in the
+     * same format as DataOutputStream; in "block data" mode, inputs data
+     * bracketed by block data markers (see object serialization specification
+     * for details).  Buffering depends on block data mode: when in default
+     * mode, no data is buffered in advance; when in block data mode, all data
+     * for the current data block is read in at once (and buffered).
+     */
+    private class BlockDataInputStream
+        extends InputStream implements DataInput
+    {
+        /** maximum data block length */
+        private static final int MAX_BLOCK_SIZE = 1024;
+        /** maximum data block header length */
+        private static final int MAX_HEADER_SIZE = 5;
+        /** (tunable) length of char buffer (for reading strings) */
+        private static final int CHAR_BUF_SIZE = 256;
+        /** readBlockHeader() return value indicating header read may block */
+        private static final int HEADER_BLOCKED = -2;
+
+        /** buffer for reading general/block data */
+        private final byte[] buf = new byte[MAX_BLOCK_SIZE];
+        /** buffer for reading block data headers */
+        private final byte[] hbuf = new byte[MAX_HEADER_SIZE];
+        /** char buffer for fast string reads */
+        private final char[] cbuf = new char[CHAR_BUF_SIZE];
+
+        /** block data mode */
+        private boolean blkmode = false;
+
+        // block data state fields; values meaningful only when blkmode true
+        /** current offset into buf */
+        private int pos = 0;
+        /** end offset of valid data in buf, or -1 if no more block data */
+        private int end = -1;
+        /** number of bytes in current block yet to be read from stream */
+        private int unread = 0;
+
+        /** underlying stream (wrapped in peekable filter stream) */
+        private final PeekInputStream in;
+        /** loopback stream (for data reads that span data blocks) */
+        private final DataInputStream din;
+
+        /**
+         * Creates new BlockDataInputStream on top of given underlying stream.
+         * Block data mode is turned off by default.
+         */
+        BlockDataInputStream(InputStream in) {
+            this.in = new PeekInputStream(in);
+            din = new DataInputStream(this);
+        }
+
+        /**
+         * Sets block data mode to the given mode (true == on, false == off)
+         * and returns the previous mode value.  If the new mode is the same as
+         * the old mode, no action is taken.  Throws IllegalStateException if
+         * block data mode is being switched from on to off while unconsumed
+         * block data is still present in the stream.
+         */
+        boolean setBlockDataMode(boolean newmode) throws IOException {
+            if (blkmode == newmode) {
+                return blkmode;
+            }
+            if (newmode) {
+                pos = 0;
+                end = 0;
+                unread = 0;
+            } else if (pos < end) {
+                throw new IllegalStateException("unread block data");
+            }
+            blkmode = newmode;
+            return !blkmode;
+        }
+
+        /**
+         * Returns true if the stream is currently in block data mode, false
+         * otherwise.
+         */
+        boolean getBlockDataMode() {
+            return blkmode;
+        }
+
+        /**
+         * If in block data mode, skips to the end of the current group of data
+         * blocks (but does not unset block data mode).  If not in block data
+         * mode, throws an IllegalStateException.
+         */
+        void skipBlockData() throws IOException {
+            if (!blkmode) {
+                throw new IllegalStateException("not in block data mode");
+            }
+            while (end >= 0) {
+                refill();
+            }
+        }
+
+        /**
+         * Attempts to read in the next block data header (if any).  If
+         * canBlock is false and a full header cannot be read without possibly
+         * blocking, returns HEADER_BLOCKED, else if the next element in the
+         * stream is a block data header, returns the block data length
+         * specified by the header, else returns -1.
+         */
+        private int readBlockHeader(boolean canBlock) throws IOException {
+            if (defaultDataEnd) {
+                /*
+                 * Fix for 4360508: stream is currently at the end of a field
+                 * value block written via default serialization; since there
+                 * is no terminating TC_ENDBLOCKDATA tag, simulate
+                 * end-of-custom-data behavior explicitly.
+                 */
+                return -1;
+            }
+            try {
+                for (;;) {
+                    int avail = canBlock ? Integer.MAX_VALUE : in.available();
+                    if (avail == 0) {
+                        return HEADER_BLOCKED;
+                    }
+
+                    int tc = in.peek();
+                    switch (tc) {
+                        case TC_BLOCKDATA:
+                            if (avail < 2) {
+                                return HEADER_BLOCKED;
+                            }
+                            in.readFully(hbuf, 0, 2);
+                            return hbuf[1] & 0xFF;
+
+                        case TC_BLOCKDATALONG:
+                            if (avail < 5) {
+                                return HEADER_BLOCKED;
+                            }
+                            in.readFully(hbuf, 0, 5);
+                            int len = Bits.getInt(hbuf, 1);
+                            if (len < 0) {
+                                throw new StreamCorruptedException(
+                                    "illegal block data header length: " +
+                                    len);
+                            }
+                            return len;
+
+                        /*
+                         * TC_RESETs may occur in between data blocks.
+                         * Unfortunately, this case must be parsed at a lower
+                         * level than other typecodes, since primitive data
+                         * reads may span data blocks separated by a TC_RESET.
+                         */
+                        case TC_RESET:
+                            in.read();
+                            handleReset();
+                            break;
+
+                        default:
+                            if (tc >= 0 && (tc < TC_BASE || tc > TC_MAX)) {
+                                throw new StreamCorruptedException(
+                                    String.format("invalid type code: %02X",
+                                    tc));
+                            }
+                            return -1;
+                    }
+                }
+            } catch (EOFException ex) {
+                throw new StreamCorruptedException(
+                    "unexpected EOF while reading block data header");
+            }
+        }
+
+        /**
+         * Refills internal buffer buf with block data.  Any data in buf at the
+         * time of the call is considered consumed.  Sets the pos, end, and
+         * unread fields to reflect the new amount of available block data; if
+         * the next element in the stream is not a data block, sets pos and
+         * unread to 0 and end to -1.
+         */
+        private void refill() throws IOException {
+            try {
+                do {
+                    pos = 0;
+                    if (unread > 0) {
+                        int n =
+                            in.read(buf, 0, Math.min(unread, MAX_BLOCK_SIZE));
+                        if (n >= 0) {
+                            end = n;
+                            unread -= n;
+                        } else {
+                            throw new StreamCorruptedException(
+                                "unexpected EOF in middle of data block");
+                        }
+                    } else {
+                        int n = readBlockHeader(true);
+                        if (n >= 0) {
+                            end = 0;
+                            unread = n;
+                        } else {
+                            end = -1;
+                            unread = 0;
+                        }
+                    }
+                } while (pos == end);
+            } catch (IOException ex) {
+                pos = 0;
+                end = -1;
+                unread = 0;
+                throw ex;
+            }
+        }
+
+        /**
+         * If in block data mode, returns the number of unconsumed bytes
+         * remaining in the current data block.  If not in block data mode,
+         * throws an IllegalStateException.
+         */
+        int currentBlockRemaining() {
+            if (blkmode) {
+                return (end >= 0) ? (end - pos) + unread : 0;
+            } else {
+                throw new IllegalStateException();
+            }
+        }
+
+        /**
+         * Peeks at (but does not consume) and returns the next byte value in
+         * the stream, or -1 if the end of the stream/block data (if in block
+         * data mode) has been reached.
+         */
+        int peek() throws IOException {
+            if (blkmode) {
+                if (pos == end) {
+                    refill();
+                }
+                return (end >= 0) ? (buf[pos] & 0xFF) : -1;
+            } else {
+                return in.peek();
+            }
+        }
+
+        /**
+         * Peeks at (but does not consume) and returns the next byte value in
+         * the stream, or throws EOFException if end of stream/block data has
+         * been reached.
+         */
+        byte peekByte() throws IOException {
+            int val = peek();
+            if (val < 0) {
+                throw new EOFException();
+            }
+            return (byte) val;
+        }
+
+
+        /* ----------------- generic input stream methods ------------------ */
+        /*
+         * The following methods are equivalent to their counterparts in
+         * InputStream, except that they interpret data block boundaries and
+         * read the requested data from within data blocks when in block data
+         * mode.
+         */
+
+        public int read() throws IOException {
+            if (blkmode) {
+                if (pos == end) {
+                    refill();
+                }
+                return (end >= 0) ? (buf[pos++] & 0xFF) : -1;
+            } else {
+                return in.read();
+            }
+        }
+
+        public int read(byte[] b, int off, int len) throws IOException {
+            return read(b, off, len, false);
+        }
+
+        public long skip(long len) throws IOException {
+            long remain = len;
+            while (remain > 0) {
+                if (blkmode) {
+                    if (pos == end) {
+                        refill();
+                    }
+                    if (end < 0) {
+                        break;
+                    }
+                    int nread = (int) Math.min(remain, end - pos);
+                    remain -= nread;
+                    pos += nread;
+                } else {
+                    int nread = (int) Math.min(remain, MAX_BLOCK_SIZE);
+                    if ((nread = in.read(buf, 0, nread)) < 0) {
+                        break;
+                    }
+                    remain -= nread;
+                }
+            }
+            return len - remain;
+        }
+
+        public int available() throws IOException {
+            if (blkmode) {
+                if ((pos == end) && (unread == 0)) {
+                    int n;
+                    while ((n = readBlockHeader(false)) == 0) ;
+                    switch (n) {
+                        case HEADER_BLOCKED:
+                            break;
+
+                        case -1:
+                            pos = 0;
+                            end = -1;
+                            break;
+
+                        default:
+                            pos = 0;
+                            end = 0;
+                            unread = n;
+                            break;
+                    }
+                }
+                // avoid unnecessary call to in.available() if possible
+                int unreadAvail = (unread > 0) ?
+                    Math.min(in.available(), unread) : 0;
+                return (end >= 0) ? (end - pos) + unreadAvail : 0;
+            } else {
+                return in.available();
+            }
+        }
+
+        public void close() throws IOException {
+            if (blkmode) {
+                pos = 0;
+                end = -1;
+                unread = 0;
+            }
+            in.close();
+        }
+
+        /**
+         * Attempts to read len bytes into byte array b at offset off.  Returns
+         * the number of bytes read, or -1 if the end of stream/block data has
+         * been reached.  If copy is true, reads values into an intermediate
+         * buffer before copying them to b (to avoid exposing a reference to
+         * b).
+         */
+        int read(byte[] b, int off, int len, boolean copy) throws IOException {
+            if (len == 0) {
+                return 0;
+            } else if (blkmode) {
+                if (pos == end) {
+                    refill();
+                }
+                if (end < 0) {
+                    return -1;
+                }
+                int nread = Math.min(len, end - pos);
+                System.arraycopy(buf, pos, b, off, nread);
+                pos += nread;
+                return nread;
+            } else if (copy) {
+                int nread = in.read(buf, 0, Math.min(len, MAX_BLOCK_SIZE));
+                if (nread > 0) {
+                    System.arraycopy(buf, 0, b, off, nread);
+                }
+                return nread;
+            } else {
+                return in.read(b, off, len);
+            }
+        }
+
+        /* ----------------- primitive data input methods ------------------ */
+        /*
+         * The following methods are equivalent to their counterparts in
+         * DataInputStream, except that they interpret data block boundaries
+         * and read the requested data from within data blocks when in block
+         * data mode.
+         */
+
+        public void readFully(byte[] b) throws IOException {
+            readFully(b, 0, b.length, false);
+        }
+
+        public void readFully(byte[] b, int off, int len) throws IOException {
+            readFully(b, off, len, false);
+        }
+
+        public void readFully(byte[] b, int off, int len, boolean copy)
+            throws IOException
+        {
+            while (len > 0) {
+                int n = read(b, off, len, copy);
+                if (n < 0) {
+                    throw new EOFException();
+                }
+                off += n;
+                len -= n;
+            }
+        }
+
+        public int skipBytes(int n) throws IOException {
+            return din.skipBytes(n);
+        }
+
+        public boolean readBoolean() throws IOException {
+            int v = read();
+            if (v < 0) {
+                throw new EOFException();
+            }
+            return (v != 0);
+        }
+
+        public byte readByte() throws IOException {
+            int v = read();
+            if (v < 0) {
+                throw new EOFException();
+            }
+            return (byte) v;
+        }
+
+        public int readUnsignedByte() throws IOException {
+            int v = read();
+            if (v < 0) {
+                throw new EOFException();
+            }
+            return v;
+        }
+
+        public char readChar() throws IOException {
+            if (!blkmode) {
+                pos = 0;
+                in.readFully(buf, 0, 2);
+            } else if (end - pos < 2) {
+                return din.readChar();
+            }
+            char v = Bits.getChar(buf, pos);
+            pos += 2;
+            return v;
+        }
+
+        public short readShort() throws IOException {
+            if (!blkmode) {
+                pos = 0;
+                in.readFully(buf, 0, 2);
+            } else if (end - pos < 2) {
+                return din.readShort();
+            }
+            short v = Bits.getShort(buf, pos);
+            pos += 2;
+            return v;
+        }
+
+        public int readUnsignedShort() throws IOException {
+            if (!blkmode) {
+                pos = 0;
+                in.readFully(buf, 0, 2);
+            } else if (end - pos < 2) {
+                return din.readUnsignedShort();
+            }
+            int v = Bits.getShort(buf, pos) & 0xFFFF;
+            pos += 2;
+            return v;
+        }
+
+        public int readInt() throws IOException {
+            if (!blkmode) {
+                pos = 0;
+                in.readFully(buf, 0, 4);
+            } else if (end - pos < 4) {
+                return din.readInt();
+            }
+            int v = Bits.getInt(buf, pos);
+            pos += 4;
+            return v;
+        }
+
+        public float readFloat() throws IOException {
+            if (!blkmode) {
+                pos = 0;
+                in.readFully(buf, 0, 4);
+            } else if (end - pos < 4) {
+                return din.readFloat();
+            }
+            float v = Bits.getFloat(buf, pos);
+            pos += 4;
+            return v;
+        }
+
+        public long readLong() throws IOException {
+            if (!blkmode) {
+                pos = 0;
+                in.readFully(buf, 0, 8);
+            } else if (end - pos < 8) {
+                return din.readLong();
+            }
+            long v = Bits.getLong(buf, pos);
+            pos += 8;
+            return v;
+        }
+
+        public double readDouble() throws IOException {
+            if (!blkmode) {
+                pos = 0;
+                in.readFully(buf, 0, 8);
+            } else if (end - pos < 8) {
+                return din.readDouble();
+            }
+            double v = Bits.getDouble(buf, pos);
+            pos += 8;
+            return v;
+        }
+
+        public String readUTF() throws IOException {
+            return readUTFBody(readUnsignedShort());
+        }
+
+        public String readLine() throws IOException {
+            return din.readLine();      // deprecated, not worth optimizing
+        }
+
+        /* -------------- primitive data array input methods --------------- */
+        /*
+         * The following methods read in spans of primitive data values.
+         * Though equivalent to calling the corresponding primitive read
+         * methods repeatedly, these methods are optimized for reading groups
+         * of primitive data values more efficiently.
+         */
+
+        void readBooleans(boolean[] v, int off, int len) throws IOException {
+            int stop, endoff = off + len;
+            while (off < endoff) {
+                if (!blkmode) {
+                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE);
+                    in.readFully(buf, 0, span);
+                    stop = off + span;
+                    pos = 0;
+                } else if (end - pos < 1) {
+                    v[off++] = din.readBoolean();
+                    continue;
+                } else {
+                    stop = Math.min(endoff, off + end - pos);
+                }
+
+                while (off < stop) {
+                    v[off++] = Bits.getBoolean(buf, pos++);
+                }
+            }
+        }
+
+        void readChars(char[] v, int off, int len) throws IOException {
+            int stop, endoff = off + len;
+            while (off < endoff) {
+                if (!blkmode) {
+                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 1);
+                    in.readFully(buf, 0, span << 1);
+                    stop = off + span;
+                    pos = 0;
+                } else if (end - pos < 2) {
+                    v[off++] = din.readChar();
+                    continue;
+                } else {
+                    stop = Math.min(endoff, off + ((end - pos) >> 1));
+                }
+
+                while (off < stop) {
+                    v[off++] = Bits.getChar(buf, pos);
+                    pos += 2;
+                }
+            }
+        }
+
+        void readShorts(short[] v, int off, int len) throws IOException {
+            int stop, endoff = off + len;
+            while (off < endoff) {
+                if (!blkmode) {
+                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 1);
+                    in.readFully(buf, 0, span << 1);
+                    stop = off + span;
+                    pos = 0;
+                } else if (end - pos < 2) {
+                    v[off++] = din.readShort();
+                    continue;
+                } else {
+                    stop = Math.min(endoff, off + ((end - pos) >> 1));
+                }
+
+                while (off < stop) {
+                    v[off++] = Bits.getShort(buf, pos);
+                    pos += 2;
+                }
+            }
+        }
+
+        void readInts(int[] v, int off, int len) throws IOException {
+            int stop, endoff = off + len;
+            while (off < endoff) {
+                if (!blkmode) {
+                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 2);
+                    in.readFully(buf, 0, span << 2);
+                    stop = off + span;
+                    pos = 0;
+                } else if (end - pos < 4) {
+                    v[off++] = din.readInt();
+                    continue;
+                } else {
+                    stop = Math.min(endoff, off + ((end - pos) >> 2));
+                }
+
+                while (off < stop) {
+                    v[off++] = Bits.getInt(buf, pos);
+                    pos += 4;
+                }
+            }
+        }
+
+        void readFloats(float[] v, int off, int len) throws IOException {
+            int span, endoff = off + len;
+            while (off < endoff) {
+                if (!blkmode) {
+                    span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 2);
+                    in.readFully(buf, 0, span << 2);
+                    pos = 0;
+                } else if (end - pos < 4) {
+                    v[off++] = din.readFloat();
+                    continue;
+                } else {
+                    span = Math.min(endoff - off, ((end - pos) >> 2));
+                }
+
+                bytesToFloats(buf, pos, v, off, span);
+                off += span;
+                pos += span << 2;
+            }
+        }
+
+        void readLongs(long[] v, int off, int len) throws IOException {
+            int stop, endoff = off + len;
+            while (off < endoff) {
+                if (!blkmode) {
+                    int span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 3);
+                    in.readFully(buf, 0, span << 3);
+                    stop = off + span;
+                    pos = 0;
+                } else if (end - pos < 8) {
+                    v[off++] = din.readLong();
+                    continue;
+                } else {
+                    stop = Math.min(endoff, off + ((end - pos) >> 3));
+                }
+
+                while (off < stop) {
+                    v[off++] = Bits.getLong(buf, pos);
+                    pos += 8;
+                }
+            }
+        }
+
+        void readDoubles(double[] v, int off, int len) throws IOException {
+            int span, endoff = off + len;
+            while (off < endoff) {
+                if (!blkmode) {
+                    span = Math.min(endoff - off, MAX_BLOCK_SIZE >> 3);
+                    in.readFully(buf, 0, span << 3);
+                    pos = 0;
+                } else if (end - pos < 8) {
+                    v[off++] = din.readDouble();
+                    continue;
+                } else {
+                    span = Math.min(endoff - off, ((end - pos) >> 3));
+                }
+
+                bytesToDoubles(buf, pos, v, off, span);
+                off += span;
+                pos += span << 3;
+            }
+        }
+
+        /**
+         * Reads in string written in "long" UTF format.  "Long" UTF format is
+         * identical to standard UTF, except that it uses an 8 byte header
+         * (instead of the standard 2 bytes) to convey the UTF encoding length.
+         */
+        String readLongUTF() throws IOException {
+            return readUTFBody(readLong());
+        }
+
+        /**
+         * Reads in the "body" (i.e., the UTF representation minus the 2-byte
+         * or 8-byte length header) of a UTF encoding, which occupies the next
+         * utflen bytes.
+         */
+        private String readUTFBody(long utflen) throws IOException {
+            StringBuilder sbuf = new StringBuilder();
+            if (!blkmode) {
+                end = pos = 0;
+            }
+
+            while (utflen > 0) {
+                int avail = end - pos;
+                if (avail >= 3 || (long) avail == utflen) {
+                    utflen -= readUTFSpan(sbuf, utflen);
+                } else {
+                    if (blkmode) {
+                        // near block boundary, read one byte at a time
+                        utflen -= readUTFChar(sbuf, utflen);
+                    } else {
+                        // shift and refill buffer manually
+                        if (avail > 0) {
+                            System.arraycopy(buf, pos, buf, 0, avail);
+                        }
+                        pos = 0;
+                        end = (int) Math.min(MAX_BLOCK_SIZE, utflen);
+                        in.readFully(buf, avail, end - avail);
+                    }
+                }
+            }
+
+            return sbuf.toString();
+        }
+
+        /**
+         * Reads span of UTF-encoded characters out of internal buffer
+         * (starting at offset pos and ending at or before offset end),
+         * consuming no more than utflen bytes.  Appends read characters to
+         * sbuf.  Returns the number of bytes consumed.
+         */
+        private long readUTFSpan(StringBuilder sbuf, long utflen)
+            throws IOException
+        {
+            int cpos = 0;
+            int start = pos;
+            int avail = Math.min(end - pos, CHAR_BUF_SIZE);
+            // stop short of last char unless all of utf bytes in buffer
+            int stop = pos + ((utflen > avail) ? avail - 2 : (int) utflen);
+            boolean outOfBounds = false;
+
+            try {
+                while (pos < stop) {
+                    int b1, b2, b3;
+                    b1 = buf[pos++] & 0xFF;
+                    switch (b1 >> 4) {
+                        case 0:
+                        case 1:
+                        case 2:
+                        case 3:
+                        case 4:
+                        case 5:
+                        case 6:
+                        case 7:   // 1 byte format: 0xxxxxxx
+                            cbuf[cpos++] = (char) b1;
+                            break;
+
+                        case 12:
+                        case 13:  // 2 byte format: 110xxxxx 10xxxxxx
+                            b2 = buf[pos++];
+                            if ((b2 & 0xC0) != 0x80) {
+                                throw new UTFDataFormatException();
+                            }
+                            cbuf[cpos++] = (char) (((b1 & 0x1F) << 6) |
+                                                   ((b2 & 0x3F) << 0));
+                            break;
+
+                        case 14:  // 3 byte format: 1110xxxx 10xxxxxx 10xxxxxx
+                            b3 = buf[pos + 1];
+                            b2 = buf[pos + 0];
+                            pos += 2;
+                            if ((b2 & 0xC0) != 0x80 || (b3 & 0xC0) != 0x80) {
+                                throw new UTFDataFormatException();
+                            }
+                            cbuf[cpos++] = (char) (((b1 & 0x0F) << 12) |
+                                                   ((b2 & 0x3F) << 6) |
+                                                   ((b3 & 0x3F) << 0));
+                            break;
+
+                        default:  // 10xx xxxx, 1111 xxxx
+                            throw new UTFDataFormatException();
+                    }
+                }
+            } catch (ArrayIndexOutOfBoundsException ex) {
+                outOfBounds = true;
+            } finally {
+                if (outOfBounds || (pos - start) > utflen) {
+                    /*
+                     * Fix for 4450867: if a malformed utf char causes the
+                     * conversion loop to scan past the expected end of the utf
+                     * string, only consume the expected number of utf bytes.
+                     */
+                    pos = start + (int) utflen;
+                    throw new UTFDataFormatException();
+                }
+            }
+
+            sbuf.append(cbuf, 0, cpos);
+            return pos - start;
+        }
+
+        /**
+         * Reads in single UTF-encoded character one byte at a time, appends
+         * the character to sbuf, and returns the number of bytes consumed.
+         * This method is used when reading in UTF strings written in block
+         * data mode to handle UTF-encoded characters which (potentially)
+         * straddle block-data boundaries.
+         */
+        private int readUTFChar(StringBuilder sbuf, long utflen)
+            throws IOException
+        {
+            int b1, b2, b3;
+            b1 = readByte() & 0xFF;
+            switch (b1 >> 4) {
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                case 6:
+                case 7:     // 1 byte format: 0xxxxxxx
+                    sbuf.append((char) b1);
+                    return 1;
+
+                case 12:
+                case 13:    // 2 byte format: 110xxxxx 10xxxxxx
+                    if (utflen < 2) {
+                        throw new UTFDataFormatException();
+                    }
+                    b2 = readByte();
+                    if ((b2 & 0xC0) != 0x80) {
+                        throw new UTFDataFormatException();
+                    }
+                    sbuf.append((char) (((b1 & 0x1F) << 6) |
+                                        ((b2 & 0x3F) << 0)));
+                    return 2;
+
+                case 14:    // 3 byte format: 1110xxxx 10xxxxxx 10xxxxxx
+                    if (utflen < 3) {
+                        if (utflen == 2) {
+                            readByte();         // consume remaining byte
+                        }
+                        throw new UTFDataFormatException();
+                    }
+                    b2 = readByte();
+                    b3 = readByte();
+                    if ((b2 & 0xC0) != 0x80 || (b3 & 0xC0) != 0x80) {
+                        throw new UTFDataFormatException();
+                    }
+                    sbuf.append((char) (((b1 & 0x0F) << 12) |
+                                        ((b2 & 0x3F) << 6) |
+                                        ((b3 & 0x3F) << 0)));
+                    return 3;
+
+                default:   // 10xx xxxx, 1111 xxxx
+                    throw new UTFDataFormatException();
+            }
+        }
+    }
+
+    /**
+     * Unsynchronized table which tracks wire handle to object mappings, as
+     * well as ClassNotFoundExceptions associated with deserialized objects.
+     * This class implements an exception-propagation algorithm for
+     * determining which objects should have ClassNotFoundExceptions associated
+     * with them, taking into account cycles and discontinuities (e.g., skipped
+     * fields) in the object graph.
+     *
+     * <p>General use of the table is as follows: during deserialization, a
+     * given object is first assigned a handle by calling the assign method.
+     * This method leaves the assigned handle in an "open" state, wherein
+     * dependencies on the exception status of other handles can be registered
+     * by calling the markDependency method, or an exception can be directly
+     * associated with the handle by calling markException.  When a handle is
+     * tagged with an exception, the HandleTable assumes responsibility for
+     * propagating the exception to any other objects which depend
+     * (transitively) on the exception-tagged object.
+     *
+     * <p>Once all exception information/dependencies for the handle have been
+     * registered, the handle should be "closed" by calling the finish method
+     * on it.  The act of finishing a handle allows the exception propagation
+     * algorithm to aggressively prune dependency links, lessening the
+     * performance/memory impact of exception tracking.
+     *
+     * <p>Note that the exception propagation algorithm used depends on handles
+     * being assigned/finished in LIFO order; however, for simplicity as well
+     * as memory conservation, it does not enforce this constraint.
+     */
+    // REMIND: add full description of exception propagation algorithm?
+    private static class HandleTable {
+
+        /* status codes indicating whether object has associated exception */
+        private static final byte STATUS_OK = 1;
+        private static final byte STATUS_UNKNOWN = 2;
+        private static final byte STATUS_EXCEPTION = 3;
+
+        /** array mapping handle -> object status */
+        byte[] status;
+        /** array mapping handle -> object/exception (depending on status) */
+        Object[] entries;
+        /** array mapping handle -> list of dependent handles (if any) */
+        HandleList[] deps;
+        /** lowest unresolved dependency */
+        int lowDep = -1;
+        /** number of handles in table */
+        int size = 0;
+
+        /**
+         * Creates handle table with the given initial capacity.
+         */
+        HandleTable(int initialCapacity) {
+            status = new byte[initialCapacity];
+            entries = new Object[initialCapacity];
+            deps = new HandleList[initialCapacity];
+        }
+
+        /**
+         * Assigns next available handle to given object, and returns assigned
+         * handle.  Once object has been completely deserialized (and all
+         * dependencies on other objects identified), the handle should be
+         * "closed" by passing it to finish().
+         */
+        int assign(Object obj) {
+            if (size >= entries.length) {
+                grow();
+            }
+            status[size] = STATUS_UNKNOWN;
+            entries[size] = obj;
+            return size++;
+        }
+
+        /**
+         * Registers a dependency (in exception status) of one handle on
+         * another.  The dependent handle must be "open" (i.e., assigned, but
+         * not finished yet).  No action is taken if either dependent or target
+         * handle is NULL_HANDLE.
+         */
+        void markDependency(int dependent, int target) {
+            if (dependent == NULL_HANDLE || target == NULL_HANDLE) {
+                return;
+            }
+            switch (status[dependent]) {
+
+                case STATUS_UNKNOWN:
+                    switch (status[target]) {
+                        case STATUS_OK:
+                            // ignore dependencies on objs with no exception
+                            break;
+
+                        case STATUS_EXCEPTION:
+                            // eagerly propagate exception
+                            markException(dependent,
+                                (ClassNotFoundException) entries[target]);
+                            break;
+
+                        case STATUS_UNKNOWN:
+                            // add to dependency list of target
+                            if (deps[target] == null) {
+                                deps[target] = new HandleList();
+                            }
+                            deps[target].add(dependent);
+
+                            // remember lowest unresolved target seen
+                            if (lowDep < 0 || lowDep > target) {
+                                lowDep = target;
+                            }
+                            break;
+
+                        default:
+                            throw new InternalError();
+                    }
+                    break;
+
+                case STATUS_EXCEPTION:
+                    break;
+
+                default:
+                    throw new InternalError();
+            }
+        }
+
+        /**
+         * Associates a ClassNotFoundException (if one not already associated)
+         * with the currently active handle and propagates it to other
+         * referencing objects as appropriate.  The specified handle must be
+         * "open" (i.e., assigned, but not finished yet).
+         */
+        void markException(int handle, ClassNotFoundException ex) {
+            switch (status[handle]) {
+                case STATUS_UNKNOWN:
+                    status[handle] = STATUS_EXCEPTION;
+                    entries[handle] = ex;
+
+                    // propagate exception to dependents
+                    HandleList dlist = deps[handle];
+                    if (dlist != null) {
+                        int ndeps = dlist.size();
+                        for (int i = 0; i < ndeps; i++) {
+                            markException(dlist.get(i), ex);
+                        }
+                        deps[handle] = null;
+                    }
+                    break;
+
+                case STATUS_EXCEPTION:
+                    break;
+
+                default:
+                    throw new InternalError();
+            }
+        }
+
+        /**
+         * Marks given handle as finished, meaning that no new dependencies
+         * will be marked for handle.  Calls to the assign and finish methods
+         * must occur in LIFO order.
+         */
+        void finish(int handle) {
+            int end;
+            if (lowDep < 0) {
+                // no pending unknowns, only resolve current handle
+                end = handle + 1;
+            } else if (lowDep >= handle) {
+                // pending unknowns now clearable, resolve all upward handles
+                end = size;
+                lowDep = -1;
+            } else {
+                // unresolved backrefs present, can't resolve anything yet
+                return;
+            }
+
+            // change STATUS_UNKNOWN -> STATUS_OK in selected span of handles
+            for (int i = handle; i < end; i++) {
+                switch (status[i]) {
+                    case STATUS_UNKNOWN:
+                        status[i] = STATUS_OK;
+                        deps[i] = null;
+                        break;
+
+                    case STATUS_OK:
+                    case STATUS_EXCEPTION:
+                        break;
+
+                    default:
+                        throw new InternalError();
+                }
+            }
+        }
+
+        /**
+         * Assigns a new object to the given handle.  The object previously
+         * associated with the handle is forgotten.  This method has no effect
+         * if the given handle already has an exception associated with it.
+         * This method may be called at any time after the handle is assigned.
+         */
+        void setObject(int handle, Object obj) {
+            switch (status[handle]) {
+                case STATUS_UNKNOWN:
+                case STATUS_OK:
+                    entries[handle] = obj;
+                    break;
+
+                case STATUS_EXCEPTION:
+                    break;
+
+                default:
+                    throw new InternalError();
+            }
+        }
+
+        /**
+         * Looks up and returns object associated with the given handle.
+         * Returns null if the given handle is NULL_HANDLE, or if it has an
+         * associated ClassNotFoundException.
+         */
+        Object lookupObject(int handle) {
+            return (handle != NULL_HANDLE &&
+                    status[handle] != STATUS_EXCEPTION) ?
+                entries[handle] : null;
+        }
+
+        /**
+         * Looks up and returns ClassNotFoundException associated with the
+         * given handle.  Returns null if the given handle is NULL_HANDLE, or
+         * if there is no ClassNotFoundException associated with the handle.
+         */
+        ClassNotFoundException lookupException(int handle) {
+            return (handle != NULL_HANDLE &&
+                    status[handle] == STATUS_EXCEPTION) ?
+                (ClassNotFoundException) entries[handle] : null;
+        }
+
+        /**
+         * Resets table to its initial state.
+         */
+        void clear() {
+            Arrays.fill(status, 0, size, (byte) 0);
+            Arrays.fill(entries, 0, size, null);
+            Arrays.fill(deps, 0, size, null);
+            lowDep = -1;
+            size = 0;
+        }
+
+        /**
+         * Returns number of handles registered in table.
+         */
+        int size() {
+            return size;
+        }
+
+        /**
+         * Expands capacity of internal arrays.
+         */
+        private void grow() {
+            int newCapacity = (entries.length << 1) + 1;
+
+            byte[] newStatus = new byte[newCapacity];
+            Object[] newEntries = new Object[newCapacity];
+            HandleList[] newDeps = new HandleList[newCapacity];
+
+            System.arraycopy(status, 0, newStatus, 0, size);
+            System.arraycopy(entries, 0, newEntries, 0, size);
+            System.arraycopy(deps, 0, newDeps, 0, size);
+
+            status = newStatus;
+            entries = newEntries;
+            deps = newDeps;
+        }
+
+        /**
+         * Simple growable list of (integer) handles.
+         */
+        private static class HandleList {
+            private int[] list = new int[4];
+            private int size = 0;
+
+            public HandleList() {
+            }
+
+            public void add(int handle) {
+                if (size >= list.length) {
+                    int[] newList = new int[list.length << 1];
+                    System.arraycopy(list, 0, newList, 0, list.length);
+                    list = newList;
+                }
+                list[size++] = handle;
+            }
+
+            public int get(int index) {
+                if (index >= size) {
+                    throw new ArrayIndexOutOfBoundsException();
+                }
+                return list[index];
+            }
+
+            public int size() {
+                return size;
+            }
+        }
+    }
+
+    /**
+     * Method for cloning arrays in case of using unsharing reading
+     */
+    private static Object cloneArray(Object array) {
+        if (array instanceof Object[]) {
+            return ((Object[]) array).clone();
+        } else if (array instanceof boolean[]) {
+            return ((boolean[]) array).clone();
+        } else if (array instanceof byte[]) {
+            return ((byte[]) array).clone();
+        } else if (array instanceof char[]) {
+            return ((char[]) array).clone();
+        } else if (array instanceof double[]) {
+            return ((double[]) array).clone();
+        } else if (array instanceof float[]) {
+            return ((float[]) array).clone();
+        } else if (array instanceof int[]) {
+            return ((int[]) array).clone();
+        } else if (array instanceof long[]) {
+            return ((long[]) array).clone();
+        } else if (array instanceof short[]) {
+            return ((short[]) array).clone();
+        } else {
+            throw new AssertionError();
+        }
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectInputValidation.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectInputValidation.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Callback interface to allow validation of objects within a graph.
+ * Allows an object to be called when a complete graph of objects has
+ * been deserialized.
+ *
+ * @author  unascribed
+ * @see     ObjectInputStream
+ * @see     ObjectInputStream#registerValidation(java.io.ObjectInputValidation, int)
+ * @since   JDK1.1
+ */
+public interface ObjectInputValidation {
+    /**
+     * Validates the object.
+     *
+     * @exception InvalidObjectException If the object cannot validate itself.
+     */
+    public void validateObject() throws InvalidObjectException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectOutput.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectOutput.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * ObjectOutput extends the DataOutput interface to include writing of objects.
+ * DataOutput includes methods for output of primitive types, ObjectOutput
+ * extends that interface to include objects, arrays, and Strings.
+ *
+ * @author  unascribed
+ * @see java.io.InputStream
+ * @see java.io.ObjectOutputStream
+ * @see java.io.ObjectInputStream
+ * @since   JDK1.1
+ */
+public interface ObjectOutput extends DataOutput, AutoCloseable {
+    /**
+     * Write an object to the underlying storage or stream.  The
+     * class that implements this interface defines how the object is
+     * written.
+     *
+     * @param obj the object to be written
+     * @exception IOException Any of the usual Input/Output related exceptions.
+     */
+    public void writeObject(Object obj)
+      throws IOException;
+
+    /**
+     * Writes a byte. This method will block until the byte is actually
+     * written.
+     * @param b the byte
+     * @exception IOException If an I/O error has occurred.
+     */
+    public void write(int b) throws IOException;
+
+    /**
+     * Writes an array of bytes. This method will block until the bytes
+     * are actually written.
+     * @param b the data to be written
+     * @exception IOException If an I/O error has occurred.
+     */
+    public void write(byte b[]) throws IOException;
+
+    /**
+     * Writes a sub array of bytes.
+     * @param b the data to be written
+     * @param off       the start offset in the data
+     * @param len       the number of bytes that are written
+     * @exception IOException If an I/O error has occurred.
+     */
+    public void write(byte b[], int off, int len) throws IOException;
+
+    /**
+     * Flushes the stream. This will write any buffered
+     * output bytes.
+     * @exception IOException If an I/O error has occurred.
+     */
+    public void flush() throws IOException;
+
+    /**
+     * Closes the stream. This method must be called
+     * to release any resources associated with the
+     * stream.
+     * @exception IOException If an I/O error has occurred.
+     */
+    public void close() throws IOException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectOutputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectOutputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,2369 @@
+/*
+ * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * An ObjectOutputStream writes primitive data types and graphs of Java objects
+ * to an OutputStream.  The objects can be read (reconstituted) using an
+ * ObjectInputStream.  Persistent storage of objects can be accomplished by
+ * using a file for the stream.  If the stream is a network socket stream, the
+ * objects can be reconstituted on another host or in another process.
+ *
+ * <p>Only objects that support the java.io.Serializable interface can be
+ * written to streams.  The class of each serializable object is encoded
+ * including the class name and signature of the class, the values of the
+ * object's fields and arrays, and the closure of any other objects referenced
+ * from the initial objects.
+ *
+ * <p>The method writeObject is used to write an object to the stream.  Any
+ * object, including Strings and arrays, is written with writeObject. Multiple
+ * objects or primitives can be written to the stream.  The objects must be
+ * read back from the corresponding ObjectInputstream with the same types and
+ * in the same order as they were written.
+ *
+ * <p>Primitive data types can also be written to the stream using the
+ * appropriate methods from DataOutput. Strings can also be written using the
+ * writeUTF method.
+ *
+ * <p>The default serialization mechanism for an object writes the class of the
+ * object, the class signature, and the values of all non-transient and
+ * non-static fields.  References to other objects (except in transient or
+ * static fields) cause those objects to be written also. Multiple references
+ * to a single object are encoded using a reference sharing mechanism so that
+ * graphs of objects can be restored to the same shape as when the original was
+ * written.
+ *
+ * <p>For example to write an object that can be read by the example in
+ * ObjectInputStream:
+ * <br>
+ * <pre>
+ *      FileOutputStream fos = new FileOutputStream("t.tmp");
+ *      ObjectOutputStream oos = new ObjectOutputStream(fos);
+ *
+ *      oos.writeInt(12345);
+ *      oos.writeObject("Today");
+ *      oos.writeObject(new Date());
+ *
+ *      oos.close();
+ * </pre>
+ *
+ * <p>Classes that require special handling during the serialization and
+ * deserialization process must implement special methods with these exact
+ * signatures:
+ * <br>
+ * <pre>
+ * private void readObject(java.io.ObjectInputStream stream)
+ *     throws IOException, ClassNotFoundException;
+ * private void writeObject(java.io.ObjectOutputStream stream)
+ *     throws IOException
+ * private void readObjectNoData()
+ *     throws ObjectStreamException;
+ * </pre>
+ *
+ * <p>The writeObject method is responsible for writing the state of the object
+ * for its particular class so that the corresponding readObject method can
+ * restore it.  The method does not need to concern itself with the state
+ * belonging to the object's superclasses or subclasses.  State is saved by
+ * writing the individual fields to the ObjectOutputStream using the
+ * writeObject method or by using the methods for primitive data types
+ * supported by DataOutput.
+ *
+ * <p>Serialization does not write out the fields of any object that does not
+ * implement the java.io.Serializable interface.  Subclasses of Objects that
+ * are not serializable can be serializable. In this case the non-serializable
+ * class must have a no-arg constructor to allow its fields to be initialized.
+ * In this case it is the responsibility of the subclass to save and restore
+ * the state of the non-serializable class. It is frequently the case that the
+ * fields of that class are accessible (public, package, or protected) or that
+ * there are get and set methods that can be used to restore the state.
+ *
+ * <p>Serialization of an object can be prevented by implementing writeObject
+ * and readObject methods that throw the NotSerializableException.  The
+ * exception will be caught by the ObjectOutputStream and abort the
+ * serialization process.
+ *
+ * <p>Implementing the Externalizable interface allows the object to assume
+ * complete control over the contents and format of the object's serialized
+ * form.  The methods of the Externalizable interface, writeExternal and
+ * readExternal, are called to save and restore the objects state.  When
+ * implemented by a class they can write and read their own state using all of
+ * the methods of ObjectOutput and ObjectInput.  It is the responsibility of
+ * the objects to handle any versioning that occurs.
+ *
+ * <p>Enum constants are serialized differently than ordinary serializable or
+ * externalizable objects.  The serialized form of an enum constant consists
+ * solely of its name; field values of the constant are not transmitted.  To
+ * serialize an enum constant, ObjectOutputStream writes the string returned by
+ * the constant's name method.  Like other serializable or externalizable
+ * objects, enum constants can function as the targets of back references
+ * appearing subsequently in the serialization stream.  The process by which
+ * enum constants are serialized cannot be customized; any class-specific
+ * writeObject and writeReplace methods defined by enum types are ignored
+ * during serialization.  Similarly, any serialPersistentFields or
+ * serialVersionUID field declarations are also ignored--all enum types have a
+ * fixed serialVersionUID of 0L.
+ *
+ * <p>Primitive data, excluding serializable fields and externalizable data, is
+ * written to the ObjectOutputStream in block-data records. A block data record
+ * is composed of a header and data. The block data header consists of a marker
+ * and the number of bytes to follow the header.  Consecutive primitive data
+ * writes are merged into one block-data record.  The blocking factor used for
+ * a block-data record will be 1024 bytes.  Each block-data record will be
+ * filled up to 1024 bytes, or be written whenever there is a termination of
+ * block-data mode.  Calls to the ObjectOutputStream methods writeObject,
+ * defaultWriteObject and writeFields initially terminate any existing
+ * block-data record.
+ *
+ * @author      Mike Warres
+ * @author      Roger Riggs
+ * @see java.io.DataOutput
+ * @see java.io.ObjectInputStream
+ * @see java.io.Serializable
+ * @see java.io.Externalizable
+ * @see <a href="../../../platform/serialization/spec/output.html">Object Serialization Specification, Section 2, Object Output Classes</a>
+ * @since       JDK1.1
+ */
+public class ObjectOutputStream
+    extends OutputStream implements ObjectOutput, ObjectStreamConstants
+{
+    /** filter stream for handling block data conversion */
+    private final BlockDataOutputStream bout;
+    /** obj -> wire handle map */
+    private final HandleTable handles;
+    /** obj -> replacement obj map */
+    private final ReplaceTable subs;
+    /** stream protocol version */
+    private int protocol = PROTOCOL_VERSION_2;
+    /** recursion depth */
+    private int depth;
+
+    /** buffer for writing primitive field values */
+    private byte[] primVals;
+
+    /** if true, invoke writeObjectOverride() instead of writeObject() */
+    private final boolean enableOverride;
+    /** if true, invoke replaceObject() */
+    private boolean enableReplace;
+
+    // values below valid only during upcalls to writeObject()/writeExternal()
+    /**
+     * Context during upcalls to class-defined writeObject methods; holds
+     * object currently being serialized and descriptor for current class.
+     * Null when not during writeObject upcall.
+     */
+    private Object curContext;
+    /** current PutField object */
+    private PutFieldImpl curPut;
+
+    /** custom storage for debug trace info */
+    private final DebugTraceInfoStack debugInfoStack;
+
+    /**
+     * value of "sun.io.serialization.extendedDebugInfo" property,
+     * as true or false for extended information about exception's place
+     */
+    private static final boolean extendedDebugInfo = false;
+
+    /**
+     * Creates an ObjectOutputStream that writes to the specified OutputStream.
+     * This constructor writes the serialization stream header to the
+     * underlying stream; callers may wish to flush the stream immediately to
+     * ensure that constructors for receiving ObjectInputStreams will not block
+     * when reading the header.
+     *
+     * <p>If a security manager is installed, this constructor will check for
+     * the "enableSubclassImplementation" SerializablePermission when invoked
+     * directly or indirectly by the constructor of a subclass which overrides
+     * the ObjectOutputStream.putFields or ObjectOutputStream.writeUnshared
+     * methods.
+     *
+     * @param   out output stream to write to
+     * @throws  IOException if an I/O error occurs while writing stream header
+     * @throws  SecurityException if untrusted subclass illegally overrides
+     *          security-sensitive methods
+     * @throws  NullPointerException if <code>out</code> is <code>null</code>
+     * @since   1.4
+     * @see     ObjectOutputStream#ObjectOutputStream()
+     * @see     ObjectOutputStream#putFields()
+     * @see     ObjectInputStream#ObjectInputStream(InputStream)
+     */
+    public ObjectOutputStream(OutputStream out) throws IOException {
+        verifySubclass();
+        bout = new BlockDataOutputStream(out);
+        handles = new HandleTable(10, (float) 3.00);
+        subs = new ReplaceTable(10, (float) 3.00);
+        enableOverride = false;
+        writeStreamHeader();
+        bout.setBlockDataMode(true);
+        if (extendedDebugInfo) {
+            debugInfoStack = new DebugTraceInfoStack();
+        } else {
+            debugInfoStack = null;
+        }
+    }
+
+    /**
+     * Provide a way for subclasses that are completely reimplementing
+     * ObjectOutputStream to not have to allocate private data just used by
+     * this implementation of ObjectOutputStream.
+     *
+     * <p>If there is a security manager installed, this method first calls the
+     * security manager's <code>checkPermission</code> method with a
+     * <code>SerializablePermission("enableSubclassImplementation")</code>
+     * permission to ensure it's ok to enable subclassing.
+     *
+     * @throws  SecurityException if a security manager exists and its
+     *          <code>checkPermission</code> method denies enabling
+     *          subclassing.
+     * @see SecurityManager#checkPermission
+     * @see java.io.SerializablePermission
+     */
+    protected ObjectOutputStream() throws IOException, SecurityException {
+        throw new SecurityException();
+    }
+
+    /**
+     * Specify stream protocol version to use when writing the stream.
+     *
+     * <p>This routine provides a hook to enable the current version of
+     * Serialization to write in a format that is backwards compatible to a
+     * previous version of the stream format.
+     *
+     * <p>Every effort will be made to avoid introducing additional
+     * backwards incompatibilities; however, sometimes there is no
+     * other alternative.
+     *
+     * @param   version use ProtocolVersion from java.io.ObjectStreamConstants.
+     * @throws  IllegalStateException if called after any objects
+     *          have been serialized.
+     * @throws  IllegalArgumentException if invalid version is passed in.
+     * @throws  IOException if I/O errors occur
+     * @see java.io.ObjectStreamConstants#PROTOCOL_VERSION_1
+     * @see java.io.ObjectStreamConstants#PROTOCOL_VERSION_2
+     * @since   1.2
+     */
+    public void useProtocolVersion(int version) throws IOException {
+        if (handles.size() != 0) {
+            // REMIND: implement better check for pristine stream?
+            throw new IllegalStateException("stream non-empty");
+        }
+        switch (version) {
+            case PROTOCOL_VERSION_1:
+            case PROTOCOL_VERSION_2:
+                protocol = version;
+                break;
+
+            default:
+                throw new IllegalArgumentException(
+                    "unknown version: " + version);
+        }
+    }
+
+    /**
+     * Write the specified object to the ObjectOutputStream.  The class of the
+     * object, the signature of the class, and the values of the non-transient
+     * and non-static fields of the class and all of its supertypes are
+     * written.  Default serialization for a class can be overridden using the
+     * writeObject and the readObject methods.  Objects referenced by this
+     * object are written transitively so that a complete equivalent graph of
+     * objects can be reconstructed by an ObjectInputStream.
+     *
+     * <p>Exceptions are thrown for problems with the OutputStream and for
+     * classes that should not be serialized.  All exceptions are fatal to the
+     * OutputStream, which is left in an indeterminate state, and it is up to
+     * the caller to ignore or recover the stream state.
+     *
+     * @throws  InvalidClassException Something is wrong with a class used by
+     *          serialization.
+     * @throws  NotSerializableException Some object to be serialized does not
+     *          implement the java.io.Serializable interface.
+     * @throws  IOException Any exception thrown by the underlying
+     *          OutputStream.
+     */
+    public final void writeObject(Object obj) throws IOException {
+        if (enableOverride) {
+            writeObjectOverride(obj);
+            return;
+        }
+        try {
+            writeObject0(obj, false);
+        } catch (IOException ex) {
+            if (depth == 0) {
+                writeFatalException(ex);
+            }
+            throw ex;
+        }
+    }
+
+    /**
+     * Method used by subclasses to override the default writeObject method.
+     * This method is called by trusted subclasses of ObjectInputStream that
+     * constructed ObjectInputStream using the protected no-arg constructor.
+     * The subclass is expected to provide an override method with the modifier
+     * "final".
+     *
+     * @param   obj object to be written to the underlying stream
+     * @throws  IOException if there are I/O errors while writing to the
+     *          underlying stream
+     * @see #ObjectOutputStream()
+     * @see #writeObject(Object)
+     * @since 1.2
+     */
+    protected void writeObjectOverride(Object obj) throws IOException {
+    }
+
+    /**
+     * Writes an "unshared" object to the ObjectOutputStream.  This method is
+     * identical to writeObject, except that it always writes the given object
+     * as a new, unique object in the stream (as opposed to a back-reference
+     * pointing to a previously serialized instance).  Specifically:
+     * <ul>
+     *   <li>An object written via writeUnshared is always serialized in the
+     *       same manner as a newly appearing object (an object that has not
+     *       been written to the stream yet), regardless of whether or not the
+     *       object has been written previously.
+     *
+     *   <li>If writeObject is used to write an object that has been previously
+     *       written with writeUnshared, the previous writeUnshared operation
+     *       is treated as if it were a write of a separate object.  In other
+     *       words, ObjectOutputStream will never generate back-references to
+     *       object data written by calls to writeUnshared.
+     * </ul>
+     * While writing an object via writeUnshared does not in itself guarantee a
+     * unique reference to the object when it is deserialized, it allows a
+     * single object to be defined multiple times in a stream, so that multiple
+     * calls to readUnshared by the receiver will not conflict.  Note that the
+     * rules described above only apply to the base-level object written with
+     * writeUnshared, and not to any transitively referenced sub-objects in the
+     * object graph to be serialized.
+     *
+     * <p>ObjectOutputStream subclasses which override this method can only be
+     * constructed in security contexts possessing the
+     * "enableSubclassImplementation" SerializablePermission; any attempt to
+     * instantiate such a subclass without this permission will cause a
+     * SecurityException to be thrown.
+     *
+     * @param   obj object to write to stream
+     * @throws  NotSerializableException if an object in the graph to be
+     *          serialized does not implement the Serializable interface
+     * @throws  InvalidClassException if a problem exists with the class of an
+     *          object to be serialized
+     * @throws  IOException if an I/O error occurs during serialization
+     * @since 1.4
+     */
+    public void writeUnshared(Object obj) throws IOException {
+        try {
+            writeObject0(obj, true);
+        } catch (IOException ex) {
+            if (depth == 0) {
+                writeFatalException(ex);
+            }
+            throw ex;
+        }
+    }
+
+    /**
+     * Write the non-static and non-transient fields of the current class to
+     * this stream.  This may only be called from the writeObject method of the
+     * class being serialized. It will throw the NotActiveException if it is
+     * called otherwise.
+     *
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          <code>OutputStream</code>
+     */
+    public void defaultWriteObject() throws IOException {
+        if ( curContext == null ) {
+            throw new NotActiveException("not in call to writeObject");
+        }
+        Object curObj = null; // curContext.getObj();
+        ObjectStreamClass curDesc = null; // curContext.getDesc();
+        bout.setBlockDataMode(false);
+        defaultWriteFields(curObj, curDesc);
+        bout.setBlockDataMode(true);
+    }
+
+    /**
+     * Retrieve the object used to buffer persistent fields to be written to
+     * the stream.  The fields will be written to the stream when writeFields
+     * method is called.
+     *
+     * @return  an instance of the class Putfield that holds the serializable
+     *          fields
+     * @throws  IOException if I/O errors occur
+     * @since 1.2
+     */
+    public ObjectOutputStream.PutField putFields() throws IOException {
+        if (curPut == null) {
+            if (curContext == null) {
+                throw new NotActiveException("not in call to writeObject");
+            }
+            Object curObj = null; // curContext.getObj();
+            ObjectStreamClass curDesc = null; // curContext.getDesc();
+            curPut = new PutFieldImpl(curDesc);
+        }
+        return curPut;
+    }
+
+    /**
+     * Write the buffered fields to the stream.
+     *
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     * @throws  NotActiveException Called when a classes writeObject method was
+     *          not called to write the state of the object.
+     * @since 1.2
+     */
+    public void writeFields() throws IOException {
+        if (curPut == null) {
+            throw new NotActiveException("no current PutField object");
+        }
+        bout.setBlockDataMode(false);
+        curPut.writeFields();
+        bout.setBlockDataMode(true);
+    }
+
+    /**
+     * Reset will disregard the state of any objects already written to the
+     * stream.  The state is reset to be the same as a new ObjectOutputStream.
+     * The current point in the stream is marked as reset so the corresponding
+     * ObjectInputStream will be reset at the same point.  Objects previously
+     * written to the stream will not be refered to as already being in the
+     * stream.  They will be written to the stream again.
+     *
+     * @throws  IOException if reset() is invoked while serializing an object.
+     */
+    public void reset() throws IOException {
+        if (depth != 0) {
+            throw new IOException("stream active");
+        }
+        bout.setBlockDataMode(false);
+        bout.writeByte(TC_RESET);
+        clear();
+        bout.setBlockDataMode(true);
+    }
+
+    /**
+     * Subclasses may implement this method to allow class data to be stored in
+     * the stream. By default this method does nothing.  The corresponding
+     * method in ObjectInputStream is resolveClass.  This method is called
+     * exactly once for each unique class in the stream.  The class name and
+     * signature will have already been written to the stream.  This method may
+     * make free use of the ObjectOutputStream to save any representation of
+     * the class it deems suitable (for example, the bytes of the class file).
+     * The resolveClass method in the corresponding subclass of
+     * ObjectInputStream must read and use any data or objects written by
+     * annotateClass.
+     *
+     * @param   cl the class to annotate custom data for
+     * @throws  IOException Any exception thrown by the underlying
+     *          OutputStream.
+     */
+    protected void annotateClass(Class<?> cl) throws IOException {
+    }
+
+    /**
+     * Subclasses may implement this method to store custom data in the stream
+     * along with descriptors for dynamic proxy classes.
+     *
+     * <p>This method is called exactly once for each unique proxy class
+     * descriptor in the stream.  The default implementation of this method in
+     * <code>ObjectOutputStream</code> does nothing.
+     *
+     * <p>The corresponding method in <code>ObjectInputStream</code> is
+     * <code>resolveProxyClass</code>.  For a given subclass of
+     * <code>ObjectOutputStream</code> that overrides this method, the
+     * <code>resolveProxyClass</code> method in the corresponding subclass of
+     * <code>ObjectInputStream</code> must read any data or objects written by
+     * <code>annotateProxyClass</code>.
+     *
+     * @param   cl the proxy class to annotate custom data for
+     * @throws  IOException any exception thrown by the underlying
+     *          <code>OutputStream</code>
+     * @see ObjectInputStream#resolveProxyClass(String[])
+     * @since   1.3
+     */
+    protected void annotateProxyClass(Class<?> cl) throws IOException {
+    }
+
+    /**
+     * This method will allow trusted subclasses of ObjectOutputStream to
+     * substitute one object for another during serialization. Replacing
+     * objects is disabled until enableReplaceObject is called. The
+     * enableReplaceObject method checks that the stream requesting to do
+     * replacement can be trusted.  The first occurrence of each object written
+     * into the serialization stream is passed to replaceObject.  Subsequent
+     * references to the object are replaced by the object returned by the
+     * original call to replaceObject.  To ensure that the private state of
+     * objects is not unintentionally exposed, only trusted streams may use
+     * replaceObject.
+     *
+     * <p>The ObjectOutputStream.writeObject method takes a parameter of type
+     * Object (as opposed to type Serializable) to allow for cases where
+     * non-serializable objects are replaced by serializable ones.
+     *
+     * <p>When a subclass is replacing objects it must insure that either a
+     * complementary substitution must be made during deserialization or that
+     * the substituted object is compatible with every field where the
+     * reference will be stored.  Objects whose type is not a subclass of the
+     * type of the field or array element abort the serialization by raising an
+     * exception and the object is not be stored.
+     *
+     * <p>This method is called only once when each object is first
+     * encountered.  All subsequent references to the object will be redirected
+     * to the new object. This method should return the object to be
+     * substituted or the original object.
+     *
+     * <p>Null can be returned as the object to be substituted, but may cause
+     * NullReferenceException in classes that contain references to the
+     * original object since they may be expecting an object instead of
+     * null.
+     *
+     * @param   obj the object to be replaced
+     * @return  the alternate object that replaced the specified one
+     * @throws  IOException Any exception thrown by the underlying
+     *          OutputStream.
+     */
+    protected Object replaceObject(Object obj) throws IOException {
+        return obj;
+    }
+
+    /**
+     * Enable the stream to do replacement of objects in the stream.  When
+     * enabled, the replaceObject method is called for every object being
+     * serialized.
+     *
+     * <p>If <code>enable</code> is true, and there is a security manager
+     * installed, this method first calls the security manager's
+     * <code>checkPermission</code> method with a
+     * <code>SerializablePermission("enableSubstitution")</code> permission to
+     * ensure it's ok to enable the stream to do replacement of objects in the
+     * stream.
+     *
+     * @param   enable boolean parameter to enable replacement of objects
+     * @return  the previous setting before this method was invoked
+     * @throws  SecurityException if a security manager exists and its
+     *          <code>checkPermission</code> method denies enabling the stream
+     *          to do replacement of objects in the stream.
+     * @see SecurityManager#checkPermission
+     * @see java.io.SerializablePermission
+     */
+    protected boolean enableReplaceObject(boolean enable)
+        throws SecurityException
+    {
+        throw new SecurityException();
+    }
+
+    /**
+     * The writeStreamHeader method is provided so subclasses can append or
+     * prepend their own header to the stream.  It writes the magic number and
+     * version to the stream.
+     *
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    protected void writeStreamHeader() throws IOException {
+        bout.writeShort(STREAM_MAGIC);
+        bout.writeShort(STREAM_VERSION);
+    }
+
+    /**
+     * Write the specified class descriptor to the ObjectOutputStream.  Class
+     * descriptors are used to identify the classes of objects written to the
+     * stream.  Subclasses of ObjectOutputStream may override this method to
+     * customize the way in which class descriptors are written to the
+     * serialization stream.  The corresponding method in ObjectInputStream,
+     * <code>readClassDescriptor</code>, should then be overridden to
+     * reconstitute the class descriptor from its custom stream representation.
+     * By default, this method writes class descriptors according to the format
+     * defined in the Object Serialization specification.
+     *
+     * <p>Note that this method will only be called if the ObjectOutputStream
+     * is not using the old serialization stream format (set by calling
+     * ObjectOutputStream's <code>useProtocolVersion</code> method).  If this
+     * serialization stream is using the old format
+     * (<code>PROTOCOL_VERSION_1</code>), the class descriptor will be written
+     * internally in a manner that cannot be overridden or customized.
+     *
+     * @param   desc class descriptor to write to the stream
+     * @throws  IOException If an I/O error has occurred.
+     * @see java.io.ObjectInputStream#readClassDescriptor()
+     * @see #useProtocolVersion(int)
+     * @see java.io.ObjectStreamConstants#PROTOCOL_VERSION_1
+     * @since 1.3
+     */
+    protected void writeClassDescriptor(ObjectStreamClass desc)
+        throws IOException
+    {
+        desc.writeNonProxy(this);
+    }
+
+    /**
+     * Writes a byte. This method will block until the byte is actually
+     * written.
+     *
+     * @param   val the byte to be written to the stream
+     * @throws  IOException If an I/O error has occurred.
+     */
+    public void write(int val) throws IOException {
+        bout.write(val);
+    }
+
+    /**
+     * Writes an array of bytes. This method will block until the bytes are
+     * actually written.
+     *
+     * @param   buf the data to be written
+     * @throws  IOException If an I/O error has occurred.
+     */
+    public void write(byte[] buf) throws IOException {
+        bout.write(buf, 0, buf.length, false);
+    }
+
+    /**
+     * Writes a sub array of bytes.
+     *
+     * @param   buf the data to be written
+     * @param   off the start offset in the data
+     * @param   len the number of bytes that are written
+     * @throws  IOException If an I/O error has occurred.
+     */
+    public void write(byte[] buf, int off, int len) throws IOException {
+        if (buf == null) {
+            throw new NullPointerException();
+        }
+        int endoff = off + len;
+        if (off < 0 || len < 0 || endoff > buf.length || endoff < 0) {
+            throw new IndexOutOfBoundsException();
+        }
+        bout.write(buf, off, len, false);
+    }
+
+    /**
+     * Flushes the stream. This will write any buffered output bytes and flush
+     * through to the underlying stream.
+     *
+     * @throws  IOException If an I/O error has occurred.
+     */
+    public void flush() throws IOException {
+        bout.flush();
+    }
+
+    /**
+     * Drain any buffered data in ObjectOutputStream.  Similar to flush but
+     * does not propagate the flush to the underlying stream.
+     *
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    protected void drain() throws IOException {
+        bout.drain();
+    }
+
+    /**
+     * Closes the stream. This method must be called to release any resources
+     * associated with the stream.
+     *
+     * @throws  IOException If an I/O error has occurred.
+     */
+    public void close() throws IOException {
+        flush();
+        clear();
+        bout.close();
+    }
+
+    /**
+     * Writes a boolean.
+     *
+     * @param   val the boolean to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeBoolean(boolean val) throws IOException {
+        bout.writeBoolean(val);
+    }
+
+    /**
+     * Writes an 8 bit byte.
+     *
+     * @param   val the byte value to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeByte(int val) throws IOException  {
+        bout.writeByte(val);
+    }
+
+    /**
+     * Writes a 16 bit short.
+     *
+     * @param   val the short value to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeShort(int val)  throws IOException {
+        bout.writeShort(val);
+    }
+
+    /**
+     * Writes a 16 bit char.
+     *
+     * @param   val the char value to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeChar(int val)  throws IOException {
+        bout.writeChar(val);
+    }
+
+    /**
+     * Writes a 32 bit int.
+     *
+     * @param   val the integer value to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeInt(int val)  throws IOException {
+        bout.writeInt(val);
+    }
+
+    /**
+     * Writes a 64 bit long.
+     *
+     * @param   val the long value to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeLong(long val)  throws IOException {
+        bout.writeLong(val);
+    }
+
+    /**
+     * Writes a 32 bit float.
+     *
+     * @param   val the float value to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeFloat(float val) throws IOException {
+        bout.writeFloat(val);
+    }
+
+    /**
+     * Writes a 64 bit double.
+     *
+     * @param   val the double value to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeDouble(double val) throws IOException {
+        bout.writeDouble(val);
+    }
+
+    /**
+     * Writes a String as a sequence of bytes.
+     *
+     * @param   str the String of bytes to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeBytes(String str) throws IOException {
+        bout.writeBytes(str);
+    }
+
+    /**
+     * Writes a String as a sequence of chars.
+     *
+     * @param   str the String of chars to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeChars(String str) throws IOException {
+        bout.writeChars(str);
+    }
+
+    /**
+     * Primitive data write of this String in
+     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
+     * format.  Note that there is a
+     * significant difference between writing a String into the stream as
+     * primitive data or as an Object. A String instance written by writeObject
+     * is written into the stream as a String initially. Future writeObject()
+     * calls write references to the string into the stream.
+     *
+     * @param   str the String to be written
+     * @throws  IOException if I/O errors occur while writing to the underlying
+     *          stream
+     */
+    public void writeUTF(String str) throws IOException {
+        bout.writeUTF(str);
+    }
+
+    /**
+     * Provide programmatic access to the persistent fields to be written
+     * to ObjectOutput.
+     *
+     * @since 1.2
+     */
+    public static abstract class PutField {
+
+        /**
+         * Put the value of the named boolean field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not
+         * <code>boolean</code>
+         */
+        public abstract void put(String name, boolean val);
+
+        /**
+         * Put the value of the named byte field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not
+         * <code>byte</code>
+         */
+        public abstract void put(String name, byte val);
+
+        /**
+         * Put the value of the named char field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not
+         * <code>char</code>
+         */
+        public abstract void put(String name, char val);
+
+        /**
+         * Put the value of the named short field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not
+         * <code>short</code>
+         */
+        public abstract void put(String name, short val);
+
+        /**
+         * Put the value of the named int field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not
+         * <code>int</code>
+         */
+        public abstract void put(String name, int val);
+
+        /**
+         * Put the value of the named long field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not
+         * <code>long</code>
+         */
+        public abstract void put(String name, long val);
+
+        /**
+         * Put the value of the named float field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not
+         * <code>float</code>
+         */
+        public abstract void put(String name, float val);
+
+        /**
+         * Put the value of the named double field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not
+         * <code>double</code>
+         */
+        public abstract void put(String name, double val);
+
+        /**
+         * Put the value of the named Object field into the persistent field.
+         *
+         * @param  name the name of the serializable field
+         * @param  val the value to assign to the field
+         *         (which may be <code>null</code>)
+         * @throws IllegalArgumentException if <code>name</code> does not
+         * match the name of a serializable field for the class whose fields
+         * are being written, or if the type of the named field is not a
+         * reference type
+         */
+        public abstract void put(String name, Object val);
+
+        /**
+         * Write the data and fields to the specified ObjectOutput stream,
+         * which must be the same stream that produced this
+         * <code>PutField</code> object.
+         *
+         * @param  out the stream to write the data and fields to
+         * @throws IOException if I/O errors occur while writing to the
+         *         underlying stream
+         * @throws IllegalArgumentException if the specified stream is not
+         *         the same stream that produced this <code>PutField</code>
+         *         object
+         * @deprecated This method does not write the values contained by this
+         *         <code>PutField</code> object in a proper format, and may
+         *         result in corruption of the serialization stream.  The
+         *         correct way to write <code>PutField</code> data is by
+         *         calling the {@link java.io.ObjectOutputStream#writeFields()}
+         *         method.
+         */
+        @Deprecated
+        public abstract void write(ObjectOutput out) throws IOException;
+    }
+
+
+    /**
+     * Returns protocol version in use.
+     */
+    int getProtocolVersion() {
+        return protocol;
+    }
+
+    /**
+     * Writes string without allowing it to be replaced in stream.  Used by
+     * ObjectStreamClass to write class descriptor type strings.
+     */
+    void writeTypeString(String str) throws IOException {
+        int handle;
+        if (str == null) {
+            writeNull();
+        } else if ((handle = handles.lookup(str)) != -1) {
+            writeHandle(handle);
+        } else {
+            writeString(str, false);
+        }
+    }
+
+    /**
+     * Verifies that this (possibly subclass) instance can be constructed
+     * without violating security constraints: the subclass must not override
+     * security-sensitive non-final methods, or else the
+     * "enableSubclassImplementation" SerializablePermission is checked.
+     */
+    private void verifySubclass() {
+        Class cl = getClass();
+        if (cl == ObjectOutputStream.class) {
+            return;
+        }
+        throw new SecurityException();
+    }
+
+    /**
+     * Clears internal data structures.
+     */
+    private void clear() {
+        subs.clear();
+        handles.clear();
+    }
+
+    /**
+     * Underlying writeObject/writeUnshared implementation.
+     */
+    private void writeObject0(Object obj, boolean unshared)
+        throws IOException
+    {
+        boolean oldMode = bout.setBlockDataMode(false);
+        depth++;
+        try {
+            // handle previously written and non-replaceable objects
+            int h;
+            if ((obj = subs.lookup(obj)) == null) {
+                writeNull();
+                return;
+            } else if (!unshared && (h = handles.lookup(obj)) != -1) {
+                writeHandle(h);
+                return;
+            } else if (obj instanceof Class) {
+                writeClass((Class) obj, unshared);
+                return;
+            } else if (obj instanceof ObjectStreamClass) {
+                writeClassDesc((ObjectStreamClass) obj, unshared);
+                return;
+            }
+
+            // check for replacement object
+            Object orig = obj;
+            Class cl = obj.getClass();
+            ObjectStreamClass desc;
+            for (;;) {
+                // REMIND: skip this check for strings/arrays?
+                Class repCl;
+                desc = ObjectStreamClass.lookup(cl, true);
+                if (!desc.hasWriteReplaceMethod() ||
+                    (obj = desc.invokeWriteReplace(obj)) == null ||
+                    (repCl = obj.getClass()) == cl)
+                {
+                    break;
+                }
+                cl = repCl;
+            }
+            if (enableReplace) {
+                Object rep = replaceObject(obj);
+                if (rep != obj && rep != null) {
+                    cl = rep.getClass();
+                    desc = ObjectStreamClass.lookup(cl, true);
+                }
+                obj = rep;
+            }
+
+            // if object replaced, run through original checks a second time
+            if (obj != orig) {
+                subs.assign(orig, obj);
+                if (obj == null) {
+                    writeNull();
+                    return;
+                } else if (!unshared && (h = handles.lookup(obj)) != -1) {
+                    writeHandle(h);
+                    return;
+                } else if (obj instanceof Class) {
+                    writeClass((Class) obj, unshared);
+                    return;
+                } else if (obj instanceof ObjectStreamClass) {
+                    writeClassDesc((ObjectStreamClass) obj, unshared);
+                    return;
+                }
+            }
+
+            // remaining cases
+            if (obj instanceof String) {
+                writeString((String) obj, unshared);
+            } else if (cl.isArray()) {
+                writeArray(obj, desc, unshared);
+            } else if (obj instanceof Enum) {
+                writeEnum((Enum) obj, desc, unshared);
+            } else if (obj instanceof Serializable) {
+                writeOrdinaryObject(obj, desc, unshared);
+            } else {
+                if (extendedDebugInfo) {
+                    throw new NotSerializableException(
+                        cl.getName() + "\n" + debugInfoStack.toString());
+                } else {
+                    throw new NotSerializableException(cl.getName());
+                }
+            }
+        } finally {
+            depth--;
+            bout.setBlockDataMode(oldMode);
+        }
+    }
+
+    /**
+     * Writes null code to stream.
+     */
+    private void writeNull() throws IOException {
+        bout.writeByte(TC_NULL);
+    }
+
+    /**
+     * Writes given object handle to stream.
+     */
+    private void writeHandle(int handle) throws IOException {
+        bout.writeByte(TC_REFERENCE);
+        bout.writeInt(baseWireHandle + handle);
+    }
+
+    /**
+     * Writes representation of given class to stream.
+     */
+    private void writeClass(Class cl, boolean unshared) throws IOException {
+        bout.writeByte(TC_CLASS);
+        writeClassDesc(ObjectStreamClass.lookup(cl, true), false);
+        handles.assign(unshared ? null : cl);
+    }
+
+    /**
+     * Writes representation of given class descriptor to stream.
+     */
+    private void writeClassDesc(ObjectStreamClass desc, boolean unshared)
+        throws IOException
+    {
+        int handle;
+        if (desc == null) {
+            writeNull();
+        } else if (!unshared && (handle = handles.lookup(desc)) != -1) {
+            writeHandle(handle);
+        } else if (desc.isProxy()) {
+            writeProxyDesc(desc, unshared);
+        } else {
+            writeNonProxyDesc(desc, unshared);
+        }
+    }
+
+    /**
+     * Writes class descriptor representing a dynamic proxy class to stream.
+     */
+    private void writeProxyDesc(ObjectStreamClass desc, boolean unshared)
+        throws IOException
+    {
+        bout.writeByte(TC_PROXYCLASSDESC);
+        handles.assign(unshared ? null : desc);
+
+        Class cl = desc.forClass();
+        Class[] ifaces = cl.getInterfaces();
+        bout.writeInt(ifaces.length);
+        for (int i = 0; i < ifaces.length; i++) {
+            bout.writeUTF(ifaces[i].getName());
+        }
+
+        bout.setBlockDataMode(true);
+        annotateProxyClass(cl);
+        bout.setBlockDataMode(false);
+        bout.writeByte(TC_ENDBLOCKDATA);
+
+        writeClassDesc(desc.getSuperDesc(), false);
+    }
+
+    /**
+     * Writes class descriptor representing a standard (i.e., not a dynamic
+     * proxy) class to stream.
+     */
+    private void writeNonProxyDesc(ObjectStreamClass desc, boolean unshared)
+        throws IOException
+    {
+        bout.writeByte(TC_CLASSDESC);
+        handles.assign(unshared ? null : desc);
+
+        if (protocol == PROTOCOL_VERSION_1) {
+            // do not invoke class descriptor write hook with old protocol
+            desc.writeNonProxy(this);
+        } else {
+            writeClassDescriptor(desc);
+        }
+
+        Class cl = desc.forClass();
+        bout.setBlockDataMode(true);
+        annotateClass(cl);
+        bout.setBlockDataMode(false);
+        bout.writeByte(TC_ENDBLOCKDATA);
+
+        writeClassDesc(desc.getSuperDesc(), false);
+    }
+
+    /**
+     * Writes given string to stream, using standard or long UTF format
+     * depending on string length.
+     */
+    private void writeString(String str, boolean unshared) throws IOException {
+        handles.assign(unshared ? null : str);
+        long utflen = bout.getUTFLength(str);
+        if (utflen <= 0xFFFF) {
+            bout.writeByte(TC_STRING);
+            bout.writeUTF(str, utflen);
+        } else {
+            bout.writeByte(TC_LONGSTRING);
+            bout.writeLongUTF(str, utflen);
+        }
+    }
+
+    /**
+     * Writes given array object to stream.
+     */
+    private void writeArray(Object array,
+                            ObjectStreamClass desc,
+                            boolean unshared)
+        throws IOException
+    {
+        bout.writeByte(TC_ARRAY);
+        writeClassDesc(desc, false);
+        handles.assign(unshared ? null : array);
+
+        Class ccl = desc.forClass().getComponentType();
+        if (ccl.isPrimitive()) {
+            if (ccl == Integer.TYPE) {
+                int[] ia = (int[]) array;
+                bout.writeInt(ia.length);
+                bout.writeInts(ia, 0, ia.length);
+            } else if (ccl == Byte.TYPE) {
+                byte[] ba = (byte[]) array;
+                bout.writeInt(ba.length);
+                bout.write(ba, 0, ba.length, true);
+            } else if (ccl == Long.TYPE) {
+                long[] ja = (long[]) array;
+                bout.writeInt(ja.length);
+                bout.writeLongs(ja, 0, ja.length);
+            } else if (ccl == Float.TYPE) {
+                float[] fa = (float[]) array;
+                bout.writeInt(fa.length);
+                bout.writeFloats(fa, 0, fa.length);
+            } else if (ccl == Double.TYPE) {
+                double[] da = (double[]) array;
+                bout.writeInt(da.length);
+                bout.writeDoubles(da, 0, da.length);
+            } else if (ccl == Short.TYPE) {
+                short[] sa = (short[]) array;
+                bout.writeInt(sa.length);
+                bout.writeShorts(sa, 0, sa.length);
+            } else if (ccl == Character.TYPE) {
+                char[] ca = (char[]) array;
+                bout.writeInt(ca.length);
+                bout.writeChars(ca, 0, ca.length);
+            } else if (ccl == Boolean.TYPE) {
+                boolean[] za = (boolean[]) array;
+                bout.writeInt(za.length);
+                bout.writeBooleans(za, 0, za.length);
+            } else {
+                throw new InternalError();
+            }
+        } else {
+            Object[] objs = (Object[]) array;
+            int len = objs.length;
+            bout.writeInt(len);
+            if (extendedDebugInfo) {
+                debugInfoStack.push(
+                    "array (class \"" + array.getClass().getName() +
+                    "\", size: " + len  + ")");
+            }
+            try {
+                for (int i = 0; i < len; i++) {
+                    if (extendedDebugInfo) {
+                        debugInfoStack.push(
+                            "element of array (index: " + i + ")");
+                    }
+                    try {
+                        writeObject0(objs[i], false);
+                    } finally {
+                        if (extendedDebugInfo) {
+                            debugInfoStack.pop();
+                        }
+                    }
+                }
+            } finally {
+                if (extendedDebugInfo) {
+                    debugInfoStack.pop();
+                }
+            }
+        }
+    }
+
+    /**
+     * Writes given enum constant to stream.
+     */
+    private void writeEnum(Enum en,
+                           ObjectStreamClass desc,
+                           boolean unshared)
+        throws IOException
+    {
+        bout.writeByte(TC_ENUM);
+        ObjectStreamClass sdesc = desc.getSuperDesc();
+        writeClassDesc((sdesc.forClass() == Enum.class) ? desc : sdesc, false);
+        handles.assign(unshared ? null : en);
+        writeString(en.name(), false);
+    }
+
+    /**
+     * Writes representation of a "ordinary" (i.e., not a String, Class,
+     * ObjectStreamClass, array, or enum constant) serializable object to the
+     * stream.
+     */
+    private void writeOrdinaryObject(Object obj,
+                                     ObjectStreamClass desc,
+                                     boolean unshared)
+        throws IOException
+    {
+        if (extendedDebugInfo) {
+            debugInfoStack.push(
+                (depth == 1 ? "root " : "") + "object (class \"" +
+                obj.getClass().getName() + "\", " + obj.toString() + ")");
+        }
+        try {
+            desc.checkSerialize();
+
+            bout.writeByte(TC_OBJECT);
+            writeClassDesc(desc, false);
+            handles.assign(unshared ? null : obj);
+            if (desc.isExternalizable() && !desc.isProxy()) {
+                writeExternalData((Externalizable) obj);
+            } else {
+                writeSerialData(obj, desc);
+            }
+        } finally {
+            if (extendedDebugInfo) {
+                debugInfoStack.pop();
+            }
+        }
+    }
+
+    /**
+     * Writes externalizable data of given object by invoking its
+     * writeExternal() method.
+     */
+    private void writeExternalData(Externalizable obj) throws IOException {
+        PutFieldImpl oldPut = curPut;
+        curPut = null;
+
+        if (extendedDebugInfo) {
+            debugInfoStack.push("writeExternal data");
+        }
+        Object oldContext = curContext;
+        try {
+            curContext = null;
+            if (protocol == PROTOCOL_VERSION_1) {
+                obj.writeExternal(this);
+            } else {
+                bout.setBlockDataMode(true);
+                obj.writeExternal(this);
+                bout.setBlockDataMode(false);
+                bout.writeByte(TC_ENDBLOCKDATA);
+            }
+        } finally {
+            curContext = oldContext;
+            if (extendedDebugInfo) {
+                debugInfoStack.pop();
+            }
+        }
+
+        curPut = oldPut;
+    }
+
+    /**
+     * Writes instance data for each serializable class of given object, from
+     * superclass to subclass.
+     */
+    private void writeSerialData(Object obj, ObjectStreamClass desc)
+        throws IOException
+    {
+        ObjectStreamClass.ClassDataSlot[] slots = desc.getClassDataLayout();
+        for (int i = 0; i < slots.length; i++) {
+            ObjectStreamClass slotDesc = slots[i].desc;
+            if (slotDesc.hasWriteObjectMethod()) {
+                PutFieldImpl oldPut = curPut;
+                curPut = null;
+                Object oldContext = curContext;
+
+                if (extendedDebugInfo) {
+                    debugInfoStack.push(
+                        "custom writeObject data (class \"" +
+                        slotDesc.getName() + "\")");
+                }
+                try {
+                    curContext = new Object(); //new SerialCallbackContext(obj, slotDesc);
+                    bout.setBlockDataMode(true);
+                    slotDesc.invokeWriteObject(obj, this);
+                    bout.setBlockDataMode(false);
+                    bout.writeByte(TC_ENDBLOCKDATA);
+                } finally {
+                    //curContext.setUsed();
+                    curContext = oldContext;
+                    if (extendedDebugInfo) {
+                        debugInfoStack.pop();
+                    }
+                }
+
+                curPut = oldPut;
+            } else {
+                defaultWriteFields(obj, slotDesc);
+            }
+        }
+    }
+
+    /**
+     * Fetches and writes values of serializable fields of given object to
+     * stream.  The given class descriptor specifies which field values to
+     * write, and in which order they should be written.
+     */
+    private void defaultWriteFields(Object obj, ObjectStreamClass desc)
+        throws IOException
+    {
+        // REMIND: perform conservative isInstance check here?
+        desc.checkDefaultSerialize();
+
+        int primDataSize = desc.getPrimDataSize();
+        if (primVals == null || primVals.length < primDataSize) {
+            primVals = new byte[primDataSize];
+        }
+        desc.getPrimFieldValues(obj, primVals);
+        bout.write(primVals, 0, primDataSize, false);
+
+        ObjectStreamField[] fields = desc.getFields(false);
+        Object[] objVals = new Object[desc.getNumObjFields()];
+        int numPrimFields = fields.length - objVals.length;
+        desc.getObjFieldValues(obj, objVals);
+        for (int i = 0; i < objVals.length; i++) {
+            if (extendedDebugInfo) {
+                debugInfoStack.push(
+                    "field (class \"" + desc.getName() + "\", name: \"" +
+                    fields[numPrimFields + i].getName() + "\", type: \"" +
+                    fields[numPrimFields + i].getType() + "\")");
+            }
+            try {
+                writeObject0(objVals[i],
+                             fields[numPrimFields + i].isUnshared());
+            } finally {
+                if (extendedDebugInfo) {
+                    debugInfoStack.pop();
+                }
+            }
+        }
+    }
+
+    /**
+     * Attempts to write to stream fatal IOException that has caused
+     * serialization to abort.
+     */
+    private void writeFatalException(IOException ex) throws IOException {
+        /*
+         * Note: the serialization specification states that if a second
+         * IOException occurs while attempting to serialize the original fatal
+         * exception to the stream, then a StreamCorruptedException should be
+         * thrown (section 2.1).  However, due to a bug in previous
+         * implementations of serialization, StreamCorruptedExceptions were
+         * rarely (if ever) actually thrown--the "root" exceptions from
+         * underlying streams were thrown instead.  This historical behavior is
+         * followed here for consistency.
+         */
+        clear();
+        boolean oldMode = bout.setBlockDataMode(false);
+        try {
+            bout.writeByte(TC_EXCEPTION);
+            writeObject0(ex, false);
+            clear();
+        } finally {
+            bout.setBlockDataMode(oldMode);
+        }
+    }
+
+    /**
+     * Converts specified span of float values into byte values.
+     */
+    // REMIND: remove once hotspot inlines Float.floatToIntBits
+    private static native void floatsToBytes(float[] src, int srcpos,
+                                             byte[] dst, int dstpos,
+                                             int nfloats);
+
+    /**
+     * Converts specified span of double values into byte values.
+     */
+    // REMIND: remove once hotspot inlines Double.doubleToLongBits
+    private static native void doublesToBytes(double[] src, int srcpos,
+                                              byte[] dst, int dstpos,
+                                              int ndoubles);
+
+    /**
+     * Default PutField implementation.
+     */
+    private class PutFieldImpl extends PutField {
+
+        /** class descriptor describing serializable fields */
+        private final ObjectStreamClass desc;
+        /** primitive field values */
+        private final byte[] primVals;
+        /** object field values */
+        private final Object[] objVals;
+
+        /**
+         * Creates PutFieldImpl object for writing fields defined in given
+         * class descriptor.
+         */
+        PutFieldImpl(ObjectStreamClass desc) {
+            this.desc = desc;
+            primVals = new byte[desc.getPrimDataSize()];
+            objVals = new Object[desc.getNumObjFields()];
+        }
+
+        public void put(String name, boolean val) {
+            Bits.putBoolean(primVals, getFieldOffset(name, Boolean.TYPE), val);
+        }
+
+        public void put(String name, byte val) {
+            primVals[getFieldOffset(name, Byte.TYPE)] = val;
+        }
+
+        public void put(String name, char val) {
+            Bits.putChar(primVals, getFieldOffset(name, Character.TYPE), val);
+        }
+
+        public void put(String name, short val) {
+            Bits.putShort(primVals, getFieldOffset(name, Short.TYPE), val);
+        }
+
+        public void put(String name, int val) {
+            Bits.putInt(primVals, getFieldOffset(name, Integer.TYPE), val);
+        }
+
+        public void put(String name, float val) {
+            Bits.putFloat(primVals, getFieldOffset(name, Float.TYPE), val);
+        }
+
+        public void put(String name, long val) {
+            Bits.putLong(primVals, getFieldOffset(name, Long.TYPE), val);
+        }
+
+        public void put(String name, double val) {
+            Bits.putDouble(primVals, getFieldOffset(name, Double.TYPE), val);
+        }
+
+        public void put(String name, Object val) {
+            objVals[getFieldOffset(name, Object.class)] = val;
+        }
+
+        // deprecated in ObjectOutputStream.PutField
+        public void write(ObjectOutput out) throws IOException {
+            /*
+             * Applications should *not* use this method to write PutField
+             * data, as it will lead to stream corruption if the PutField
+             * object writes any primitive data (since block data mode is not
+             * unset/set properly, as is done in OOS.writeFields()).  This
+             * broken implementation is being retained solely for behavioral
+             * compatibility, in order to support applications which use
+             * OOS.PutField.write() for writing only non-primitive data.
+             *
+             * Serialization of unshared objects is not implemented here since
+             * it is not necessary for backwards compatibility; also, unshared
+             * semantics may not be supported by the given ObjectOutput
+             * instance.  Applications which write unshared objects using the
+             * PutField API must use OOS.writeFields().
+             */
+            if (ObjectOutputStream.this != out) {
+                throw new IllegalArgumentException("wrong stream");
+            }
+            out.write(primVals, 0, primVals.length);
+
+            ObjectStreamField[] fields = desc.getFields(false);
+            int numPrimFields = fields.length - objVals.length;
+            // REMIND: warn if numPrimFields > 0?
+            for (int i = 0; i < objVals.length; i++) {
+                if (fields[numPrimFields + i].isUnshared()) {
+                    throw new IOException("cannot write unshared object");
+                }
+                out.writeObject(objVals[i]);
+            }
+        }
+
+        /**
+         * Writes buffered primitive data and object fields to stream.
+         */
+        void writeFields() throws IOException {
+            bout.write(primVals, 0, primVals.length, false);
+
+            ObjectStreamField[] fields = desc.getFields(false);
+            int numPrimFields = fields.length - objVals.length;
+            for (int i = 0; i < objVals.length; i++) {
+                if (extendedDebugInfo) {
+                    debugInfoStack.push(
+                        "field (class \"" + desc.getName() + "\", name: \"" +
+                        fields[numPrimFields + i].getName() + "\", type: \"" +
+                        fields[numPrimFields + i].getType() + "\")");
+                }
+                try {
+                    writeObject0(objVals[i],
+                                 fields[numPrimFields + i].isUnshared());
+                } finally {
+                    if (extendedDebugInfo) {
+                        debugInfoStack.pop();
+                    }
+                }
+            }
+        }
+
+        /**
+         * Returns offset of field with given name and type.  A specified type
+         * of null matches all types, Object.class matches all non-primitive
+         * types, and any other non-null type matches assignable types only.
+         * Throws IllegalArgumentException if no matching field found.
+         */
+        private int getFieldOffset(String name, Class type) {
+            ObjectStreamField field = desc.getField(name, type);
+            if (field == null) {
+                throw new IllegalArgumentException("no such field " + name +
+                                                   " with type " + type);
+            }
+            return field.getOffset();
+        }
+    }
+
+    /**
+     * Buffered output stream with two modes: in default mode, outputs data in
+     * same format as DataOutputStream; in "block data" mode, outputs data
+     * bracketed by block data markers (see object serialization specification
+     * for details).
+     */
+    private static class BlockDataOutputStream
+        extends OutputStream implements DataOutput
+    {
+        /** maximum data block length */
+        private static final int MAX_BLOCK_SIZE = 1024;
+        /** maximum data block header length */
+        private static final int MAX_HEADER_SIZE = 5;
+        /** (tunable) length of char buffer (for writing strings) */
+        private static final int CHAR_BUF_SIZE = 256;
+
+        /** buffer for writing general/block data */
+        private final byte[] buf = new byte[MAX_BLOCK_SIZE];
+        /** buffer for writing block data headers */
+        private final byte[] hbuf = new byte[MAX_HEADER_SIZE];
+        /** char buffer for fast string writes */
+        private final char[] cbuf = new char[CHAR_BUF_SIZE];
+
+        /** block data mode */
+        private boolean blkmode = false;
+        /** current offset into buf */
+        private int pos = 0;
+
+        /** underlying output stream */
+        private final OutputStream out;
+        /** loopback stream (for data writes that span data blocks) */
+        private final DataOutputStream dout;
+
+        /**
+         * Creates new BlockDataOutputStream on top of given underlying stream.
+         * Block data mode is turned off by default.
+         */
+        BlockDataOutputStream(OutputStream out) {
+            this.out = out;
+            dout = new DataOutputStream(this);
+        }
+
+        /**
+         * Sets block data mode to the given mode (true == on, false == off)
+         * and returns the previous mode value.  If the new mode is the same as
+         * the old mode, no action is taken.  If the new mode differs from the
+         * old mode, any buffered data is flushed before switching to the new
+         * mode.
+         */
+        boolean setBlockDataMode(boolean mode) throws IOException {
+            if (blkmode == mode) {
+                return blkmode;
+            }
+            drain();
+            blkmode = mode;
+            return !blkmode;
+        }
+
+        /**
+         * Returns true if the stream is currently in block data mode, false
+         * otherwise.
+         */
+        boolean getBlockDataMode() {
+            return blkmode;
+        }
+
+        /* ----------------- generic output stream methods ----------------- */
+        /*
+         * The following methods are equivalent to their counterparts in
+         * OutputStream, except that they partition written data into data
+         * blocks when in block data mode.
+         */
+
+        public void write(int b) throws IOException {
+            if (pos >= MAX_BLOCK_SIZE) {
+                drain();
+            }
+            buf[pos++] = (byte) b;
+        }
+
+        public void write(byte[] b) throws IOException {
+            write(b, 0, b.length, false);
+        }
+
+        public void write(byte[] b, int off, int len) throws IOException {
+            write(b, off, len, false);
+        }
+
+        public void flush() throws IOException {
+            drain();
+            out.flush();
+        }
+
+        public void close() throws IOException {
+            flush();
+            out.close();
+        }
+
+        /**
+         * Writes specified span of byte values from given array.  If copy is
+         * true, copies the values to an intermediate buffer before writing
+         * them to underlying stream (to avoid exposing a reference to the
+         * original byte array).
+         */
+        void write(byte[] b, int off, int len, boolean copy)
+            throws IOException
+        {
+            if (!(copy || blkmode)) {           // write directly
+                drain();
+                out.write(b, off, len);
+                return;
+            }
+
+            while (len > 0) {
+                if (pos >= MAX_BLOCK_SIZE) {
+                    drain();
+                }
+                if (len >= MAX_BLOCK_SIZE && !copy && pos == 0) {
+                    // avoid unnecessary copy
+                    writeBlockHeader(MAX_BLOCK_SIZE);
+                    out.write(b, off, MAX_BLOCK_SIZE);
+                    off += MAX_BLOCK_SIZE;
+                    len -= MAX_BLOCK_SIZE;
+                } else {
+                    int wlen = Math.min(len, MAX_BLOCK_SIZE - pos);
+                    System.arraycopy(b, off, buf, pos, wlen);
+                    pos += wlen;
+                    off += wlen;
+                    len -= wlen;
+                }
+            }
+        }
+
+        /**
+         * Writes all buffered data from this stream to the underlying stream,
+         * but does not flush underlying stream.
+         */
+        void drain() throws IOException {
+            if (pos == 0) {
+                return;
+            }
+            if (blkmode) {
+                writeBlockHeader(pos);
+            }
+            out.write(buf, 0, pos);
+            pos = 0;
+        }
+
+        /**
+         * Writes block data header.  Data blocks shorter than 256 bytes are
+         * prefixed with a 2-byte header; all others start with a 5-byte
+         * header.
+         */
+        private void writeBlockHeader(int len) throws IOException {
+            if (len <= 0xFF) {
+                hbuf[0] = TC_BLOCKDATA;
+                hbuf[1] = (byte) len;
+                out.write(hbuf, 0, 2);
+            } else {
+                hbuf[0] = TC_BLOCKDATALONG;
+                Bits.putInt(hbuf, 1, len);
+                out.write(hbuf, 0, 5);
+            }
+        }
+
+
+        /* ----------------- primitive data output methods ----------------- */
+        /*
+         * The following methods are equivalent to their counterparts in
+         * DataOutputStream, except that they partition written data into data
+         * blocks when in block data mode.
+         */
+
+        public void writeBoolean(boolean v) throws IOException {
+            if (pos >= MAX_BLOCK_SIZE) {
+                drain();
+            }
+            Bits.putBoolean(buf, pos++, v);
+        }
+
+        public void writeByte(int v) throws IOException {
+            if (pos >= MAX_BLOCK_SIZE) {
+                drain();
+            }
+            buf[pos++] = (byte) v;
+        }
+
+        public void writeChar(int v) throws IOException {
+            if (pos + 2 <= MAX_BLOCK_SIZE) {
+                Bits.putChar(buf, pos, (char) v);
+                pos += 2;
+            } else {
+                dout.writeChar(v);
+            }
+        }
+
+        public void writeShort(int v) throws IOException {
+            if (pos + 2 <= MAX_BLOCK_SIZE) {
+                Bits.putShort(buf, pos, (short) v);
+                pos += 2;
+            } else {
+                dout.writeShort(v);
+            }
+        }
+
+        public void writeInt(int v) throws IOException {
+            if (pos + 4 <= MAX_BLOCK_SIZE) {
+                Bits.putInt(buf, pos, v);
+                pos += 4;
+            } else {
+                dout.writeInt(v);
+            }
+        }
+
+        public void writeFloat(float v) throws IOException {
+            if (pos + 4 <= MAX_BLOCK_SIZE) {
+                Bits.putFloat(buf, pos, v);
+                pos += 4;
+            } else {
+                dout.writeFloat(v);
+            }
+        }
+
+        public void writeLong(long v) throws IOException {
+            if (pos + 8 <= MAX_BLOCK_SIZE) {
+                Bits.putLong(buf, pos, v);
+                pos += 8;
+            } else {
+                dout.writeLong(v);
+            }
+        }
+
+        public void writeDouble(double v) throws IOException {
+            if (pos + 8 <= MAX_BLOCK_SIZE) {
+                Bits.putDouble(buf, pos, v);
+                pos += 8;
+            } else {
+                dout.writeDouble(v);
+            }
+        }
+
+        public void writeBytes(String s) throws IOException {
+            int endoff = s.length();
+            int cpos = 0;
+            int csize = 0;
+            for (int off = 0; off < endoff; ) {
+                if (cpos >= csize) {
+                    cpos = 0;
+                    csize = Math.min(endoff - off, CHAR_BUF_SIZE);
+                    s.getChars(off, off + csize, cbuf, 0);
+                }
+                if (pos >= MAX_BLOCK_SIZE) {
+                    drain();
+                }
+                int n = Math.min(csize - cpos, MAX_BLOCK_SIZE - pos);
+                int stop = pos + n;
+                while (pos < stop) {
+                    buf[pos++] = (byte) cbuf[cpos++];
+                }
+                off += n;
+            }
+        }
+
+        public void writeChars(String s) throws IOException {
+            int endoff = s.length();
+            for (int off = 0; off < endoff; ) {
+                int csize = Math.min(endoff - off, CHAR_BUF_SIZE);
+                s.getChars(off, off + csize, cbuf, 0);
+                writeChars(cbuf, 0, csize);
+                off += csize;
+            }
+        }
+
+        public void writeUTF(String s) throws IOException {
+            writeUTF(s, getUTFLength(s));
+        }
+
+
+        /* -------------- primitive data array output methods -------------- */
+        /*
+         * The following methods write out spans of primitive data values.
+         * Though equivalent to calling the corresponding primitive write
+         * methods repeatedly, these methods are optimized for writing groups
+         * of primitive data values more efficiently.
+         */
+
+        void writeBooleans(boolean[] v, int off, int len) throws IOException {
+            int endoff = off + len;
+            while (off < endoff) {
+                if (pos >= MAX_BLOCK_SIZE) {
+                    drain();
+                }
+                int stop = Math.min(endoff, off + (MAX_BLOCK_SIZE - pos));
+                while (off < stop) {
+                    Bits.putBoolean(buf, pos++, v[off++]);
+                }
+            }
+        }
+
+        void writeChars(char[] v, int off, int len) throws IOException {
+            int limit = MAX_BLOCK_SIZE - 2;
+            int endoff = off + len;
+            while (off < endoff) {
+                if (pos <= limit) {
+                    int avail = (MAX_BLOCK_SIZE - pos) >> 1;
+                    int stop = Math.min(endoff, off + avail);
+                    while (off < stop) {
+                        Bits.putChar(buf, pos, v[off++]);
+                        pos += 2;
+                    }
+                } else {
+                    dout.writeChar(v[off++]);
+                }
+            }
+        }
+
+        void writeShorts(short[] v, int off, int len) throws IOException {
+            int limit = MAX_BLOCK_SIZE - 2;
+            int endoff = off + len;
+            while (off < endoff) {
+                if (pos <= limit) {
+                    int avail = (MAX_BLOCK_SIZE - pos) >> 1;
+                    int stop = Math.min(endoff, off + avail);
+                    while (off < stop) {
+                        Bits.putShort(buf, pos, v[off++]);
+                        pos += 2;
+                    }
+                } else {
+                    dout.writeShort(v[off++]);
+                }
+            }
+        }
+
+        void writeInts(int[] v, int off, int len) throws IOException {
+            int limit = MAX_BLOCK_SIZE - 4;
+            int endoff = off + len;
+            while (off < endoff) {
+                if (pos <= limit) {
+                    int avail = (MAX_BLOCK_SIZE - pos) >> 2;
+                    int stop = Math.min(endoff, off + avail);
+                    while (off < stop) {
+                        Bits.putInt(buf, pos, v[off++]);
+                        pos += 4;
+                    }
+                } else {
+                    dout.writeInt(v[off++]);
+                }
+            }
+        }
+
+        void writeFloats(float[] v, int off, int len) throws IOException {
+            int limit = MAX_BLOCK_SIZE - 4;
+            int endoff = off + len;
+            while (off < endoff) {
+                if (pos <= limit) {
+                    int avail = (MAX_BLOCK_SIZE - pos) >> 2;
+                    int chunklen = Math.min(endoff - off, avail);
+                    floatsToBytes(v, off, buf, pos, chunklen);
+                    off += chunklen;
+                    pos += chunklen << 2;
+                } else {
+                    dout.writeFloat(v[off++]);
+                }
+            }
+        }
+
+        void writeLongs(long[] v, int off, int len) throws IOException {
+            int limit = MAX_BLOCK_SIZE - 8;
+            int endoff = off + len;
+            while (off < endoff) {
+                if (pos <= limit) {
+                    int avail = (MAX_BLOCK_SIZE - pos) >> 3;
+                    int stop = Math.min(endoff, off + avail);
+                    while (off < stop) {
+                        Bits.putLong(buf, pos, v[off++]);
+                        pos += 8;
+                    }
+                } else {
+                    dout.writeLong(v[off++]);
+                }
+            }
+        }
+
+        void writeDoubles(double[] v, int off, int len) throws IOException {
+            int limit = MAX_BLOCK_SIZE - 8;
+            int endoff = off + len;
+            while (off < endoff) {
+                if (pos <= limit) {
+                    int avail = (MAX_BLOCK_SIZE - pos) >> 3;
+                    int chunklen = Math.min(endoff - off, avail);
+                    doublesToBytes(v, off, buf, pos, chunklen);
+                    off += chunklen;
+                    pos += chunklen << 3;
+                } else {
+                    dout.writeDouble(v[off++]);
+                }
+            }
+        }
+
+        /**
+         * Returns the length in bytes of the UTF encoding of the given string.
+         */
+        long getUTFLength(String s) {
+            int len = s.length();
+            long utflen = 0;
+            for (int off = 0; off < len; ) {
+                int csize = Math.min(len - off, CHAR_BUF_SIZE);
+                s.getChars(off, off + csize, cbuf, 0);
+                for (int cpos = 0; cpos < csize; cpos++) {
+                    char c = cbuf[cpos];
+                    if (c >= 0x0001 && c <= 0x007F) {
+                        utflen++;
+                    } else if (c > 0x07FF) {
+                        utflen += 3;
+                    } else {
+                        utflen += 2;
+                    }
+                }
+                off += csize;
+            }
+            return utflen;
+        }
+
+        /**
+         * Writes the given string in UTF format.  This method is used in
+         * situations where the UTF encoding length of the string is already
+         * known; specifying it explicitly avoids a prescan of the string to
+         * determine its UTF length.
+         */
+        void writeUTF(String s, long utflen) throws IOException {
+            if (utflen > 0xFFFFL) {
+                throw new UTFDataFormatException();
+            }
+            writeShort((int) utflen);
+            if (utflen == (long) s.length()) {
+                writeBytes(s);
+            } else {
+                writeUTFBody(s);
+            }
+        }
+
+        /**
+         * Writes given string in "long" UTF format.  "Long" UTF format is
+         * identical to standard UTF, except that it uses an 8 byte header
+         * (instead of the standard 2 bytes) to convey the UTF encoding length.
+         */
+        void writeLongUTF(String s) throws IOException {
+            writeLongUTF(s, getUTFLength(s));
+        }
+
+        /**
+         * Writes given string in "long" UTF format, where the UTF encoding
+         * length of the string is already known.
+         */
+        void writeLongUTF(String s, long utflen) throws IOException {
+            writeLong(utflen);
+            if (utflen == (long) s.length()) {
+                writeBytes(s);
+            } else {
+                writeUTFBody(s);
+            }
+        }
+
+        /**
+         * Writes the "body" (i.e., the UTF representation minus the 2-byte or
+         * 8-byte length header) of the UTF encoding for the given string.
+         */
+        private void writeUTFBody(String s) throws IOException {
+            int limit = MAX_BLOCK_SIZE - 3;
+            int len = s.length();
+            for (int off = 0; off < len; ) {
+                int csize = Math.min(len - off, CHAR_BUF_SIZE);
+                s.getChars(off, off + csize, cbuf, 0);
+                for (int cpos = 0; cpos < csize; cpos++) {
+                    char c = cbuf[cpos];
+                    if (pos <= limit) {
+                        if (c <= 0x007F && c != 0) {
+                            buf[pos++] = (byte) c;
+                        } else if (c > 0x07FF) {
+                            buf[pos + 2] = (byte) (0x80 | ((c >> 0) & 0x3F));
+                            buf[pos + 1] = (byte) (0x80 | ((c >> 6) & 0x3F));
+                            buf[pos + 0] = (byte) (0xE0 | ((c >> 12) & 0x0F));
+                            pos += 3;
+                        } else {
+                            buf[pos + 1] = (byte) (0x80 | ((c >> 0) & 0x3F));
+                            buf[pos + 0] = (byte) (0xC0 | ((c >> 6) & 0x1F));
+                            pos += 2;
+                        }
+                    } else {    // write one byte at a time to normalize block
+                        if (c <= 0x007F && c != 0) {
+                            write(c);
+                        } else if (c > 0x07FF) {
+                            write(0xE0 | ((c >> 12) & 0x0F));
+                            write(0x80 | ((c >> 6) & 0x3F));
+                            write(0x80 | ((c >> 0) & 0x3F));
+                        } else {
+                            write(0xC0 | ((c >> 6) & 0x1F));
+                            write(0x80 | ((c >> 0) & 0x3F));
+                        }
+                    }
+                }
+                off += csize;
+            }
+        }
+    }
+
+    /**
+     * Lightweight identity hash table which maps objects to integer handles,
+     * assigned in ascending order.
+     */
+    private static class HandleTable {
+
+        /* number of mappings in table/next available handle */
+        private int size;
+        /* size threshold determining when to expand hash spine */
+        private int threshold;
+        /* factor for computing size threshold */
+        private final float loadFactor;
+        /* maps hash value -> candidate handle value */
+        private int[] spine;
+        /* maps handle value -> next candidate handle value */
+        private int[] next;
+        /* maps handle value -> associated object */
+        private Object[] objs;
+
+        /**
+         * Creates new HandleTable with given capacity and load factor.
+         */
+        HandleTable(int initialCapacity, float loadFactor) {
+            this.loadFactor = loadFactor;
+            spine = new int[initialCapacity];
+            next = new int[initialCapacity];
+            objs = new Object[initialCapacity];
+            threshold = (int) (initialCapacity * loadFactor);
+            clear();
+        }
+
+        /**
+         * Assigns next available handle to given object, and returns handle
+         * value.  Handles are assigned in ascending order starting at 0.
+         */
+        int assign(Object obj) {
+            if (size >= next.length) {
+                growEntries();
+            }
+            if (size >= threshold) {
+                growSpine();
+            }
+            insert(obj, size);
+            return size++;
+        }
+
+        /**
+         * Looks up and returns handle associated with given object, or -1 if
+         * no mapping found.
+         */
+        int lookup(Object obj) {
+            if (size == 0) {
+                return -1;
+            }
+            int index = hash(obj) % spine.length;
+            for (int i = spine[index]; i >= 0; i = next[i]) {
+                if (objs[i] == obj) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        /**
+         * Resets table to its initial (empty) state.
+         */
+        void clear() {
+            Arrays.fill(spine, -1);
+            Arrays.fill(objs, 0, size, null);
+            size = 0;
+        }
+
+        /**
+         * Returns the number of mappings currently in table.
+         */
+        int size() {
+            return size;
+        }
+
+        /**
+         * Inserts mapping object -> handle mapping into table.  Assumes table
+         * is large enough to accommodate new mapping.
+         */
+        private void insert(Object obj, int handle) {
+            int index = hash(obj) % spine.length;
+            objs[handle] = obj;
+            next[handle] = spine[index];
+            spine[index] = handle;
+        }
+
+        /**
+         * Expands the hash "spine" -- equivalent to increasing the number of
+         * buckets in a conventional hash table.
+         */
+        private void growSpine() {
+            spine = new int[(spine.length << 1) + 1];
+            threshold = (int) (spine.length * loadFactor);
+            Arrays.fill(spine, -1);
+            for (int i = 0; i < size; i++) {
+                insert(objs[i], i);
+            }
+        }
+
+        /**
+         * Increases hash table capacity by lengthening entry arrays.
+         */
+        private void growEntries() {
+            int newLength = (next.length << 1) + 1;
+            int[] newNext = new int[newLength];
+            System.arraycopy(next, 0, newNext, 0, size);
+            next = newNext;
+
+            Object[] newObjs = new Object[newLength];
+            System.arraycopy(objs, 0, newObjs, 0, size);
+            objs = newObjs;
+        }
+
+        /**
+         * Returns hash value for given object.
+         */
+        private int hash(Object obj) {
+            return System.identityHashCode(obj) & 0x7FFFFFFF;
+        }
+    }
+
+    /**
+     * Lightweight identity hash table which maps objects to replacement
+     * objects.
+     */
+    private static class ReplaceTable {
+
+        /* maps object -> index */
+        private final HandleTable htab;
+        /* maps index -> replacement object */
+        private Object[] reps;
+
+        /**
+         * Creates new ReplaceTable with given capacity and load factor.
+         */
+        ReplaceTable(int initialCapacity, float loadFactor) {
+            htab = new HandleTable(initialCapacity, loadFactor);
+            reps = new Object[initialCapacity];
+        }
+
+        /**
+         * Enters mapping from object to replacement object.
+         */
+        void assign(Object obj, Object rep) {
+            int index = htab.assign(obj);
+            while (index >= reps.length) {
+                grow();
+            }
+            reps[index] = rep;
+        }
+
+        /**
+         * Looks up and returns replacement for given object.  If no
+         * replacement is found, returns the lookup object itself.
+         */
+        Object lookup(Object obj) {
+            int index = htab.lookup(obj);
+            return (index >= 0) ? reps[index] : obj;
+        }
+
+        /**
+         * Resets table to its initial (empty) state.
+         */
+        void clear() {
+            Arrays.fill(reps, 0, htab.size(), null);
+            htab.clear();
+        }
+
+        /**
+         * Returns the number of mappings currently in table.
+         */
+        int size() {
+            return htab.size();
+        }
+
+        /**
+         * Increases table capacity.
+         */
+        private void grow() {
+            Object[] newReps = new Object[(reps.length << 1) + 1];
+            System.arraycopy(reps, 0, newReps, 0, reps.length);
+            reps = newReps;
+        }
+    }
+
+    /**
+     * Stack to keep debug information about the state of the
+     * serialization process, for embedding in exception messages.
+     */
+    private static class DebugTraceInfoStack {
+        private final List<String> stack;
+
+        DebugTraceInfoStack() {
+            stack = new ArrayList<>();
+        }
+
+        /**
+         * Removes all of the elements from enclosed list.
+         */
+        void clear() {
+            stack.clear();
+        }
+
+        /**
+         * Removes the object at the top of enclosed list.
+         */
+        void pop() {
+            stack.remove(stack.size()-1);
+        }
+
+        /**
+         * Pushes a String onto the top of enclosed list.
+         */
+        void push(String entry) {
+            stack.add("\t- " + entry);
+        }
+
+        /**
+         * Returns a string representation of this object
+         */
+        public String toString() {
+            StringBuilder buffer = new StringBuilder();
+            if (!stack.isEmpty()) {
+                for(int i = stack.size(); i > 0; i-- ) {
+                    buffer.append(stack.get(i-1) + ((i != 1) ? "\n" : ""));
+                }
+            }
+            return buffer.toString();
+        }
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectStreamClass.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectStreamClass.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1396 @@
+/*
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Serialization's descriptor for classes.  It contains the name and
+ * serialVersionUID of the class.  The ObjectStreamClass for a specific class
+ * loaded in this Java VM can be found/created using the lookup method.
+ *
+ * <p>The algorithm to compute the SerialVersionUID is described in
+ * <a href="../../../platform/serialization/spec/class.html#4100">Object
+ * Serialization Specification, Section 4.6, Stream Unique Identifiers</a>.
+ *
+ * @author      Mike Warres
+ * @author      Roger Riggs
+ * @see ObjectStreamField
+ * @see <a href="../../../platform/serialization/spec/class.html">Object Serialization Specification, Section 4, Class Descriptors</a>
+ * @since   JDK1.1
+ */
+public class ObjectStreamClass implements Serializable {
+
+    /** serialPersistentFields value indicating no serializable fields */
+    public static final ObjectStreamField[] NO_FIELDS =
+        new ObjectStreamField[0];
+
+    private static final long serialVersionUID = -6120832682080437368L;
+    private static final ObjectStreamField[] serialPersistentFields =
+        NO_FIELDS;
+
+
+    /** class associated with this descriptor (if any) */
+    private Class<?> cl;
+    /** name of class represented by this descriptor */
+    private String name;
+    /** serialVersionUID of represented class (null if not computed yet) */
+    private volatile Long suid;
+
+    /** true if represents dynamic proxy class */
+    private boolean isProxy;
+    /** true if represents enum type */
+    private boolean isEnum;
+    /** true if represented class implements Serializable */
+    private boolean serializable;
+    /** true if represented class implements Externalizable */
+    private boolean externalizable;
+    /** true if desc has data written by class-defined writeObject method */
+    private boolean hasWriteObjectData;
+    /**
+     * true if desc has externalizable data written in block data format; this
+     * must be true by default to accommodate ObjectInputStream subclasses which
+     * override readClassDescriptor() to return class descriptors obtained from
+     * ObjectStreamClass.lookup() (see 4461737)
+     */
+    private boolean hasBlockExternalData = true;
+
+    /** exception (if any) thrown while attempting to resolve class */
+    private ClassNotFoundException resolveEx;
+    /** exception (if any) to throw if non-enum deserialization attempted */
+    private InvalidClassException deserializeEx;
+    /** exception (if any) to throw if non-enum serialization attempted */
+    private InvalidClassException serializeEx;
+    /** exception (if any) to throw if default serialization attempted */
+    private InvalidClassException defaultSerializeEx;
+
+    /** serializable fields */
+    private ObjectStreamField[] fields;
+    /** aggregate marshalled size of primitive fields */
+    private int primDataSize;
+    /** number of non-primitive fields */
+    private int numObjFields;
+    /** reflector for setting/getting serializable field values */
+//    private FieldReflector fieldRefl;
+    /** data layout of serialized objects described by this class desc */
+    private volatile ClassDataSlot[] dataLayout;
+
+    /** serialization-appropriate constructor, or null if none */
+    private Constructor cons;
+    /** class-defined writeObject method, or null if none */
+    private Method writeObjectMethod;
+    /** class-defined readObject method, or null if none */
+    private Method readObjectMethod;
+    /** class-defined readObjectNoData method, or null if none */
+    private Method readObjectNoDataMethod;
+    /** class-defined writeReplace method, or null if none */
+    private Method writeReplaceMethod;
+    /** class-defined readResolve method, or null if none */
+    private Method readResolveMethod;
+
+    /** local class descriptor for represented class (may point to self) */
+    private ObjectStreamClass localDesc;
+    /** superclass descriptor appearing in stream */
+    private ObjectStreamClass superDesc;
+
+    /**
+     * Initializes native code.
+     */
+    private static native void initNative();
+    static {
+        initNative();
+    }
+
+    /**
+     * Find the descriptor for a class that can be serialized.  Creates an
+     * ObjectStreamClass instance if one does not exist yet for class. Null is
+     * returned if the specified class does not implement java.io.Serializable
+     * or java.io.Externalizable.
+     *
+     * @param   cl class for which to get the descriptor
+     * @return  the class descriptor for the specified class
+     */
+    public static ObjectStreamClass lookup(Class<?> cl) {
+        return lookup(cl, false);
+    }
+
+    /**
+     * Returns the descriptor for any class, regardless of whether it
+     * implements {@link Serializable}.
+     *
+     * @param        cl class for which to get the descriptor
+     * @return       the class descriptor for the specified class
+     * @since 1.6
+     */
+    public static ObjectStreamClass lookupAny(Class<?> cl) {
+        return lookup(cl, true);
+    }
+
+    /**
+     * Returns the name of the class described by this descriptor.
+     * This method returns the name of the class in the format that
+     * is used by the {@link Class#getName} method.
+     *
+     * @return a string representing the name of the class
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Return the serialVersionUID for this class.  The serialVersionUID
+     * defines a set of classes all with the same name that have evolved from a
+     * common root class and agree to be serialized and deserialized using a
+     * common format.  NonSerializable classes have a serialVersionUID of 0L.
+     *
+     * @return  the SUID of the class described by this descriptor
+     */
+    public long getSerialVersionUID() {
+        // REMIND: synchronize instead of relying on volatile?
+        if (suid == null) {
+            return computeDefaultSUID(cl);
+        }
+        return suid.longValue();
+    }
+
+    /**
+     * Return the class in the local VM that this version is mapped to.  Null
+     * is returned if there is no corresponding local class.
+     *
+     * @return  the <code>Class</code> instance that this descriptor represents
+     */
+    public Class<?> forClass() {
+        return cl;
+    }
+
+    /**
+     * Return an array of the fields of this serializable class.
+     *
+     * @return  an array containing an element for each persistent field of
+     *          this class. Returns an array of length zero if there are no
+     *          fields.
+     * @since 1.2
+     */
+    public ObjectStreamField[] getFields() {
+        return getFields(true);
+    }
+
+    /**
+     * Get the field of this class by name.
+     *
+     * @param   name the name of the data field to look for
+     * @return  The ObjectStreamField object of the named field or null if
+     *          there is no such named field.
+     */
+    public ObjectStreamField getField(String name) {
+        return getField(name, null);
+    }
+
+    /**
+     * Return a string describing this ObjectStreamClass.
+     */
+    public String toString() {
+        return name + ": static final long serialVersionUID = " +
+            getSerialVersionUID() + "L;";
+    }
+
+    /**
+     * Looks up and returns class descriptor for given class, or null if class
+     * is non-serializable and "all" is set to false.
+     *
+     * @param   cl class to look up
+     * @param   all if true, return descriptors for all classes; if false, only
+     *          return descriptors for serializable classes
+     */
+    static ObjectStreamClass lookup(Class<?> cl, boolean all) {
+        if (!(all || Serializable.class.isAssignableFrom(cl))) {
+            return null;
+        }
+        Object entry = null;
+        EntryFuture future = null;
+        if (entry == null) {
+            EntryFuture newEntry = new EntryFuture();
+            Reference<?> newRef = new SoftReference<>(newEntry);
+            if (entry == null) {
+                future = newEntry;
+            }
+        }
+
+        if (entry instanceof ObjectStreamClass) {  // check common case first
+            return (ObjectStreamClass) entry;
+        }
+        if (entry instanceof EntryFuture) {
+            future = (EntryFuture) entry;
+            if (true) {
+                /*
+                 * Handle nested call situation described by 4803747: waiting
+                 * for future value to be set by a lookup() call further up the
+                 * stack will result in deadlock, so calculate and set the
+                 * future value here instead.
+                 */
+                entry = null;
+            } else {
+                entry = future.get();
+            }
+        }
+        if (entry == null) {
+            try {
+                entry = new ObjectStreamClass(cl);
+            } catch (Throwable th) {
+                entry = th;
+            }
+            // nested lookup call already set future
+            entry = future.get();
+        }
+
+        if (entry instanceof ObjectStreamClass) {
+            return (ObjectStreamClass) entry;
+        } else if (entry instanceof RuntimeException) {
+            throw (RuntimeException) entry;
+        } else if (entry instanceof Error) {
+            throw (Error) entry;
+        } else {
+            throw new InternalError("unexpected entry: " + entry);
+        }
+    }
+
+    /**
+     * Placeholder used in class descriptor and field reflector lookup tables
+     * for an entry in the process of being initialized.  (Internal) callers
+     * which receive an EntryFuture belonging to another thread as the result
+     * of a lookup should call the get() method of the EntryFuture; this will
+     * return the actual entry once it is ready for use and has been set().  To
+     * conserve objects, EntryFutures synchronize on themselves.
+     */
+    private static class EntryFuture {
+
+        private static final Object unset = new Object();
+        private Object entry = unset;
+
+        /**
+         * Attempts to set the value contained by this EntryFuture.  If the
+         * EntryFuture's value has not been set already, then the value is
+         * saved, any callers blocked in the get() method are notified, and
+         * true is returned.  If the value has already been set, then no saving
+         * or notification occurs, and false is returned.
+         */
+        synchronized boolean set(Object entry) {
+            if (this.entry != unset) {
+                return false;
+            }
+            this.entry = entry;
+            notifyAll();
+            return true;
+        }
+
+        /**
+         * Returns the value contained by this EntryFuture, blocking if
+         * necessary until a value is set.
+         */
+        synchronized Object get() {
+            boolean interrupted = false;
+            while (entry == unset) {
+                try {
+                    wait();
+                } catch (InterruptedException ex) {
+                    interrupted = true;
+                }
+            }
+            return entry;
+        }
+    }
+
+    /**
+     * Creates local class descriptor representing given class.
+     */
+    private ObjectStreamClass(final Class<?> cl) {
+        this.cl = cl;
+        name = cl.getName();
+        isProxy = Proxy.isProxyClass(cl);
+        isEnum = Enum.class.isAssignableFrom(cl);
+        serializable = Serializable.class.isAssignableFrom(cl);
+        externalizable = Externalizable.class.isAssignableFrom(cl);
+
+        Class<?> superCl = cl.getSuperclass();
+        superDesc = (superCl != null) ? lookup(superCl, false) : null;
+        localDesc = this;
+
+        suid = Long.valueOf(0);
+        fields = NO_FIELDS;
+
+
+        if (deserializeEx == null) {
+            if (isEnum) {
+                deserializeEx = new InvalidClassException(name, "enum type");
+            } else if (cons == null) {
+                deserializeEx = new InvalidClassException(
+                    name, "no valid constructor");
+            }
+        }
+        for (int i = 0; i < fields.length; i++) {
+            if (fields[i].getField() == null) {
+                defaultSerializeEx = new InvalidClassException(
+                    name, "unmatched serializable field(s) declared");
+            }
+        }
+    }
+
+    /**
+     * Creates blank class descriptor which should be initialized via a
+     * subsequent call to initProxy(), initNonProxy() or readNonProxy().
+     */
+    ObjectStreamClass() {
+    }
+
+    /**
+     * Initializes class descriptor representing a proxy class.
+     */
+    void initProxy(Class<?> cl,
+                   ClassNotFoundException resolveEx,
+                   ObjectStreamClass superDesc)
+        throws InvalidClassException
+    {
+        this.cl = cl;
+        this.resolveEx = resolveEx;
+        this.superDesc = superDesc;
+        isProxy = true;
+        serializable = true;
+        suid = Long.valueOf(0);
+        fields = NO_FIELDS;
+
+        if (cl != null) {
+            localDesc = lookup(cl, true);
+            if (!localDesc.isProxy) {
+                throw new InvalidClassException(
+                    "cannot bind proxy descriptor to a non-proxy class");
+            }
+            name = localDesc.name;
+            externalizable = localDesc.externalizable;
+            cons = localDesc.cons;
+            writeReplaceMethod = localDesc.writeReplaceMethod;
+            readResolveMethod = localDesc.readResolveMethod;
+            deserializeEx = localDesc.deserializeEx;
+        }
+    }
+
+    /**
+     * Initializes class descriptor representing a non-proxy class.
+     */
+    void initNonProxy(ObjectStreamClass model,
+                      Class<?> cl,
+                      ClassNotFoundException resolveEx,
+                      ObjectStreamClass superDesc)
+        throws InvalidClassException
+    {
+        this.cl = cl;
+        this.resolveEx = resolveEx;
+        this.superDesc = superDesc;
+        name = model.name;
+        suid = Long.valueOf(model.getSerialVersionUID());
+        isProxy = false;
+        isEnum = model.isEnum;
+        serializable = model.serializable;
+        externalizable = model.externalizable;
+        hasBlockExternalData = model.hasBlockExternalData;
+        hasWriteObjectData = model.hasWriteObjectData;
+        fields = model.fields;
+        primDataSize = model.primDataSize;
+        numObjFields = model.numObjFields;
+
+        if (cl != null) {
+            localDesc = lookup(cl, true);
+            if (localDesc.isProxy) {
+                throw new InvalidClassException(
+                    "cannot bind non-proxy descriptor to a proxy class");
+            }
+            if (isEnum != localDesc.isEnum) {
+                throw new InvalidClassException(isEnum ?
+                    "cannot bind enum descriptor to a non-enum class" :
+                    "cannot bind non-enum descriptor to an enum class");
+            }
+
+            if (serializable == localDesc.serializable &&
+                !cl.isArray() &&
+                suid.longValue() != localDesc.getSerialVersionUID())
+            {
+                throw new InvalidClassException(localDesc.name,
+                    "local class incompatible: " +
+                    "stream classdesc serialVersionUID = " + suid +
+                    ", local class serialVersionUID = " +
+                    localDesc.getSerialVersionUID());
+            }
+
+            if (!classNamesEqual(name, localDesc.name)) {
+                throw new InvalidClassException(localDesc.name,
+                    "local class name incompatible with stream class " +
+                    "name \"" + name + "\"");
+            }
+
+            if (!isEnum) {
+                if ((serializable == localDesc.serializable) &&
+                    (externalizable != localDesc.externalizable))
+                {
+                    throw new InvalidClassException(localDesc.name,
+                        "Serializable incompatible with Externalizable");
+                }
+
+                if ((serializable != localDesc.serializable) ||
+                    (externalizable != localDesc.externalizable) ||
+                    !(serializable || externalizable))
+                {
+                    deserializeEx = new InvalidClassException(localDesc.name,
+                        "class invalid for deserialization");
+                }
+            }
+
+            cons = localDesc.cons;
+            writeObjectMethod = localDesc.writeObjectMethod;
+            readObjectMethod = localDesc.readObjectMethod;
+            readObjectNoDataMethod = localDesc.readObjectNoDataMethod;
+            writeReplaceMethod = localDesc.writeReplaceMethod;
+            readResolveMethod = localDesc.readResolveMethod;
+            if (deserializeEx == null) {
+                deserializeEx = localDesc.deserializeEx;
+            }
+        }
+        // reassign to matched fields so as to reflect local unshared settings
+        fields = null;
+    }
+
+    /**
+     * Reads non-proxy class descriptor information from given input stream.
+     * The resulting class descriptor is not fully functional; it can only be
+     * used as input to the ObjectInputStream.resolveClass() and
+     * ObjectStreamClass.initNonProxy() methods.
+     */
+    void readNonProxy(ObjectInputStream in)
+        throws IOException, ClassNotFoundException
+    {
+        name = in.readUTF();
+        suid = Long.valueOf(in.readLong());
+        isProxy = false;
+
+        byte flags = in.readByte();
+        hasWriteObjectData =
+            ((flags & ObjectStreamConstants.SC_WRITE_METHOD) != 0);
+        hasBlockExternalData =
+            ((flags & ObjectStreamConstants.SC_BLOCK_DATA) != 0);
+        externalizable =
+            ((flags & ObjectStreamConstants.SC_EXTERNALIZABLE) != 0);
+        boolean sflag =
+            ((flags & ObjectStreamConstants.SC_SERIALIZABLE) != 0);
+        if (externalizable && sflag) {
+            throw new InvalidClassException(
+                name, "serializable and externalizable flags conflict");
+        }
+        serializable = externalizable || sflag;
+        isEnum = ((flags & ObjectStreamConstants.SC_ENUM) != 0);
+        if (isEnum && suid.longValue() != 0L) {
+            throw new InvalidClassException(name,
+                "enum descriptor has non-zero serialVersionUID: " + suid);
+        }
+
+        int numFields = in.readShort();
+        if (isEnum && numFields != 0) {
+            throw new InvalidClassException(name,
+                "enum descriptor has non-zero field count: " + numFields);
+        }
+        fields = (numFields > 0) ?
+            new ObjectStreamField[numFields] : NO_FIELDS;
+        for (int i = 0; i < numFields; i++) {
+            char tcode = (char) in.readByte();
+            String fname = in.readUTF();
+            String signature = ((tcode == 'L') || (tcode == '[')) ?
+                in.readTypeString() : new String(new char[] { tcode });
+            try {
+                fields[i] = new ObjectStreamField(fname, signature, false);
+            } catch (RuntimeException e) {
+                throw (IOException) new InvalidClassException(name,
+                    "invalid descriptor for field " + fname).initCause(e);
+            }
+        }
+        computeFieldOffsets();
+    }
+
+    /**
+     * Writes non-proxy class descriptor information to given output stream.
+     */
+    void writeNonProxy(ObjectOutputStream out) throws IOException {
+        out.writeUTF(name);
+        out.writeLong(getSerialVersionUID());
+
+        byte flags = 0;
+        if (externalizable) {
+            flags |= ObjectStreamConstants.SC_EXTERNALIZABLE;
+            int protocol = out.getProtocolVersion();
+            if (protocol != ObjectStreamConstants.PROTOCOL_VERSION_1) {
+                flags |= ObjectStreamConstants.SC_BLOCK_DATA;
+            }
+        } else if (serializable) {
+            flags |= ObjectStreamConstants.SC_SERIALIZABLE;
+        }
+        if (hasWriteObjectData) {
+            flags |= ObjectStreamConstants.SC_WRITE_METHOD;
+        }
+        if (isEnum) {
+            flags |= ObjectStreamConstants.SC_ENUM;
+        }
+        out.writeByte(flags);
+
+        out.writeShort(fields.length);
+        for (int i = 0; i < fields.length; i++) {
+            ObjectStreamField f = fields[i];
+            out.writeByte(f.getTypeCode());
+            out.writeUTF(f.getName());
+            if (!f.isPrimitive()) {
+                out.writeTypeString(f.getTypeString());
+            }
+        }
+    }
+
+    /**
+     * Returns ClassNotFoundException (if any) thrown while attempting to
+     * resolve local class corresponding to this class descriptor.
+     */
+    ClassNotFoundException getResolveException() {
+        return resolveEx;
+    }
+
+    /**
+     * Throws an InvalidClassException if object instances referencing this
+     * class descriptor should not be allowed to deserialize.  This method does
+     * not apply to deserialization of enum constants.
+     */
+    void checkDeserialize() throws InvalidClassException {
+        if (deserializeEx != null) {
+            InvalidClassException ice =
+                new InvalidClassException(deserializeEx.classname,
+                                          deserializeEx.getMessage());
+            ice.initCause(deserializeEx);
+            throw ice;
+        }
+    }
+
+    /**
+     * Throws an InvalidClassException if objects whose class is represented by
+     * this descriptor should not be allowed to serialize.  This method does
+     * not apply to serialization of enum constants.
+     */
+    void checkSerialize() throws InvalidClassException {
+        if (serializeEx != null) {
+            InvalidClassException ice =
+                new InvalidClassException(serializeEx.classname,
+                                          serializeEx.getMessage());
+            ice.initCause(serializeEx);
+            throw ice;
+        }
+    }
+
+    /**
+     * Throws an InvalidClassException if objects whose class is represented by
+     * this descriptor should not be permitted to use default serialization
+     * (e.g., if the class declares serializable fields that do not correspond
+     * to actual fields, and hence must use the GetField API).  This method
+     * does not apply to deserialization of enum constants.
+     */
+    void checkDefaultSerialize() throws InvalidClassException {
+        if (defaultSerializeEx != null) {
+            InvalidClassException ice =
+                new InvalidClassException(defaultSerializeEx.classname,
+                                          defaultSerializeEx.getMessage());
+            ice.initCause(defaultSerializeEx);
+            throw ice;
+        }
+    }
+
+    /**
+     * Returns superclass descriptor.  Note that on the receiving side, the
+     * superclass descriptor may be bound to a class that is not a superclass
+     * of the subclass descriptor's bound class.
+     */
+    ObjectStreamClass getSuperDesc() {
+        return superDesc;
+    }
+
+    /**
+     * Returns the "local" class descriptor for the class associated with this
+     * class descriptor (i.e., the result of
+     * ObjectStreamClass.lookup(this.forClass())) or null if there is no class
+     * associated with this descriptor.
+     */
+    ObjectStreamClass getLocalDesc() {
+        return localDesc;
+    }
+
+    /**
+     * Returns arrays of ObjectStreamFields representing the serializable
+     * fields of the represented class.  If copy is true, a clone of this class
+     * descriptor's field array is returned, otherwise the array itself is
+     * returned.
+     */
+    ObjectStreamField[] getFields(boolean copy) {
+        return copy ? fields.clone() : fields;
+    }
+
+    /**
+     * Looks up a serializable field of the represented class by name and type.
+     * A specified type of null matches all types, Object.class matches all
+     * non-primitive types, and any other non-null type matches assignable
+     * types only.  Returns matching field, or null if no match found.
+     */
+    ObjectStreamField getField(String name, Class<?> type) {
+        for (int i = 0; i < fields.length; i++) {
+            ObjectStreamField f = fields[i];
+            if (f.getName().equals(name)) {
+                if (type == null ||
+                    (type == Object.class && !f.isPrimitive()))
+                {
+                    return f;
+                }
+                Class<?> ftype = f.getType();
+                if (ftype != null && type.isAssignableFrom(ftype)) {
+                    return f;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns true if class descriptor represents a dynamic proxy class, false
+     * otherwise.
+     */
+    boolean isProxy() {
+        return isProxy;
+    }
+
+    /**
+     * Returns true if class descriptor represents an enum type, false
+     * otherwise.
+     */
+    boolean isEnum() {
+        return isEnum;
+    }
+
+    /**
+     * Returns true if represented class implements Externalizable, false
+     * otherwise.
+     */
+    boolean isExternalizable() {
+        return externalizable;
+    }
+
+    /**
+     * Returns true if represented class implements Serializable, false
+     * otherwise.
+     */
+    boolean isSerializable() {
+        return serializable;
+    }
+
+    /**
+     * Returns true if class descriptor represents externalizable class that
+     * has written its data in 1.2 (block data) format, false otherwise.
+     */
+    boolean hasBlockExternalData() {
+        return hasBlockExternalData;
+    }
+
+    /**
+     * Returns true if class descriptor represents serializable (but not
+     * externalizable) class which has written its data via a custom
+     * writeObject() method, false otherwise.
+     */
+    boolean hasWriteObjectData() {
+        return hasWriteObjectData;
+    }
+
+    /**
+     * Returns true if represented class is serializable/externalizable and can
+     * be instantiated by the serialization runtime--i.e., if it is
+     * externalizable and defines a public no-arg constructor, or if it is
+     * non-externalizable and its first non-serializable superclass defines an
+     * accessible no-arg constructor.  Otherwise, returns false.
+     */
+    boolean isInstantiable() {
+        return (cons != null);
+    }
+
+    /**
+     * Returns true if represented class is serializable (but not
+     * externalizable) and defines a conformant writeObject method.  Otherwise,
+     * returns false.
+     */
+    boolean hasWriteObjectMethod() {
+        return (writeObjectMethod != null);
+    }
+
+    /**
+     * Returns true if represented class is serializable (but not
+     * externalizable) and defines a conformant readObject method.  Otherwise,
+     * returns false.
+     */
+    boolean hasReadObjectMethod() {
+        return (readObjectMethod != null);
+    }
+
+    /**
+     * Returns true if represented class is serializable (but not
+     * externalizable) and defines a conformant readObjectNoData method.
+     * Otherwise, returns false.
+     */
+    boolean hasReadObjectNoDataMethod() {
+        return (readObjectNoDataMethod != null);
+    }
+
+    /**
+     * Returns true if represented class is serializable or externalizable and
+     * defines a conformant writeReplace method.  Otherwise, returns false.
+     */
+    boolean hasWriteReplaceMethod() {
+        return (writeReplaceMethod != null);
+    }
+
+    /**
+     * Returns true if represented class is serializable or externalizable and
+     * defines a conformant readResolve method.  Otherwise, returns false.
+     */
+    boolean hasReadResolveMethod() {
+        return (readResolveMethod != null);
+    }
+
+    /**
+     * Creates a new instance of the represented class.  If the class is
+     * externalizable, invokes its public no-arg constructor; otherwise, if the
+     * class is serializable, invokes the no-arg constructor of the first
+     * non-serializable superclass.  Throws UnsupportedOperationException if
+     * this class descriptor is not associated with a class, if the associated
+     * class is non-serializable or if the appropriate no-arg constructor is
+     * inaccessible/unavailable.
+     */
+    Object newInstance()
+        throws InstantiationException, InvocationTargetException,
+               UnsupportedOperationException
+    {
+        if (cons != null) {
+            try {
+                return cons.newInstance();
+            } catch (IllegalAccessException ex) {
+                // should not occur, as access checks have been suppressed
+                throw new InternalError();
+            }
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Invokes the writeObject method of the represented serializable class.
+     * Throws UnsupportedOperationException if this class descriptor is not
+     * associated with a class, or if the class is externalizable,
+     * non-serializable or does not define writeObject.
+     */
+    void invokeWriteObject(Object obj, ObjectOutputStream out)
+        throws IOException, UnsupportedOperationException
+    {
+        if (writeObjectMethod != null) {
+            try {
+                writeObjectMethod.invoke(obj, new Object[]{ out });
+            } catch (InvocationTargetException ex) {
+                Throwable th = ex.getTargetException();
+                if (th instanceof IOException) {
+                    throw (IOException) th;
+                } else {
+                    throwMiscException(th);
+                }
+            } catch (IllegalAccessException ex) {
+                // should not occur, as access checks have been suppressed
+                throw new InternalError();
+            }
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Invokes the readObject method of the represented serializable class.
+     * Throws UnsupportedOperationException if this class descriptor is not
+     * associated with a class, or if the class is externalizable,
+     * non-serializable or does not define readObject.
+     */
+    void invokeReadObject(Object obj, ObjectInputStream in)
+        throws ClassNotFoundException, IOException,
+               UnsupportedOperationException
+    {
+        if (readObjectMethod != null) {
+            try {
+                readObjectMethod.invoke(obj, new Object[]{ in });
+            } catch (InvocationTargetException ex) {
+                Throwable th = ex.getTargetException();
+                if (th instanceof ClassNotFoundException) {
+                    throw (ClassNotFoundException) th;
+                } else if (th instanceof IOException) {
+                    throw (IOException) th;
+                } else {
+                    throwMiscException(th);
+                }
+            } catch (IllegalAccessException ex) {
+                // should not occur, as access checks have been suppressed
+                throw new InternalError();
+            }
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Invokes the readObjectNoData method of the represented serializable
+     * class.  Throws UnsupportedOperationException if this class descriptor is
+     * not associated with a class, or if the class is externalizable,
+     * non-serializable or does not define readObjectNoData.
+     */
+    void invokeReadObjectNoData(Object obj)
+        throws IOException, UnsupportedOperationException
+    {
+        if (readObjectNoDataMethod != null) {
+            try {
+                readObjectNoDataMethod.invoke(obj, (Object[]) null);
+            } catch (InvocationTargetException ex) {
+                Throwable th = ex.getTargetException();
+                if (th instanceof ObjectStreamException) {
+                    throw (ObjectStreamException) th;
+                } else {
+                    throwMiscException(th);
+                }
+            } catch (IllegalAccessException ex) {
+                // should not occur, as access checks have been suppressed
+                throw new InternalError();
+            }
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Invokes the writeReplace method of the represented serializable class and
+     * returns the result.  Throws UnsupportedOperationException if this class
+     * descriptor is not associated with a class, or if the class is
+     * non-serializable or does not define writeReplace.
+     */
+    Object invokeWriteReplace(Object obj)
+        throws IOException, UnsupportedOperationException
+    {
+        if (writeReplaceMethod != null) {
+            try {
+                return writeReplaceMethod.invoke(obj, (Object[]) null);
+            } catch (InvocationTargetException ex) {
+                Throwable th = ex.getTargetException();
+                if (th instanceof ObjectStreamException) {
+                    throw (ObjectStreamException) th;
+                } else {
+                    throwMiscException(th);
+                    throw new InternalError();  // never reached
+                }
+            } catch (IllegalAccessException ex) {
+                // should not occur, as access checks have been suppressed
+                throw new InternalError();
+            }
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Invokes the readResolve method of the represented serializable class and
+     * returns the result.  Throws UnsupportedOperationException if this class
+     * descriptor is not associated with a class, or if the class is
+     * non-serializable or does not define readResolve.
+     */
+    Object invokeReadResolve(Object obj)
+        throws IOException, UnsupportedOperationException
+    {
+        if (readResolveMethod != null) {
+            try {
+                return readResolveMethod.invoke(obj, (Object[]) null);
+            } catch (InvocationTargetException ex) {
+                Throwable th = ex.getTargetException();
+                if (th instanceof ObjectStreamException) {
+                    throw (ObjectStreamException) th;
+                } else {
+                    throwMiscException(th);
+                    throw new InternalError();  // never reached
+                }
+            } catch (IllegalAccessException ex) {
+                // should not occur, as access checks have been suppressed
+                throw new InternalError();
+            }
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Class representing the portion of an object's serialized form allotted
+     * to data described by a given class descriptor.  If "hasData" is false,
+     * the object's serialized form does not contain data associated with the
+     * class descriptor.
+     */
+    static class ClassDataSlot {
+
+        /** class descriptor "occupying" this slot */
+        final ObjectStreamClass desc;
+        /** true if serialized form includes data for this slot's descriptor */
+        final boolean hasData;
+
+        ClassDataSlot(ObjectStreamClass desc, boolean hasData) {
+            this.desc = desc;
+            this.hasData = hasData;
+        }
+    }
+
+    /**
+     * Returns array of ClassDataSlot instances representing the data layout
+     * (including superclass data) for serialized objects described by this
+     * class descriptor.  ClassDataSlots are ordered by inheritance with those
+     * containing "higher" superclasses appearing first.  The final
+     * ClassDataSlot contains a reference to this descriptor.
+     */
+    ClassDataSlot[] getClassDataLayout() throws InvalidClassException {
+        // REMIND: synchronize instead of relying on volatile?
+        if (dataLayout == null) {
+            dataLayout = getClassDataLayout0();
+        }
+        return dataLayout;
+    }
+
+    private ClassDataSlot[] getClassDataLayout0()
+        throws InvalidClassException
+    {
+        ArrayList<ClassDataSlot> slots = new ArrayList<>();
+        Class<?> start = cl, end = cl;
+
+        // locate closest non-serializable superclass
+        while (end != null && Serializable.class.isAssignableFrom(end)) {
+            end = end.getSuperclass();
+        }
+
+        for (ObjectStreamClass d = this; d != null; d = d.superDesc) {
+
+            // search up inheritance hierarchy for class with matching name
+            String searchName = (d.cl != null) ? d.cl.getName() : d.name;
+            Class<?> match = null;
+            for (Class<?> c = start; c != end; c = c.getSuperclass()) {
+                if (searchName.equals(c.getName())) {
+                    match = c;
+                    break;
+                }
+            }
+
+            // add "no data" slot for each unmatched class below match
+            if (match != null) {
+                for (Class<?> c = start; c != match; c = c.getSuperclass()) {
+                    slots.add(new ClassDataSlot(
+                        ObjectStreamClass.lookup(c, true), false));
+                }
+                start = match.getSuperclass();
+            }
+
+            // record descriptor/class pairing
+            slots.add(new ClassDataSlot(d.getVariantFor(match), true));
+        }
+
+        // add "no data" slot for any leftover unmatched classes
+        for (Class<?> c = start; c != end; c = c.getSuperclass()) {
+            slots.add(new ClassDataSlot(
+                ObjectStreamClass.lookup(c, true), false));
+        }
+
+        // order slots from superclass -> subclass
+        Collections.reverse(slots);
+        return slots.toArray(new ClassDataSlot[slots.size()]);
+    }
+
+    /**
+     * Returns aggregate size (in bytes) of marshalled primitive field values
+     * for represented class.
+     */
+    int getPrimDataSize() {
+        return primDataSize;
+    }
+
+    /**
+     * Returns number of non-primitive serializable fields of represented
+     * class.
+     */
+    int getNumObjFields() {
+        return numObjFields;
+    }
+
+    /**
+     * Fetches the serializable primitive field values of object obj and
+     * marshals them into byte array buf starting at offset 0.  It is the
+     * responsibility of the caller to ensure that obj is of the proper type if
+     * non-null.
+     */
+    void getPrimFieldValues(Object obj, byte[] buf) {
+    }
+
+    /**
+     * Sets the serializable primitive fields of object obj using values
+     * unmarshalled from byte array buf starting at offset 0.  It is the
+     * responsibility of the caller to ensure that obj is of the proper type if
+     * non-null.
+     */
+    void setPrimFieldValues(Object obj, byte[] buf) {
+    }
+
+    /**
+     * Fetches the serializable object field values of object obj and stores
+     * them in array vals starting at offset 0.  It is the responsibility of
+     * the caller to ensure that obj is of the proper type if non-null.
+     */
+    void getObjFieldValues(Object obj, Object[] vals) {
+    }
+
+    /**
+     * Sets the serializable object fields of object obj using values from
+     * array vals starting at offset 0.  It is the responsibility of the caller
+     * to ensure that obj is of the proper type if non-null.
+     */
+    void setObjFieldValues(Object obj, Object[] vals) {
+    }
+
+    /**
+     * Calculates and sets serializable field offsets, as well as primitive
+     * data size and object field count totals.  Throws InvalidClassException
+     * if fields are illegally ordered.
+     */
+    private void computeFieldOffsets() throws InvalidClassException {
+        primDataSize = 0;
+        numObjFields = 0;
+        int firstObjIndex = -1;
+
+        for (int i = 0; i < fields.length; i++) {
+            ObjectStreamField f = fields[i];
+            switch (f.getTypeCode()) {
+                case 'Z':
+                case 'B':
+                    f.setOffset(primDataSize++);
+                    break;
+
+                case 'C':
+                case 'S':
+                    f.setOffset(primDataSize);
+                    primDataSize += 2;
+                    break;
+
+                case 'I':
+                case 'F':
+                    f.setOffset(primDataSize);
+                    primDataSize += 4;
+                    break;
+
+                case 'J':
+                case 'D':
+                    f.setOffset(primDataSize);
+                    primDataSize += 8;
+                    break;
+
+                case '[':
+                case 'L':
+                    f.setOffset(numObjFields++);
+                    if (firstObjIndex == -1) {
+                        firstObjIndex = i;
+                    }
+                    break;
+
+                default:
+                    throw new InternalError();
+            }
+        }
+        if (firstObjIndex != -1 &&
+            firstObjIndex + numObjFields != fields.length)
+        {
+            throw new InvalidClassException(name, "illegal field order");
+        }
+    }
+
+    /**
+     * If given class is the same as the class associated with this class
+     * descriptor, returns reference to this class descriptor.  Otherwise,
+     * returns variant of this class descriptor bound to given class.
+     */
+    private ObjectStreamClass getVariantFor(Class<?> cl)
+        throws InvalidClassException
+    {
+        if (this.cl == cl) {
+            return this;
+        }
+        ObjectStreamClass desc = new ObjectStreamClass();
+        if (isProxy) {
+            desc.initProxy(cl, null, superDesc);
+        } else {
+            desc.initNonProxy(this, cl, null, superDesc);
+        }
+        return desc;
+    }
+
+    /**
+     * Returns public no-arg constructor of given class, or null if none found.
+     * Access checks are disabled on the returned constructor (if any), since
+     * the defining class may still be non-public.
+     */
+    private static Constructor getExternalizableConstructor(Class<?> cl) {
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns subclass-accessible no-arg constructor of first non-serializable
+     * superclass, or null if none found.  Access checks are disabled on the
+     * returned constructor (if any).
+     */
+    private static Constructor getSerializableConstructor(Class<?> cl) {
+        Class<?> initCl = cl;
+        while (Serializable.class.isAssignableFrom(initCl)) {
+            if ((initCl = initCl.getSuperclass()) == null) {
+                return null;
+            }
+        }
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns non-static, non-abstract method with given signature provided it
+     * is defined by or accessible (via inheritance) by the given class, or
+     * null if no match found.  Access checks are disabled on the returned
+     * method (if any).
+     */
+    private static Method getInheritableMethod(Class<?> cl, String name,
+                                               Class<?>[] argTypes,
+                                               Class<?> returnType)
+    {
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns non-static private method with given signature defined by given
+     * class, or null if none found.  Access checks are disabled on the
+     * returned method (if any).
+     */
+    private static Method getPrivateMethod(Class<?> cl, String name,
+                                           Class<?>[] argTypes,
+                                           Class<?> returnType)
+    {
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns true if classes are defined in the same runtime package, false
+     * otherwise.
+     */
+    private static boolean packageEquals(Class<?> cl1, Class<?> cl2) {
+        return (cl1.getClassLoader() == cl2.getClassLoader() &&
+                getPackageName(cl1).equals(getPackageName(cl2)));
+    }
+
+    /**
+     * Returns package name of given class.
+     */
+    private static String getPackageName(Class<?> cl) {
+        String s = cl.getName();
+        int i = s.lastIndexOf('[');
+        if (i >= 0) {
+            s = s.substring(i + 2);
+        }
+        i = s.lastIndexOf('.');
+        return (i >= 0) ? s.substring(0, i) : "";
+    }
+
+    /**
+     * Compares class names for equality, ignoring package names.  Returns true
+     * if class names equal, false otherwise.
+     */
+    private static boolean classNamesEqual(String name1, String name2) {
+        name1 = name1.substring(name1.lastIndexOf('.') + 1);
+        name2 = name2.substring(name2.lastIndexOf('.') + 1);
+        return name1.equals(name2);
+    }
+
+    /**
+     * Returns JVM type signature for given class.
+     */
+    private static String getClassSignature(Class<?> cl) {
+        StringBuilder sbuf = new StringBuilder();
+        while (cl.isArray()) {
+            sbuf.append('[');
+            cl = cl.getComponentType();
+        }
+        if (cl.isPrimitive()) {
+            if (cl == Integer.TYPE) {
+                sbuf.append('I');
+            } else if (cl == Byte.TYPE) {
+                sbuf.append('B');
+            } else if (cl == Long.TYPE) {
+                sbuf.append('J');
+            } else if (cl == Float.TYPE) {
+                sbuf.append('F');
+            } else if (cl == Double.TYPE) {
+                sbuf.append('D');
+            } else if (cl == Short.TYPE) {
+                sbuf.append('S');
+            } else if (cl == Character.TYPE) {
+                sbuf.append('C');
+            } else if (cl == Boolean.TYPE) {
+                sbuf.append('Z');
+            } else if (cl == Void.TYPE) {
+                sbuf.append('V');
+            } else {
+                throw new InternalError();
+            }
+        } else {
+            sbuf.append('L' + cl.getName().replace('.', '/') + ';');
+        }
+        return sbuf.toString();
+    }
+
+    /**
+     * Returns JVM type signature for given list of parameters and return type.
+     */
+    private static String getMethodSignature(Class<?>[] paramTypes,
+                                             Class<?> retType)
+    {
+        StringBuilder sbuf = new StringBuilder();
+        sbuf.append('(');
+        for (int i = 0; i < paramTypes.length; i++) {
+            sbuf.append(getClassSignature(paramTypes[i]));
+        }
+        sbuf.append(')');
+        sbuf.append(getClassSignature(retType));
+        return sbuf.toString();
+    }
+
+    /**
+     * Convenience method for throwing an exception that is either a
+     * RuntimeException, Error, or of some unexpected type (in which case it is
+     * wrapped inside an IOException).
+     */
+    private static void throwMiscException(Throwable th) throws IOException {
+        if (th instanceof RuntimeException) {
+            throw (RuntimeException) th;
+        } else if (th instanceof Error) {
+            throw (Error) th;
+        } else {
+            IOException ex = new IOException("unexpected exception type");
+            ex.initCause(th);
+            throw ex;
+        }
+    }
+
+    /**
+     * Returns ObjectStreamField array describing the serializable fields of
+     * the given class.  Serializable fields backed by an actual field of the
+     * class are represented by ObjectStreamFields with corresponding non-null
+     * Field objects.  Throws InvalidClassException if the (explicitly
+     * declared) serializable fields are invalid.
+     */
+    private static ObjectStreamField[] getSerialFields(Class<?> cl)
+        throws InvalidClassException
+    {
+        ObjectStreamField[] fields;
+        if (Serializable.class.isAssignableFrom(cl) &&
+            !Externalizable.class.isAssignableFrom(cl) &&
+            !Proxy.isProxyClass(cl) &&
+            !cl.isInterface())
+        {
+            if ((fields = getDeclaredSerialFields(cl)) == null) {
+                fields = getDefaultSerialFields(cl);
+            }
+            Arrays.sort(fields);
+        } else {
+            fields = NO_FIELDS;
+        }
+        return fields;
+    }
+
+    /**
+     * Returns serializable fields of given class as defined explicitly by a
+     * "serialPersistentFields" field, or null if no appropriate
+     * "serialPersistentFields" field is defined.  Serializable fields backed
+     * by an actual field of the class are represented by ObjectStreamFields
+     * with corresponding non-null Field objects.  For compatibility with past
+     * releases, a "serialPersistentFields" field with a null value is
+     * considered equivalent to not declaring "serialPersistentFields".  Throws
+     * InvalidClassException if the declared serializable fields are
+     * invalid--e.g., if multiple fields share the same name.
+     */
+    private static ObjectStreamField[] getDeclaredSerialFields(Class<?> cl)
+        throws InvalidClassException
+    {
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns array of ObjectStreamFields corresponding to all non-static
+     * non-transient fields declared by given class.  Each ObjectStreamField
+     * contains a Field object for the field it represents.  If no default
+     * serializable fields exist, NO_FIELDS is returned.
+     */
+    private static ObjectStreamField[] getDefaultSerialFields(Class<?> cl) {
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns explicit serial version UID value declared by given class, or
+     * null if none.
+     */
+    private static Long getDeclaredSUID(Class<?> cl) {
+        return null;
+    }
+
+    /**
+     * Computes the default serial version UID value for the given class.
+     */
+    private static long computeDefaultSUID(Class<?> cl) {
+        throw new SecurityException();
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectStreamConstants.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectStreamConstants.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Constants written into the Object Serialization Stream.
+ *
+ * @author  unascribed
+ * @since JDK 1.1
+ */
+public interface ObjectStreamConstants {
+
+    /**
+     * Magic number that is written to the stream header.
+     */
+    final static short STREAM_MAGIC = (short)0xaced;
+
+    /**
+     * Version number that is written to the stream header.
+     */
+    final static short STREAM_VERSION = 5;
+
+    /* Each item in the stream is preceded by a tag
+     */
+
+    /**
+     * First tag value.
+     */
+    final static byte TC_BASE = 0x70;
+
+    /**
+     * Null object reference.
+     */
+    final static byte TC_NULL =         (byte)0x70;
+
+    /**
+     * Reference to an object already written into the stream.
+     */
+    final static byte TC_REFERENCE =    (byte)0x71;
+
+    /**
+     * new Class Descriptor.
+     */
+    final static byte TC_CLASSDESC =    (byte)0x72;
+
+    /**
+     * new Object.
+     */
+    final static byte TC_OBJECT =       (byte)0x73;
+
+    /**
+     * new String.
+     */
+    final static byte TC_STRING =       (byte)0x74;
+
+    /**
+     * new Array.
+     */
+    final static byte TC_ARRAY =        (byte)0x75;
+
+    /**
+     * Reference to Class.
+     */
+    final static byte TC_CLASS =        (byte)0x76;
+
+    /**
+     * Block of optional data. Byte following tag indicates number
+     * of bytes in this block data.
+     */
+    final static byte TC_BLOCKDATA =    (byte)0x77;
+
+    /**
+     * End of optional block data blocks for an object.
+     */
+    final static byte TC_ENDBLOCKDATA = (byte)0x78;
+
+    /**
+     * Reset stream context. All handles written into stream are reset.
+     */
+    final static byte TC_RESET =        (byte)0x79;
+
+    /**
+     * long Block data. The long following the tag indicates the
+     * number of bytes in this block data.
+     */
+    final static byte TC_BLOCKDATALONG= (byte)0x7A;
+
+    /**
+     * Exception during write.
+     */
+    final static byte TC_EXCEPTION =    (byte)0x7B;
+
+    /**
+     * Long string.
+     */
+    final static byte TC_LONGSTRING =   (byte)0x7C;
+
+    /**
+     * new Proxy Class Descriptor.
+     */
+    final static byte TC_PROXYCLASSDESC =       (byte)0x7D;
+
+    /**
+     * new Enum constant.
+     * @since 1.5
+     */
+    final static byte TC_ENUM =         (byte)0x7E;
+
+    /**
+     * Last tag value.
+     */
+    final static byte TC_MAX =          (byte)0x7E;
+
+    /**
+     * First wire handle to be assigned.
+     */
+    final static int baseWireHandle = 0x7e0000;
+
+
+    /******************************************************/
+    /* Bit masks for ObjectStreamClass flag.*/
+
+    /**
+     * Bit mask for ObjectStreamClass flag. Indicates a Serializable class
+     * defines its own writeObject method.
+     */
+    final static byte SC_WRITE_METHOD = 0x01;
+
+    /**
+     * Bit mask for ObjectStreamClass flag. Indicates Externalizable data
+     * written in Block Data mode.
+     * Added for PROTOCOL_VERSION_2.
+     *
+     * @see #PROTOCOL_VERSION_2
+     * @since 1.2
+     */
+    final static byte SC_BLOCK_DATA = 0x08;
+
+    /**
+     * Bit mask for ObjectStreamClass flag. Indicates class is Serializable.
+     */
+    final static byte SC_SERIALIZABLE = 0x02;
+
+    /**
+     * Bit mask for ObjectStreamClass flag. Indicates class is Externalizable.
+     */
+    final static byte SC_EXTERNALIZABLE = 0x04;
+
+    /**
+     * Bit mask for ObjectStreamClass flag. Indicates class is an enum type.
+     * @since 1.5
+     */
+    final static byte SC_ENUM = 0x10;
+
+
+    /* *******************************************************************/
+    /* Security permissions */
+
+   /**
+    * A Stream Protocol Version. <p>
+    *
+    * All externalizable data is written in JDK 1.1 external data
+    * format after calling this method. This version is needed to write
+    * streams containing Externalizable data that can be read by
+    * pre-JDK 1.1.6 JVMs.
+    *
+    * @see java.io.ObjectOutputStream#useProtocolVersion(int)
+    * @since 1.2
+    */
+    public final static int PROTOCOL_VERSION_1 = 1;
+
+
+   /**
+    * A Stream Protocol Version. <p>
+    *
+    * This protocol is written by JVM 1.2.
+    *
+    * Externalizable data is written in block data mode and is
+    * terminated with TC_ENDBLOCKDATA. Externalizable classdescriptor
+    * flags has SC_BLOCK_DATA enabled. JVM 1.1.6 and greater can
+    * read this format change.
+    *
+    * Enables writing a nonSerializable class descriptor into the
+    * stream. The serialVersionUID of a nonSerializable class is
+    * set to 0L.
+    *
+    * @see java.io.ObjectOutputStream#useProtocolVersion(int)
+    * @see #SC_BLOCK_DATA
+    * @since 1.2
+    */
+    public final static int PROTOCOL_VERSION_2 = 2;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectStreamException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectStreamException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Superclass of all exceptions specific to Object Stream classes.
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public abstract class ObjectStreamException extends IOException {
+
+    private static final long serialVersionUID = 7260898174833392607L;
+
+    /**
+     * Create an ObjectStreamException with the specified argument.
+     *
+     * @param classname the detailed message for the exception
+     */
+    protected ObjectStreamException(String classname) {
+        super(classname);
+    }
+
+    /**
+     * Create an ObjectStreamException.
+     */
+    protected ObjectStreamException() {
+        super();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/ObjectStreamField.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/ObjectStreamField.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import java.lang.reflect.Field;
+
+/**
+ * A description of a Serializable field from a Serializable class.  An array
+ * of ObjectStreamFields is used to declare the Serializable fields of a class.
+ *
+ * @author      Mike Warres
+ * @author      Roger Riggs
+ * @see ObjectStreamClass
+ * @since 1.2
+ */
+public class ObjectStreamField
+    implements Comparable<Object>
+{
+
+    /** field name */
+    private final String name;
+    /** canonical JVM signature of field type */
+    private final String signature;
+    /** field type (Object.class if unknown non-primitive type) */
+    private final Class<?> type;
+    /** whether or not to (de)serialize field values as unshared */
+    private final boolean unshared;
+    /** corresponding reflective field object, if any */
+    private final Field field;
+    /** offset of field value in enclosing field group */
+    private int offset = 0;
+
+    /**
+     * Create a Serializable field with the specified type.  This field should
+     * be documented with a <code>serialField</code> tag.
+     *
+     * @param   name the name of the serializable field
+     * @param   type the <code>Class</code> object of the serializable field
+     */
+    public ObjectStreamField(String name, Class<?> type) {
+        this(name, type, false);
+    }
+
+    /**
+     * Creates an ObjectStreamField representing a serializable field with the
+     * given name and type.  If unshared is false, values of the represented
+     * field are serialized and deserialized in the default manner--if the
+     * field is non-primitive, object values are serialized and deserialized as
+     * if they had been written and read by calls to writeObject and
+     * readObject.  If unshared is true, values of the represented field are
+     * serialized and deserialized as if they had been written and read by
+     * calls to writeUnshared and readUnshared.
+     *
+     * @param   name field name
+     * @param   type field type
+     * @param   unshared if false, write/read field values in the same manner
+     *          as writeObject/readObject; if true, write/read in the same
+     *          manner as writeUnshared/readUnshared
+     * @since   1.4
+     */
+    public ObjectStreamField(String name, Class<?> type, boolean unshared) {
+        if (name == null) {
+            throw new NullPointerException();
+        }
+        this.name = name;
+        this.type = type;
+        this.unshared = unshared;
+        signature = getClassSignature(type).intern();
+        field = null;
+    }
+
+    /**
+     * Creates an ObjectStreamField representing a field with the given name,
+     * signature and unshared setting.
+     */
+    ObjectStreamField(String name, String signature, boolean unshared) {
+        if (name == null) {
+            throw new NullPointerException();
+        }
+        this.name = name;
+        this.signature = signature.intern();
+        this.unshared = unshared;
+        field = null;
+
+        switch (signature.charAt(0)) {
+            case 'Z': type = Boolean.TYPE; break;
+            case 'B': type = Byte.TYPE; break;
+            case 'C': type = Character.TYPE; break;
+            case 'S': type = Short.TYPE; break;
+            case 'I': type = Integer.TYPE; break;
+            case 'J': type = Long.TYPE; break;
+            case 'F': type = Float.TYPE; break;
+            case 'D': type = Double.TYPE; break;
+            case 'L':
+            case '[': type = Object.class; break;
+            default: throw new IllegalArgumentException("illegal signature");
+        }
+    }
+
+    /**
+     * Creates an ObjectStreamField representing the given field with the
+     * specified unshared setting.  For compatibility with the behavior of
+     * earlier serialization implementations, a "showType" parameter is
+     * necessary to govern whether or not a getType() call on this
+     * ObjectStreamField (if non-primitive) will return Object.class (as
+     * opposed to a more specific reference type).
+     */
+    ObjectStreamField(Field field, boolean unshared, boolean showType) {
+        this.field = field;
+        this.unshared = unshared;
+        name = field.getName();
+        Class<?> ftype = field.getType();
+        type = (showType || ftype.isPrimitive()) ? ftype : Object.class;
+        signature = getClassSignature(ftype).intern();
+    }
+
+    /**
+     * Get the name of this field.
+     *
+     * @return  a <code>String</code> representing the name of the serializable
+     *          field
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Get the type of the field.  If the type is non-primitive and this
+     * <code>ObjectStreamField</code> was obtained from a deserialized {@link
+     * ObjectStreamClass} instance, then <code>Object.class</code> is returned.
+     * Otherwise, the <code>Class</code> object for the type of the field is
+     * returned.
+     *
+     * @return  a <code>Class</code> object representing the type of the
+     *          serializable field
+     */
+    public Class<?> getType() {
+        return type;
+    }
+
+    /**
+     * Returns character encoding of field type.  The encoding is as follows:
+     * <blockquote><pre>
+     * B            byte
+     * C            char
+     * D            double
+     * F            float
+     * I            int
+     * J            long
+     * L            class or interface
+     * S            short
+     * Z            boolean
+     * [            array
+     * </pre></blockquote>
+     *
+     * @return  the typecode of the serializable field
+     */
+    // REMIND: deprecate?
+    public char getTypeCode() {
+        return signature.charAt(0);
+    }
+
+    /**
+     * Return the JVM type signature.
+     *
+     * @return  null if this field has a primitive type.
+     */
+    // REMIND: deprecate?
+    public String getTypeString() {
+        return isPrimitive() ? null : signature;
+    }
+
+    /**
+     * Offset of field within instance data.
+     *
+     * @return  the offset of this field
+     * @see #setOffset
+     */
+    // REMIND: deprecate?
+    public int getOffset() {
+        return offset;
+    }
+
+    /**
+     * Offset within instance data.
+     *
+     * @param   offset the offset of the field
+     * @see #getOffset
+     */
+    // REMIND: deprecate?
+    protected void setOffset(int offset) {
+        this.offset = offset;
+    }
+
+    /**
+     * Return true if this field has a primitive type.
+     *
+     * @return  true if and only if this field corresponds to a primitive type
+     */
+    // REMIND: deprecate?
+    public boolean isPrimitive() {
+        char tcode = signature.charAt(0);
+        return ((tcode != 'L') && (tcode != '['));
+    }
+
+    /**
+     * Returns boolean value indicating whether or not the serializable field
+     * represented by this ObjectStreamField instance is unshared.
+     *
+     * @since 1.4
+     */
+    public boolean isUnshared() {
+        return unshared;
+    }
+
+    /**
+     * Compare this field with another <code>ObjectStreamField</code>.  Return
+     * -1 if this is smaller, 0 if equal, 1 if greater.  Types that are
+     * primitives are "smaller" than object types.  If equal, the field names
+     * are compared.
+     */
+    // REMIND: deprecate?
+    public int compareTo(Object obj) {
+        ObjectStreamField other = (ObjectStreamField) obj;
+        boolean isPrim = isPrimitive();
+        if (isPrim != other.isPrimitive()) {
+            return isPrim ? -1 : 1;
+        }
+        return name.compareTo(other.name);
+    }
+
+    /**
+     * Return a string that describes this field.
+     */
+    public String toString() {
+        return signature + ' ' + name;
+    }
+
+    /**
+     * Returns field represented by this ObjectStreamField, or null if
+     * ObjectStreamField is not associated with an actual field.
+     */
+    Field getField() {
+        return field;
+    }
+
+    /**
+     * Returns JVM type signature of field (similar to getTypeString, except
+     * that signature strings are returned for primitive fields as well).
+     */
+    String getSignature() {
+        return signature;
+    }
+
+    /**
+     * Returns JVM type signature for given class.
+     */
+    private static String getClassSignature(Class<?> cl) {
+        StringBuilder sbuf = new StringBuilder();
+        while (cl.isArray()) {
+            sbuf.append('[');
+            cl = cl.getComponentType();
+        }
+        if (cl.isPrimitive()) {
+            if (cl == Integer.TYPE) {
+                sbuf.append('I');
+            } else if (cl == Byte.TYPE) {
+                sbuf.append('B');
+            } else if (cl == Long.TYPE) {
+                sbuf.append('J');
+            } else if (cl == Float.TYPE) {
+                sbuf.append('F');
+            } else if (cl == Double.TYPE) {
+                sbuf.append('D');
+            } else if (cl == Short.TYPE) {
+                sbuf.append('S');
+            } else if (cl == Character.TYPE) {
+                sbuf.append('C');
+            } else if (cl == Boolean.TYPE) {
+                sbuf.append('Z');
+            } else if (cl == Void.TYPE) {
+                sbuf.append('V');
+            } else {
+                throw new InternalError();
+            }
+        } else {
+            sbuf.append('L' + cl.getName().replace('.', '/') + ';');
+        }
+        return sbuf.toString();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/OptionalDataException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/OptionalDataException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.io;
+
+/**
+ * Exception indicating the failure of an object read operation due to
+ * unread primitive data, or the end of data belonging to a serialized
+ * object in the stream.  This exception may be thrown in two cases:
+ *
+ * <ul>
+ *   <li>An attempt was made to read an object when the next element in the
+ *       stream is primitive data.  In this case, the OptionalDataException's
+ *       length field is set to the number of bytes of primitive data
+ *       immediately readable from the stream, and the eof field is set to
+ *       false.
+ *
+ *   <li>An attempt was made to read past the end of data consumable by a
+ *       class-defined readObject or readExternal method.  In this case, the
+ *       OptionalDataException's eof field is set to true, and the length field
+ *       is set to 0.
+ * </ul>
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public class OptionalDataException extends ObjectStreamException {
+
+    private static final long serialVersionUID = -8011121865681257820L;
+
+    /*
+     * Create an <code>OptionalDataException</code> with a length.
+     */
+    OptionalDataException(int len) {
+        eof = false;
+        length = len;
+    }
+
+    /*
+     * Create an <code>OptionalDataException</code> signifying no
+     * more primitive data is available.
+     */
+    OptionalDataException(boolean end) {
+        length = 0;
+        eof = end;
+    }
+
+    /**
+     * The number of bytes of primitive data available to be read
+     * in the current buffer.
+     *
+     * @serial
+     */
+    public int length;
+
+    /**
+     * True if there is no more data in the buffered part of the stream.
+     *
+     * @serial
+     */
+    public boolean eof;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/OutputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/OutputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * This abstract class is the superclass of all classes representing
+ * an output stream of bytes. An output stream accepts output bytes
+ * and sends them to some sink.
+ * <p>
+ * Applications that need to define a subclass of
+ * <code>OutputStream</code> must always provide at least a method
+ * that writes one byte of output.
+ *
+ * @author  Arthur van Hoff
+ * @see     java.io.BufferedOutputStream
+ * @see     java.io.ByteArrayOutputStream
+ * @see     java.io.DataOutputStream
+ * @see     java.io.FilterOutputStream
+ * @see     java.io.InputStream
+ * @see     java.io.OutputStream#write(int)
+ * @since   JDK1.0
+ */
+public abstract class OutputStream implements Closeable, Flushable {
+    /**
+     * Writes the specified byte to this output stream. The general
+     * contract for <code>write</code> is that one byte is written
+     * to the output stream. The byte to be written is the eight
+     * low-order bits of the argument <code>b</code>. The 24
+     * high-order bits of <code>b</code> are ignored.
+     * <p>
+     * Subclasses of <code>OutputStream</code> must provide an
+     * implementation for this method.
+     *
+     * @param      b   the <code>byte</code>.
+     * @exception  IOException  if an I/O error occurs. In particular,
+     *             an <code>IOException</code> may be thrown if the
+     *             output stream has been closed.
+     */
+    public abstract void write(int b) throws IOException;
+
+    /**
+     * Writes <code>b.length</code> bytes from the specified byte array
+     * to this output stream. The general contract for <code>write(b)</code>
+     * is that it should have exactly the same effect as the call
+     * <code>write(b, 0, b.length)</code>.
+     *
+     * @param      b   the data.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.OutputStream#write(byte[], int, int)
+     */
+    public void write(byte b[]) throws IOException {
+        write(b, 0, b.length);
+    }
+
+    /**
+     * Writes <code>len</code> bytes from the specified byte array
+     * starting at offset <code>off</code> to this output stream.
+     * The general contract for <code>write(b, off, len)</code> is that
+     * some of the bytes in the array <code>b</code> are written to the
+     * output stream in order; element <code>b[off]</code> is the first
+     * byte written and <code>b[off+len-1]</code> is the last byte written
+     * by this operation.
+     * <p>
+     * The <code>write</code> method of <code>OutputStream</code> calls
+     * the write method of one argument on each of the bytes to be
+     * written out. Subclasses are encouraged to override this method and
+     * provide a more efficient implementation.
+     * <p>
+     * If <code>b</code> is <code>null</code>, a
+     * <code>NullPointerException</code> is thrown.
+     * <p>
+     * If <code>off</code> is negative, or <code>len</code> is negative, or
+     * <code>off+len</code> is greater than the length of the array
+     * <code>b</code>, then an <tt>IndexOutOfBoundsException</tt> is thrown.
+     *
+     * @param      b     the data.
+     * @param      off   the start offset in the data.
+     * @param      len   the number of bytes to write.
+     * @exception  IOException  if an I/O error occurs. In particular,
+     *             an <code>IOException</code> is thrown if the output
+     *             stream is closed.
+     */
+    public void write(byte b[], int off, int len) throws IOException {
+        if (b == null) {
+            throw new NullPointerException();
+        } else if ((off < 0) || (off > b.length) || (len < 0) ||
+                   ((off + len) > b.length) || ((off + len) < 0)) {
+            throw new IndexOutOfBoundsException();
+        } else if (len == 0) {
+            return;
+        }
+        for (int i = 0 ; i < len ; i++) {
+            write(b[off + i]);
+        }
+    }
+
+    /**
+     * Flushes this output stream and forces any buffered output bytes
+     * to be written out. The general contract of <code>flush</code> is
+     * that calling it is an indication that, if any bytes previously
+     * written have been buffered by the implementation of the output
+     * stream, such bytes should immediately be written to their
+     * intended destination.
+     * <p>
+     * If the intended destination of this stream is an abstraction provided by
+     * the underlying operating system, for example a file, then flushing the
+     * stream guarantees only that bytes previously written to the stream are
+     * passed to the operating system for writing; it does not guarantee that
+     * they are actually written to a physical device such as a disk drive.
+     * <p>
+     * The <code>flush</code> method of <code>OutputStream</code> does nothing.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public void flush() throws IOException {
+    }
+
+    /**
+     * Closes this output stream and releases any system resources
+     * associated with this stream. The general contract of <code>close</code>
+     * is that it closes the output stream. A closed stream cannot perform
+     * output operations and cannot be reopened.
+     * <p>
+     * The <code>close</code> method of <code>OutputStream</code> does nothing.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public void close() throws IOException {
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/Reader.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/Reader.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+
+/**
+ * Abstract class for reading character streams.  The only methods that a
+ * subclass must implement are read(char[], int, int) and close().  Most
+ * subclasses, however, will override some of the methods defined here in order
+ * to provide higher efficiency, additional functionality, or both.
+ *
+ *
+ * @see BufferedReader
+ * @see   LineNumberReader
+ * @see CharArrayReader
+ * @see InputStreamReader
+ * @see   FileReader
+ * @see FilterReader
+ * @see   PushbackReader
+ * @see PipedReader
+ * @see StringReader
+ * @see Writer
+ *
+ * @author      Mark Reinhold
+ * @since       JDK1.1
+ */
+
+public abstract class Reader implements Readable, Closeable {
+
+    /**
+     * The object used to synchronize operations on this stream.  For
+     * efficiency, a character-stream object may use an object other than
+     * itself to protect critical sections.  A subclass should therefore use
+     * the object in this field rather than <tt>this</tt> or a synchronized
+     * method.
+     */
+    protected Object lock;
+
+    /**
+     * Creates a new character-stream reader whose critical sections will
+     * synchronize on the reader itself.
+     */
+    protected Reader() {
+        this.lock = this;
+    }
+
+    /**
+     * Creates a new character-stream reader whose critical sections will
+     * synchronize on the given object.
+     *
+     * @param lock  The Object to synchronize on.
+     */
+    protected Reader(Object lock) {
+        if (lock == null) {
+            throw new NullPointerException();
+        }
+        this.lock = lock;
+    }
+
+    /**
+     * Attempts to read characters into the specified character buffer.
+     * The buffer is used as a repository of characters as-is: the only
+     * changes made are the results of a put operation. No flipping or
+     * rewinding of the buffer is performed.
+     *
+     * @param target the buffer to read characters into
+     * @return The number of characters added to the buffer, or
+     *         -1 if this source of characters is at its end
+     * @throws IOException if an I/O error occurs
+     * @throws NullPointerException if target is null
+     * @throws ReadOnlyBufferException if target is a read only buffer
+     * @since 1.5
+     */
+//    public int read(java.nio.CharBuffer target) throws IOException {
+//        int len = target.remaining();
+//        char[] cbuf = new char[len];
+//        int n = read(cbuf, 0, len);
+//        if (n > 0)
+//            target.put(cbuf, 0, n);
+//        return n;
+//    }
+
+    /**
+     * Reads a single character.  This method will block until a character is
+     * available, an I/O error occurs, or the end of the stream is reached.
+     *
+     * <p> Subclasses that intend to support efficient single-character input
+     * should override this method.
+     *
+     * @return     The character read, as an integer in the range 0 to 65535
+     *             (<tt>0x00-0xffff</tt>), or -1 if the end of the stream has
+     *             been reached
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    public int read() throws IOException {
+        char cb[] = new char[1];
+        if (read(cb, 0, 1) == -1)
+            return -1;
+        else
+            return cb[0];
+    }
+
+    /**
+     * Reads characters into an array.  This method will block until some input
+     * is available, an I/O error occurs, or the end of the stream is reached.
+     *
+     * @param       cbuf  Destination buffer
+     *
+     * @return      The number of characters read, or -1
+     *              if the end of the stream
+     *              has been reached
+     *
+     * @exception   IOException  If an I/O error occurs
+     */
+    public int read(char cbuf[]) throws IOException {
+        return read(cbuf, 0, cbuf.length);
+    }
+
+    /**
+     * Reads characters into a portion of an array.  This method will block
+     * until some input is available, an I/O error occurs, or the end of the
+     * stream is reached.
+     *
+     * @param      cbuf  Destination buffer
+     * @param      off   Offset at which to start storing characters
+     * @param      len   Maximum number of characters to read
+     *
+     * @return     The number of characters read, or -1 if the end of the
+     *             stream has been reached
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    abstract public int read(char cbuf[], int off, int len) throws IOException;
+
+    /** Maximum skip-buffer size */
+    private static final int maxSkipBufferSize = 8192;
+
+    /** Skip buffer, null until allocated */
+    private char skipBuffer[] = null;
+
+    /**
+     * Skips characters.  This method will block until some characters are
+     * available, an I/O error occurs, or the end of the stream is reached.
+     *
+     * @param  n  The number of characters to skip
+     *
+     * @return    The number of characters actually skipped
+     *
+     * @exception  IllegalArgumentException  If <code>n</code> is negative.
+     * @exception  IOException  If an I/O error occurs
+     */
+    public long skip(long n) throws IOException {
+        if (n < 0L)
+            throw new IllegalArgumentException("skip value is negative");
+        int nn = (int) Math.min(n, maxSkipBufferSize);
+        synchronized (lock) {
+            if ((skipBuffer == null) || (skipBuffer.length < nn))
+                skipBuffer = new char[nn];
+            long r = n;
+            while (r > 0) {
+                int nc = read(skipBuffer, 0, (int)Math.min(r, nn));
+                if (nc == -1)
+                    break;
+                r -= nc;
+            }
+            return n - r;
+        }
+    }
+
+    /**
+     * Tells whether this stream is ready to be read.
+     *
+     * @return True if the next read() is guaranteed not to block for input,
+     * false otherwise.  Note that returning false does not guarantee that the
+     * next read will block.
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+    public boolean ready() throws IOException {
+        return false;
+    }
+
+    /**
+     * Tells whether this stream supports the mark() operation. The default
+     * implementation always returns false. Subclasses should override this
+     * method.
+     *
+     * @return true if and only if this stream supports the mark operation.
+     */
+    public boolean markSupported() {
+        return false;
+    }
+
+    /**
+     * Marks the present position in the stream.  Subsequent calls to reset()
+     * will attempt to reposition the stream to this point.  Not all
+     * character-input streams support the mark() operation.
+     *
+     * @param  readAheadLimit  Limit on the number of characters that may be
+     *                         read while still preserving the mark.  After
+     *                         reading this many characters, attempting to
+     *                         reset the stream may fail.
+     *
+     * @exception  IOException  If the stream does not support mark(),
+     *                          or if some other I/O error occurs
+     */
+    public void mark(int readAheadLimit) throws IOException {
+        throw new IOException("mark() not supported");
+    }
+
+    /**
+     * Resets the stream.  If the stream has been marked, then attempt to
+     * reposition it at the mark.  If the stream has not been marked, then
+     * attempt to reset it in some way appropriate to the particular stream,
+     * for example by repositioning it to its starting point.  Not all
+     * character-input streams support the reset() operation, and some support
+     * reset() without supporting mark().
+     *
+     * @exception  IOException  If the stream has not been marked,
+     *                          or if the mark has been invalidated,
+     *                          or if the stream does not support reset(),
+     *                          or if some other I/O error occurs
+     */
+    public void reset() throws IOException {
+        throw new IOException("reset() not supported");
+    }
+
+    /**
+     * Closes the stream and releases any system resources associated with
+     * it.  Once the stream has been closed, further read(), ready(),
+     * mark(), reset(), or skip() invocations will throw an IOException.
+     * Closing a previously closed stream has no effect.
+     *
+     * @exception  IOException  If an I/O error occurs
+     */
+     abstract public void close() throws IOException;
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/StreamCorruptedException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/StreamCorruptedException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Thrown when control information that was read from an object stream
+ * violates internal consistency checks.
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public class StreamCorruptedException extends ObjectStreamException {
+
+    private static final long serialVersionUID = 8983558202217591746L;
+
+    /**
+     * Create a StreamCorruptedException and list a reason why thrown.
+     *
+     * @param reason  String describing the reason for the exception.
+     */
+    public StreamCorruptedException(String reason) {
+        super(reason);
+    }
+
+    /**
+     * Create a StreamCorruptedException and list no reason why thrown.
+     */
+    public StreamCorruptedException() {
+        super();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/io/WriteAbortedException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/io/WriteAbortedException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Signals that one of the ObjectStreamExceptions was thrown during a
+ * write operation.  Thrown during a read operation when one of the
+ * ObjectStreamExceptions was thrown during a write operation.  The
+ * exception that terminated the write can be found in the detail
+ * field. The stream is reset to it's initial state and all references
+ * to objects already deserialized are discarded.
+ *
+ * <p>As of release 1.4, this exception has been retrofitted to conform to
+ * the general purpose exception-chaining mechanism.  The "exception causing
+ * the abort" that is provided at construction time and
+ * accessed via the public {@link #detail} field is now known as the
+ * <i>cause</i>, and may be accessed via the {@link Throwable#getCause()}
+ * method, as well as the aforementioned "legacy field."
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public class WriteAbortedException extends ObjectStreamException {
+    private static final long serialVersionUID = -3326426625597282442L;
+
+    /**
+     * Exception that was caught while writing the ObjectStream.
+     *
+     * <p>This field predates the general-purpose exception chaining facility.
+     * The {@link Throwable#getCause()} method is now the preferred means of
+     * obtaining this information.
+     *
+     * @serial
+     */
+    public Exception detail;
+
+    /**
+     * Constructs a WriteAbortedException with a string describing
+     * the exception and the exception causing the abort.
+     * @param s   String describing the exception.
+     * @param ex  Exception causing the abort.
+     */
+    public WriteAbortedException(String s, Exception ex) {
+        super(s);
+        initCause(null);  // Disallow subsequent initCause
+        detail = ex;
+    }
+
+    /**
+     * Produce the message and include the message from the nested
+     * exception, if there is one.
+     */
+    public String getMessage() {
+        if (detail == null)
+            return super.getMessage();
+        else
+            return super.getMessage() + "; " + detail.toString();
+    }
+
+    /**
+     * Returns the exception that terminated the operation (the <i>cause</i>).
+     *
+     * @return  the exception that terminated the operation (the <i>cause</i>),
+     *          which may be null.
+     * @since   1.4
+     */
+    public Throwable getCause() {
+        return detail;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/AbstractMethodError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/AbstractMethodError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when an application tries to call an abstract method.
+ * Normally, this error is caught by the compiler; this error can
+ * only occur at run time if the definition of some class has
+ * incompatibly changed since the currently executing method was last
+ * compiled.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class AbstractMethodError extends IncompatibleClassChangeError {
+    private static final long serialVersionUID = -1654391082989018462L;
+
+    /**
+     * Constructs an <code>AbstractMethodError</code> with no detail  message.
+     */
+    public AbstractMethodError() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>AbstractMethodError</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public AbstractMethodError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/Cloneable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/Cloneable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * A class implements the <code>Cloneable</code> interface to
+ * indicate to the {@link java.lang.Object#clone()} method that it
+ * is legal for that method to make a
+ * field-for-field copy of instances of that class.
+ * <p>
+ * Invoking Object's clone method on an instance that does not implement the
+ * <code>Cloneable</code> interface results in the exception
+ * <code>CloneNotSupportedException</code> being thrown.
+ * <p>
+ * By convention, classes that implement this interface should override
+ * <tt>Object.clone</tt> (which is protected) with a public method.
+ * See {@link java.lang.Object#clone()} for details on overriding this
+ * method.
+ * <p>
+ * Note that this interface does <i>not</i> contain the <tt>clone</tt> method.
+ * Therefore, it is not possible to clone an object merely by virtue of the
+ * fact that it implements this interface.  Even if the clone method is invoked
+ * reflectively, there is no guarantee that it will succeed.
+ *
+ * @author  unascribed
+ * @see     java.lang.CloneNotSupportedException
+ * @see     java.lang.Object#clone()
+ * @since   JDK1.0
+ */
+public interface Cloneable {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/IncompatibleClassChangeError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/IncompatibleClassChangeError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when an incompatible class change has occurred to some class
+ * definition. The definition of some class, on which the currently
+ * executing method depends, has since changed.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class IncompatibleClassChangeError extends LinkageError {
+    private static final long serialVersionUID = -4914975503642802119L;
+
+    /**
+     * Constructs an <code>IncompatibleClassChangeError</code> with no
+     * detail message.
+     */
+    public IncompatibleClassChangeError () {
+        super();
+    }
+
+    /**
+     * Constructs an <code>IncompatibleClassChangeError</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public IncompatibleClassChangeError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/InternalError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/InternalError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate some unexpected internal error has occurred in
+ * the Java Virtual Machine.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class InternalError extends VirtualMachineError {
+    private static final long serialVersionUID = -9062593416125562365L;
+
+    /**
+     * Constructs an <code>InternalError</code> with no detail message.
+     */
+    public InternalError() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>InternalError</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public InternalError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/Iterable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/Iterable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.util.Iterator;
+
+/**
+ * Implementing this interface allows an object to be the target of
+ * the "foreach" statement.
+ *
+ * @param <T> the type of elements returned by the iterator
+ *
+ * @since 1.5
+ */
+public interface Iterable<T> {
+
+    /**
+     * Returns an iterator over a set of elements of type T.
+     *
+     * @return an Iterator.
+     */
+    Iterator<T> iterator();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/NoSuchFieldError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/NoSuchFieldError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown if an application tries to access or modify a specified
+ * field of an object, and that object no longer has that field.
+ * <p>
+ * Normally, this error is caught by the compiler; this error can
+ * only occur at run time if the definition of a class has
+ * incompatibly changed.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class NoSuchFieldError extends IncompatibleClassChangeError {
+    private static final long serialVersionUID = -3456430195886129035L;
+
+    /**
+     * Constructs a <code>NoSuchFieldError</code> with no detail message.
+     */
+    public NoSuchFieldError() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>NoSuchFieldError</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public NoSuchFieldError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/Readable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/Readable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.io.IOException;
+
+/**
+ * A <tt>Readable</tt> is a source of characters. Characters from
+ * a <tt>Readable</tt> are made available to callers of the read
+ * method via a {@link java.nio.CharBuffer CharBuffer}.
+ *
+ * @since 1.5
+ */
+
+public interface Readable {
+
+    /**
+     * Attempts to read characters into the specified character buffer.
+     * The buffer is used as a repository of characters as-is: the only
+     * changes made are the results of a put operation. No flipping or
+     * rewinding of the buffer is performed.
+     *
+     * @param cb the buffer to read characters into
+     * @return The number of {@code char} values added to the buffer,
+     *                 or -1 if this source of characters is at its end
+     * @throws IOException if an I/O error occurs
+     * @throws NullPointerException if cb is null
+     * @throws java.nio.ReadOnlyBufferException if cb is a read only buffer
+     */
+// XXX:    public int read(java.nio.CharBuffer cb) throws IOException;
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/SafeVarargs.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/SafeVarargs.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.lang.annotation.*;
+
+/**
+ * A programmer assertion that the body of the annotated method or
+ * constructor does not perform potentially unsafe operations on its
+ * varargs parameter.  Applying this annotation to a method or
+ * constructor suppresses unchecked warnings about a
+ * <i>non-reifiable</i> variable arity (vararg) type and suppresses
+ * unchecked warnings about parameterized array creation at call
+ * sites.
+ *
+ * <p> In addition to the usage restrictions imposed by its {@link
+ * Target @Target} meta-annotation, compilers are required to implement
+ * additional usage restrictions on this annotation type; it is a
+ * compile-time error if a method or constructor declaration is
+ * annotated with a {@code @SafeVarargs} annotation, and either:
+ * <ul>
+ * <li>  the declaration is a fixed arity method or constructor
+ *
+ * <li> the declaration is a variable arity method that is neither
+ * {@code static} nor {@code final}.
+ *
+ * </ul>
+ *
+ * <p> Compilers are encouraged to issue warnings when this annotation
+ * type is applied to a method or constructor declaration where:
+ *
+ * <ul>
+ *
+ * <li> The variable arity parameter has a reifiable element type,
+ * which includes primitive types, {@code Object}, and {@code String}.
+ * (The unchecked warnings this annotation type suppresses already do
+ * not occur for a reifiable element type.)
+ *
+ * <li> The body of the method or constructor declaration performs
+ * potentially unsafe operations, such as an assignment to an element
+ * of the variable arity parameter's array that generates an unchecked
+ * warning.  Some unsafe operations do not trigger an unchecked
+ * warning.  For example, the aliasing in
+ *
+ * <blockquote><pre>
+ * &#64;SafeVarargs // Not actually safe!
+ * static void m(List&lt;String&gt;... stringLists) {
+ *   Object[] array = stringLists;
+ *   List&lt;Integer&gt; tmpList = Arrays.asList(42);
+ *   array[0] = tmpList; // Semantically invalid, but compiles without warnings
+ *   String s = stringLists[0].get(0); // Oh no, ClassCastException at runtime!
+ * }
+ * </pre></blockquote>
+ *
+ * leads to a {@code ClassCastException} at runtime.
+ *
+ * <p>Future versions of the platform may mandate compiler errors for
+ * such unsafe operations.
+ *
+ * </ul>
+ *
+ * @jls 4.7 Reifiable Types
+ * @jls 8.4.1 Formal Parameters
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.CONSTRUCTOR, ElementType.METHOD})
+public @interface SafeVarargs {}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/SuppressWarnings.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/SuppressWarnings.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+
+/**
+ * Indicates that the named compiler warnings should be suppressed in the
+ * annotated element (and in all program elements contained in the annotated
+ * element).  Note that the set of warnings suppressed in a given element is
+ * a superset of the warnings suppressed in all containing elements.  For
+ * example, if you annotate a class to suppress one warning and annotate a
+ * method to suppress another, both warnings will be suppressed in the method.
+ *
+ * <p>As a matter of style, programmers should always use this annotation
+ * on the most deeply nested element where it is effective.  If you want to
+ * suppress a warning in a particular method, you should annotate that
+ * method rather than its class.
+ *
+ * @since 1.5
+ * @author Josh Bloch
+ */
+@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface SuppressWarnings {
+    /**
+     * The set of warnings that are to be suppressed by the compiler in the
+     * annotated element.  Duplicate names are permitted.  The second and
+     * successive occurrences of a name are ignored.  The presence of
+     * unrecognized warning names is <i>not</i> an error: Compilers must
+     * ignore any warning names they do not recognize.  They are, however,
+     * free to emit a warning if an annotation contains an unrecognized
+     * warning name.
+     *
+     * <p>Compiler vendors should document the warning names they support in
+     * conjunction with this annotation type. They are encouraged to cooperate
+     * to ensure that the same names work across multiple compilers.
+     */
+    String[] value();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/System.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/System.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,36 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package java.lang;
+
+/** Poor man's re-implementation of most important System methods.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class System {
+    private System() {
+    }
+    
+    public static void arraycopy(Object value, int srcBegin, Object dst, int dstBegin, int count) {
+        org.apidesign.bck2brwsr.emul.lang.System.arraycopy(value, srcBegin, dst, dstBegin, count);
+    }
+    
+    public static long currentTimeMillis() {
+        return org.apidesign.bck2brwsr.emul.lang.System.currentTimeMillis();
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/ref/PhantomReference.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/ref/PhantomReference.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.ref;
+
+
+/**
+ * Phantom reference objects, which are enqueued after the collector
+ * determines that their referents may otherwise be reclaimed.  Phantom
+ * references are most often used for scheduling pre-mortem cleanup actions in
+ * a more flexible way than is possible with the Java finalization mechanism.
+ *
+ * <p> If the garbage collector determines at a certain point in time that the
+ * referent of a phantom reference is <a
+ * href="package-summary.html#reachability">phantom reachable</a>, then at that
+ * time or at some later time it will enqueue the reference.
+ *
+ * <p> In order to ensure that a reclaimable object remains so, the referent of
+ * a phantom reference may not be retrieved: The <code>get</code> method of a
+ * phantom reference always returns <code>null</code>.
+ *
+ * <p> Unlike soft and weak references, phantom references are not
+ * automatically cleared by the garbage collector as they are enqueued.  An
+ * object that is reachable via phantom references will remain so until all
+ * such references are cleared or themselves become unreachable.
+ *
+ * @author   Mark Reinhold
+ * @since    1.2
+ */
+
+public class PhantomReference<T> extends Reference<T> {
+
+    /**
+     * Returns this reference object's referent.  Because the referent of a
+     * phantom reference is always inaccessible, this method always returns
+     * <code>null</code>.
+     *
+     * @return  <code>null</code>
+     */
+    public T get() {
+        return null;
+    }
+
+    /**
+     * Creates a new phantom reference that refers to the given object and
+     * is registered with the given queue.
+     *
+     * <p> It is possible to create a phantom reference with a <tt>null</tt>
+     * queue, but such a reference is completely useless: Its <tt>get</tt>
+     * method will always return null and, since it does not have a queue, it
+     * will never be enqueued.
+     *
+     * @param referent the object the new phantom reference will refer to
+     * @param q the queue with which the reference is to be registered,
+     *          or <tt>null</tt> if registration is not required
+     */
+    public PhantomReference(T referent, ReferenceQueue<? super T> q) {
+        super(referent, q);
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/ref/Reference.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/ref/Reference.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.ref;
+
+
+/**
+ * Abstract base class for reference objects.  This class defines the
+ * operations common to all reference objects.  Because reference objects are
+ * implemented in close cooperation with the garbage collector, this class may
+ * not be subclassed directly.
+ *
+ * @author   Mark Reinhold
+ * @since    1.2
+ */
+
+public abstract class Reference<T> {
+
+    /* A Reference instance is in one of four possible internal states:
+     *
+     *     Active: Subject to special treatment by the garbage collector.  Some
+     *     time after the collector detects that the reachability of the
+     *     referent has changed to the appropriate state, it changes the
+     *     instance's state to either Pending or Inactive, depending upon
+     *     whether or not the instance was registered with a queue when it was
+     *     created.  In the former case it also adds the instance to the
+     *     pending-Reference list.  Newly-created instances are Active.
+     *
+     *     Pending: An element of the pending-Reference list, waiting to be
+     *     enqueued by the Reference-handler thread.  Unregistered instances
+     *     are never in this state.
+     *
+     *     Enqueued: An element of the queue with which the instance was
+     *     registered when it was created.  When an instance is removed from
+     *     its ReferenceQueue, it is made Inactive.  Unregistered instances are
+     *     never in this state.
+     *
+     *     Inactive: Nothing more to do.  Once an instance becomes Inactive its
+     *     state will never change again.
+     *
+     * The state is encoded in the queue and next fields as follows:
+     *
+     *     Active: queue = ReferenceQueue with which instance is registered, or
+     *     ReferenceQueue.NULL if it was not registered with a queue; next =
+     *     null.
+     *
+     *     Pending: queue = ReferenceQueue with which instance is registered;
+     *     next = Following instance in queue, or this if at end of list.
+     *
+     *     Enqueued: queue = ReferenceQueue.ENQUEUED; next = Following instance
+     *     in queue, or this if at end of list.
+     *
+     *     Inactive: queue = ReferenceQueue.NULL; next = this.
+     *
+     * With this scheme the collector need only examine the next field in order
+     * to determine whether a Reference instance requires special treatment: If
+     * the next field is null then the instance is active; if it is non-null,
+     * then the collector should treat the instance normally.
+     *
+     * To ensure that concurrent collector can discover active Reference
+     * objects without interfering with application threads that may apply
+     * the enqueue() method to those objects, collectors should link
+     * discovered objects through the discovered field.
+     */
+
+    private T referent;         /* Treated specially by GC */
+
+    ReferenceQueue<? super T> queue;
+
+    Reference next;
+    transient private Reference<T> discovered;  /* used by VM */
+
+
+    /* Object used to synchronize with the garbage collector.  The collector
+     * must acquire this lock at the beginning of each collection cycle.  It is
+     * therefore critical that any code holding this lock complete as quickly
+     * as possible, allocate no new objects, and avoid calling user code.
+     */
+    static private class Lock { };
+    private static Lock lock = new Lock();
+
+
+    /* List of References waiting to be enqueued.  The collector adds
+     * References to this list, while the Reference-handler thread removes
+     * them.  This list is protected by the above lock object.
+     */
+    private static Reference pending = null;
+
+
+
+    /* -- Referent accessor and setters -- */
+
+    /**
+     * Returns this reference object's referent.  If this reference object has
+     * been cleared, either by the program or by the garbage collector, then
+     * this method returns <code>null</code>.
+     *
+     * @return   The object to which this reference refers, or
+     *           <code>null</code> if this reference object has been cleared
+     */
+    public T get() {
+        return this.referent;
+    }
+
+    /**
+     * Clears this reference object.  Invoking this method will not cause this
+     * object to be enqueued.
+     *
+     * <p> This method is invoked only by Java code; when the garbage collector
+     * clears references it does so directly, without invoking this method.
+     */
+    public void clear() {
+        this.referent = null;
+    }
+
+
+    /* -- Queue operations -- */
+
+    /**
+     * Tells whether or not this reference object has been enqueued, either by
+     * the program or by the garbage collector.  If this reference object was
+     * not registered with a queue when it was created, then this method will
+     * always return <code>false</code>.
+     *
+     * @return   <code>true</code> if and only if this reference object has
+     *           been enqueued
+     */
+    public boolean isEnqueued() {
+        /* In terms of the internal states, this predicate actually tests
+           whether the instance is either Pending or Enqueued */
+        synchronized (this) {
+            return (this.queue != ReferenceQueue.NULL) && (this.next != null);
+        }
+    }
+
+    /**
+     * Adds this reference object to the queue with which it is registered,
+     * if any.
+     *
+     * <p> This method is invoked only by Java code; when the garbage collector
+     * enqueues references it does so directly, without invoking this method.
+     *
+     * @return   <code>true</code> if this reference object was successfully
+     *           enqueued; <code>false</code> if it was already enqueued or if
+     *           it was not registered with a queue when it was created
+     */
+    public boolean enqueue() {
+        return this.queue.enqueue(this);
+    }
+
+
+    /* -- Constructors -- */
+
+    Reference(T referent) {
+        this(referent, null);
+    }
+
+    Reference(T referent, ReferenceQueue<? super T> queue) {
+        this.referent = referent;
+        this.queue = (queue == null) ? ReferenceQueue.NULL : queue;
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/ref/ReferenceQueue.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/ref/ReferenceQueue.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.ref;
+
+/**
+ * Reference queues, to which registered reference objects are appended by the
+ * garbage collector after the appropriate reachability changes are detected.
+ *
+ * @author   Mark Reinhold
+ * @since    1.2
+ */
+
+public class ReferenceQueue<T> {
+
+    /**
+     * Constructs a new reference-object queue.
+     */
+    public ReferenceQueue() { }
+
+    private static class Null extends ReferenceQueue {
+        boolean enqueue(Reference r) {
+            return false;
+        }
+    }
+
+    static ReferenceQueue NULL = new Null();
+    static ReferenceQueue ENQUEUED = new Null();
+
+    static private class Lock { };
+    private Lock lock = new Lock();
+    private volatile Reference<? extends T> head = null;
+    private long queueLength = 0;
+
+    boolean enqueue(Reference<? extends T> r) { /* Called only by Reference class */
+        synchronized (r) {
+            if (r.queue == ENQUEUED) return false;
+            synchronized (lock) {
+                r.queue = ENQUEUED;
+                r.next = (head == null) ? r : head;
+                head = r;
+                queueLength++;
+                lock.notifyAll();
+                return true;
+            }
+        }
+    }
+
+    private Reference<? extends T> reallyPoll() {       /* Must hold lock */
+        if (head != null) {
+            Reference<? extends T> r = head;
+            head = (r.next == r) ? null : r.next;
+            r.queue = NULL;
+            r.next = r;
+            queueLength--;
+            return r;
+        }
+        return null;
+    }
+
+    /**
+     * Polls this queue to see if a reference object is available.  If one is
+     * available without further delay then it is removed from the queue and
+     * returned.  Otherwise this method immediately returns <tt>null</tt>.
+     *
+     * @return  A reference object, if one was immediately available,
+     *          otherwise <code>null</code>
+     */
+    public Reference<? extends T> poll() {
+        if (head == null)
+            return null;
+        synchronized (lock) {
+            return reallyPoll();
+        }
+    }
+
+    /**
+     * Removes the next reference object in this queue, blocking until either
+     * one becomes available or the given timeout period expires.
+     *
+     * <p> This method does not offer real-time guarantees: It schedules the
+     * timeout as if by invoking the {@link Object#wait(long)} method.
+     *
+     * @param  timeout  If positive, block for up to <code>timeout</code>
+     *                  milliseconds while waiting for a reference to be
+     *                  added to this queue.  If zero, block indefinitely.
+     *
+     * @return  A reference object, if one was available within the specified
+     *          timeout period, otherwise <code>null</code>
+     *
+     * @throws  IllegalArgumentException
+     *          If the value of the timeout argument is negative
+     *
+     * @throws  InterruptedException
+     *          If the timeout wait is interrupted
+     */
+    public Reference<? extends T> remove(long timeout)
+        throws IllegalArgumentException, InterruptedException
+    {
+        if (timeout < 0) {
+            throw new IllegalArgumentException("Negative timeout value");
+        }
+        synchronized (lock) {
+            Reference<? extends T> r = reallyPoll();
+            if (r != null) return r;
+            for (;;) {
+                lock.wait(timeout);
+                r = reallyPoll();
+                if (r != null) return r;
+                if (timeout != 0) return null;
+            }
+        }
+    }
+
+    /**
+     * Removes the next reference object in this queue, blocking until one
+     * becomes available.
+     *
+     * @return A reference object, blocking until one becomes available
+     * @throws  InterruptedException  If the wait is interrupted
+     */
+    public Reference<? extends T> remove() throws InterruptedException {
+        return remove(0);
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/ref/SoftReference.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/ref/SoftReference.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.ref;
+
+
+/**
+ * Soft reference objects, which are cleared at the discretion of the garbage
+ * collector in response to memory demand.  Soft references are most often used
+ * to implement memory-sensitive caches.
+ *
+ * <p> Suppose that the garbage collector determines at a certain point in time
+ * that an object is <a href="package-summary.html#reachability">softly
+ * reachable</a>.  At that time it may choose to clear atomically all soft
+ * references to that object and all soft references to any other
+ * softly-reachable objects from which that object is reachable through a chain
+ * of strong references.  At the same time or at some later time it will
+ * enqueue those newly-cleared soft references that are registered with
+ * reference queues.
+ *
+ * <p> All soft references to softly-reachable objects are guaranteed to have
+ * been cleared before the virtual machine throws an
+ * <code>OutOfMemoryError</code>.  Otherwise no constraints are placed upon the
+ * time at which a soft reference will be cleared or the order in which a set
+ * of such references to different objects will be cleared.  Virtual machine
+ * implementations are, however, encouraged to bias against clearing
+ * recently-created or recently-used soft references.
+ *
+ * <p> Direct instances of this class may be used to implement simple caches;
+ * this class or derived subclasses may also be used in larger data structures
+ * to implement more sophisticated caches.  As long as the referent of a soft
+ * reference is strongly reachable, that is, is actually in use, the soft
+ * reference will not be cleared.  Thus a sophisticated cache can, for example,
+ * prevent its most recently used entries from being discarded by keeping
+ * strong referents to those entries, leaving the remaining entries to be
+ * discarded at the discretion of the garbage collector.
+ *
+ * @author   Mark Reinhold
+ * @since    1.2
+ */
+
+public class SoftReference<T> extends Reference<T> {
+
+    /**
+     * Timestamp clock, updated by the garbage collector
+     */
+    static private long clock;
+
+    /**
+     * Timestamp updated by each invocation of the get method.  The VM may use
+     * this field when selecting soft references to be cleared, but it is not
+     * required to do so.
+     */
+    private long timestamp;
+
+    /**
+     * Creates a new soft reference that refers to the given object.  The new
+     * reference is not registered with any queue.
+     *
+     * @param referent object the new soft reference will refer to
+     */
+    public SoftReference(T referent) {
+        super(referent);
+        this.timestamp = clock;
+    }
+
+    /**
+     * Creates a new soft reference that refers to the given object and is
+     * registered with the given queue.
+     *
+     * @param referent object the new soft reference will refer to
+     * @param q the queue with which the reference is to be registered,
+     *          or <tt>null</tt> if registration is not required
+     *
+     */
+    public SoftReference(T referent, ReferenceQueue<? super T> q) {
+        super(referent, q);
+        this.timestamp = clock;
+    }
+
+    /**
+     * Returns this reference object's referent.  If this reference object has
+     * been cleared, either by the program or by the garbage collector, then
+     * this method returns <code>null</code>.
+     *
+     * @return   The object to which this reference refers, or
+     *           <code>null</code> if this reference object has been cleared
+     */
+    public T get() {
+        T o = super.get();
+        if (o != null && this.timestamp != clock)
+            this.timestamp = clock;
+        return o;
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/ref/WeakReference.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/ref/WeakReference.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.ref;
+
+
+/**
+ * Weak reference objects, which do not prevent their referents from being
+ * made finalizable, finalized, and then reclaimed.  Weak references are most
+ * often used to implement canonicalizing mappings.
+ *
+ * <p> Suppose that the garbage collector determines at a certain point in time
+ * that an object is <a href="package-summary.html#reachability">weakly
+ * reachable</a>.  At that time it will atomically clear all weak references to
+ * that object and all weak references to any other weakly-reachable objects
+ * from which that object is reachable through a chain of strong and soft
+ * references.  At the same time it will declare all of the formerly
+ * weakly-reachable objects to be finalizable.  At the same time or at some
+ * later time it will enqueue those newly-cleared weak references that are
+ * registered with reference queues.
+ *
+ * @author   Mark Reinhold
+ * @since    1.2
+ */
+
+public class WeakReference<T> extends Reference<T> {
+
+    /**
+     * Creates a new weak reference that refers to the given object.  The new
+     * reference is not registered with any queue.
+     *
+     * @param referent object the new weak reference will refer to
+     */
+    public WeakReference(T referent) {
+        super(referent);
+    }
+
+    /**
+     * Creates a new weak reference that refers to the given object and is
+     * registered with the given queue.
+     *
+     * @param referent object the new weak reference will refer to
+     * @param q the queue with which the reference is to be registered,
+     *          or <tt>null</tt> if registration is not required
+     */
+    public WeakReference(T referent, ReferenceQueue<? super T> q) {
+        super(referent, q);
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/lang/ref/package.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/lang/ref/package.html	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,147 @@
+<!--
+ Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<body bgcolor="white">
+
+
+Provides reference-object classes, which support a limited degree of
+interaction with the garbage collector.  A program may use a reference object
+to maintain a reference to some other object in such a way that the latter
+object may still be reclaimed by the collector.  A program may also arrange to
+be notified some time after the collector has determined that the reachability
+of a given object has changed.
+
+
+<h2>Package Specification</h2>
+
+A <em>reference object</em> encapsulates a reference to some other object so
+that the reference itself may be examined and manipulated like any other
+object.  Three types of reference objects are provided, each weaker than the
+last: <em>soft</em>, <em>weak</em>, and <em>phantom</em>.  Each type
+corresponds to a different level of reachability, as defined below.  Soft
+references are for implementing memory-sensitive caches, weak references are
+for implementing canonicalizing mappings that do not prevent their keys (or
+values) from being reclaimed, and phantom references are for scheduling
+pre-mortem cleanup actions in a more flexible way than is possible with the
+Java finalization mechanism.
+
+<p> Each reference-object type is implemented by a subclass of the abstract
+base <code>{@link java.lang.ref.Reference}</code> class.  An instance of one of
+these subclasses encapsulates a single reference to a particular object, called
+the <em>referent</em>.  Every reference object provides methods for getting and
+clearing the reference.  Aside from the clearing operation reference objects
+are otherwise immutable, so no <code>set</code> operation is provided.  A
+program may further subclass these subclasses, adding whatever fields and
+methods are required for its purposes, or it may use these subclasses without
+change.
+
+
+<h3>Notification</h3>
+
+A program may request to be notified of changes in an object's reachability by
+<em>registering</em> an appropriate reference object with a <em>reference
+queue</em> at the time the reference object is created.  Some time after the
+garbage collector determines that the reachability of the referent has changed
+to the value corresponding to the type of the reference, it will add the
+reference to the associated queue.  At this point, the reference is considered
+to be <em>enqueued</em>.  The program may remove references from a queue either
+by polling or by blocking until a reference becomes available.  Reference
+queues are implemented by the <code>{@link java.lang.ref.ReferenceQueue}</code>
+class.
+
+<p> The relationship between a registered reference object and its queue is
+one-sided.  That is, a queue does not keep track of the references that are
+registered with it.  If a registered reference becomes unreachable itself, then
+it will never be enqueued.  It is the responsibility of the program using
+reference objects to ensure that the objects remain reachable for as long as
+the program is interested in their referents.
+
+<p> While some programs will choose to dedicate a thread to removing reference
+objects from one or more queues and processing them, this is by no means
+necessary.  A tactic that often works well is to examine a reference queue in
+the course of performing some other fairly-frequent action.  For example, a
+hashtable that uses weak references to implement weak keys could poll its
+reference queue each time the table is accessed.  This is how the <code>{@link
+java.util.WeakHashMap}</code> class works.  Because the <code>{@link
+java.lang.ref.ReferenceQueue#poll ReferenceQueue.poll}</code> method simply
+checks an internal data structure, this check will add little overhead to the
+hashtable access methods.
+
+
+<h3>Automatically-cleared references</h3>
+
+Soft and weak references are automatically cleared by the collector before
+being added to the queues with which they are registered, if any.  Therefore
+soft and weak references need not be registered with a queue in order to be
+useful, while phantom references do.  An object that is reachable via phantom
+references will remain so until all such references are cleared or themselves
+become unreachable.
+
+
+<a name="reachability"></a>
+<h3>Reachability</h3>
+
+Going from strongest to weakest, the different levels of reachability reflect
+the life cycle of an object.  They are operationally defined as follows:
+
+<ul>
+
+<li> An object is <em>strongly reachable</em> if it can be reached by some
+thread without traversing any reference objects.  A newly-created object is
+strongly reachable by the thread that created it.
+
+<li> An object is <em>softly reachable</em> if it is not strongly reachable but
+can be reached by traversing a soft reference.
+
+<li> An object is <em>weakly reachable</em> if it is neither strongly nor
+softly reachable but can be reached by traversing a weak reference.  When the
+weak references to a weakly-reachable object are cleared, the object becomes
+eligible for finalization.
+
+<li> An object is <em>phantom reachable</em> if it is neither strongly, softly,
+nor weakly reachable, it has been finalized, and some phantom reference refers
+to it.
+
+<li> Finally, an object is <em>unreachable</em>, and therefore eligible for
+reclamation, when it is not reachable in any of the above ways.
+
+</ul>
+
+
+@author	  Mark Reinhold
+@since	  1.2
+
+<!--
+<h2>Related Documentation</h2>
+
+For overviews, tutorials, examples, guides, and tool documentation, please see:
+<ul>
+  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
+</ul>
+-->
+</body>
+</html>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/AbstractCollection.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/AbstractCollection.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,457 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * This class provides a skeletal implementation of the <tt>Collection</tt>
+ * interface, to minimize the effort required to implement this interface. <p>
+ *
+ * To implement an unmodifiable collection, the programmer needs only to
+ * extend this class and provide implementations for the <tt>iterator</tt> and
+ * <tt>size</tt> methods.  (The iterator returned by the <tt>iterator</tt>
+ * method must implement <tt>hasNext</tt> and <tt>next</tt>.)<p>
+ *
+ * To implement a modifiable collection, the programmer must additionally
+ * override this class's <tt>add</tt> method (which otherwise throws an
+ * <tt>UnsupportedOperationException</tt>), and the iterator returned by the
+ * <tt>iterator</tt> method must additionally implement its <tt>remove</tt>
+ * method.<p>
+ *
+ * The programmer should generally provide a void (no argument) and
+ * <tt>Collection</tt> constructor, as per the recommendation in the
+ * <tt>Collection</tt> interface specification.<p>
+ *
+ * The documentation for each non-abstract method in this class describes its
+ * implementation in detail.  Each of these methods may be overridden if
+ * the collection being implemented admits a more efficient implementation.<p>
+ *
+ * This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see Collection
+ * @since 1.2
+ */
+
+public abstract class AbstractCollection<E> implements Collection<E> {
+    /**
+     * Sole constructor.  (For invocation by subclass constructors, typically
+     * implicit.)
+     */
+    protected AbstractCollection() {
+    }
+
+    // Query Operations
+
+    /**
+     * Returns an iterator over the elements contained in this collection.
+     *
+     * @return an iterator over the elements contained in this collection
+     */
+    public abstract Iterator<E> iterator();
+
+    public abstract int size();
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns <tt>size() == 0</tt>.
+     */
+    public boolean isEmpty() {
+        return size() == 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over the elements in the collection,
+     * checking each element in turn for equality with the specified element.
+     *
+     * @throws ClassCastException   {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public boolean contains(Object o) {
+        Iterator<E> it = iterator();
+        if (o==null) {
+            while (it.hasNext())
+                if (it.next()==null)
+                    return true;
+        } else {
+            while (it.hasNext())
+                if (o.equals(it.next()))
+                    return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns an array containing all the elements
+     * returned by this collection's iterator, in the same order, stored in
+     * consecutive elements of the array, starting with index {@code 0}.
+     * The length of the returned array is equal to the number of elements
+     * returned by the iterator, even if the size of this collection changes
+     * during iteration, as might happen if the collection permits
+     * concurrent modification during iteration.  The {@code size} method is
+     * called only as an optimization hint; the correct result is returned
+     * even if the iterator returns a different number of elements.
+     *
+     * <p>This method is equivalent to:
+     *
+     *  <pre> {@code
+     * List<E> list = new ArrayList<E>(size());
+     * for (E e : this)
+     *     list.add(e);
+     * return list.toArray();
+     * }</pre>
+     */
+    public Object[] toArray() {
+        // Estimate size of array; be prepared to see more or fewer elements
+        Object[] r = new Object[size()];
+        Iterator<E> it = iterator();
+        for (int i = 0; i < r.length; i++) {
+            if (! it.hasNext()) // fewer elements than expected
+                return Arrays.copyOf(r, i);
+            r[i] = it.next();
+        }
+        return it.hasNext() ? finishToArray(r, it) : r;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns an array containing all the elements
+     * returned by this collection's iterator in the same order, stored in
+     * consecutive elements of the array, starting with index {@code 0}.
+     * If the number of elements returned by the iterator is too large to
+     * fit into the specified array, then the elements are returned in a
+     * newly allocated array with length equal to the number of elements
+     * returned by the iterator, even if the size of this collection
+     * changes during iteration, as might happen if the collection permits
+     * concurrent modification during iteration.  The {@code size} method is
+     * called only as an optimization hint; the correct result is returned
+     * even if the iterator returns a different number of elements.
+     *
+     * <p>This method is equivalent to:
+     *
+     *  <pre> {@code
+     * List<E> list = new ArrayList<E>(size());
+     * for (E e : this)
+     *     list.add(e);
+     * return list.toArray(a);
+     * }</pre>
+     *
+     * @throws ArrayStoreException  {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public <T> T[] toArray(T[] a) {
+        // Estimate size of array; be prepared to see more or fewer elements
+        int size = size();
+        T[] r = a.length >= size ? a :
+                  (T[])java.lang.reflect.Array
+                  .newInstance(a.getClass().getComponentType(), size);
+        Iterator<E> it = iterator();
+
+        for (int i = 0; i < r.length; i++) {
+            if (! it.hasNext()) { // fewer elements than expected
+                if (a != r)
+                    return Arrays.copyOf(r, i);
+                r[i] = null; // null-terminate
+                return r;
+            }
+            r[i] = (T)it.next();
+        }
+        return it.hasNext() ? finishToArray(r, it) : r;
+    }
+
+    /**
+     * The maximum size of array to allocate.
+     * Some VMs reserve some header words in an array.
+     * Attempts to allocate larger arrays may result in
+     * OutOfMemoryError: Requested array size exceeds VM limit
+     */
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    /**
+     * Reallocates the array being used within toArray when the iterator
+     * returned more elements than expected, and finishes filling it from
+     * the iterator.
+     *
+     * @param r the array, replete with previously stored elements
+     * @param it the in-progress iterator over this collection
+     * @return array containing the elements in the given array, plus any
+     *         further elements returned by the iterator, trimmed to size
+     */
+    private static <T> T[] finishToArray(T[] r, Iterator<?> it) {
+        int i = r.length;
+        while (it.hasNext()) {
+            int cap = r.length;
+            if (i == cap) {
+                int newCap = cap + (cap >> 1) + 1;
+                // overflow-conscious code
+                if (newCap - MAX_ARRAY_SIZE > 0)
+                    newCap = hugeCapacity(cap + 1);
+                r = Arrays.copyOf(r, newCap);
+            }
+            r[i++] = (T)it.next();
+        }
+        // trim if overallocated
+        return (i == r.length) ? r : Arrays.copyOf(r, i);
+    }
+
+    private static int hugeCapacity(int minCapacity) {
+        if (minCapacity < 0) // overflow
+            throw new OutOfMemoryError
+                ("Required array size too large");
+        return (minCapacity > MAX_ARRAY_SIZE) ?
+            Integer.MAX_VALUE :
+            MAX_ARRAY_SIZE;
+    }
+
+    // Modification Operations
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation always throws an
+     * <tt>UnsupportedOperationException</tt>.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     * @throws IllegalStateException         {@inheritDoc}
+     */
+    public boolean add(E e) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over the collection looking for the
+     * specified element.  If it finds the element, it removes the element
+     * from the collection using the iterator's remove method.
+     *
+     * <p>Note that this implementation throws an
+     * <tt>UnsupportedOperationException</tt> if the iterator returned by this
+     * collection's iterator method does not implement the <tt>remove</tt>
+     * method and this collection contains the specified object.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     */
+    public boolean remove(Object o) {
+        Iterator<E> it = iterator();
+        if (o==null) {
+            while (it.hasNext()) {
+                if (it.next()==null) {
+                    it.remove();
+                    return true;
+                }
+            }
+        } else {
+            while (it.hasNext()) {
+                if (o.equals(it.next())) {
+                    it.remove();
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+
+    // Bulk Operations
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over the specified collection,
+     * checking each element returned by the iterator in turn to see
+     * if it's contained in this collection.  If all elements are so
+     * contained <tt>true</tt> is returned, otherwise <tt>false</tt>.
+     *
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @see #contains(Object)
+     */
+    public boolean containsAll(Collection<?> c) {
+        for (Object e : c)
+            if (!contains(e))
+                return false;
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over the specified collection, and adds
+     * each object returned by the iterator to this collection, in turn.
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> unless <tt>add</tt> is
+     * overridden (assuming the specified collection is non-empty).
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     * @throws IllegalStateException         {@inheritDoc}
+     *
+     * @see #add(Object)
+     */
+    public boolean addAll(Collection<? extends E> c) {
+        boolean modified = false;
+        for (E e : c)
+            if (add(e))
+                modified = true;
+        return modified;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over this collection, checking each
+     * element returned by the iterator in turn to see if it's contained
+     * in the specified collection.  If it's so contained, it's removed from
+     * this collection with the iterator's <tt>remove</tt> method.
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> if the iterator returned by the
+     * <tt>iterator</tt> method does not implement the <tt>remove</tt> method
+     * and this collection contains one or more elements in common with the
+     * specified collection.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     *
+     * @see #remove(Object)
+     * @see #contains(Object)
+     */
+    public boolean removeAll(Collection<?> c) {
+        boolean modified = false;
+        Iterator<?> it = iterator();
+        while (it.hasNext()) {
+            if (c.contains(it.next())) {
+                it.remove();
+                modified = true;
+            }
+        }
+        return modified;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over this collection, checking each
+     * element returned by the iterator in turn to see if it's contained
+     * in the specified collection.  If it's not so contained, it's removed
+     * from this collection with the iterator's <tt>remove</tt> method.
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> if the iterator returned by the
+     * <tt>iterator</tt> method does not implement the <tt>remove</tt> method
+     * and this collection contains one or more elements not present in the
+     * specified collection.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     *
+     * @see #remove(Object)
+     * @see #contains(Object)
+     */
+    public boolean retainAll(Collection<?> c) {
+        boolean modified = false;
+        Iterator<E> it = iterator();
+        while (it.hasNext()) {
+            if (!c.contains(it.next())) {
+                it.remove();
+                modified = true;
+            }
+        }
+        return modified;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over this collection, removing each
+     * element using the <tt>Iterator.remove</tt> operation.  Most
+     * implementations will probably choose to override this method for
+     * efficiency.
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> if the iterator returned by this
+     * collection's <tt>iterator</tt> method does not implement the
+     * <tt>remove</tt> method and this collection is non-empty.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     */
+    public void clear() {
+        Iterator<E> it = iterator();
+        while (it.hasNext()) {
+            it.next();
+            it.remove();
+        }
+    }
+
+
+    //  String conversion
+
+    /**
+     * Returns a string representation of this collection.  The string
+     * representation consists of a list of the collection's elements in the
+     * order they are returned by its iterator, enclosed in square brackets
+     * (<tt>"[]"</tt>).  Adjacent elements are separated by the characters
+     * <tt>", "</tt> (comma and space).  Elements are converted to strings as
+     * by {@link String#valueOf(Object)}.
+     *
+     * @return a string representation of this collection
+     */
+    public String toString() {
+        Iterator<E> it = iterator();
+        if (! it.hasNext())
+            return "[]";
+
+        StringBuilder sb = new StringBuilder();
+        sb.append('[');
+        for (;;) {
+            E e = it.next();
+            sb.append(e == this ? "(this Collection)" : e);
+            if (! it.hasNext())
+                return sb.append(']').toString();
+            sb.append(',').append(' ');
+        }
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/AbstractList.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/AbstractList.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,781 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * This class provides a skeletal implementation of the {@link List}
+ * interface to minimize the effort required to implement this interface
+ * backed by a "random access" data store (such as an array).  For sequential
+ * access data (such as a linked list), {@link AbstractSequentialList} should
+ * be used in preference to this class.
+ *
+ * <p>To implement an unmodifiable list, the programmer needs only to extend
+ * this class and provide implementations for the {@link #get(int)} and
+ * {@link List#size() size()} methods.
+ *
+ * <p>To implement a modifiable list, the programmer must additionally
+ * override the {@link #set(int, Object) set(int, E)} method (which otherwise
+ * throws an {@code UnsupportedOperationException}).  If the list is
+ * variable-size the programmer must additionally override the
+ * {@link #add(int, Object) add(int, E)} and {@link #remove(int)} methods.
+ *
+ * <p>The programmer should generally provide a void (no argument) and collection
+ * constructor, as per the recommendation in the {@link Collection} interface
+ * specification.
+ *
+ * <p>Unlike the other abstract collection implementations, the programmer does
+ * <i>not</i> have to provide an iterator implementation; the iterator and
+ * list iterator are implemented by this class, on top of the "random access"
+ * methods:
+ * {@link #get(int)},
+ * {@link #set(int, Object) set(int, E)},
+ * {@link #add(int, Object) add(int, E)} and
+ * {@link #remove(int)}.
+ *
+ * <p>The documentation for each non-abstract method in this class describes its
+ * implementation in detail.  Each of these methods may be overridden if the
+ * collection being implemented admits a more efficient implementation.
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @since 1.2
+ */
+
+public abstract class AbstractList<E> extends AbstractCollection<E> implements List<E> {
+    /**
+     * Sole constructor.  (For invocation by subclass constructors, typically
+     * implicit.)
+     */
+    protected AbstractList() {
+    }
+
+    /**
+     * Appends the specified element to the end of this list (optional
+     * operation).
+     *
+     * <p>Lists that support this operation may place limitations on what
+     * elements may be added to this list.  In particular, some
+     * lists will refuse to add null elements, and others will impose
+     * restrictions on the type of elements that may be added.  List
+     * classes should clearly specify in their documentation any restrictions
+     * on what elements may be added.
+     *
+     * <p>This implementation calls {@code add(size(), e)}.
+     *
+     * <p>Note that this implementation throws an
+     * {@code UnsupportedOperationException} unless
+     * {@link #add(int, Object) add(int, E)} is overridden.
+     *
+     * @param e element to be appended to this list
+     * @return {@code true} (as specified by {@link Collection#add})
+     * @throws UnsupportedOperationException if the {@code add} operation
+     *         is not supported by this list
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this list
+     * @throws NullPointerException if the specified element is null and this
+     *         list does not permit null elements
+     * @throws IllegalArgumentException if some property of this element
+     *         prevents it from being added to this list
+     */
+    public boolean add(E e) {
+        add(size(), e);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    abstract public E get(int index);
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation always throws an
+     * {@code UnsupportedOperationException}.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     * @throws IndexOutOfBoundsException     {@inheritDoc}
+     */
+    public E set(int index, E element) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation always throws an
+     * {@code UnsupportedOperationException}.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     * @throws IndexOutOfBoundsException     {@inheritDoc}
+     */
+    public void add(int index, E element) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation always throws an
+     * {@code UnsupportedOperationException}.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws IndexOutOfBoundsException     {@inheritDoc}
+     */
+    public E remove(int index) {
+        throw new UnsupportedOperationException();
+    }
+
+
+    // Search Operations
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation first gets a list iterator (with
+     * {@code listIterator()}).  Then, it iterates over the list until the
+     * specified element is found or the end of the list is reached.
+     *
+     * @throws ClassCastException   {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public int indexOf(Object o) {
+        ListIterator<E> it = listIterator();
+        if (o==null) {
+            while (it.hasNext())
+                if (it.next()==null)
+                    return it.previousIndex();
+        } else {
+            while (it.hasNext())
+                if (o.equals(it.next()))
+                    return it.previousIndex();
+        }
+        return -1;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation first gets a list iterator that points to the end
+     * of the list (with {@code listIterator(size())}).  Then, it iterates
+     * backwards over the list until the specified element is found, or the
+     * beginning of the list is reached.
+     *
+     * @throws ClassCastException   {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public int lastIndexOf(Object o) {
+        ListIterator<E> it = listIterator(size());
+        if (o==null) {
+            while (it.hasPrevious())
+                if (it.previous()==null)
+                    return it.nextIndex();
+        } else {
+            while (it.hasPrevious())
+                if (o.equals(it.previous()))
+                    return it.nextIndex();
+        }
+        return -1;
+    }
+
+
+    // Bulk Operations
+
+    /**
+     * Removes all of the elements from this list (optional operation).
+     * The list will be empty after this call returns.
+     *
+     * <p>This implementation calls {@code removeRange(0, size())}.
+     *
+     * <p>Note that this implementation throws an
+     * {@code UnsupportedOperationException} unless {@code remove(int
+     * index)} or {@code removeRange(int fromIndex, int toIndex)} is
+     * overridden.
+     *
+     * @throws UnsupportedOperationException if the {@code clear} operation
+     *         is not supported by this list
+     */
+    public void clear() {
+        removeRange(0, size());
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation gets an iterator over the specified collection
+     * and iterates over it, inserting the elements obtained from the
+     * iterator into this list at the appropriate position, one at a time,
+     * using {@code add(int, E)}.
+     * Many implementations will override this method for efficiency.
+     *
+     * <p>Note that this implementation throws an
+     * {@code UnsupportedOperationException} unless
+     * {@link #add(int, Object) add(int, E)} is overridden.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     * @throws IndexOutOfBoundsException     {@inheritDoc}
+     */
+    public boolean addAll(int index, Collection<? extends E> c) {
+        rangeCheckForAdd(index);
+        boolean modified = false;
+        for (E e : c) {
+            add(index++, e);
+            modified = true;
+        }
+        return modified;
+    }
+
+
+    // Iterators
+
+    /**
+     * Returns an iterator over the elements in this list in proper sequence.
+     *
+     * <p>This implementation returns a straightforward implementation of the
+     * iterator interface, relying on the backing list's {@code size()},
+     * {@code get(int)}, and {@code remove(int)} methods.
+     *
+     * <p>Note that the iterator returned by this method will throw an
+     * {@link UnsupportedOperationException} in response to its
+     * {@code remove} method unless the list's {@code remove(int)} method is
+     * overridden.
+     *
+     * <p>This implementation can be made to throw runtime exceptions in the
+     * face of concurrent modification, as described in the specification
+     * for the (protected) {@link #modCount} field.
+     *
+     * @return an iterator over the elements in this list in proper sequence
+     */
+    public Iterator<E> iterator() {
+        return new Itr();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns {@code listIterator(0)}.
+     *
+     * @see #listIterator(int)
+     */
+    public ListIterator<E> listIterator() {
+        return listIterator(0);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns a straightforward implementation of the
+     * {@code ListIterator} interface that extends the implementation of the
+     * {@code Iterator} interface returned by the {@code iterator()} method.
+     * The {@code ListIterator} implementation relies on the backing list's
+     * {@code get(int)}, {@code set(int, E)}, {@code add(int, E)}
+     * and {@code remove(int)} methods.
+     *
+     * <p>Note that the list iterator returned by this implementation will
+     * throw an {@link UnsupportedOperationException} in response to its
+     * {@code remove}, {@code set} and {@code add} methods unless the
+     * list's {@code remove(int)}, {@code set(int, E)}, and
+     * {@code add(int, E)} methods are overridden.
+     *
+     * <p>This implementation can be made to throw runtime exceptions in the
+     * face of concurrent modification, as described in the specification for
+     * the (protected) {@link #modCount} field.
+     *
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public ListIterator<E> listIterator(final int index) {
+        rangeCheckForAdd(index);
+
+        return new ListItr(index);
+    }
+
+    private class Itr implements Iterator<E> {
+        /**
+         * Index of element to be returned by subsequent call to next.
+         */
+        int cursor = 0;
+
+        /**
+         * Index of element returned by most recent call to next or
+         * previous.  Reset to -1 if this element is deleted by a call
+         * to remove.
+         */
+        int lastRet = -1;
+
+        /**
+         * The modCount value that the iterator believes that the backing
+         * List should have.  If this expectation is violated, the iterator
+         * has detected concurrent modification.
+         */
+        int expectedModCount = modCount;
+
+        public boolean hasNext() {
+            return cursor != size();
+        }
+
+        public E next() {
+            checkForComodification();
+            try {
+                int i = cursor;
+                E next = get(i);
+                lastRet = i;
+                cursor = i + 1;
+                return next;
+            } catch (IndexOutOfBoundsException e) {
+                checkForComodification();
+                throw new NoSuchElementException();
+            }
+        }
+
+        public void remove() {
+            if (lastRet < 0)
+                throw new IllegalStateException();
+            checkForComodification();
+
+            try {
+                AbstractList.this.remove(lastRet);
+                if (lastRet < cursor)
+                    cursor--;
+                lastRet = -1;
+                expectedModCount = modCount;
+            } catch (IndexOutOfBoundsException e) {
+                throw new ConcurrentModificationException();
+            }
+        }
+
+        final void checkForComodification() {
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+        }
+    }
+
+    private class ListItr extends Itr implements ListIterator<E> {
+        ListItr(int index) {
+            cursor = index;
+        }
+
+        public boolean hasPrevious() {
+            return cursor != 0;
+        }
+
+        public E previous() {
+            checkForComodification();
+            try {
+                int i = cursor - 1;
+                E previous = get(i);
+                lastRet = cursor = i;
+                return previous;
+            } catch (IndexOutOfBoundsException e) {
+                checkForComodification();
+                throw new NoSuchElementException();
+            }
+        }
+
+        public int nextIndex() {
+            return cursor;
+        }
+
+        public int previousIndex() {
+            return cursor-1;
+        }
+
+        public void set(E e) {
+            if (lastRet < 0)
+                throw new IllegalStateException();
+            checkForComodification();
+
+            try {
+                AbstractList.this.set(lastRet, e);
+                expectedModCount = modCount;
+            } catch (IndexOutOfBoundsException ex) {
+                throw new ConcurrentModificationException();
+            }
+        }
+
+        public void add(E e) {
+            checkForComodification();
+
+            try {
+                int i = cursor;
+                AbstractList.this.add(i, e);
+                lastRet = -1;
+                cursor = i + 1;
+                expectedModCount = modCount;
+            } catch (IndexOutOfBoundsException ex) {
+                throw new ConcurrentModificationException();
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns a list that subclasses
+     * {@code AbstractList}.  The subclass stores, in private fields, the
+     * offset of the subList within the backing list, the size of the subList
+     * (which can change over its lifetime), and the expected
+     * {@code modCount} value of the backing list.  There are two variants
+     * of the subclass, one of which implements {@code RandomAccess}.
+     * If this list implements {@code RandomAccess} the returned list will
+     * be an instance of the subclass that implements {@code RandomAccess}.
+     *
+     * <p>The subclass's {@code set(int, E)}, {@code get(int)},
+     * {@code add(int, E)}, {@code remove(int)}, {@code addAll(int,
+     * Collection)} and {@code removeRange(int, int)} methods all
+     * delegate to the corresponding methods on the backing abstract list,
+     * after bounds-checking the index and adjusting for the offset.  The
+     * {@code addAll(Collection c)} method merely returns {@code addAll(size,
+     * c)}.
+     *
+     * <p>The {@code listIterator(int)} method returns a "wrapper object"
+     * over a list iterator on the backing list, which is created with the
+     * corresponding method on the backing list.  The {@code iterator} method
+     * merely returns {@code listIterator()}, and the {@code size} method
+     * merely returns the subclass's {@code size} field.
+     *
+     * <p>All methods first check to see if the actual {@code modCount} of
+     * the backing list is equal to its expected value, and throw a
+     * {@code ConcurrentModificationException} if it is not.
+     *
+     * @throws IndexOutOfBoundsException if an endpoint index value is out of range
+     *         {@code (fromIndex < 0 || toIndex > size)}
+     * @throws IllegalArgumentException if the endpoint indices are out of order
+     *         {@code (fromIndex > toIndex)}
+     */
+    public List<E> subList(int fromIndex, int toIndex) {
+        return (this instanceof RandomAccess ?
+                new RandomAccessSubList<>(this, fromIndex, toIndex) :
+                new SubList<>(this, fromIndex, toIndex));
+    }
+
+    // Comparison and hashing
+
+    /**
+     * Compares the specified object with this list for equality.  Returns
+     * {@code true} if and only if the specified object is also a list, both
+     * lists have the same size, and all corresponding pairs of elements in
+     * the two lists are <i>equal</i>.  (Two elements {@code e1} and
+     * {@code e2} are <i>equal</i> if {@code (e1==null ? e2==null :
+     * e1.equals(e2))}.)  In other words, two lists are defined to be
+     * equal if they contain the same elements in the same order.<p>
+     *
+     * This implementation first checks if the specified object is this
+     * list. If so, it returns {@code true}; if not, it checks if the
+     * specified object is a list. If not, it returns {@code false}; if so,
+     * it iterates over both lists, comparing corresponding pairs of elements.
+     * If any comparison returns {@code false}, this method returns
+     * {@code false}.  If either iterator runs out of elements before the
+     * other it returns {@code false} (as the lists are of unequal length);
+     * otherwise it returns {@code true} when the iterations complete.
+     *
+     * @param o the object to be compared for equality with this list
+     * @return {@code true} if the specified object is equal to this list
+     */
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+        if (!(o instanceof List))
+            return false;
+
+        ListIterator<E> e1 = listIterator();
+        ListIterator e2 = ((List) o).listIterator();
+        while (e1.hasNext() && e2.hasNext()) {
+            E o1 = e1.next();
+            Object o2 = e2.next();
+            if (!(o1==null ? o2==null : o1.equals(o2)))
+                return false;
+        }
+        return !(e1.hasNext() || e2.hasNext());
+    }
+
+    /**
+     * Returns the hash code value for this list.
+     *
+     * <p>This implementation uses exactly the code that is used to define the
+     * list hash function in the documentation for the {@link List#hashCode}
+     * method.
+     *
+     * @return the hash code value for this list
+     */
+    public int hashCode() {
+        int hashCode = 1;
+        for (E e : this)
+            hashCode = 31*hashCode + (e==null ? 0 : e.hashCode());
+        return hashCode;
+    }
+
+    /**
+     * Removes from this list all of the elements whose index is between
+     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
+     * Shifts any succeeding elements to the left (reduces their index).
+     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
+     * (If {@code toIndex==fromIndex}, this operation has no effect.)
+     *
+     * <p>This method is called by the {@code clear} operation on this list
+     * and its subLists.  Overriding this method to take advantage of
+     * the internals of the list implementation can <i>substantially</i>
+     * improve the performance of the {@code clear} operation on this list
+     * and its subLists.
+     *
+     * <p>This implementation gets a list iterator positioned before
+     * {@code fromIndex}, and repeatedly calls {@code ListIterator.next}
+     * followed by {@code ListIterator.remove} until the entire range has
+     * been removed.  <b>Note: if {@code ListIterator.remove} requires linear
+     * time, this implementation requires quadratic time.</b>
+     *
+     * @param fromIndex index of first element to be removed
+     * @param toIndex index after last element to be removed
+     */
+    protected void removeRange(int fromIndex, int toIndex) {
+        ListIterator<E> it = listIterator(fromIndex);
+        for (int i=0, n=toIndex-fromIndex; i<n; i++) {
+            it.next();
+            it.remove();
+        }
+    }
+
+    /**
+     * The number of times this list has been <i>structurally modified</i>.
+     * Structural modifications are those that change the size of the
+     * list, or otherwise perturb it in such a fashion that iterations in
+     * progress may yield incorrect results.
+     *
+     * <p>This field is used by the iterator and list iterator implementation
+     * returned by the {@code iterator} and {@code listIterator} methods.
+     * If the value of this field changes unexpectedly, the iterator (or list
+     * iterator) will throw a {@code ConcurrentModificationException} in
+     * response to the {@code next}, {@code remove}, {@code previous},
+     * {@code set} or {@code add} operations.  This provides
+     * <i>fail-fast</i> behavior, rather than non-deterministic behavior in
+     * the face of concurrent modification during iteration.
+     *
+     * <p><b>Use of this field by subclasses is optional.</b> If a subclass
+     * wishes to provide fail-fast iterators (and list iterators), then it
+     * merely has to increment this field in its {@code add(int, E)} and
+     * {@code remove(int)} methods (and any other methods that it overrides
+     * that result in structural modifications to the list).  A single call to
+     * {@code add(int, E)} or {@code remove(int)} must add no more than
+     * one to this field, or the iterators (and list iterators) will throw
+     * bogus {@code ConcurrentModificationExceptions}.  If an implementation
+     * does not wish to provide fail-fast iterators, this field may be
+     * ignored.
+     */
+    protected transient int modCount = 0;
+
+    private void rangeCheckForAdd(int index) {
+        if (index < 0 || index > size())
+            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+    }
+
+    private String outOfBoundsMsg(int index) {
+        return "Index: "+index+", Size: "+size();
+    }
+}
+
+class SubList<E> extends AbstractList<E> {
+    private final AbstractList<E> l;
+    private final int offset;
+    private int size;
+
+    SubList(AbstractList<E> list, int fromIndex, int toIndex) {
+        if (fromIndex < 0)
+            throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
+        if (toIndex > list.size())
+            throw new IndexOutOfBoundsException("toIndex = " + toIndex);
+        if (fromIndex > toIndex)
+            throw new IllegalArgumentException("fromIndex(" + fromIndex +
+                                               ") > toIndex(" + toIndex + ")");
+        l = list;
+        offset = fromIndex;
+        size = toIndex - fromIndex;
+        this.modCount = l.modCount;
+    }
+
+    public E set(int index, E element) {
+        rangeCheck(index);
+        checkForComodification();
+        return l.set(index+offset, element);
+    }
+
+    public E get(int index) {
+        rangeCheck(index);
+        checkForComodification();
+        return l.get(index+offset);
+    }
+
+    public int size() {
+        checkForComodification();
+        return size;
+    }
+
+    public void add(int index, E element) {
+        rangeCheckForAdd(index);
+        checkForComodification();
+        l.add(index+offset, element);
+        this.modCount = l.modCount;
+        size++;
+    }
+
+    public E remove(int index) {
+        rangeCheck(index);
+        checkForComodification();
+        E result = l.remove(index+offset);
+        this.modCount = l.modCount;
+        size--;
+        return result;
+    }
+
+    protected void removeRange(int fromIndex, int toIndex) {
+        checkForComodification();
+        l.removeRange(fromIndex+offset, toIndex+offset);
+        this.modCount = l.modCount;
+        size -= (toIndex-fromIndex);
+    }
+
+    public boolean addAll(Collection<? extends E> c) {
+        return addAll(size, c);
+    }
+
+    public boolean addAll(int index, Collection<? extends E> c) {
+        rangeCheckForAdd(index);
+        int cSize = c.size();
+        if (cSize==0)
+            return false;
+
+        checkForComodification();
+        l.addAll(offset+index, c);
+        this.modCount = l.modCount;
+        size += cSize;
+        return true;
+    }
+
+    public Iterator<E> iterator() {
+        return listIterator();
+    }
+
+    public ListIterator<E> listIterator(final int index) {
+        checkForComodification();
+        rangeCheckForAdd(index);
+
+        return new ListIterator<E>() {
+            private final ListIterator<E> i = l.listIterator(index+offset);
+
+            public boolean hasNext() {
+                return nextIndex() < size;
+            }
+
+            public E next() {
+                if (hasNext())
+                    return i.next();
+                else
+                    throw new NoSuchElementException();
+            }
+
+            public boolean hasPrevious() {
+                return previousIndex() >= 0;
+            }
+
+            public E previous() {
+                if (hasPrevious())
+                    return i.previous();
+                else
+                    throw new NoSuchElementException();
+            }
+
+            public int nextIndex() {
+                return i.nextIndex() - offset;
+            }
+
+            public int previousIndex() {
+                return i.previousIndex() - offset;
+            }
+
+            public void remove() {
+                i.remove();
+                SubList.this.modCount = l.modCount;
+                size--;
+            }
+
+            public void set(E e) {
+                i.set(e);
+            }
+
+            public void add(E e) {
+                i.add(e);
+                SubList.this.modCount = l.modCount;
+                size++;
+            }
+        };
+    }
+
+    public List<E> subList(int fromIndex, int toIndex) {
+        return new SubList<>(this, fromIndex, toIndex);
+    }
+
+    private void rangeCheck(int index) {
+        if (index < 0 || index >= size)
+            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+    }
+
+    private void rangeCheckForAdd(int index) {
+        if (index < 0 || index > size)
+            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+    }
+
+    private String outOfBoundsMsg(int index) {
+        return "Index: "+index+", Size: "+size;
+    }
+
+    private void checkForComodification() {
+        if (this.modCount != l.modCount)
+            throw new ConcurrentModificationException();
+    }
+}
+
+class RandomAccessSubList<E> extends SubList<E> implements RandomAccess {
+    RandomAccessSubList(AbstractList<E> list, int fromIndex, int toIndex) {
+        super(list, fromIndex, toIndex);
+    }
+
+    public List<E> subList(int fromIndex, int toIndex) {
+        return new RandomAccessSubList<>(this, fromIndex, toIndex);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/AbstractMap.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/AbstractMap.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,822 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+import java.util.Map.Entry;
+
+/**
+ * This class provides a skeletal implementation of the <tt>Map</tt>
+ * interface, to minimize the effort required to implement this interface.
+ *
+ * <p>To implement an unmodifiable map, the programmer needs only to extend this
+ * class and provide an implementation for the <tt>entrySet</tt> method, which
+ * returns a set-view of the map's mappings.  Typically, the returned set
+ * will, in turn, be implemented atop <tt>AbstractSet</tt>.  This set should
+ * not support the <tt>add</tt> or <tt>remove</tt> methods, and its iterator
+ * should not support the <tt>remove</tt> method.
+ *
+ * <p>To implement a modifiable map, the programmer must additionally override
+ * this class's <tt>put</tt> method (which otherwise throws an
+ * <tt>UnsupportedOperationException</tt>), and the iterator returned by
+ * <tt>entrySet().iterator()</tt> must additionally implement its
+ * <tt>remove</tt> method.
+ *
+ * <p>The programmer should generally provide a void (no argument) and map
+ * constructor, as per the recommendation in the <tt>Map</tt> interface
+ * specification.
+ *
+ * <p>The documentation for each non-abstract method in this class describes its
+ * implementation in detail.  Each of these methods may be overridden if the
+ * map being implemented admits a more efficient implementation.
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <K> the type of keys maintained by this map
+ * @param <V> the type of mapped values
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see Map
+ * @see Collection
+ * @since 1.2
+ */
+
+public abstract class AbstractMap<K,V> implements Map<K,V> {
+    /**
+     * Sole constructor.  (For invocation by subclass constructors, typically
+     * implicit.)
+     */
+    protected AbstractMap() {
+    }
+
+    // Query Operations
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns <tt>entrySet().size()</tt>.
+     */
+    public int size() {
+        return entrySet().size();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns <tt>size() == 0</tt>.
+     */
+    public boolean isEmpty() {
+        return size() == 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over <tt>entrySet()</tt> searching
+     * for an entry with the specified value.  If such an entry is found,
+     * <tt>true</tt> is returned.  If the iteration terminates without
+     * finding such an entry, <tt>false</tt> is returned.  Note that this
+     * implementation requires linear time in the size of the map.
+     *
+     * @throws ClassCastException   {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public boolean containsValue(Object value) {
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        if (value==null) {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (e.getValue()==null)
+                    return true;
+            }
+        } else {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (value.equals(e.getValue()))
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over <tt>entrySet()</tt> searching
+     * for an entry with the specified key.  If such an entry is found,
+     * <tt>true</tt> is returned.  If the iteration terminates without
+     * finding such an entry, <tt>false</tt> is returned.  Note that this
+     * implementation requires linear time in the size of the map; many
+     * implementations will override this method.
+     *
+     * @throws ClassCastException   {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public boolean containsKey(Object key) {
+        Iterator<Map.Entry<K,V>> i = entrySet().iterator();
+        if (key==null) {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (e.getKey()==null)
+                    return true;
+            }
+        } else {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (key.equals(e.getKey()))
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over <tt>entrySet()</tt> searching
+     * for an entry with the specified key.  If such an entry is found,
+     * the entry's value is returned.  If the iteration terminates without
+     * finding such an entry, <tt>null</tt> is returned.  Note that this
+     * implementation requires linear time in the size of the map; many
+     * implementations will override this method.
+     *
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     */
+    public V get(Object key) {
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        if (key==null) {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (e.getKey()==null)
+                    return e.getValue();
+            }
+        } else {
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (key.equals(e.getKey()))
+                    return e.getValue();
+            }
+        }
+        return null;
+    }
+
+
+    // Modification Operations
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation always throws an
+     * <tt>UnsupportedOperationException</tt>.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     */
+    public V put(K key, V value) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over <tt>entrySet()</tt> searching for an
+     * entry with the specified key.  If such an entry is found, its value is
+     * obtained with its <tt>getValue</tt> operation, the entry is removed
+     * from the collection (and the backing map) with the iterator's
+     * <tt>remove</tt> operation, and the saved value is returned.  If the
+     * iteration terminates without finding such an entry, <tt>null</tt> is
+     * returned.  Note that this implementation requires linear time in the
+     * size of the map; many implementations will override this method.
+     *
+     * <p>Note that this implementation throws an
+     * <tt>UnsupportedOperationException</tt> if the <tt>entrySet</tt>
+     * iterator does not support the <tt>remove</tt> method and this map
+     * contains a mapping for the specified key.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     */
+    public V remove(Object key) {
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        Entry<K,V> correctEntry = null;
+        if (key==null) {
+            while (correctEntry==null && i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (e.getKey()==null)
+                    correctEntry = e;
+            }
+        } else {
+            while (correctEntry==null && i.hasNext()) {
+                Entry<K,V> e = i.next();
+                if (key.equals(e.getKey()))
+                    correctEntry = e;
+            }
+        }
+
+        V oldValue = null;
+        if (correctEntry !=null) {
+            oldValue = correctEntry.getValue();
+            i.remove();
+        }
+        return oldValue;
+    }
+
+
+    // Bulk Operations
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation iterates over the specified map's
+     * <tt>entrySet()</tt> collection, and calls this map's <tt>put</tt>
+     * operation once for each entry returned by the iteration.
+     *
+     * <p>Note that this implementation throws an
+     * <tt>UnsupportedOperationException</tt> if this map does not support
+     * the <tt>put</tt> operation and the specified map is nonempty.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     */
+    public void putAll(Map<? extends K, ? extends V> m) {
+        for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
+            put(e.getKey(), e.getValue());
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation calls <tt>entrySet().clear()</tt>.
+     *
+     * <p>Note that this implementation throws an
+     * <tt>UnsupportedOperationException</tt> if the <tt>entrySet</tt>
+     * does not support the <tt>clear</tt> operation.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     */
+    public void clear() {
+        entrySet().clear();
+    }
+
+
+    // Views
+
+    /**
+     * Each of these fields are initialized to contain an instance of the
+     * appropriate view the first time this view is requested.  The views are
+     * stateless, so there's no reason to create more than one of each.
+     */
+    transient volatile Set<K>        keySet = null;
+    transient volatile Collection<V> values = null;
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns a set that subclasses {@link AbstractSet}.
+     * The subclass's iterator method returns a "wrapper object" over this
+     * map's <tt>entrySet()</tt> iterator.  The <tt>size</tt> method
+     * delegates to this map's <tt>size</tt> method and the
+     * <tt>contains</tt> method delegates to this map's
+     * <tt>containsKey</tt> method.
+     *
+     * <p>The set is created the first time this method is called,
+     * and returned in response to all subsequent calls.  No synchronization
+     * is performed, so there is a slight chance that multiple calls to this
+     * method will not all return the same set.
+     */
+    public Set<K> keySet() {
+        if (keySet == null) {
+            keySet = new AbstractSet<K>() {
+                public Iterator<K> iterator() {
+                    return new Iterator<K>() {
+                        private Iterator<Entry<K,V>> i = entrySet().iterator();
+
+                        public boolean hasNext() {
+                            return i.hasNext();
+                        }
+
+                        public K next() {
+                            return i.next().getKey();
+                        }
+
+                        public void remove() {
+                            i.remove();
+                        }
+                    };
+                }
+
+                public int size() {
+                    return AbstractMap.this.size();
+                }
+
+                public boolean isEmpty() {
+                    return AbstractMap.this.isEmpty();
+                }
+
+                public void clear() {
+                    AbstractMap.this.clear();
+                }
+
+                public boolean contains(Object k) {
+                    return AbstractMap.this.containsKey(k);
+                }
+            };
+        }
+        return keySet;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>This implementation returns a collection that subclasses {@link
+     * AbstractCollection}.  The subclass's iterator method returns a
+     * "wrapper object" over this map's <tt>entrySet()</tt> iterator.
+     * The <tt>size</tt> method delegates to this map's <tt>size</tt>
+     * method and the <tt>contains</tt> method delegates to this map's
+     * <tt>containsValue</tt> method.
+     *
+     * <p>The collection is created the first time this method is called, and
+     * returned in response to all subsequent calls.  No synchronization is
+     * performed, so there is a slight chance that multiple calls to this
+     * method will not all return the same collection.
+     */
+    public Collection<V> values() {
+        if (values == null) {
+            values = new AbstractCollection<V>() {
+                public Iterator<V> iterator() {
+                    return new Iterator<V>() {
+                        private Iterator<Entry<K,V>> i = entrySet().iterator();
+
+                        public boolean hasNext() {
+                            return i.hasNext();
+                        }
+
+                        public V next() {
+                            return i.next().getValue();
+                        }
+
+                        public void remove() {
+                            i.remove();
+                        }
+                    };
+                }
+
+                public int size() {
+                    return AbstractMap.this.size();
+                }
+
+                public boolean isEmpty() {
+                    return AbstractMap.this.isEmpty();
+                }
+
+                public void clear() {
+                    AbstractMap.this.clear();
+                }
+
+                public boolean contains(Object v) {
+                    return AbstractMap.this.containsValue(v);
+                }
+            };
+        }
+        return values;
+    }
+
+    public abstract Set<Entry<K,V>> entrySet();
+
+
+    // Comparison and hashing
+
+    /**
+     * Compares the specified object with this map for equality.  Returns
+     * <tt>true</tt> if the given object is also a map and the two maps
+     * represent the same mappings.  More formally, two maps <tt>m1</tt> and
+     * <tt>m2</tt> represent the same mappings if
+     * <tt>m1.entrySet().equals(m2.entrySet())</tt>.  This ensures that the
+     * <tt>equals</tt> method works properly across different implementations
+     * of the <tt>Map</tt> interface.
+     *
+     * <p>This implementation first checks if the specified object is this map;
+     * if so it returns <tt>true</tt>.  Then, it checks if the specified
+     * object is a map whose size is identical to the size of this map; if
+     * not, it returns <tt>false</tt>.  If so, it iterates over this map's
+     * <tt>entrySet</tt> collection, and checks that the specified map
+     * contains each mapping that this map contains.  If the specified map
+     * fails to contain such a mapping, <tt>false</tt> is returned.  If the
+     * iteration completes, <tt>true</tt> is returned.
+     *
+     * @param o object to be compared for equality with this map
+     * @return <tt>true</tt> if the specified object is equal to this map
+     */
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+
+        if (!(o instanceof Map))
+            return false;
+        Map<K,V> m = (Map<K,V>) o;
+        if (m.size() != size())
+            return false;
+
+        try {
+            Iterator<Entry<K,V>> i = entrySet().iterator();
+            while (i.hasNext()) {
+                Entry<K,V> e = i.next();
+                K key = e.getKey();
+                V value = e.getValue();
+                if (value == null) {
+                    if (!(m.get(key)==null && m.containsKey(key)))
+                        return false;
+                } else {
+                    if (!value.equals(m.get(key)))
+                        return false;
+                }
+            }
+        } catch (ClassCastException unused) {
+            return false;
+        } catch (NullPointerException unused) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the hash code value for this map.  The hash code of a map is
+     * defined to be the sum of the hash codes of each entry in the map's
+     * <tt>entrySet()</tt> view.  This ensures that <tt>m1.equals(m2)</tt>
+     * implies that <tt>m1.hashCode()==m2.hashCode()</tt> for any two maps
+     * <tt>m1</tt> and <tt>m2</tt>, as required by the general contract of
+     * {@link Object#hashCode}.
+     *
+     * <p>This implementation iterates over <tt>entrySet()</tt>, calling
+     * {@link Map.Entry#hashCode hashCode()} on each element (entry) in the
+     * set, and adding up the results.
+     *
+     * @return the hash code value for this map
+     * @see Map.Entry#hashCode()
+     * @see Object#equals(Object)
+     * @see Set#equals(Object)
+     */
+    public int hashCode() {
+        int h = 0;
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        while (i.hasNext())
+            h += i.next().hashCode();
+        return h;
+    }
+
+    /**
+     * Returns a string representation of this map.  The string representation
+     * consists of a list of key-value mappings in the order returned by the
+     * map's <tt>entrySet</tt> view's iterator, enclosed in braces
+     * (<tt>"{}"</tt>).  Adjacent mappings are separated by the characters
+     * <tt>", "</tt> (comma and space).  Each key-value mapping is rendered as
+     * the key followed by an equals sign (<tt>"="</tt>) followed by the
+     * associated value.  Keys and values are converted to strings as by
+     * {@link String#valueOf(Object)}.
+     *
+     * @return a string representation of this map
+     */
+    public String toString() {
+        Iterator<Entry<K,V>> i = entrySet().iterator();
+        if (! i.hasNext())
+            return "{}";
+
+        StringBuilder sb = new StringBuilder();
+        sb.append('{');
+        for (;;) {
+            Entry<K,V> e = i.next();
+            K key = e.getKey();
+            V value = e.getValue();
+            sb.append(key   == this ? "(this Map)" : key);
+            sb.append('=');
+            sb.append(value == this ? "(this Map)" : value);
+            if (! i.hasNext())
+                return sb.append('}').toString();
+            sb.append(',').append(' ');
+        }
+    }
+
+    /**
+     * Returns a shallow copy of this <tt>AbstractMap</tt> instance: the keys
+     * and values themselves are not cloned.
+     *
+     * @return a shallow copy of this map
+     */
+    protected Object clone() throws CloneNotSupportedException {
+        AbstractMap<K,V> result = (AbstractMap<K,V>)super.clone();
+        result.keySet = null;
+        result.values = null;
+        return result;
+    }
+
+    /**
+     * Utility method for SimpleEntry and SimpleImmutableEntry.
+     * Test for equality, checking for nulls.
+     */
+    private static boolean eq(Object o1, Object o2) {
+        return o1 == null ? o2 == null : o1.equals(o2);
+    }
+
+    // Implementation Note: SimpleEntry and SimpleImmutableEntry
+    // are distinct unrelated classes, even though they share
+    // some code. Since you can't add or subtract final-ness
+    // of a field in a subclass, they can't share representations,
+    // and the amount of duplicated code is too small to warrant
+    // exposing a common abstract class.
+
+
+    /**
+     * An Entry maintaining a key and a value.  The value may be
+     * changed using the <tt>setValue</tt> method.  This class
+     * facilitates the process of building custom map
+     * implementations. For example, it may be convenient to return
+     * arrays of <tt>SimpleEntry</tt> instances in method
+     * <tt>Map.entrySet().toArray</tt>.
+     *
+     * @since 1.6
+     */
+    public static class SimpleEntry<K,V>
+        implements Entry<K,V>, java.io.Serializable
+    {
+        private static final long serialVersionUID = -8499721149061103585L;
+
+        private final K key;
+        private V value;
+
+        /**
+         * Creates an entry representing a mapping from the specified
+         * key to the specified value.
+         *
+         * @param key the key represented by this entry
+         * @param value the value represented by this entry
+         */
+        public SimpleEntry(K key, V value) {
+            this.key   = key;
+            this.value = value;
+        }
+
+        /**
+         * Creates an entry representing the same mapping as the
+         * specified entry.
+         *
+         * @param entry the entry to copy
+         */
+        public SimpleEntry(Entry<? extends K, ? extends V> entry) {
+            this.key   = entry.getKey();
+            this.value = entry.getValue();
+        }
+
+        /**
+         * Returns the key corresponding to this entry.
+         *
+         * @return the key corresponding to this entry
+         */
+        public K getKey() {
+            return key;
+        }
+
+        /**
+         * Returns the value corresponding to this entry.
+         *
+         * @return the value corresponding to this entry
+         */
+        public V getValue() {
+            return value;
+        }
+
+        /**
+         * Replaces the value corresponding to this entry with the specified
+         * value.
+         *
+         * @param value new value to be stored in this entry
+         * @return the old value corresponding to the entry
+         */
+        public V setValue(V value) {
+            V oldValue = this.value;
+            this.value = value;
+            return oldValue;
+        }
+
+        /**
+         * Compares the specified object with this entry for equality.
+         * Returns {@code true} if the given object is also a map entry and
+         * the two entries represent the same mapping.  More formally, two
+         * entries {@code e1} and {@code e2} represent the same mapping
+         * if<pre>
+         *   (e1.getKey()==null ?
+         *    e2.getKey()==null :
+         *    e1.getKey().equals(e2.getKey()))
+         *   &amp;&amp;
+         *   (e1.getValue()==null ?
+         *    e2.getValue()==null :
+         *    e1.getValue().equals(e2.getValue()))</pre>
+         * This ensures that the {@code equals} method works properly across
+         * different implementations of the {@code Map.Entry} interface.
+         *
+         * @param o object to be compared for equality with this map entry
+         * @return {@code true} if the specified object is equal to this map
+         *         entry
+         * @see    #hashCode
+         */
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry e = (Map.Entry)o;
+            return eq(key, e.getKey()) && eq(value, e.getValue());
+        }
+
+        /**
+         * Returns the hash code value for this map entry.  The hash code
+         * of a map entry {@code e} is defined to be: <pre>
+         *   (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
+         *   (e.getValue()==null ? 0 : e.getValue().hashCode())</pre>
+         * This ensures that {@code e1.equals(e2)} implies that
+         * {@code e1.hashCode()==e2.hashCode()} for any two Entries
+         * {@code e1} and {@code e2}, as required by the general
+         * contract of {@link Object#hashCode}.
+         *
+         * @return the hash code value for this map entry
+         * @see    #equals
+         */
+        public int hashCode() {
+            return (key   == null ? 0 :   key.hashCode()) ^
+                   (value == null ? 0 : value.hashCode());
+        }
+
+        /**
+         * Returns a String representation of this map entry.  This
+         * implementation returns the string representation of this
+         * entry's key followed by the equals character ("<tt>=</tt>")
+         * followed by the string representation of this entry's value.
+         *
+         * @return a String representation of this map entry
+         */
+        public String toString() {
+            return key + "=" + value;
+        }
+
+    }
+
+    /**
+     * An Entry maintaining an immutable key and value.  This class
+     * does not support method <tt>setValue</tt>.  This class may be
+     * convenient in methods that return thread-safe snapshots of
+     * key-value mappings.
+     *
+     * @since 1.6
+     */
+    public static class SimpleImmutableEntry<K,V>
+        implements Entry<K,V>, java.io.Serializable
+    {
+        private static final long serialVersionUID = 7138329143949025153L;
+
+        private final K key;
+        private final V value;
+
+        /**
+         * Creates an entry representing a mapping from the specified
+         * key to the specified value.
+         *
+         * @param key the key represented by this entry
+         * @param value the value represented by this entry
+         */
+        public SimpleImmutableEntry(K key, V value) {
+            this.key   = key;
+            this.value = value;
+        }
+
+        /**
+         * Creates an entry representing the same mapping as the
+         * specified entry.
+         *
+         * @param entry the entry to copy
+         */
+        public SimpleImmutableEntry(Entry<? extends K, ? extends V> entry) {
+            this.key   = entry.getKey();
+            this.value = entry.getValue();
+        }
+
+        /**
+         * Returns the key corresponding to this entry.
+         *
+         * @return the key corresponding to this entry
+         */
+        public K getKey() {
+            return key;
+        }
+
+        /**
+         * Returns the value corresponding to this entry.
+         *
+         * @return the value corresponding to this entry
+         */
+        public V getValue() {
+            return value;
+        }
+
+        /**
+         * Replaces the value corresponding to this entry with the specified
+         * value (optional operation).  This implementation simply throws
+         * <tt>UnsupportedOperationException</tt>, as this class implements
+         * an <i>immutable</i> map entry.
+         *
+         * @param value new value to be stored in this entry
+         * @return (Does not return)
+         * @throws UnsupportedOperationException always
+         */
+        public V setValue(V value) {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Compares the specified object with this entry for equality.
+         * Returns {@code true} if the given object is also a map entry and
+         * the two entries represent the same mapping.  More formally, two
+         * entries {@code e1} and {@code e2} represent the same mapping
+         * if<pre>
+         *   (e1.getKey()==null ?
+         *    e2.getKey()==null :
+         *    e1.getKey().equals(e2.getKey()))
+         *   &amp;&amp;
+         *   (e1.getValue()==null ?
+         *    e2.getValue()==null :
+         *    e1.getValue().equals(e2.getValue()))</pre>
+         * This ensures that the {@code equals} method works properly across
+         * different implementations of the {@code Map.Entry} interface.
+         *
+         * @param o object to be compared for equality with this map entry
+         * @return {@code true} if the specified object is equal to this map
+         *         entry
+         * @see    #hashCode
+         */
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry e = (Map.Entry)o;
+            return eq(key, e.getKey()) && eq(value, e.getValue());
+        }
+
+        /**
+         * Returns the hash code value for this map entry.  The hash code
+         * of a map entry {@code e} is defined to be: <pre>
+         *   (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
+         *   (e.getValue()==null ? 0 : e.getValue().hashCode())</pre>
+         * This ensures that {@code e1.equals(e2)} implies that
+         * {@code e1.hashCode()==e2.hashCode()} for any two Entries
+         * {@code e1} and {@code e2}, as required by the general
+         * contract of {@link Object#hashCode}.
+         *
+         * @return the hash code value for this map entry
+         * @see    #equals
+         */
+        public int hashCode() {
+            return (key   == null ? 0 :   key.hashCode()) ^
+                   (value == null ? 0 : value.hashCode());
+        }
+
+        /**
+         * Returns a String representation of this map entry.  This
+         * implementation returns the string representation of this
+         * entry's key followed by the equals character ("<tt>=</tt>")
+         * followed by the string representation of this entry's value.
+         *
+         * @return a String representation of this map entry
+         */
+        public String toString() {
+            return key + "=" + value;
+        }
+
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/AbstractQueue.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/AbstractQueue.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,192 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util;
+
+/**
+ * This class provides skeletal implementations of some {@link Queue}
+ * operations. The implementations in this class are appropriate when
+ * the base implementation does <em>not</em> allow <tt>null</tt>
+ * elements.  Methods {@link #add add}, {@link #remove remove}, and
+ * {@link #element element} are based on {@link #offer offer}, {@link
+ * #poll poll}, and {@link #peek peek}, respectively, but throw
+ * exceptions instead of indicating failure via <tt>false</tt> or
+ * <tt>null</tt> returns.
+ *
+ * <p>A <tt>Queue</tt> implementation that extends this class must
+ * minimally define a method {@link Queue#offer} which does not permit
+ * insertion of <tt>null</tt> elements, along with methods {@link
+ * Queue#peek}, {@link Queue#poll}, {@link Collection#size}, and
+ * {@link Collection#iterator}.  Typically, additional methods will be
+ * overridden as well.  If these requirements cannot be met, consider
+ * instead subclassing {@link AbstractCollection}.
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @since 1.5
+ * @author Doug Lea
+ * @param <E> the type of elements held in this collection
+ */
+public abstract class AbstractQueue<E>
+    extends AbstractCollection<E>
+    implements Queue<E> {
+
+    /**
+     * Constructor for use by subclasses.
+     */
+    protected AbstractQueue() {
+    }
+
+    /**
+     * Inserts the specified element into this queue if it is possible to do so
+     * immediately without violating capacity restrictions, returning
+     * <tt>true</tt> upon success and throwing an <tt>IllegalStateException</tt>
+     * if no space is currently available.
+     *
+     * <p>This implementation returns <tt>true</tt> if <tt>offer</tt> succeeds,
+     * else throws an <tt>IllegalStateException</tt>.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> (as specified by {@link Collection#add})
+     * @throws IllegalStateException if the element cannot be added at this
+     *         time due to capacity restrictions
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this queue
+     * @throws NullPointerException if the specified element is null and
+     *         this queue does not permit null elements
+     * @throws IllegalArgumentException if some property of this element
+     *         prevents it from being added to this queue
+     */
+    public boolean add(E e) {
+        if (offer(e))
+            return true;
+        else
+            throw new IllegalStateException("Queue full");
+    }
+
+    /**
+     * Retrieves and removes the head of this queue.  This method differs
+     * from {@link #poll poll} only in that it throws an exception if this
+     * queue is empty.
+     *
+     * <p>This implementation returns the result of <tt>poll</tt>
+     * unless the queue is empty.
+     *
+     * @return the head of this queue
+     * @throws NoSuchElementException if this queue is empty
+     */
+    public E remove() {
+        E x = poll();
+        if (x != null)
+            return x;
+        else
+            throw new NoSuchElementException();
+    }
+
+    /**
+     * Retrieves, but does not remove, the head of this queue.  This method
+     * differs from {@link #peek peek} only in that it throws an exception if
+     * this queue is empty.
+     *
+     * <p>This implementation returns the result of <tt>peek</tt>
+     * unless the queue is empty.
+     *
+     * @return the head of this queue
+     * @throws NoSuchElementException if this queue is empty
+     */
+    public E element() {
+        E x = peek();
+        if (x != null)
+            return x;
+        else
+            throw new NoSuchElementException();
+    }
+
+    /**
+     * Removes all of the elements from this queue.
+     * The queue will be empty after this call returns.
+     *
+     * <p>This implementation repeatedly invokes {@link #poll poll} until it
+     * returns <tt>null</tt>.
+     */
+    public void clear() {
+        while (poll() != null)
+            ;
+    }
+
+    /**
+     * Adds all of the elements in the specified collection to this
+     * queue.  Attempts to addAll of a queue to itself result in
+     * <tt>IllegalArgumentException</tt>. Further, the behavior of
+     * this operation is undefined if the specified collection is
+     * modified while the operation is in progress.
+     *
+     * <p>This implementation iterates over the specified collection,
+     * and adds each element returned by the iterator to this
+     * queue, in turn.  A runtime exception encountered while
+     * trying to add an element (including, in particular, a
+     * <tt>null</tt> element) may result in only some of the elements
+     * having been successfully added when the associated exception is
+     * thrown.
+     *
+     * @param c collection containing elements to be added to this queue
+     * @return <tt>true</tt> if this queue changed as a result of the call
+     * @throws ClassCastException if the class of an element of the specified
+     *         collection prevents it from being added to this queue
+     * @throws NullPointerException if the specified collection contains a
+     *         null element and this queue does not permit null elements,
+     *         or if the specified collection is null
+     * @throws IllegalArgumentException if some property of an element of the
+     *         specified collection prevents it from being added to this
+     *         queue, or if the specified collection is this queue
+     * @throws IllegalStateException if not all the elements can be added at
+     *         this time due to insertion restrictions
+     * @see #add(Object)
+     */
+    public boolean addAll(Collection<? extends E> c) {
+        if (c == null)
+            throw new NullPointerException();
+        if (c == this)
+            throw new IllegalArgumentException();
+        boolean modified = false;
+        for (E e : c)
+            if (add(e))
+                modified = true;
+        return modified;
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/AbstractSequentialList.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/AbstractSequentialList.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * This class provides a skeletal implementation of the <tt>List</tt>
+ * interface to minimize the effort required to implement this interface
+ * backed by a "sequential access" data store (such as a linked list).  For
+ * random access data (such as an array), <tt>AbstractList</tt> should be used
+ * in preference to this class.<p>
+ *
+ * This class is the opposite of the <tt>AbstractList</tt> class in the sense
+ * that it implements the "random access" methods (<tt>get(int index)</tt>,
+ * <tt>set(int index, E element)</tt>, <tt>add(int index, E element)</tt> and
+ * <tt>remove(int index)</tt>) on top of the list's list iterator, instead of
+ * the other way around.<p>
+ *
+ * To implement a list the programmer needs only to extend this class and
+ * provide implementations for the <tt>listIterator</tt> and <tt>size</tt>
+ * methods.  For an unmodifiable list, the programmer need only implement the
+ * list iterator's <tt>hasNext</tt>, <tt>next</tt>, <tt>hasPrevious</tt>,
+ * <tt>previous</tt> and <tt>index</tt> methods.<p>
+ *
+ * For a modifiable list the programmer should additionally implement the list
+ * iterator's <tt>set</tt> method.  For a variable-size list the programmer
+ * should additionally implement the list iterator's <tt>remove</tt> and
+ * <tt>add</tt> methods.<p>
+ *
+ * The programmer should generally provide a void (no argument) and collection
+ * constructor, as per the recommendation in the <tt>Collection</tt> interface
+ * specification.<p>
+ *
+ * This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see Collection
+ * @see List
+ * @see AbstractList
+ * @see AbstractCollection
+ * @since 1.2
+ */
+
+public abstract class AbstractSequentialList<E> extends AbstractList<E> {
+    /**
+     * Sole constructor.  (For invocation by subclass constructors, typically
+     * implicit.)
+     */
+    protected AbstractSequentialList() {
+    }
+
+    /**
+     * Returns the element at the specified position in this list.
+     *
+     * <p>This implementation first gets a list iterator pointing to the
+     * indexed element (with <tt>listIterator(index)</tt>).  Then, it gets
+     * the element using <tt>ListIterator.next</tt> and returns it.
+     *
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public E get(int index) {
+        try {
+            return listIterator(index).next();
+        } catch (NoSuchElementException exc) {
+            throw new IndexOutOfBoundsException("Index: "+index);
+        }
+    }
+
+    /**
+     * Replaces the element at the specified position in this list with the
+     * specified element (optional operation).
+     *
+     * <p>This implementation first gets a list iterator pointing to the
+     * indexed element (with <tt>listIterator(index)</tt>).  Then, it gets
+     * the current element using <tt>ListIterator.next</tt> and replaces it
+     * with <tt>ListIterator.set</tt>.
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> if the list iterator does not
+     * implement the <tt>set</tt> operation.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     * @throws IndexOutOfBoundsException     {@inheritDoc}
+     */
+    public E set(int index, E element) {
+        try {
+            ListIterator<E> e = listIterator(index);
+            E oldVal = e.next();
+            e.set(element);
+            return oldVal;
+        } catch (NoSuchElementException exc) {
+            throw new IndexOutOfBoundsException("Index: "+index);
+        }
+    }
+
+    /**
+     * Inserts the specified element at the specified position in this list
+     * (optional operation).  Shifts the element currently at that position
+     * (if any) and any subsequent elements to the right (adds one to their
+     * indices).
+     *
+     * <p>This implementation first gets a list iterator pointing to the
+     * indexed element (with <tt>listIterator(index)</tt>).  Then, it
+     * inserts the specified element with <tt>ListIterator.add</tt>.
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> if the list iterator does not
+     * implement the <tt>add</tt> operation.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     * @throws IndexOutOfBoundsException     {@inheritDoc}
+     */
+    public void add(int index, E element) {
+        try {
+            listIterator(index).add(element);
+        } catch (NoSuchElementException exc) {
+            throw new IndexOutOfBoundsException("Index: "+index);
+        }
+    }
+
+    /**
+     * Removes the element at the specified position in this list (optional
+     * operation).  Shifts any subsequent elements to the left (subtracts one
+     * from their indices).  Returns the element that was removed from the
+     * list.
+     *
+     * <p>This implementation first gets a list iterator pointing to the
+     * indexed element (with <tt>listIterator(index)</tt>).  Then, it removes
+     * the element with <tt>ListIterator.remove</tt>.
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> if the list iterator does not
+     * implement the <tt>remove</tt> operation.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws IndexOutOfBoundsException     {@inheritDoc}
+     */
+    public E remove(int index) {
+        try {
+            ListIterator<E> e = listIterator(index);
+            E outCast = e.next();
+            e.remove();
+            return outCast;
+        } catch (NoSuchElementException exc) {
+            throw new IndexOutOfBoundsException("Index: "+index);
+        }
+    }
+
+
+    // Bulk Operations
+
+    /**
+     * Inserts all of the elements in the specified collection into this
+     * list at the specified position (optional operation).  Shifts the
+     * element currently at that position (if any) and any subsequent
+     * elements to the right (increases their indices).  The new elements
+     * will appear in this list in the order that they are returned by the
+     * specified collection's iterator.  The behavior of this operation is
+     * undefined if the specified collection is modified while the
+     * operation is in progress.  (Note that this will occur if the specified
+     * collection is this list, and it's nonempty.)
+     *
+     * <p>This implementation gets an iterator over the specified collection and
+     * a list iterator over this list pointing to the indexed element (with
+     * <tt>listIterator(index)</tt>).  Then, it iterates over the specified
+     * collection, inserting the elements obtained from the iterator into this
+     * list, one at a time, using <tt>ListIterator.add</tt> followed by
+     * <tt>ListIterator.next</tt> (to skip over the added element).
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> if the list iterator returned by
+     * the <tt>listIterator</tt> method does not implement the <tt>add</tt>
+     * operation.
+     *
+     * @throws UnsupportedOperationException {@inheritDoc}
+     * @throws ClassCastException            {@inheritDoc}
+     * @throws NullPointerException          {@inheritDoc}
+     * @throws IllegalArgumentException      {@inheritDoc}
+     * @throws IndexOutOfBoundsException     {@inheritDoc}
+     */
+    public boolean addAll(int index, Collection<? extends E> c) {
+        try {
+            boolean modified = false;
+            ListIterator<E> e1 = listIterator(index);
+            Iterator<? extends E> e2 = c.iterator();
+            while (e2.hasNext()) {
+                e1.add(e2.next());
+                modified = true;
+            }
+            return modified;
+        } catch (NoSuchElementException exc) {
+            throw new IndexOutOfBoundsException("Index: "+index);
+        }
+    }
+
+
+    // Iterators
+
+    /**
+     * Returns an iterator over the elements in this list (in proper
+     * sequence).<p>
+     *
+     * This implementation merely returns a list iterator over the list.
+     *
+     * @return an iterator over the elements in this list (in proper sequence)
+     */
+    public Iterator<E> iterator() {
+        return listIterator();
+    }
+
+    /**
+     * Returns a list iterator over the elements in this list (in proper
+     * sequence).
+     *
+     * @param  index index of first element to be returned from the list
+     *         iterator (by a call to the <code>next</code> method)
+     * @return a list iterator over the elements in this list (in proper
+     *         sequence)
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public abstract ListIterator<E> listIterator(int index);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/AbstractSet.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/AbstractSet.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * This class provides a skeletal implementation of the <tt>Set</tt>
+ * interface to minimize the effort required to implement this
+ * interface. <p>
+ *
+ * The process of implementing a set by extending this class is identical
+ * to that of implementing a Collection by extending AbstractCollection,
+ * except that all of the methods and constructors in subclasses of this
+ * class must obey the additional constraints imposed by the <tt>Set</tt>
+ * interface (for instance, the add method must not permit addition of
+ * multiple instances of an object to a set).<p>
+ *
+ * Note that this class does not override any of the implementations from
+ * the <tt>AbstractCollection</tt> class.  It merely adds implementations
+ * for <tt>equals</tt> and <tt>hashCode</tt>.<p>
+ *
+ * This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <E> the type of elements maintained by this set
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see Collection
+ * @see AbstractCollection
+ * @see Set
+ * @since 1.2
+ */
+
+public abstract class AbstractSet<E> extends AbstractCollection<E> implements Set<E> {
+    /**
+     * Sole constructor.  (For invocation by subclass constructors, typically
+     * implicit.)
+     */
+    protected AbstractSet() {
+    }
+
+    // Comparison and hashing
+
+    /**
+     * Compares the specified object with this set for equality.  Returns
+     * <tt>true</tt> if the given object is also a set, the two sets have
+     * the same size, and every member of the given set is contained in
+     * this set.  This ensures that the <tt>equals</tt> method works
+     * properly across different implementations of the <tt>Set</tt>
+     * interface.<p>
+     *
+     * This implementation first checks if the specified object is this
+     * set; if so it returns <tt>true</tt>.  Then, it checks if the
+     * specified object is a set whose size is identical to the size of
+     * this set; if not, it returns false.  If so, it returns
+     * <tt>containsAll((Collection) o)</tt>.
+     *
+     * @param o object to be compared for equality with this set
+     * @return <tt>true</tt> if the specified object is equal to this set
+     */
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+
+        if (!(o instanceof Set))
+            return false;
+        Collection c = (Collection) o;
+        if (c.size() != size())
+            return false;
+        try {
+            return containsAll(c);
+        } catch (ClassCastException unused)   {
+            return false;
+        } catch (NullPointerException unused) {
+            return false;
+        }
+    }
+
+    /**
+     * Returns the hash code value for this set.  The hash code of a set is
+     * defined to be the sum of the hash codes of the elements in the set,
+     * where the hash code of a <tt>null</tt> element is defined to be zero.
+     * This ensures that <tt>s1.equals(s2)</tt> implies that
+     * <tt>s1.hashCode()==s2.hashCode()</tt> for any two sets <tt>s1</tt>
+     * and <tt>s2</tt>, as required by the general contract of
+     * {@link Object#hashCode}.
+     *
+     * <p>This implementation iterates over the set, calling the
+     * <tt>hashCode</tt> method on each element in the set, and adding up
+     * the results.
+     *
+     * @return the hash code value for this set
+     * @see Object#equals(Object)
+     * @see Set#equals(Object)
+     */
+    public int hashCode() {
+        int h = 0;
+        Iterator<E> i = iterator();
+        while (i.hasNext()) {
+            E obj = i.next();
+            if (obj != null)
+                h += obj.hashCode();
+        }
+        return h;
+    }
+
+    /**
+     * Removes from this set all of its elements that are contained in the
+     * specified collection (optional operation).  If the specified
+     * collection is also a set, this operation effectively modifies this
+     * set so that its value is the <i>asymmetric set difference</i> of
+     * the two sets.
+     *
+     * <p>This implementation determines which is the smaller of this set
+     * and the specified collection, by invoking the <tt>size</tt>
+     * method on each.  If this set has fewer elements, then the
+     * implementation iterates over this set, checking each element
+     * returned by the iterator in turn to see if it is contained in
+     * the specified collection.  If it is so contained, it is removed
+     * from this set with the iterator's <tt>remove</tt> method.  If
+     * the specified collection has fewer elements, then the
+     * implementation iterates over the specified collection, removing
+     * from this set each element returned by the iterator, using this
+     * set's <tt>remove</tt> method.
+     *
+     * <p>Note that this implementation will throw an
+     * <tt>UnsupportedOperationException</tt> if the iterator returned by the
+     * <tt>iterator</tt> method does not implement the <tt>remove</tt> method.
+     *
+     * @param  c collection containing elements to be removed from this set
+     * @return <tt>true</tt> if this set changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
+     *         is not supported by this set
+     * @throws ClassCastException if the class of an element of this set
+     *         is incompatible with the specified collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this set contains a null element and the
+     *         specified collection does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see #remove(Object)
+     * @see #contains(Object)
+     */
+    public boolean removeAll(Collection<?> c) {
+        boolean modified = false;
+
+        if (size() > c.size()) {
+            for (Iterator<?> i = c.iterator(); i.hasNext(); )
+                modified |= remove(i.next());
+        } else {
+            for (Iterator<?> i = iterator(); i.hasNext(); ) {
+                if (c.contains(i.next())) {
+                    i.remove();
+                    modified = true;
+                }
+            }
+        }
+        return modified;
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/ArrayDeque.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/ArrayDeque.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,830 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Josh Bloch of Google Inc. and released to the public domain,
+ * as explained at http://creativecommons.org/publicdomain/zero/1.0/.
+ */
+
+package java.util;
+import java.io.*;
+
+/**
+ * Resizable-array implementation of the {@link Deque} interface.  Array
+ * deques have no capacity restrictions; they grow as necessary to support
+ * usage.  They are not thread-safe; in the absence of external
+ * synchronization, they do not support concurrent access by multiple threads.
+ * Null elements are prohibited.  This class is likely to be faster than
+ * {@link Stack} when used as a stack, and faster than {@link LinkedList}
+ * when used as a queue.
+ *
+ * <p>Most <tt>ArrayDeque</tt> operations run in amortized constant time.
+ * Exceptions include {@link #remove(Object) remove}, {@link
+ * #removeFirstOccurrence removeFirstOccurrence}, {@link #removeLastOccurrence
+ * removeLastOccurrence}, {@link #contains contains}, {@link #iterator
+ * iterator.remove()}, and the bulk operations, all of which run in linear
+ * time.
+ *
+ * <p>The iterators returned by this class's <tt>iterator</tt> method are
+ * <i>fail-fast</i>: If the deque is modified at any time after the iterator
+ * is created, in any way except through the iterator's own <tt>remove</tt>
+ * method, the iterator will generally throw a {@link
+ * ConcurrentModificationException}.  Thus, in the face of concurrent
+ * modification, the iterator fails quickly and cleanly, rather than risking
+ * arbitrary, non-deterministic behavior at an undetermined time in the
+ * future.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness: <i>the fail-fast behavior of iterators
+ * should be used only to detect bugs.</i>
+ *
+ * <p>This class and its iterator implement all of the
+ * <em>optional</em> methods of the {@link Collection} and {@link
+ * Iterator} interfaces.
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch and Doug Lea
+ * @since   1.6
+ * @param <E> the type of elements held in this collection
+ */
+public class ArrayDeque<E> extends AbstractCollection<E>
+                           implements Deque<E>, Cloneable, Serializable
+{
+    /**
+     * The array in which the elements of the deque are stored.
+     * The capacity of the deque is the length of this array, which is
+     * always a power of two. The array is never allowed to become
+     * full, except transiently within an addX method where it is
+     * resized (see doubleCapacity) immediately upon becoming full,
+     * thus avoiding head and tail wrapping around to equal each
+     * other.  We also guarantee that all array cells not holding
+     * deque elements are always null.
+     */
+    private transient E[] elements;
+
+    /**
+     * The index of the element at the head of the deque (which is the
+     * element that would be removed by remove() or pop()); or an
+     * arbitrary number equal to tail if the deque is empty.
+     */
+    private transient int head;
+
+    /**
+     * The index at which the next element would be added to the tail
+     * of the deque (via addLast(E), add(E), or push(E)).
+     */
+    private transient int tail;
+
+    /**
+     * The minimum capacity that we'll use for a newly created deque.
+     * Must be a power of 2.
+     */
+    private static final int MIN_INITIAL_CAPACITY = 8;
+
+    // ******  Array allocation and resizing utilities ******
+
+    /**
+     * Allocate empty array to hold the given number of elements.
+     *
+     * @param numElements  the number of elements to hold
+     */
+    private void allocateElements(int numElements) {
+        int initialCapacity = MIN_INITIAL_CAPACITY;
+        // Find the best power of two to hold elements.
+        // Tests "<=" because arrays aren't kept full.
+        if (numElements >= initialCapacity) {
+            initialCapacity = numElements;
+            initialCapacity |= (initialCapacity >>>  1);
+            initialCapacity |= (initialCapacity >>>  2);
+            initialCapacity |= (initialCapacity >>>  4);
+            initialCapacity |= (initialCapacity >>>  8);
+            initialCapacity |= (initialCapacity >>> 16);
+            initialCapacity++;
+
+            if (initialCapacity < 0)   // Too many elements, must back off
+                initialCapacity >>>= 1;// Good luck allocating 2 ^ 30 elements
+        }
+        elements = (E[]) new Object[initialCapacity];
+    }
+
+    /**
+     * Double the capacity of this deque.  Call only when full, i.e.,
+     * when head and tail have wrapped around to become equal.
+     */
+    private void doubleCapacity() {
+        assert head == tail;
+        int p = head;
+        int n = elements.length;
+        int r = n - p; // number of elements to the right of p
+        int newCapacity = n << 1;
+        if (newCapacity < 0)
+            throw new IllegalStateException("Sorry, deque too big");
+        Object[] a = new Object[newCapacity];
+        System.arraycopy(elements, p, a, 0, r);
+        System.arraycopy(elements, 0, a, r, p);
+        elements = (E[])a;
+        head = 0;
+        tail = n;
+    }
+
+    /**
+     * Copies the elements from our element array into the specified array,
+     * in order (from first to last element in the deque).  It is assumed
+     * that the array is large enough to hold all elements in the deque.
+     *
+     * @return its argument
+     */
+    private <T> T[] copyElements(T[] a) {
+        if (head < tail) {
+            System.arraycopy(elements, head, a, 0, size());
+        } else if (head > tail) {
+            int headPortionLen = elements.length - head;
+            System.arraycopy(elements, head, a, 0, headPortionLen);
+            System.arraycopy(elements, 0, a, headPortionLen, tail);
+        }
+        return a;
+    }
+
+    /**
+     * Constructs an empty array deque with an initial capacity
+     * sufficient to hold 16 elements.
+     */
+    public ArrayDeque() {
+        elements = (E[]) new Object[16];
+    }
+
+    /**
+     * Constructs an empty array deque with an initial capacity
+     * sufficient to hold the specified number of elements.
+     *
+     * @param numElements  lower bound on initial capacity of the deque
+     */
+    public ArrayDeque(int numElements) {
+        allocateElements(numElements);
+    }
+
+    /**
+     * Constructs a deque containing the elements of the specified
+     * collection, in the order they are returned by the collection's
+     * iterator.  (The first element returned by the collection's
+     * iterator becomes the first element, or <i>front</i> of the
+     * deque.)
+     *
+     * @param c the collection whose elements are to be placed into the deque
+     * @throws NullPointerException if the specified collection is null
+     */
+    public ArrayDeque(Collection<? extends E> c) {
+        allocateElements(c.size());
+        addAll(c);
+    }
+
+    // The main insertion and extraction methods are addFirst,
+    // addLast, pollFirst, pollLast. The other methods are defined in
+    // terms of these.
+
+    /**
+     * Inserts the specified element at the front of this deque.
+     *
+     * @param e the element to add
+     * @throws NullPointerException if the specified element is null
+     */
+    public void addFirst(E e) {
+        if (e == null)
+            throw new NullPointerException();
+        elements[head = (head - 1) & (elements.length - 1)] = e;
+        if (head == tail)
+            doubleCapacity();
+    }
+
+    /**
+     * Inserts the specified element at the end of this deque.
+     *
+     * <p>This method is equivalent to {@link #add}.
+     *
+     * @param e the element to add
+     * @throws NullPointerException if the specified element is null
+     */
+    public void addLast(E e) {
+        if (e == null)
+            throw new NullPointerException();
+        elements[tail] = e;
+        if ( (tail = (tail + 1) & (elements.length - 1)) == head)
+            doubleCapacity();
+    }
+
+    /**
+     * Inserts the specified element at the front of this deque.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> (as specified by {@link Deque#offerFirst})
+     * @throws NullPointerException if the specified element is null
+     */
+    public boolean offerFirst(E e) {
+        addFirst(e);
+        return true;
+    }
+
+    /**
+     * Inserts the specified element at the end of this deque.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> (as specified by {@link Deque#offerLast})
+     * @throws NullPointerException if the specified element is null
+     */
+    public boolean offerLast(E e) {
+        addLast(e);
+        return true;
+    }
+
+    /**
+     * @throws NoSuchElementException {@inheritDoc}
+     */
+    public E removeFirst() {
+        E x = pollFirst();
+        if (x == null)
+            throw new NoSuchElementException();
+        return x;
+    }
+
+    /**
+     * @throws NoSuchElementException {@inheritDoc}
+     */
+    public E removeLast() {
+        E x = pollLast();
+        if (x == null)
+            throw new NoSuchElementException();
+        return x;
+    }
+
+    public E pollFirst() {
+        int h = head;
+        E result = elements[h]; // Element is null if deque empty
+        if (result == null)
+            return null;
+        elements[h] = null;     // Must null out slot
+        head = (h + 1) & (elements.length - 1);
+        return result;
+    }
+
+    public E pollLast() {
+        int t = (tail - 1) & (elements.length - 1);
+        E result = elements[t];
+        if (result == null)
+            return null;
+        elements[t] = null;
+        tail = t;
+        return result;
+    }
+
+    /**
+     * @throws NoSuchElementException {@inheritDoc}
+     */
+    public E getFirst() {
+        E x = elements[head];
+        if (x == null)
+            throw new NoSuchElementException();
+        return x;
+    }
+
+    /**
+     * @throws NoSuchElementException {@inheritDoc}
+     */
+    public E getLast() {
+        E x = elements[(tail - 1) & (elements.length - 1)];
+        if (x == null)
+            throw new NoSuchElementException();
+        return x;
+    }
+
+    public E peekFirst() {
+        return elements[head]; // elements[head] is null if deque empty
+    }
+
+    public E peekLast() {
+        return elements[(tail - 1) & (elements.length - 1)];
+    }
+
+    /**
+     * Removes the first occurrence of the specified element in this
+     * deque (when traversing the deque from head to tail).
+     * If the deque does not contain the element, it is unchanged.
+     * More formally, removes the first element <tt>e</tt> such that
+     * <tt>o.equals(e)</tt> (if such an element exists).
+     * Returns <tt>true</tt> if this deque contained the specified element
+     * (or equivalently, if this deque changed as a result of the call).
+     *
+     * @param o element to be removed from this deque, if present
+     * @return <tt>true</tt> if the deque contained the specified element
+     */
+    public boolean removeFirstOccurrence(Object o) {
+        if (o == null)
+            return false;
+        int mask = elements.length - 1;
+        int i = head;
+        E x;
+        while ( (x = elements[i]) != null) {
+            if (o.equals(x)) {
+                delete(i);
+                return true;
+            }
+            i = (i + 1) & mask;
+        }
+        return false;
+    }
+
+    /**
+     * Removes the last occurrence of the specified element in this
+     * deque (when traversing the deque from head to tail).
+     * If the deque does not contain the element, it is unchanged.
+     * More formally, removes the last element <tt>e</tt> such that
+     * <tt>o.equals(e)</tt> (if such an element exists).
+     * Returns <tt>true</tt> if this deque contained the specified element
+     * (or equivalently, if this deque changed as a result of the call).
+     *
+     * @param o element to be removed from this deque, if present
+     * @return <tt>true</tt> if the deque contained the specified element
+     */
+    public boolean removeLastOccurrence(Object o) {
+        if (o == null)
+            return false;
+        int mask = elements.length - 1;
+        int i = (tail - 1) & mask;
+        E x;
+        while ( (x = elements[i]) != null) {
+            if (o.equals(x)) {
+                delete(i);
+                return true;
+            }
+            i = (i - 1) & mask;
+        }
+        return false;
+    }
+
+    // *** Queue methods ***
+
+    /**
+     * Inserts the specified element at the end of this deque.
+     *
+     * <p>This method is equivalent to {@link #addLast}.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> (as specified by {@link Collection#add})
+     * @throws NullPointerException if the specified element is null
+     */
+    public boolean add(E e) {
+        addLast(e);
+        return true;
+    }
+
+    /**
+     * Inserts the specified element at the end of this deque.
+     *
+     * <p>This method is equivalent to {@link #offerLast}.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> (as specified by {@link Queue#offer})
+     * @throws NullPointerException if the specified element is null
+     */
+    public boolean offer(E e) {
+        return offerLast(e);
+    }
+
+    /**
+     * Retrieves and removes the head of the queue represented by this deque.
+     *
+     * This method differs from {@link #poll poll} only in that it throws an
+     * exception if this deque is empty.
+     *
+     * <p>This method is equivalent to {@link #removeFirst}.
+     *
+     * @return the head of the queue represented by this deque
+     * @throws NoSuchElementException {@inheritDoc}
+     */
+    public E remove() {
+        return removeFirst();
+    }
+
+    /**
+     * Retrieves and removes the head of the queue represented by this deque
+     * (in other words, the first element of this deque), or returns
+     * <tt>null</tt> if this deque is empty.
+     *
+     * <p>This method is equivalent to {@link #pollFirst}.
+     *
+     * @return the head of the queue represented by this deque, or
+     *         <tt>null</tt> if this deque is empty
+     */
+    public E poll() {
+        return pollFirst();
+    }
+
+    /**
+     * Retrieves, but does not remove, the head of the queue represented by
+     * this deque.  This method differs from {@link #peek peek} only in
+     * that it throws an exception if this deque is empty.
+     *
+     * <p>This method is equivalent to {@link #getFirst}.
+     *
+     * @return the head of the queue represented by this deque
+     * @throws NoSuchElementException {@inheritDoc}
+     */
+    public E element() {
+        return getFirst();
+    }
+
+    /**
+     * Retrieves, but does not remove, the head of the queue represented by
+     * this deque, or returns <tt>null</tt> if this deque is empty.
+     *
+     * <p>This method is equivalent to {@link #peekFirst}.
+     *
+     * @return the head of the queue represented by this deque, or
+     *         <tt>null</tt> if this deque is empty
+     */
+    public E peek() {
+        return peekFirst();
+    }
+
+    // *** Stack methods ***
+
+    /**
+     * Pushes an element onto the stack represented by this deque.  In other
+     * words, inserts the element at the front of this deque.
+     *
+     * <p>This method is equivalent to {@link #addFirst}.
+     *
+     * @param e the element to push
+     * @throws NullPointerException if the specified element is null
+     */
+    public void push(E e) {
+        addFirst(e);
+    }
+
+    /**
+     * Pops an element from the stack represented by this deque.  In other
+     * words, removes and returns the first element of this deque.
+     *
+     * <p>This method is equivalent to {@link #removeFirst()}.
+     *
+     * @return the element at the front of this deque (which is the top
+     *         of the stack represented by this deque)
+     * @throws NoSuchElementException {@inheritDoc}
+     */
+    public E pop() {
+        return removeFirst();
+    }
+
+    private void checkInvariants() {
+        assert elements[tail] == null;
+        assert head == tail ? elements[head] == null :
+            (elements[head] != null &&
+             elements[(tail - 1) & (elements.length - 1)] != null);
+        assert elements[(head - 1) & (elements.length - 1)] == null;
+    }
+
+    /**
+     * Removes the element at the specified position in the elements array,
+     * adjusting head and tail as necessary.  This can result in motion of
+     * elements backwards or forwards in the array.
+     *
+     * <p>This method is called delete rather than remove to emphasize
+     * that its semantics differ from those of {@link List#remove(int)}.
+     *
+     * @return true if elements moved backwards
+     */
+    private boolean delete(int i) {
+        checkInvariants();
+        final E[] elements = this.elements;
+        final int mask = elements.length - 1;
+        final int h = head;
+        final int t = tail;
+        final int front = (i - h) & mask;
+        final int back  = (t - i) & mask;
+
+        // Invariant: head <= i < tail mod circularity
+        if (front >= ((t - h) & mask))
+            throw new ConcurrentModificationException();
+
+        // Optimize for least element motion
+        if (front < back) {
+            if (h <= i) {
+                System.arraycopy(elements, h, elements, h + 1, front);
+            } else { // Wrap around
+                System.arraycopy(elements, 0, elements, 1, i);
+                elements[0] = elements[mask];
+                System.arraycopy(elements, h, elements, h + 1, mask - h);
+            }
+            elements[h] = null;
+            head = (h + 1) & mask;
+            return false;
+        } else {
+            if (i < t) { // Copy the null tail as well
+                System.arraycopy(elements, i + 1, elements, i, back);
+                tail = t - 1;
+            } else { // Wrap around
+                System.arraycopy(elements, i + 1, elements, i, mask - i);
+                elements[mask] = elements[0];
+                System.arraycopy(elements, 1, elements, 0, t);
+                tail = (t - 1) & mask;
+            }
+            return true;
+        }
+    }
+
+    // *** Collection Methods ***
+
+    /**
+     * Returns the number of elements in this deque.
+     *
+     * @return the number of elements in this deque
+     */
+    public int size() {
+        return (tail - head) & (elements.length - 1);
+    }
+
+    /**
+     * Returns <tt>true</tt> if this deque contains no elements.
+     *
+     * @return <tt>true</tt> if this deque contains no elements
+     */
+    public boolean isEmpty() {
+        return head == tail;
+    }
+
+    /**
+     * Returns an iterator over the elements in this deque.  The elements
+     * will be ordered from first (head) to last (tail).  This is the same
+     * order that elements would be dequeued (via successive calls to
+     * {@link #remove} or popped (via successive calls to {@link #pop}).
+     *
+     * @return an iterator over the elements in this deque
+     */
+    public Iterator<E> iterator() {
+        return new DeqIterator();
+    }
+
+    public Iterator<E> descendingIterator() {
+        return new DescendingIterator();
+    }
+
+    private class DeqIterator implements Iterator<E> {
+        /**
+         * Index of element to be returned by subsequent call to next.
+         */
+        private int cursor = head;
+
+        /**
+         * Tail recorded at construction (also in remove), to stop
+         * iterator and also to check for comodification.
+         */
+        private int fence = tail;
+
+        /**
+         * Index of element returned by most recent call to next.
+         * Reset to -1 if element is deleted by a call to remove.
+         */
+        private int lastRet = -1;
+
+        public boolean hasNext() {
+            return cursor != fence;
+        }
+
+        public E next() {
+            if (cursor == fence)
+                throw new NoSuchElementException();
+            E result = elements[cursor];
+            // This check doesn't catch all possible comodifications,
+            // but does catch the ones that corrupt traversal
+            if (tail != fence || result == null)
+                throw new ConcurrentModificationException();
+            lastRet = cursor;
+            cursor = (cursor + 1) & (elements.length - 1);
+            return result;
+        }
+
+        public void remove() {
+            if (lastRet < 0)
+                throw new IllegalStateException();
+            if (delete(lastRet)) { // if left-shifted, undo increment in next()
+                cursor = (cursor - 1) & (elements.length - 1);
+                fence = tail;
+            }
+            lastRet = -1;
+        }
+    }
+
+    private class DescendingIterator implements Iterator<E> {
+        /*
+         * This class is nearly a mirror-image of DeqIterator, using
+         * tail instead of head for initial cursor, and head instead of
+         * tail for fence.
+         */
+        private int cursor = tail;
+        private int fence = head;
+        private int lastRet = -1;
+
+        public boolean hasNext() {
+            return cursor != fence;
+        }
+
+        public E next() {
+            if (cursor == fence)
+                throw new NoSuchElementException();
+            cursor = (cursor - 1) & (elements.length - 1);
+            E result = elements[cursor];
+            if (head != fence || result == null)
+                throw new ConcurrentModificationException();
+            lastRet = cursor;
+            return result;
+        }
+
+        public void remove() {
+            if (lastRet < 0)
+                throw new IllegalStateException();
+            if (!delete(lastRet)) {
+                cursor = (cursor + 1) & (elements.length - 1);
+                fence = head;
+            }
+            lastRet = -1;
+        }
+    }
+
+    /**
+     * Returns <tt>true</tt> if this deque contains the specified element.
+     * More formally, returns <tt>true</tt> if and only if this deque contains
+     * at least one element <tt>e</tt> such that <tt>o.equals(e)</tt>.
+     *
+     * @param o object to be checked for containment in this deque
+     * @return <tt>true</tt> if this deque contains the specified element
+     */
+    public boolean contains(Object o) {
+        if (o == null)
+            return false;
+        int mask = elements.length - 1;
+        int i = head;
+        E x;
+        while ( (x = elements[i]) != null) {
+            if (o.equals(x))
+                return true;
+            i = (i + 1) & mask;
+        }
+        return false;
+    }
+
+    /**
+     * Removes a single instance of the specified element from this deque.
+     * If the deque does not contain the element, it is unchanged.
+     * More formally, removes the first element <tt>e</tt> such that
+     * <tt>o.equals(e)</tt> (if such an element exists).
+     * Returns <tt>true</tt> if this deque contained the specified element
+     * (or equivalently, if this deque changed as a result of the call).
+     *
+     * <p>This method is equivalent to {@link #removeFirstOccurrence}.
+     *
+     * @param o element to be removed from this deque, if present
+     * @return <tt>true</tt> if this deque contained the specified element
+     */
+    public boolean remove(Object o) {
+        return removeFirstOccurrence(o);
+    }
+
+    /**
+     * Removes all of the elements from this deque.
+     * The deque will be empty after this call returns.
+     */
+    public void clear() {
+        int h = head;
+        int t = tail;
+        if (h != t) { // clear all cells
+            head = tail = 0;
+            int i = h;
+            int mask = elements.length - 1;
+            do {
+                elements[i] = null;
+                i = (i + 1) & mask;
+            } while (i != t);
+        }
+    }
+
+    /**
+     * Returns an array containing all of the elements in this deque
+     * in proper sequence (from first to last element).
+     *
+     * <p>The returned array will be "safe" in that no references to it are
+     * maintained by this deque.  (In other words, this method must allocate
+     * a new array).  The caller is thus free to modify the returned array.
+     *
+     * <p>This method acts as bridge between array-based and collection-based
+     * APIs.
+     *
+     * @return an array containing all of the elements in this deque
+     */
+    public Object[] toArray() {
+        return copyElements(new Object[size()]);
+    }
+
+    /**
+     * Returns an array containing all of the elements in this deque in
+     * proper sequence (from first to last element); the runtime type of the
+     * returned array is that of the specified array.  If the deque fits in
+     * the specified array, it is returned therein.  Otherwise, a new array
+     * is allocated with the runtime type of the specified array and the
+     * size of this deque.
+     *
+     * <p>If this deque fits in the specified array with room to spare
+     * (i.e., the array has more elements than this deque), the element in
+     * the array immediately following the end of the deque is set to
+     * <tt>null</tt>.
+     *
+     * <p>Like the {@link #toArray()} method, this method acts as bridge between
+     * array-based and collection-based APIs.  Further, this method allows
+     * precise control over the runtime type of the output array, and may,
+     * under certain circumstances, be used to save allocation costs.
+     *
+     * <p>Suppose <tt>x</tt> is a deque known to contain only strings.
+     * The following code can be used to dump the deque into a newly
+     * allocated array of <tt>String</tt>:
+     *
+     * <pre>
+     *     String[] y = x.toArray(new String[0]);</pre>
+     *
+     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
+     * <tt>toArray()</tt>.
+     *
+     * @param a the array into which the elements of the deque are to
+     *          be stored, if it is big enough; otherwise, a new array of the
+     *          same runtime type is allocated for this purpose
+     * @return an array containing all of the elements in this deque
+     * @throws ArrayStoreException if the runtime type of the specified array
+     *         is not a supertype of the runtime type of every element in
+     *         this deque
+     * @throws NullPointerException if the specified array is null
+     */
+    public <T> T[] toArray(T[] a) {
+        int size = size();
+        if (a.length < size)
+            a = (T[])java.lang.reflect.Array.newInstance(
+                    a.getClass().getComponentType(), size);
+        copyElements(a);
+        if (a.length > size)
+            a[size] = null;
+        return a;
+    }
+
+    // *** Object methods ***
+
+    /**
+     * Returns a copy of this deque.
+     *
+     * @return a copy of this deque
+     */
+    public ArrayDeque<E> clone() {
+        try {
+            ArrayDeque<E> result = (ArrayDeque<E>) super.clone();
+            result.elements = Arrays.copyOf(elements, elements.length);
+            return result;
+
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError();
+        }
+    }
+
+    /**
+     * Appease the serialization gods.
+     */
+    private static final long serialVersionUID = 2340985798034038923L;
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/ArrayList.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/ArrayList.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1088 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+
+/**
+ * Resizable-array implementation of the <tt>List</tt> interface.  Implements
+ * all optional list operations, and permits all elements, including
+ * <tt>null</tt>.  In addition to implementing the <tt>List</tt> interface,
+ * this class provides methods to manipulate the size of the array that is
+ * used internally to store the list.  (This class is roughly equivalent to
+ * <tt>Vector</tt>, except that it is unsynchronized.)
+ *
+ * <p>The <tt>size</tt>, <tt>isEmpty</tt>, <tt>get</tt>, <tt>set</tt>,
+ * <tt>iterator</tt>, and <tt>listIterator</tt> operations run in constant
+ * time.  The <tt>add</tt> operation runs in <i>amortized constant time</i>,
+ * that is, adding n elements requires O(n) time.  All of the other operations
+ * run in linear time (roughly speaking).  The constant factor is low compared
+ * to that for the <tt>LinkedList</tt> implementation.
+ *
+ * <p>Each <tt>ArrayList</tt> instance has a <i>capacity</i>.  The capacity is
+ * the size of the array used to store the elements in the list.  It is always
+ * at least as large as the list size.  As elements are added to an ArrayList,
+ * its capacity grows automatically.  The details of the growth policy are not
+ * specified beyond the fact that adding an element has constant amortized
+ * time cost.
+ *
+ * <p>An application can increase the capacity of an <tt>ArrayList</tt> instance
+ * before adding a large number of elements using the <tt>ensureCapacity</tt>
+ * operation.  This may reduce the amount of incremental reallocation.
+ *
+ * <p><strong>Note that this implementation is not synchronized.</strong>
+ * If multiple threads access an <tt>ArrayList</tt> instance concurrently,
+ * and at least one of the threads modifies the list structurally, it
+ * <i>must</i> be synchronized externally.  (A structural modification is
+ * any operation that adds or deletes one or more elements, or explicitly
+ * resizes the backing array; merely setting the value of an element is not
+ * a structural modification.)  This is typically accomplished by
+ * synchronizing on some object that naturally encapsulates the list.
+ *
+ * If no such object exists, the list should be "wrapped" using the
+ * {@link Collections#synchronizedList Collections.synchronizedList}
+ * method.  This is best done at creation time, to prevent accidental
+ * unsynchronized access to the list:<pre>
+ *   List list = Collections.synchronizedList(new ArrayList(...));</pre>
+ *
+ * <p><a name="fail-fast"/>
+ * The iterators returned by this class's {@link #iterator() iterator} and
+ * {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>:
+ * if the list is structurally modified at any time after the iterator is
+ * created, in any way except through the iterator's own
+ * {@link ListIterator#remove() remove} or
+ * {@link ListIterator#add(Object) add} methods, the iterator will throw a
+ * {@link ConcurrentModificationException}.  Thus, in the face of
+ * concurrent modification, the iterator fails quickly and cleanly, rather
+ * than risking arbitrary, non-deterministic behavior at an undetermined
+ * time in the future.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness:  <i>the fail-fast behavior of iterators
+ * should be used only to detect bugs.</i>
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see     Collection
+ * @see     List
+ * @see     LinkedList
+ * @see     Vector
+ * @since   1.2
+ */
+
+public class ArrayList<E> extends AbstractList<E>
+        implements List<E>, RandomAccess, Cloneable, java.io.Serializable
+{
+    private static final long serialVersionUID = 8683452581122892189L;
+
+    /**
+     * The array buffer into which the elements of the ArrayList are stored.
+     * The capacity of the ArrayList is the length of this array buffer.
+     */
+    private transient Object[] elementData;
+
+    /**
+     * The size of the ArrayList (the number of elements it contains).
+     *
+     * @serial
+     */
+    private int size;
+
+    /**
+     * Constructs an empty list with the specified initial capacity.
+     *
+     * @param  initialCapacity  the initial capacity of the list
+     * @throws IllegalArgumentException if the specified initial capacity
+     *         is negative
+     */
+    public ArrayList(int initialCapacity) {
+        super();
+        if (initialCapacity < 0)
+            throw new IllegalArgumentException("Illegal Capacity: "+
+                                               initialCapacity);
+        this.elementData = new Object[initialCapacity];
+    }
+
+    /**
+     * Constructs an empty list with an initial capacity of ten.
+     */
+    public ArrayList() {
+        this(10);
+    }
+
+    /**
+     * Constructs a list containing the elements of the specified
+     * collection, in the order they are returned by the collection's
+     * iterator.
+     *
+     * @param c the collection whose elements are to be placed into this list
+     * @throws NullPointerException if the specified collection is null
+     */
+    public ArrayList(Collection<? extends E> c) {
+        elementData = c.toArray();
+        size = elementData.length;
+        // c.toArray might (incorrectly) not return Object[] (see 6260652)
+        if (elementData.getClass() != Object[].class)
+            elementData = Arrays.copyOf(elementData, size, Object[].class);
+    }
+
+    /**
+     * Trims the capacity of this <tt>ArrayList</tt> instance to be the
+     * list's current size.  An application can use this operation to minimize
+     * the storage of an <tt>ArrayList</tt> instance.
+     */
+    public void trimToSize() {
+        modCount++;
+        int oldCapacity = elementData.length;
+        if (size < oldCapacity) {
+            elementData = Arrays.copyOf(elementData, size);
+        }
+    }
+
+    /**
+     * Increases the capacity of this <tt>ArrayList</tt> instance, if
+     * necessary, to ensure that it can hold at least the number of elements
+     * specified by the minimum capacity argument.
+     *
+     * @param   minCapacity   the desired minimum capacity
+     */
+    public void ensureCapacity(int minCapacity) {
+        if (minCapacity > 0)
+            ensureCapacityInternal(minCapacity);
+    }
+
+    private void ensureCapacityInternal(int minCapacity) {
+        modCount++;
+        // overflow-conscious code
+        if (minCapacity - elementData.length > 0)
+            grow(minCapacity);
+    }
+
+    /**
+     * The maximum size of array to allocate.
+     * Some VMs reserve some header words in an array.
+     * Attempts to allocate larger arrays may result in
+     * OutOfMemoryError: Requested array size exceeds VM limit
+     */
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    /**
+     * Increases the capacity to ensure that it can hold at least the
+     * number of elements specified by the minimum capacity argument.
+     *
+     * @param minCapacity the desired minimum capacity
+     */
+    private void grow(int minCapacity) {
+        // overflow-conscious code
+        int oldCapacity = elementData.length;
+        int newCapacity = oldCapacity + (oldCapacity >> 1);
+        if (newCapacity - minCapacity < 0)
+            newCapacity = minCapacity;
+        if (newCapacity - MAX_ARRAY_SIZE > 0)
+            newCapacity = hugeCapacity(minCapacity);
+        // minCapacity is usually close to size, so this is a win:
+        elementData = Arrays.copyOf(elementData, newCapacity);
+    }
+
+    private static int hugeCapacity(int minCapacity) {
+        if (minCapacity < 0) // overflow
+            throw new OutOfMemoryError();
+        return (minCapacity > MAX_ARRAY_SIZE) ?
+            Integer.MAX_VALUE :
+            MAX_ARRAY_SIZE;
+    }
+
+    /**
+     * Returns the number of elements in this list.
+     *
+     * @return the number of elements in this list
+     */
+    public int size() {
+        return size;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this list contains no elements.
+     *
+     * @return <tt>true</tt> if this list contains no elements
+     */
+    public boolean isEmpty() {
+        return size == 0;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this list contains the specified element.
+     * More formally, returns <tt>true</tt> if and only if this list contains
+     * at least one element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     *
+     * @param o element whose presence in this list is to be tested
+     * @return <tt>true</tt> if this list contains the specified element
+     */
+    public boolean contains(Object o) {
+        return indexOf(o) >= 0;
+    }
+
+    /**
+     * Returns the index of the first occurrence of the specified element
+     * in this list, or -1 if this list does not contain the element.
+     * More formally, returns the lowest index <tt>i</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
+     * or -1 if there is no such index.
+     */
+    public int indexOf(Object o) {
+        if (o == null) {
+            for (int i = 0; i < size; i++)
+                if (elementData[i]==null)
+                    return i;
+        } else {
+            for (int i = 0; i < size; i++)
+                if (o.equals(elementData[i]))
+                    return i;
+        }
+        return -1;
+    }
+
+    /**
+     * Returns the index of the last occurrence of the specified element
+     * in this list, or -1 if this list does not contain the element.
+     * More formally, returns the highest index <tt>i</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
+     * or -1 if there is no such index.
+     */
+    public int lastIndexOf(Object o) {
+        if (o == null) {
+            for (int i = size-1; i >= 0; i--)
+                if (elementData[i]==null)
+                    return i;
+        } else {
+            for (int i = size-1; i >= 0; i--)
+                if (o.equals(elementData[i]))
+                    return i;
+        }
+        return -1;
+    }
+
+    /**
+     * Returns a shallow copy of this <tt>ArrayList</tt> instance.  (The
+     * elements themselves are not copied.)
+     *
+     * @return a clone of this <tt>ArrayList</tt> instance
+     */
+    public Object clone() {
+        try {
+            @SuppressWarnings("unchecked")
+                ArrayList<E> v = (ArrayList<E>) super.clone();
+            v.elementData = Arrays.copyOf(elementData, size);
+            v.modCount = 0;
+            return v;
+        } catch (CloneNotSupportedException e) {
+            // this shouldn't happen, since we are Cloneable
+            throw new InternalError();
+        }
+    }
+
+    /**
+     * Returns an array containing all of the elements in this list
+     * in proper sequence (from first to last element).
+     *
+     * <p>The returned array will be "safe" in that no references to it are
+     * maintained by this list.  (In other words, this method must allocate
+     * a new array).  The caller is thus free to modify the returned array.
+     *
+     * <p>This method acts as bridge between array-based and collection-based
+     * APIs.
+     *
+     * @return an array containing all of the elements in this list in
+     *         proper sequence
+     */
+    public Object[] toArray() {
+        return Arrays.copyOf(elementData, size);
+    }
+
+    /**
+     * Returns an array containing all of the elements in this list in proper
+     * sequence (from first to last element); the runtime type of the returned
+     * array is that of the specified array.  If the list fits in the
+     * specified array, it is returned therein.  Otherwise, a new array is
+     * allocated with the runtime type of the specified array and the size of
+     * this list.
+     *
+     * <p>If the list fits in the specified array with room to spare
+     * (i.e., the array has more elements than the list), the element in
+     * the array immediately following the end of the collection is set to
+     * <tt>null</tt>.  (This is useful in determining the length of the
+     * list <i>only</i> if the caller knows that the list does not contain
+     * any null elements.)
+     *
+     * @param a the array into which the elements of the list are to
+     *          be stored, if it is big enough; otherwise, a new array of the
+     *          same runtime type is allocated for this purpose.
+     * @return an array containing the elements of the list
+     * @throws ArrayStoreException if the runtime type of the specified array
+     *         is not a supertype of the runtime type of every element in
+     *         this list
+     * @throws NullPointerException if the specified array is null
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T[] toArray(T[] a) {
+        if (a.length < size)
+            // Make a new array of a's runtime type, but my contents:
+            return (T[]) Arrays.copyOf(elementData, size, a.getClass());
+        System.arraycopy(elementData, 0, a, 0, size);
+        if (a.length > size)
+            a[size] = null;
+        return a;
+    }
+
+    // Positional Access Operations
+
+    @SuppressWarnings("unchecked")
+    E elementData(int index) {
+        return (E) elementData[index];
+    }
+
+    /**
+     * Returns the element at the specified position in this list.
+     *
+     * @param  index index of the element to return
+     * @return the element at the specified position in this list
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public E get(int index) {
+        rangeCheck(index);
+
+        return elementData(index);
+    }
+
+    /**
+     * Replaces the element at the specified position in this list with
+     * the specified element.
+     *
+     * @param index index of the element to replace
+     * @param element element to be stored at the specified position
+     * @return the element previously at the specified position
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public E set(int index, E element) {
+        rangeCheck(index);
+
+        E oldValue = elementData(index);
+        elementData[index] = element;
+        return oldValue;
+    }
+
+    /**
+     * Appends the specified element to the end of this list.
+     *
+     * @param e element to be appended to this list
+     * @return <tt>true</tt> (as specified by {@link Collection#add})
+     */
+    public boolean add(E e) {
+        ensureCapacityInternal(size + 1);  // Increments modCount!!
+        elementData[size++] = e;
+        return true;
+    }
+
+    /**
+     * Inserts the specified element at the specified position in this
+     * list. Shifts the element currently at that position (if any) and
+     * any subsequent elements to the right (adds one to their indices).
+     *
+     * @param index index at which the specified element is to be inserted
+     * @param element element to be inserted
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public void add(int index, E element) {
+        rangeCheckForAdd(index);
+
+        ensureCapacityInternal(size + 1);  // Increments modCount!!
+        System.arraycopy(elementData, index, elementData, index + 1,
+                         size - index);
+        elementData[index] = element;
+        size++;
+    }
+
+    /**
+     * Removes the element at the specified position in this list.
+     * Shifts any subsequent elements to the left (subtracts one from their
+     * indices).
+     *
+     * @param index the index of the element to be removed
+     * @return the element that was removed from the list
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public E remove(int index) {
+        rangeCheck(index);
+
+        modCount++;
+        E oldValue = elementData(index);
+
+        int numMoved = size - index - 1;
+        if (numMoved > 0)
+            System.arraycopy(elementData, index+1, elementData, index,
+                             numMoved);
+        elementData[--size] = null; // Let gc do its work
+
+        return oldValue;
+    }
+
+    /**
+     * Removes the first occurrence of the specified element from this list,
+     * if it is present.  If the list does not contain the element, it is
+     * unchanged.  More formally, removes the element with the lowest index
+     * <tt>i</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>
+     * (if such an element exists).  Returns <tt>true</tt> if this list
+     * contained the specified element (or equivalently, if this list
+     * changed as a result of the call).
+     *
+     * @param o element to be removed from this list, if present
+     * @return <tt>true</tt> if this list contained the specified element
+     */
+    public boolean remove(Object o) {
+        if (o == null) {
+            for (int index = 0; index < size; index++)
+                if (elementData[index] == null) {
+                    fastRemove(index);
+                    return true;
+                }
+        } else {
+            for (int index = 0; index < size; index++)
+                if (o.equals(elementData[index])) {
+                    fastRemove(index);
+                    return true;
+                }
+        }
+        return false;
+    }
+
+    /*
+     * Private remove method that skips bounds checking and does not
+     * return the value removed.
+     */
+    private void fastRemove(int index) {
+        modCount++;
+        int numMoved = size - index - 1;
+        if (numMoved > 0)
+            System.arraycopy(elementData, index+1, elementData, index,
+                             numMoved);
+        elementData[--size] = null; // Let gc do its work
+    }
+
+    /**
+     * Removes all of the elements from this list.  The list will
+     * be empty after this call returns.
+     */
+    public void clear() {
+        modCount++;
+
+        // Let gc do its work
+        for (int i = 0; i < size; i++)
+            elementData[i] = null;
+
+        size = 0;
+    }
+
+    /**
+     * Appends all of the elements in the specified collection to the end of
+     * this list, in the order that they are returned by the
+     * specified collection's Iterator.  The behavior of this operation is
+     * undefined if the specified collection is modified while the operation
+     * is in progress.  (This implies that the behavior of this call is
+     * undefined if the specified collection is this list, and this
+     * list is nonempty.)
+     *
+     * @param c collection containing elements to be added to this list
+     * @return <tt>true</tt> if this list changed as a result of the call
+     * @throws NullPointerException if the specified collection is null
+     */
+    public boolean addAll(Collection<? extends E> c) {
+        Object[] a = c.toArray();
+        int numNew = a.length;
+        ensureCapacityInternal(size + numNew);  // Increments modCount
+        System.arraycopy(a, 0, elementData, size, numNew);
+        size += numNew;
+        return numNew != 0;
+    }
+
+    /**
+     * Inserts all of the elements in the specified collection into this
+     * list, starting at the specified position.  Shifts the element
+     * currently at that position (if any) and any subsequent elements to
+     * the right (increases their indices).  The new elements will appear
+     * in the list in the order that they are returned by the
+     * specified collection's iterator.
+     *
+     * @param index index at which to insert the first element from the
+     *              specified collection
+     * @param c collection containing elements to be added to this list
+     * @return <tt>true</tt> if this list changed as a result of the call
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @throws NullPointerException if the specified collection is null
+     */
+    public boolean addAll(int index, Collection<? extends E> c) {
+        rangeCheckForAdd(index);
+
+        Object[] a = c.toArray();
+        int numNew = a.length;
+        ensureCapacityInternal(size + numNew);  // Increments modCount
+
+        int numMoved = size - index;
+        if (numMoved > 0)
+            System.arraycopy(elementData, index, elementData, index + numNew,
+                             numMoved);
+
+        System.arraycopy(a, 0, elementData, index, numNew);
+        size += numNew;
+        return numNew != 0;
+    }
+
+    /**
+     * Removes from this list all of the elements whose index is between
+     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
+     * Shifts any succeeding elements to the left (reduces their index).
+     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
+     * (If {@code toIndex==fromIndex}, this operation has no effect.)
+     *
+     * @throws IndexOutOfBoundsException if {@code fromIndex} or
+     *         {@code toIndex} is out of range
+     *         ({@code fromIndex < 0 ||
+     *          fromIndex >= size() ||
+     *          toIndex > size() ||
+     *          toIndex < fromIndex})
+     */
+    protected void removeRange(int fromIndex, int toIndex) {
+        modCount++;
+        int numMoved = size - toIndex;
+        System.arraycopy(elementData, toIndex, elementData, fromIndex,
+                         numMoved);
+
+        // Let gc do its work
+        int newSize = size - (toIndex-fromIndex);
+        while (size != newSize)
+            elementData[--size] = null;
+    }
+
+    /**
+     * Checks if the given index is in range.  If not, throws an appropriate
+     * runtime exception.  This method does *not* check if the index is
+     * negative: It is always used immediately prior to an array access,
+     * which throws an ArrayIndexOutOfBoundsException if index is negative.
+     */
+    private void rangeCheck(int index) {
+        if (index >= size)
+            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+    }
+
+    /**
+     * A version of rangeCheck used by add and addAll.
+     */
+    private void rangeCheckForAdd(int index) {
+        if (index > size || index < 0)
+            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+    }
+
+    /**
+     * Constructs an IndexOutOfBoundsException detail message.
+     * Of the many possible refactorings of the error handling code,
+     * this "outlining" performs best with both server and client VMs.
+     */
+    private String outOfBoundsMsg(int index) {
+        return "Index: "+index+", Size: "+size;
+    }
+
+    /**
+     * Removes from this list all of its elements that are contained in the
+     * specified collection.
+     *
+     * @param c collection containing elements to be removed from this list
+     * @return {@code true} if this list changed as a result of the call
+     * @throws ClassCastException if the class of an element of this list
+     *         is incompatible with the specified collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this list contains a null element and the
+     *         specified collection does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see Collection#contains(Object)
+     */
+    public boolean removeAll(Collection<?> c) {
+        return batchRemove(c, false);
+    }
+
+    /**
+     * Retains only the elements in this list that are contained in the
+     * specified collection.  In other words, removes from this list all
+     * of its elements that are not contained in the specified collection.
+     *
+     * @param c collection containing elements to be retained in this list
+     * @return {@code true} if this list changed as a result of the call
+     * @throws ClassCastException if the class of an element of this list
+     *         is incompatible with the specified collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this list contains a null element and the
+     *         specified collection does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see Collection#contains(Object)
+     */
+    public boolean retainAll(Collection<?> c) {
+        return batchRemove(c, true);
+    }
+
+    private boolean batchRemove(Collection<?> c, boolean complement) {
+        final Object[] elementData = this.elementData;
+        int r = 0, w = 0;
+        boolean modified = false;
+        try {
+            for (; r < size; r++)
+                if (c.contains(elementData[r]) == complement)
+                    elementData[w++] = elementData[r];
+        } finally {
+            // Preserve behavioral compatibility with AbstractCollection,
+            // even if c.contains() throws.
+            if (r != size) {
+                System.arraycopy(elementData, r,
+                                 elementData, w,
+                                 size - r);
+                w += size - r;
+            }
+            if (w != size) {
+                for (int i = w; i < size; i++)
+                    elementData[i] = null;
+                modCount += size - w;
+                size = w;
+                modified = true;
+            }
+        }
+        return modified;
+    }
+
+    /**
+     * Returns a list iterator over the elements in this list (in proper
+     * sequence), starting at the specified position in the list.
+     * The specified index indicates the first element that would be
+     * returned by an initial call to {@link ListIterator#next next}.
+     * An initial call to {@link ListIterator#previous previous} would
+     * return the element with the specified index minus one.
+     *
+     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
+     *
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public ListIterator<E> listIterator(int index) {
+        if (index < 0 || index > size)
+            throw new IndexOutOfBoundsException("Index: "+index);
+        return new ListItr(index);
+    }
+
+    /**
+     * Returns a list iterator over the elements in this list (in proper
+     * sequence).
+     *
+     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
+     *
+     * @see #listIterator(int)
+     */
+    public ListIterator<E> listIterator() {
+        return new ListItr(0);
+    }
+
+    /**
+     * Returns an iterator over the elements in this list in proper sequence.
+     *
+     * <p>The returned iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
+     *
+     * @return an iterator over the elements in this list in proper sequence
+     */
+    public Iterator<E> iterator() {
+        return new Itr();
+    }
+
+    /**
+     * An optimized version of AbstractList.Itr
+     */
+    private class Itr implements Iterator<E> {
+        int cursor;       // index of next element to return
+        int lastRet = -1; // index of last element returned; -1 if no such
+        int expectedModCount = modCount;
+
+        public boolean hasNext() {
+            return cursor != size;
+        }
+
+        @SuppressWarnings("unchecked")
+        public E next() {
+            checkForComodification();
+            int i = cursor;
+            if (i >= size)
+                throw new NoSuchElementException();
+            Object[] elementData = ArrayList.this.elementData;
+            if (i >= elementData.length)
+                throw new ConcurrentModificationException();
+            cursor = i + 1;
+            return (E) elementData[lastRet = i];
+        }
+
+        public void remove() {
+            if (lastRet < 0)
+                throw new IllegalStateException();
+            checkForComodification();
+
+            try {
+                ArrayList.this.remove(lastRet);
+                cursor = lastRet;
+                lastRet = -1;
+                expectedModCount = modCount;
+            } catch (IndexOutOfBoundsException ex) {
+                throw new ConcurrentModificationException();
+            }
+        }
+
+        final void checkForComodification() {
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+        }
+    }
+
+    /**
+     * An optimized version of AbstractList.ListItr
+     */
+    private class ListItr extends Itr implements ListIterator<E> {
+        ListItr(int index) {
+            super();
+            cursor = index;
+        }
+
+        public boolean hasPrevious() {
+            return cursor != 0;
+        }
+
+        public int nextIndex() {
+            return cursor;
+        }
+
+        public int previousIndex() {
+            return cursor - 1;
+        }
+
+        @SuppressWarnings("unchecked")
+        public E previous() {
+            checkForComodification();
+            int i = cursor - 1;
+            if (i < 0)
+                throw new NoSuchElementException();
+            Object[] elementData = ArrayList.this.elementData;
+            if (i >= elementData.length)
+                throw new ConcurrentModificationException();
+            cursor = i;
+            return (E) elementData[lastRet = i];
+        }
+
+        public void set(E e) {
+            if (lastRet < 0)
+                throw new IllegalStateException();
+            checkForComodification();
+
+            try {
+                ArrayList.this.set(lastRet, e);
+            } catch (IndexOutOfBoundsException ex) {
+                throw new ConcurrentModificationException();
+            }
+        }
+
+        public void add(E e) {
+            checkForComodification();
+
+            try {
+                int i = cursor;
+                ArrayList.this.add(i, e);
+                cursor = i + 1;
+                lastRet = -1;
+                expectedModCount = modCount;
+            } catch (IndexOutOfBoundsException ex) {
+                throw new ConcurrentModificationException();
+            }
+        }
+    }
+
+    /**
+     * Returns a view of the portion of this list between the specified
+     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.  (If
+     * {@code fromIndex} and {@code toIndex} are equal, the returned list is
+     * empty.)  The returned list is backed by this list, so non-structural
+     * changes in the returned list are reflected in this list, and vice-versa.
+     * The returned list supports all of the optional list operations.
+     *
+     * <p>This method eliminates the need for explicit range operations (of
+     * the sort that commonly exist for arrays).  Any operation that expects
+     * a list can be used as a range operation by passing a subList view
+     * instead of a whole list.  For example, the following idiom
+     * removes a range of elements from a list:
+     * <pre>
+     *      list.subList(from, to).clear();
+     * </pre>
+     * Similar idioms may be constructed for {@link #indexOf(Object)} and
+     * {@link #lastIndexOf(Object)}, and all of the algorithms in the
+     * {@link Collections} class can be applied to a subList.
+     *
+     * <p>The semantics of the list returned by this method become undefined if
+     * the backing list (i.e., this list) is <i>structurally modified</i> in
+     * any way other than via the returned list.  (Structural modifications are
+     * those that change the size of this list, or otherwise perturb it in such
+     * a fashion that iterations in progress may yield incorrect results.)
+     *
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @throws IllegalArgumentException {@inheritDoc}
+     */
+    public List<E> subList(int fromIndex, int toIndex) {
+        subListRangeCheck(fromIndex, toIndex, size);
+        return new SubList(this, 0, fromIndex, toIndex);
+    }
+
+    static void subListRangeCheck(int fromIndex, int toIndex, int size) {
+        if (fromIndex < 0)
+            throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
+        if (toIndex > size)
+            throw new IndexOutOfBoundsException("toIndex = " + toIndex);
+        if (fromIndex > toIndex)
+            throw new IllegalArgumentException("fromIndex(" + fromIndex +
+                                               ") > toIndex(" + toIndex + ")");
+    }
+
+    private class SubList extends AbstractList<E> implements RandomAccess {
+        private final AbstractList<E> parent;
+        private final int parentOffset;
+        private final int offset;
+        int size;
+
+        SubList(AbstractList<E> parent,
+                int offset, int fromIndex, int toIndex) {
+            this.parent = parent;
+            this.parentOffset = fromIndex;
+            this.offset = offset + fromIndex;
+            this.size = toIndex - fromIndex;
+            this.modCount = ArrayList.this.modCount;
+        }
+
+        public E set(int index, E e) {
+            rangeCheck(index);
+            checkForComodification();
+            E oldValue = ArrayList.this.elementData(offset + index);
+            ArrayList.this.elementData[offset + index] = e;
+            return oldValue;
+        }
+
+        public E get(int index) {
+            rangeCheck(index);
+            checkForComodification();
+            return ArrayList.this.elementData(offset + index);
+        }
+
+        public int size() {
+            checkForComodification();
+            return this.size;
+        }
+
+        public void add(int index, E e) {
+            rangeCheckForAdd(index);
+            checkForComodification();
+            parent.add(parentOffset + index, e);
+            this.modCount = parent.modCount;
+            this.size++;
+        }
+
+        public E remove(int index) {
+            rangeCheck(index);
+            checkForComodification();
+            E result = parent.remove(parentOffset + index);
+            this.modCount = parent.modCount;
+            this.size--;
+            return result;
+        }
+
+        protected void removeRange(int fromIndex, int toIndex) {
+            checkForComodification();
+            parent.removeRange(parentOffset + fromIndex,
+                               parentOffset + toIndex);
+            this.modCount = parent.modCount;
+            this.size -= toIndex - fromIndex;
+        }
+
+        public boolean addAll(Collection<? extends E> c) {
+            return addAll(this.size, c);
+        }
+
+        public boolean addAll(int index, Collection<? extends E> c) {
+            rangeCheckForAdd(index);
+            int cSize = c.size();
+            if (cSize==0)
+                return false;
+
+            checkForComodification();
+            parent.addAll(parentOffset + index, c);
+            this.modCount = parent.modCount;
+            this.size += cSize;
+            return true;
+        }
+
+        public Iterator<E> iterator() {
+            return listIterator();
+        }
+
+        public ListIterator<E> listIterator(final int index) {
+            checkForComodification();
+            rangeCheckForAdd(index);
+            final int offset = this.offset;
+
+            return new ListIterator<E>() {
+                int cursor = index;
+                int lastRet = -1;
+                int expectedModCount = ArrayList.this.modCount;
+
+                public boolean hasNext() {
+                    return cursor != SubList.this.size;
+                }
+
+                @SuppressWarnings("unchecked")
+                public E next() {
+                    checkForComodification();
+                    int i = cursor;
+                    if (i >= SubList.this.size)
+                        throw new NoSuchElementException();
+                    Object[] elementData = ArrayList.this.elementData;
+                    if (offset + i >= elementData.length)
+                        throw new ConcurrentModificationException();
+                    cursor = i + 1;
+                    return (E) elementData[offset + (lastRet = i)];
+                }
+
+                public boolean hasPrevious() {
+                    return cursor != 0;
+                }
+
+                @SuppressWarnings("unchecked")
+                public E previous() {
+                    checkForComodification();
+                    int i = cursor - 1;
+                    if (i < 0)
+                        throw new NoSuchElementException();
+                    Object[] elementData = ArrayList.this.elementData;
+                    if (offset + i >= elementData.length)
+                        throw new ConcurrentModificationException();
+                    cursor = i;
+                    return (E) elementData[offset + (lastRet = i)];
+                }
+
+                public int nextIndex() {
+                    return cursor;
+                }
+
+                public int previousIndex() {
+                    return cursor - 1;
+                }
+
+                public void remove() {
+                    if (lastRet < 0)
+                        throw new IllegalStateException();
+                    checkForComodification();
+
+                    try {
+                        SubList.this.remove(lastRet);
+                        cursor = lastRet;
+                        lastRet = -1;
+                        expectedModCount = ArrayList.this.modCount;
+                    } catch (IndexOutOfBoundsException ex) {
+                        throw new ConcurrentModificationException();
+                    }
+                }
+
+                public void set(E e) {
+                    if (lastRet < 0)
+                        throw new IllegalStateException();
+                    checkForComodification();
+
+                    try {
+                        ArrayList.this.set(offset + lastRet, e);
+                    } catch (IndexOutOfBoundsException ex) {
+                        throw new ConcurrentModificationException();
+                    }
+                }
+
+                public void add(E e) {
+                    checkForComodification();
+
+                    try {
+                        int i = cursor;
+                        SubList.this.add(i, e);
+                        cursor = i + 1;
+                        lastRet = -1;
+                        expectedModCount = ArrayList.this.modCount;
+                    } catch (IndexOutOfBoundsException ex) {
+                        throw new ConcurrentModificationException();
+                    }
+                }
+
+                final void checkForComodification() {
+                    if (expectedModCount != ArrayList.this.modCount)
+                        throw new ConcurrentModificationException();
+                }
+            };
+        }
+
+        public List<E> subList(int fromIndex, int toIndex) {
+            subListRangeCheck(fromIndex, toIndex, size);
+            return new SubList(this, offset, fromIndex, toIndex);
+        }
+
+        private void rangeCheck(int index) {
+            if (index < 0 || index >= this.size)
+                throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+        }
+
+        private void rangeCheckForAdd(int index) {
+            if (index < 0 || index > this.size)
+                throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+        }
+
+        private String outOfBoundsMsg(int index) {
+            return "Index: "+index+", Size: "+this.size;
+        }
+
+        private void checkForComodification() {
+            if (ArrayList.this.modCount != this.modCount)
+                throw new ConcurrentModificationException();
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Arrays.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Arrays.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,3670 @@
+/*
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+import java.lang.reflect.*;
+
+/**
+ * This class contains various methods for manipulating arrays (such as
+ * sorting and searching). This class also contains a static factory
+ * that allows arrays to be viewed as lists.
+ *
+ * <p>The methods in this class all throw a {@code NullPointerException},
+ * if the specified array reference is null, except where noted.
+ *
+ * <p>The documentation for the methods contained in this class includes
+ * briefs description of the <i>implementations</i>. Such descriptions should
+ * be regarded as <i>implementation notes</i>, rather than parts of the
+ * <i>specification</i>. Implementors should feel free to substitute other
+ * algorithms, so long as the specification itself is adhered to. (For
+ * example, the algorithm used by {@code sort(Object[])} does not have to be
+ * a MergeSort, but it does have to be <i>stable</i>.)
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author Josh Bloch
+ * @author Neal Gafter
+ * @author John Rose
+ * @since  1.2
+ */
+public class Arrays {
+
+    // Suppresses default constructor, ensuring non-instantiability.
+    private Arrays() {}
+
+    /*
+     * Sorting of primitive type arrays.
+     */
+
+    /**
+     * Sorts the specified array into ascending numerical order.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(int[] a) {
+        DualPivotQuicksort.sort(a);
+    }
+
+    /**
+     * Sorts the specified range of the array into ascending order. The range
+     * to be sorted extends from the index {@code fromIndex}, inclusive, to
+     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
+     * the range to be sorted is empty.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element, inclusive, to be sorted
+     * @param toIndex the index of the last element, exclusive, to be sorted
+     *
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
+     */
+    public static void sort(int[] a, int fromIndex, int toIndex) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
+    }
+
+    /**
+     * Sorts the specified array into ascending numerical order.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(long[] a) {
+        DualPivotQuicksort.sort(a);
+    }
+
+    /**
+     * Sorts the specified range of the array into ascending order. The range
+     * to be sorted extends from the index {@code fromIndex}, inclusive, to
+     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
+     * the range to be sorted is empty.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element, inclusive, to be sorted
+     * @param toIndex the index of the last element, exclusive, to be sorted
+     *
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
+     */
+    public static void sort(long[] a, int fromIndex, int toIndex) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
+    }
+
+    /**
+     * Sorts the specified array into ascending numerical order.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(short[] a) {
+        DualPivotQuicksort.sort(a);
+    }
+
+    /**
+     * Sorts the specified range of the array into ascending order. The range
+     * to be sorted extends from the index {@code fromIndex}, inclusive, to
+     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
+     * the range to be sorted is empty.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element, inclusive, to be sorted
+     * @param toIndex the index of the last element, exclusive, to be sorted
+     *
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
+     */
+    public static void sort(short[] a, int fromIndex, int toIndex) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
+    }
+
+    /**
+     * Sorts the specified array into ascending numerical order.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(char[] a) {
+        DualPivotQuicksort.sort(a);
+    }
+
+    /**
+     * Sorts the specified range of the array into ascending order. The range
+     * to be sorted extends from the index {@code fromIndex}, inclusive, to
+     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
+     * the range to be sorted is empty.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element, inclusive, to be sorted
+     * @param toIndex the index of the last element, exclusive, to be sorted
+     *
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
+     */
+    public static void sort(char[] a, int fromIndex, int toIndex) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
+    }
+
+    /**
+     * Sorts the specified array into ascending numerical order.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(byte[] a) {
+        DualPivotQuicksort.sort(a);
+    }
+
+    /**
+     * Sorts the specified range of the array into ascending order. The range
+     * to be sorted extends from the index {@code fromIndex}, inclusive, to
+     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
+     * the range to be sorted is empty.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element, inclusive, to be sorted
+     * @param toIndex the index of the last element, exclusive, to be sorted
+     *
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
+     */
+    public static void sort(byte[] a, int fromIndex, int toIndex) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
+    }
+
+    /**
+     * Sorts the specified array into ascending numerical order.
+     *
+     * <p>The {@code <} relation does not provide a total order on all float
+     * values: {@code -0.0f == 0.0f} is {@code true} and a {@code Float.NaN}
+     * value compares neither less than, greater than, nor equal to any value,
+     * even itself. This method uses the total order imposed by the method
+     * {@link Float#compareTo}: {@code -0.0f} is treated as less than value
+     * {@code 0.0f} and {@code Float.NaN} is considered greater than any
+     * other value and all {@code Float.NaN} values are considered equal.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(float[] a) {
+        DualPivotQuicksort.sort(a);
+    }
+
+    /**
+     * Sorts the specified range of the array into ascending order. The range
+     * to be sorted extends from the index {@code fromIndex}, inclusive, to
+     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
+     * the range to be sorted is empty.
+     *
+     * <p>The {@code <} relation does not provide a total order on all float
+     * values: {@code -0.0f == 0.0f} is {@code true} and a {@code Float.NaN}
+     * value compares neither less than, greater than, nor equal to any value,
+     * even itself. This method uses the total order imposed by the method
+     * {@link Float#compareTo}: {@code -0.0f} is treated as less than value
+     * {@code 0.0f} and {@code Float.NaN} is considered greater than any
+     * other value and all {@code Float.NaN} values are considered equal.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element, inclusive, to be sorted
+     * @param toIndex the index of the last element, exclusive, to be sorted
+     *
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
+     */
+    public static void sort(float[] a, int fromIndex, int toIndex) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
+    }
+
+    /**
+     * Sorts the specified array into ascending numerical order.
+     *
+     * <p>The {@code <} relation does not provide a total order on all double
+     * values: {@code -0.0d == 0.0d} is {@code true} and a {@code Double.NaN}
+     * value compares neither less than, greater than, nor equal to any value,
+     * even itself. This method uses the total order imposed by the method
+     * {@link Double#compareTo}: {@code -0.0d} is treated as less than value
+     * {@code 0.0d} and {@code Double.NaN} is considered greater than any
+     * other value and all {@code Double.NaN} values are considered equal.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(double[] a) {
+        DualPivotQuicksort.sort(a);
+    }
+
+    /**
+     * Sorts the specified range of the array into ascending order. The range
+     * to be sorted extends from the index {@code fromIndex}, inclusive, to
+     * the index {@code toIndex}, exclusive. If {@code fromIndex == toIndex},
+     * the range to be sorted is empty.
+     *
+     * <p>The {@code <} relation does not provide a total order on all double
+     * values: {@code -0.0d == 0.0d} is {@code true} and a {@code Double.NaN}
+     * value compares neither less than, greater than, nor equal to any value,
+     * even itself. This method uses the total order imposed by the method
+     * {@link Double#compareTo}: {@code -0.0d} is treated as less than value
+     * {@code 0.0d} and {@code Double.NaN} is considered greater than any
+     * other value and all {@code Double.NaN} values are considered equal.
+     *
+     * <p>Implementation note: The sorting algorithm is a Dual-Pivot Quicksort
+     * by Vladimir Yaroslavskiy, Jon Bentley, and Joshua Bloch. This algorithm
+     * offers O(n log(n)) performance on many data sets that cause other
+     * quicksorts to degrade to quadratic performance, and is typically
+     * faster than traditional (one-pivot) Quicksort implementations.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element, inclusive, to be sorted
+     * @param toIndex the index of the last element, exclusive, to be sorted
+     *
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *     if {@code fromIndex < 0} or {@code toIndex > a.length}
+     */
+    public static void sort(double[] a, int fromIndex, int toIndex) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        DualPivotQuicksort.sort(a, fromIndex, toIndex - 1);
+    }
+
+    /*
+     * Sorting of complex type arrays.
+     */
+
+    /**
+     * Old merge sort implementation can be selected (for
+     * compatibility with broken comparators) using a system property.
+     * Cannot be a static boolean in the enclosing class due to
+     * circular dependencies. To be removed in a future release.
+     */
+    static final class LegacyMergeSort {
+        private static final boolean userRequested = false;
+    }
+
+    /*
+     * If this platform has an optimizing VM, check whether ComparableTimSort
+     * offers any performance benefit over TimSort in conjunction with a
+     * comparator that returns:
+     *    {@code ((Comparable)first).compareTo(Second)}.
+     * If not, you are better off deleting ComparableTimSort to
+     * eliminate the code duplication.  In other words, the commented
+     * out code below is the preferable implementation for sorting
+     * arrays of Comparables if it offers sufficient performance.
+     */
+
+//    /**
+//     * A comparator that implements the natural ordering of a group of
+//     * mutually comparable elements.  Using this comparator saves us
+//     * from duplicating most of the code in this file (one version for
+//     * Comparables, one for explicit Comparators).
+//     */
+//    private static final Comparator<Object> NATURAL_ORDER =
+//            new Comparator<Object>() {
+//        @SuppressWarnings("unchecked")
+//        public int compare(Object first, Object second) {
+//            return ((Comparable<Object>)first).compareTo(second);
+//        }
+//    };
+//
+//    public static void sort(Object[] a) {
+//        sort(a, 0, a.length, NATURAL_ORDER);
+//    }
+//
+//    public static void sort(Object[] a, int fromIndex, int toIndex) {
+//        sort(a, fromIndex, toIndex, NATURAL_ORDER);
+//    }
+
+    /**
+     * Sorts the specified array of objects into ascending order, according
+     * to the {@linkplain Comparable natural ordering} of its elements.
+     * All elements in the array must implement the {@link Comparable}
+     * interface.  Furthermore, all elements in the array must be
+     * <i>mutually comparable</i> (that is, {@code e1.compareTo(e2)} must
+     * not throw a {@code ClassCastException} for any elements {@code e1}
+     * and {@code e2} in the array).
+     *
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
+     *
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
+     *
+     * @param a the array to be sorted
+     * @throws ClassCastException if the array contains elements that are not
+     *         <i>mutually comparable</i> (for example, strings and integers)
+     * @throws IllegalArgumentException (optional) if the natural
+     *         ordering of the array elements is found to violate the
+     *         {@link Comparable} contract
+     */
+    public static void sort(Object[] a) {
+        if (LegacyMergeSort.userRequested)
+            legacyMergeSort(a);
+        else
+            ComparableTimSort.sort(a);
+    }
+
+    /** To be removed in a future release. */
+    private static void legacyMergeSort(Object[] a) {
+        Object[] aux = a.clone();
+        mergeSort(aux, a, 0, a.length, 0);
+    }
+
+    /**
+     * Sorts the specified range of the specified array of objects into
+     * ascending order, according to the
+     * {@linkplain Comparable natural ordering} of its
+     * elements.  The range to be sorted extends from index
+     * {@code fromIndex}, inclusive, to index {@code toIndex}, exclusive.
+     * (If {@code fromIndex==toIndex}, the range to be sorted is empty.)  All
+     * elements in this range must implement the {@link Comparable}
+     * interface.  Furthermore, all elements in this range must be <i>mutually
+     * comparable</i> (that is, {@code e1.compareTo(e2)} must not throw a
+     * {@code ClassCastException} for any elements {@code e1} and
+     * {@code e2} in the array).
+     *
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
+     *
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        sorted
+     * @param toIndex the index of the last element (exclusive) to be sorted
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex} or
+     *         (optional) if the natural ordering of the array elements is
+     *         found to violate the {@link Comparable} contract
+     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+     *         {@code toIndex > a.length}
+     * @throws ClassCastException if the array contains elements that are
+     *         not <i>mutually comparable</i> (for example, strings and
+     *         integers).
+     */
+    public static void sort(Object[] a, int fromIndex, int toIndex) {
+        if (LegacyMergeSort.userRequested)
+            legacyMergeSort(a, fromIndex, toIndex);
+        else
+            ComparableTimSort.sort(a, fromIndex, toIndex);
+    }
+
+    /** To be removed in a future release. */
+    private static void legacyMergeSort(Object[] a,
+                                        int fromIndex, int toIndex) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        Object[] aux = copyOfRange(a, fromIndex, toIndex);
+        mergeSort(aux, a, fromIndex, toIndex, -fromIndex);
+    }
+
+    /**
+     * Tuning parameter: list size at or below which insertion sort will be
+     * used in preference to mergesort.
+     * To be removed in a future release.
+     */
+    private static final int INSERTIONSORT_THRESHOLD = 7;
+
+    /**
+     * Src is the source array that starts at index 0
+     * Dest is the (possibly larger) array destination with a possible offset
+     * low is the index in dest to start sorting
+     * high is the end index in dest to end sorting
+     * off is the offset to generate corresponding low, high in src
+     * To be removed in a future release.
+     */
+    private static void mergeSort(Object[] src,
+                                  Object[] dest,
+                                  int low,
+                                  int high,
+                                  int off) {
+        int length = high - low;
+
+        // Insertion sort on smallest arrays
+        if (length < INSERTIONSORT_THRESHOLD) {
+            for (int i=low; i<high; i++)
+                for (int j=i; j>low &&
+                         ((Comparable) dest[j-1]).compareTo(dest[j])>0; j--)
+                    swap(dest, j, j-1);
+            return;
+        }
+
+        // Recursively sort halves of dest into src
+        int destLow  = low;
+        int destHigh = high;
+        low  += off;
+        high += off;
+        int mid = (low + high) >>> 1;
+        mergeSort(dest, src, low, mid, -off);
+        mergeSort(dest, src, mid, high, -off);
+
+        // If list is already sorted, just copy from src to dest.  This is an
+        // optimization that results in faster sorts for nearly ordered lists.
+        if (((Comparable)src[mid-1]).compareTo(src[mid]) <= 0) {
+            System.arraycopy(src, low, dest, destLow, length);
+            return;
+        }
+
+        // Merge sorted halves (now in src) into dest
+        for(int i = destLow, p = low, q = mid; i < destHigh; i++) {
+            if (q >= high || p < mid && ((Comparable)src[p]).compareTo(src[q])<=0)
+                dest[i] = src[p++];
+            else
+                dest[i] = src[q++];
+        }
+    }
+
+    /**
+     * Swaps x[a] with x[b].
+     */
+    private static void swap(Object[] x, int a, int b) {
+        Object t = x[a];
+        x[a] = x[b];
+        x[b] = t;
+    }
+
+    /**
+     * Sorts the specified array of objects according to the order induced by
+     * the specified comparator.  All elements in the array must be
+     * <i>mutually comparable</i> by the specified comparator (that is,
+     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
+     * for any elements {@code e1} and {@code e2} in the array).
+     *
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
+     *
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
+     *
+     * @param a the array to be sorted
+     * @param c the comparator to determine the order of the array.  A
+     *        {@code null} value indicates that the elements'
+     *        {@linkplain Comparable natural ordering} should be used.
+     * @throws ClassCastException if the array contains elements that are
+     *         not <i>mutually comparable</i> using the specified comparator
+     * @throws IllegalArgumentException (optional) if the comparator is
+     *         found to violate the {@link Comparator} contract
+     */
+    public static <T> void sort(T[] a, Comparator<? super T> c) {
+        if (LegacyMergeSort.userRequested)
+            legacyMergeSort(a, c);
+        else
+            TimSort.sort(a, c);
+    }
+
+    /** To be removed in a future release. */
+    private static <T> void legacyMergeSort(T[] a, Comparator<? super T> c) {
+        T[] aux = a.clone();
+        if (c==null)
+            mergeSort(aux, a, 0, a.length, 0);
+        else
+            mergeSort(aux, a, 0, a.length, 0, c);
+    }
+
+    /**
+     * Sorts the specified range of the specified array of objects according
+     * to the order induced by the specified comparator.  The range to be
+     * sorted extends from index {@code fromIndex}, inclusive, to index
+     * {@code toIndex}, exclusive.  (If {@code fromIndex==toIndex}, the
+     * range to be sorted is empty.)  All elements in the range must be
+     * <i>mutually comparable</i> by the specified comparator (that is,
+     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
+     * for any elements {@code e1} and {@code e2} in the range).
+     *
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
+     *
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
+     *
+     * @param a the array to be sorted
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        sorted
+     * @param toIndex the index of the last element (exclusive) to be sorted
+     * @param c the comparator to determine the order of the array.  A
+     *        {@code null} value indicates that the elements'
+     *        {@linkplain Comparable natural ordering} should be used.
+     * @throws ClassCastException if the array contains elements that are not
+     *         <i>mutually comparable</i> using the specified comparator.
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex} or
+     *         (optional) if the comparator is found to violate the
+     *         {@link Comparator} contract
+     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+     *         {@code toIndex > a.length}
+     */
+    public static <T> void sort(T[] a, int fromIndex, int toIndex,
+                                Comparator<? super T> c) {
+        if (LegacyMergeSort.userRequested)
+            legacyMergeSort(a, fromIndex, toIndex, c);
+        else
+            TimSort.sort(a, fromIndex, toIndex, c);
+    }
+
+    /** To be removed in a future release. */
+    private static <T> void legacyMergeSort(T[] a, int fromIndex, int toIndex,
+                                            Comparator<? super T> c) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        T[] aux = copyOfRange(a, fromIndex, toIndex);
+        if (c==null)
+            mergeSort(aux, a, fromIndex, toIndex, -fromIndex);
+        else
+            mergeSort(aux, a, fromIndex, toIndex, -fromIndex, c);
+    }
+
+    /**
+     * Src is the source array that starts at index 0
+     * Dest is the (possibly larger) array destination with a possible offset
+     * low is the index in dest to start sorting
+     * high is the end index in dest to end sorting
+     * off is the offset into src corresponding to low in dest
+     * To be removed in a future release.
+     */
+    private static void mergeSort(Object[] src,
+                                  Object[] dest,
+                                  int low, int high, int off,
+                                  Comparator c) {
+        int length = high - low;
+
+        // Insertion sort on smallest arrays
+        if (length < INSERTIONSORT_THRESHOLD) {
+            for (int i=low; i<high; i++)
+                for (int j=i; j>low && c.compare(dest[j-1], dest[j])>0; j--)
+                    swap(dest, j, j-1);
+            return;
+        }
+
+        // Recursively sort halves of dest into src
+        int destLow  = low;
+        int destHigh = high;
+        low  += off;
+        high += off;
+        int mid = (low + high) >>> 1;
+        mergeSort(dest, src, low, mid, -off, c);
+        mergeSort(dest, src, mid, high, -off, c);
+
+        // If list is already sorted, just copy from src to dest.  This is an
+        // optimization that results in faster sorts for nearly ordered lists.
+        if (c.compare(src[mid-1], src[mid]) <= 0) {
+           System.arraycopy(src, low, dest, destLow, length);
+           return;
+        }
+
+        // Merge sorted halves (now in src) into dest
+        for(int i = destLow, p = low, q = mid; i < destHigh; i++) {
+            if (q >= high || p < mid && c.compare(src[p], src[q]) <= 0)
+                dest[i] = src[p++];
+            else
+                dest[i] = src[q++];
+        }
+    }
+
+    /**
+     * Checks that {@code fromIndex} and {@code toIndex} are in
+     * the range and throws an appropriate exception, if they aren't.
+     */
+    private static void rangeCheck(int length, int fromIndex, int toIndex) {
+        if (fromIndex > toIndex) {
+            throw new IllegalArgumentException(
+                "fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")");
+        }
+        if (fromIndex < 0) {
+            throw new ArrayIndexOutOfBoundsException(fromIndex);
+        }
+        if (toIndex > length) {
+            throw new ArrayIndexOutOfBoundsException(toIndex);
+        }
+    }
+
+    // Searching
+
+    /**
+     * Searches the specified array of longs for the specified value using the
+     * binary search algorithm.  The array must be sorted (as
+     * by the {@link #sort(long[])} method) prior to making this call.  If it
+     * is not sorted, the results are undefined.  If the array contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     */
+    public static int binarySearch(long[] a, long key) {
+        return binarySearch0(a, 0, a.length, key);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array of longs for the specified value using the
+     * binary search algorithm.
+     * The range must be sorted (as
+     * by the {@link #sort(long[], int, int)} method)
+     * prior to making this call.  If it
+     * is not sorted, the results are undefined.  If the range contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static int binarySearch(long[] a, int fromIndex, int toIndex,
+                                   long key) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key);
+    }
+
+    // Like public version, but without range checks.
+    private static int binarySearch0(long[] a, int fromIndex, int toIndex,
+                                     long key) {
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            long midVal = a[mid];
+
+            if (midVal < key)
+                low = mid + 1;
+            else if (midVal > key)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    /**
+     * Searches the specified array of ints for the specified value using the
+     * binary search algorithm.  The array must be sorted (as
+     * by the {@link #sort(int[])} method) prior to making this call.  If it
+     * is not sorted, the results are undefined.  If the array contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     */
+    public static int binarySearch(int[] a, int key) {
+        return binarySearch0(a, 0, a.length, key);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array of ints for the specified value using the
+     * binary search algorithm.
+     * The range must be sorted (as
+     * by the {@link #sort(int[], int, int)} method)
+     * prior to making this call.  If it
+     * is not sorted, the results are undefined.  If the range contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static int binarySearch(int[] a, int fromIndex, int toIndex,
+                                   int key) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key);
+    }
+
+    // Like public version, but without range checks.
+    private static int binarySearch0(int[] a, int fromIndex, int toIndex,
+                                     int key) {
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            int midVal = a[mid];
+
+            if (midVal < key)
+                low = mid + 1;
+            else if (midVal > key)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    /**
+     * Searches the specified array of shorts for the specified value using
+     * the binary search algorithm.  The array must be sorted
+     * (as by the {@link #sort(short[])} method) prior to making this call.  If
+     * it is not sorted, the results are undefined.  If the array contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     */
+    public static int binarySearch(short[] a, short key) {
+        return binarySearch0(a, 0, a.length, key);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array of shorts for the specified value using
+     * the binary search algorithm.
+     * The range must be sorted
+     * (as by the {@link #sort(short[], int, int)} method)
+     * prior to making this call.  If
+     * it is not sorted, the results are undefined.  If the range contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static int binarySearch(short[] a, int fromIndex, int toIndex,
+                                   short key) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key);
+    }
+
+    // Like public version, but without range checks.
+    private static int binarySearch0(short[] a, int fromIndex, int toIndex,
+                                     short key) {
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            short midVal = a[mid];
+
+            if (midVal < key)
+                low = mid + 1;
+            else if (midVal > key)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    /**
+     * Searches the specified array of chars for the specified value using the
+     * binary search algorithm.  The array must be sorted (as
+     * by the {@link #sort(char[])} method) prior to making this call.  If it
+     * is not sorted, the results are undefined.  If the array contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     */
+    public static int binarySearch(char[] a, char key) {
+        return binarySearch0(a, 0, a.length, key);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array of chars for the specified value using the
+     * binary search algorithm.
+     * The range must be sorted (as
+     * by the {@link #sort(char[], int, int)} method)
+     * prior to making this call.  If it
+     * is not sorted, the results are undefined.  If the range contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static int binarySearch(char[] a, int fromIndex, int toIndex,
+                                   char key) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key);
+    }
+
+    // Like public version, but without range checks.
+    private static int binarySearch0(char[] a, int fromIndex, int toIndex,
+                                     char key) {
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            char midVal = a[mid];
+
+            if (midVal < key)
+                low = mid + 1;
+            else if (midVal > key)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    /**
+     * Searches the specified array of bytes for the specified value using the
+     * binary search algorithm.  The array must be sorted (as
+     * by the {@link #sort(byte[])} method) prior to making this call.  If it
+     * is not sorted, the results are undefined.  If the array contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     */
+    public static int binarySearch(byte[] a, byte key) {
+        return binarySearch0(a, 0, a.length, key);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array of bytes for the specified value using the
+     * binary search algorithm.
+     * The range must be sorted (as
+     * by the {@link #sort(byte[], int, int)} method)
+     * prior to making this call.  If it
+     * is not sorted, the results are undefined.  If the range contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static int binarySearch(byte[] a, int fromIndex, int toIndex,
+                                   byte key) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key);
+    }
+
+    // Like public version, but without range checks.
+    private static int binarySearch0(byte[] a, int fromIndex, int toIndex,
+                                     byte key) {
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            byte midVal = a[mid];
+
+            if (midVal < key)
+                low = mid + 1;
+            else if (midVal > key)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    /**
+     * Searches the specified array of doubles for the specified value using
+     * the binary search algorithm.  The array must be sorted
+     * (as by the {@link #sort(double[])} method) prior to making this call.
+     * If it is not sorted, the results are undefined.  If the array contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.  This method considers all NaN values to be
+     * equivalent and equal.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     */
+    public static int binarySearch(double[] a, double key) {
+        return binarySearch0(a, 0, a.length, key);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array of doubles for the specified value using
+     * the binary search algorithm.
+     * The range must be sorted
+     * (as by the {@link #sort(double[], int, int)} method)
+     * prior to making this call.
+     * If it is not sorted, the results are undefined.  If the range contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found.  This method considers all NaN values to be
+     * equivalent and equal.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static int binarySearch(double[] a, int fromIndex, int toIndex,
+                                   double key) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key);
+    }
+
+    // Like public version, but without range checks.
+    private static int binarySearch0(double[] a, int fromIndex, int toIndex,
+                                     double key) {
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            double midVal = a[mid];
+
+            if (midVal < key)
+                low = mid + 1;  // Neither val is NaN, thisVal is smaller
+            else if (midVal > key)
+                high = mid - 1; // Neither val is NaN, thisVal is larger
+            else {
+                long midBits = Double.doubleToLongBits(midVal);
+                long keyBits = Double.doubleToLongBits(key);
+                if (midBits == keyBits)     // Values are equal
+                    return mid;             // Key found
+                else if (midBits < keyBits) // (-0.0, 0.0) or (!NaN, NaN)
+                    low = mid + 1;
+                else                        // (0.0, -0.0) or (NaN, !NaN)
+                    high = mid - 1;
+            }
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    /**
+     * Searches the specified array of floats for the specified value using
+     * the binary search algorithm. The array must be sorted
+     * (as by the {@link #sort(float[])} method) prior to making this call. If
+     * it is not sorted, the results are undefined. If the array contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found. This method considers all NaN values to be
+     * equivalent and equal.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key. Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     */
+    public static int binarySearch(float[] a, float key) {
+        return binarySearch0(a, 0, a.length, key);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array of floats for the specified value using
+     * the binary search algorithm.
+     * The range must be sorted
+     * (as by the {@link #sort(float[], int, int)} method)
+     * prior to making this call. If
+     * it is not sorted, the results are undefined. If the range contains
+     * multiple elements with the specified value, there is no guarantee which
+     * one will be found. This method considers all NaN values to be
+     * equivalent and equal.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key. Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static int binarySearch(float[] a, int fromIndex, int toIndex,
+                                   float key) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key);
+    }
+
+    // Like public version, but without range checks.
+    private static int binarySearch0(float[] a, int fromIndex, int toIndex,
+                                     float key) {
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            float midVal = a[mid];
+
+            if (midVal < key)
+                low = mid + 1;  // Neither val is NaN, thisVal is smaller
+            else if (midVal > key)
+                high = mid - 1; // Neither val is NaN, thisVal is larger
+            else {
+                int midBits = Float.floatToIntBits(midVal);
+                int keyBits = Float.floatToIntBits(key);
+                if (midBits == keyBits)     // Values are equal
+                    return mid;             // Key found
+                else if (midBits < keyBits) // (-0.0, 0.0) or (!NaN, NaN)
+                    low = mid + 1;
+                else                        // (0.0, -0.0) or (NaN, !NaN)
+                    high = mid - 1;
+            }
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    /**
+     * Searches the specified array for the specified object using the binary
+     * search algorithm. The array must be sorted into ascending order
+     * according to the
+     * {@linkplain Comparable natural ordering}
+     * of its elements (as by the
+     * {@link #sort(Object[])} method) prior to making this call.
+     * If it is not sorted, the results are undefined.
+     * (If the array contains elements that are not mutually comparable (for
+     * example, strings and integers), it <i>cannot</i> be sorted according
+     * to the natural ordering of its elements, hence results are undefined.)
+     * If the array contains multiple
+     * elements equal to the specified object, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws ClassCastException if the search key is not comparable to the
+     *         elements of the array.
+     */
+    public static int binarySearch(Object[] a, Object key) {
+        return binarySearch0(a, 0, a.length, key);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array for the specified object using the binary
+     * search algorithm.
+     * The range must be sorted into ascending order
+     * according to the
+     * {@linkplain Comparable natural ordering}
+     * of its elements (as by the
+     * {@link #sort(Object[], int, int)} method) prior to making this
+     * call.  If it is not sorted, the results are undefined.
+     * (If the range contains elements that are not mutually comparable (for
+     * example, strings and integers), it <i>cannot</i> be sorted according
+     * to the natural ordering of its elements, hence results are undefined.)
+     * If the range contains multiple
+     * elements equal to the specified object, there is no guarantee which
+     * one will be found.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws ClassCastException if the search key is not comparable to the
+     *         elements of the array within the specified range.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static int binarySearch(Object[] a, int fromIndex, int toIndex,
+                                   Object key) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key);
+    }
+
+    // Like public version, but without range checks.
+    private static int binarySearch0(Object[] a, int fromIndex, int toIndex,
+                                     Object key) {
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            Comparable midVal = (Comparable)a[mid];
+            int cmp = midVal.compareTo(key);
+
+            if (cmp < 0)
+                low = mid + 1;
+            else if (cmp > 0)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    /**
+     * Searches the specified array for the specified object using the binary
+     * search algorithm.  The array must be sorted into ascending order
+     * according to the specified comparator (as by the
+     * {@link #sort(Object[], Comparator) sort(T[], Comparator)}
+     * method) prior to making this call.  If it is
+     * not sorted, the results are undefined.
+     * If the array contains multiple
+     * elements equal to the specified object, there is no guarantee which one
+     * will be found.
+     *
+     * @param a the array to be searched
+     * @param key the value to be searched for
+     * @param c the comparator by which the array is ordered.  A
+     *        <tt>null</tt> value indicates that the elements'
+     *        {@linkplain Comparable natural ordering} should be used.
+     * @return index of the search key, if it is contained in the array;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element greater than the key, or <tt>a.length</tt> if all
+     *         elements in the array are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws ClassCastException if the array contains elements that are not
+     *         <i>mutually comparable</i> using the specified comparator,
+     *         or the search key is not comparable to the
+     *         elements of the array using this comparator.
+     */
+    public static <T> int binarySearch(T[] a, T key, Comparator<? super T> c) {
+        return binarySearch0(a, 0, a.length, key, c);
+    }
+
+    /**
+     * Searches a range of
+     * the specified array for the specified object using the binary
+     * search algorithm.
+     * The range must be sorted into ascending order
+     * according to the specified comparator (as by the
+     * {@link #sort(Object[], int, int, Comparator)
+     * sort(T[], int, int, Comparator)}
+     * method) prior to making this call.
+     * If it is not sorted, the results are undefined.
+     * If the range contains multiple elements equal to the specified object,
+     * there is no guarantee which one will be found.
+     *
+     * @param a the array to be searched
+     * @param fromIndex the index of the first element (inclusive) to be
+     *          searched
+     * @param toIndex the index of the last element (exclusive) to be searched
+     * @param key the value to be searched for
+     * @param c the comparator by which the array is ordered.  A
+     *        <tt>null</tt> value indicates that the elements'
+     *        {@linkplain Comparable natural ordering} should be used.
+     * @return index of the search key, if it is contained in the array
+     *         within the specified range;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the array: the index of the first
+     *         element in the range greater than the key,
+     *         or <tt>toIndex</tt> if all
+     *         elements in the range are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws ClassCastException if the range contains elements that are not
+     *         <i>mutually comparable</i> using the specified comparator,
+     *         or the search key is not comparable to the
+     *         elements in the range using this comparator.
+     * @throws IllegalArgumentException
+     *         if {@code fromIndex > toIndex}
+     * @throws ArrayIndexOutOfBoundsException
+     *         if {@code fromIndex < 0 or toIndex > a.length}
+     * @since 1.6
+     */
+    public static <T> int binarySearch(T[] a, int fromIndex, int toIndex,
+                                       T key, Comparator<? super T> c) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        return binarySearch0(a, fromIndex, toIndex, key, c);
+    }
+
+    // Like public version, but without range checks.
+    private static <T> int binarySearch0(T[] a, int fromIndex, int toIndex,
+                                         T key, Comparator<? super T> c) {
+        if (c == null) {
+            return binarySearch0(a, fromIndex, toIndex, key);
+        }
+        int low = fromIndex;
+        int high = toIndex - 1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            T midVal = a[mid];
+            int cmp = c.compare(midVal, key);
+            if (cmp < 0)
+                low = mid + 1;
+            else if (cmp > 0)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found.
+    }
+
+    // Equality Testing
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of longs are
+     * <i>equal</i> to one another.  Two arrays are considered equal if both
+     * arrays contain the same number of elements, and all corresponding pairs
+     * of elements in the two arrays are equal.  In other words, two arrays
+     * are equal if they contain the same elements in the same order.  Also,
+     * two array references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     */
+    public static boolean equals(long[] a, long[] a2) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++)
+            if (a[i] != a2[i])
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of ints are
+     * <i>equal</i> to one another.  Two arrays are considered equal if both
+     * arrays contain the same number of elements, and all corresponding pairs
+     * of elements in the two arrays are equal.  In other words, two arrays
+     * are equal if they contain the same elements in the same order.  Also,
+     * two array references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     */
+    public static boolean equals(int[] a, int[] a2) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++)
+            if (a[i] != a2[i])
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of shorts are
+     * <i>equal</i> to one another.  Two arrays are considered equal if both
+     * arrays contain the same number of elements, and all corresponding pairs
+     * of elements in the two arrays are equal.  In other words, two arrays
+     * are equal if they contain the same elements in the same order.  Also,
+     * two array references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     */
+    public static boolean equals(short[] a, short a2[]) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++)
+            if (a[i] != a2[i])
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of chars are
+     * <i>equal</i> to one another.  Two arrays are considered equal if both
+     * arrays contain the same number of elements, and all corresponding pairs
+     * of elements in the two arrays are equal.  In other words, two arrays
+     * are equal if they contain the same elements in the same order.  Also,
+     * two array references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     */
+    public static boolean equals(char[] a, char[] a2) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++)
+            if (a[i] != a2[i])
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of bytes are
+     * <i>equal</i> to one another.  Two arrays are considered equal if both
+     * arrays contain the same number of elements, and all corresponding pairs
+     * of elements in the two arrays are equal.  In other words, two arrays
+     * are equal if they contain the same elements in the same order.  Also,
+     * two array references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     */
+    public static boolean equals(byte[] a, byte[] a2) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++)
+            if (a[i] != a2[i])
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of booleans are
+     * <i>equal</i> to one another.  Two arrays are considered equal if both
+     * arrays contain the same number of elements, and all corresponding pairs
+     * of elements in the two arrays are equal.  In other words, two arrays
+     * are equal if they contain the same elements in the same order.  Also,
+     * two array references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     */
+    public static boolean equals(boolean[] a, boolean[] a2) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++)
+            if (a[i] != a2[i])
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of doubles are
+     * <i>equal</i> to one another.  Two arrays are considered equal if both
+     * arrays contain the same number of elements, and all corresponding pairs
+     * of elements in the two arrays are equal.  In other words, two arrays
+     * are equal if they contain the same elements in the same order.  Also,
+     * two array references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * Two doubles <tt>d1</tt> and <tt>d2</tt> are considered equal if:
+     * <pre>    <tt>new Double(d1).equals(new Double(d2))</tt></pre>
+     * (Unlike the <tt>==</tt> operator, this method considers
+     * <tt>NaN</tt> equals to itself, and 0.0d unequal to -0.0d.)
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     * @see Double#equals(Object)
+     */
+    public static boolean equals(double[] a, double[] a2) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++)
+            if (Double.doubleToLongBits(a[i])!=Double.doubleToLongBits(a2[i]))
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of floats are
+     * <i>equal</i> to one another.  Two arrays are considered equal if both
+     * arrays contain the same number of elements, and all corresponding pairs
+     * of elements in the two arrays are equal.  In other words, two arrays
+     * are equal if they contain the same elements in the same order.  Also,
+     * two array references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * Two floats <tt>f1</tt> and <tt>f2</tt> are considered equal if:
+     * <pre>    <tt>new Float(f1).equals(new Float(f2))</tt></pre>
+     * (Unlike the <tt>==</tt> operator, this method considers
+     * <tt>NaN</tt> equals to itself, and 0.0f unequal to -0.0f.)
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     * @see Float#equals(Object)
+     */
+    public static boolean equals(float[] a, float[] a2) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++)
+            if (Float.floatToIntBits(a[i])!=Float.floatToIntBits(a2[i]))
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays of Objects are
+     * <i>equal</i> to one another.  The two arrays are considered equal if
+     * both arrays contain the same number of elements, and all corresponding
+     * pairs of elements in the two arrays are equal.  Two objects <tt>e1</tt>
+     * and <tt>e2</tt> are considered <i>equal</i> if <tt>(e1==null ? e2==null
+     * : e1.equals(e2))</tt>.  In other words, the two arrays are equal if
+     * they contain the same elements in the same order.  Also, two array
+     * references are considered equal if both are <tt>null</tt>.<p>
+     *
+     * @param a one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     */
+    public static boolean equals(Object[] a, Object[] a2) {
+        if (a==a2)
+            return true;
+        if (a==null || a2==null)
+            return false;
+
+        int length = a.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i=0; i<length; i++) {
+            Object o1 = a[i];
+            Object o2 = a2[i];
+            if (!(o1==null ? o2==null : o1.equals(o2)))
+                return false;
+        }
+
+        return true;
+    }
+
+    // Filling
+
+    /**
+     * Assigns the specified long value to each element of the specified array
+     * of longs.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     */
+    public static void fill(long[] a, long val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified long value to each element of the specified
+     * range of the specified array of longs.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     */
+    public static void fill(long[] a, int fromIndex, int toIndex, long val) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified int value to each element of the specified array
+     * of ints.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     */
+    public static void fill(int[] a, int val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified int value to each element of the specified
+     * range of the specified array of ints.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     */
+    public static void fill(int[] a, int fromIndex, int toIndex, int val) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified short value to each element of the specified array
+     * of shorts.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     */
+    public static void fill(short[] a, short val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified short value to each element of the specified
+     * range of the specified array of shorts.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     */
+    public static void fill(short[] a, int fromIndex, int toIndex, short val) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified char value to each element of the specified array
+     * of chars.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     */
+    public static void fill(char[] a, char val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified char value to each element of the specified
+     * range of the specified array of chars.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     */
+    public static void fill(char[] a, int fromIndex, int toIndex, char val) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified byte value to each element of the specified array
+     * of bytes.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     */
+    public static void fill(byte[] a, byte val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified byte value to each element of the specified
+     * range of the specified array of bytes.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     */
+    public static void fill(byte[] a, int fromIndex, int toIndex, byte val) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified boolean value to each element of the specified
+     * array of booleans.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     */
+    public static void fill(boolean[] a, boolean val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified boolean value to each element of the specified
+     * range of the specified array of booleans.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     */
+    public static void fill(boolean[] a, int fromIndex, int toIndex,
+                            boolean val) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified double value to each element of the specified
+     * array of doubles.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     */
+    public static void fill(double[] a, double val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified double value to each element of the specified
+     * range of the specified array of doubles.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     */
+    public static void fill(double[] a, int fromIndex, int toIndex,double val){
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified float value to each element of the specified array
+     * of floats.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     */
+    public static void fill(float[] a, float val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified float value to each element of the specified
+     * range of the specified array of floats.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     */
+    public static void fill(float[] a, int fromIndex, int toIndex, float val) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified Object reference to each element of the specified
+     * array of Objects.
+     *
+     * @param a the array to be filled
+     * @param val the value to be stored in all elements of the array
+     * @throws ArrayStoreException if the specified value is not of a
+     *         runtime type that can be stored in the specified array
+     */
+    public static void fill(Object[] a, Object val) {
+        for (int i = 0, len = a.length; i < len; i++)
+            a[i] = val;
+    }
+
+    /**
+     * Assigns the specified Object reference to each element of the specified
+     * range of the specified array of Objects.  The range to be filled
+     * extends from index <tt>fromIndex</tt>, inclusive, to index
+     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * range to be filled is empty.)
+     *
+     * @param a the array to be filled
+     * @param fromIndex the index of the first element (inclusive) to be
+     *        filled with the specified value
+     * @param toIndex the index of the last element (exclusive) to be
+     *        filled with the specified value
+     * @param val the value to be stored in all elements of the array
+     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
+     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
+     *         <tt>toIndex &gt; a.length</tt>
+     * @throws ArrayStoreException if the specified value is not of a
+     *         runtime type that can be stored in the specified array
+     */
+    public static void fill(Object[] a, int fromIndex, int toIndex, Object val) {
+        rangeCheck(a.length, fromIndex, toIndex);
+        for (int i = fromIndex; i < toIndex; i++)
+            a[i] = val;
+    }
+
+    // Cloning
+
+    /**
+     * Copies the specified array, truncating or padding with nulls (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>null</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     * The resulting array is of exactly the same class as the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with nulls
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static <T> T[] copyOf(T[] original, int newLength) {
+        return (T[]) copyOf(original, newLength, original.getClass());
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with nulls (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>null</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     * The resulting array is of the class <tt>newType</tt>.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @param newType the class of the copy to be returned
+     * @return a copy of the original array, truncated or padded with nulls
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @throws ArrayStoreException if an element copied from
+     *     <tt>original</tt> is not of a runtime type that can be stored in
+     *     an array of class <tt>newType</tt>
+     * @since 1.6
+     */
+    public static <T,U> T[] copyOf(U[] original, int newLength, Class<? extends T[]> newType) {
+        T[] copy = ((Object)newType == (Object)Object[].class)
+            ? (T[]) new Object[newLength]
+            : (T[]) Array.newInstance(newType.getComponentType(), newLength);
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with zeros (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>(byte)0</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with zeros
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static byte[] copyOf(byte[] original, int newLength) {
+        byte[] copy = new byte[newLength];
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with zeros (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>(short)0</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with zeros
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static short[] copyOf(short[] original, int newLength) {
+        short[] copy = new short[newLength];
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with zeros (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>0</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with zeros
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static int[] copyOf(int[] original, int newLength) {
+        int[] copy = new int[newLength];
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with zeros (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>0L</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with zeros
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static long[] copyOf(long[] original, int newLength) {
+        long[] copy = new long[newLength];
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with null characters (if necessary)
+     * so the copy has the specified length.  For all indices that are valid
+     * in both the original array and the copy, the two arrays will contain
+     * identical values.  For any indices that are valid in the copy but not
+     * the original, the copy will contain <tt>'\\u000'</tt>.  Such indices
+     * will exist if and only if the specified length is greater than that of
+     * the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with null characters
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static char[] copyOf(char[] original, int newLength) {
+        char[] copy = new char[newLength];
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with zeros (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>0f</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with zeros
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static float[] copyOf(float[] original, int newLength) {
+        float[] copy = new float[newLength];
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with zeros (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>0d</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with zeros
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static double[] copyOf(double[] original, int newLength) {
+        double[] copy = new double[newLength];
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified array, truncating or padding with <tt>false</tt> (if necessary)
+     * so the copy has the specified length.  For all indices that are
+     * valid in both the original array and the copy, the two arrays will
+     * contain identical values.  For any indices that are valid in the
+     * copy but not the original, the copy will contain <tt>false</tt>.
+     * Such indices will exist if and only if the specified length
+     * is greater than that of the original array.
+     *
+     * @param original the array to be copied
+     * @param newLength the length of the copy to be returned
+     * @return a copy of the original array, truncated or padded with false elements
+     *     to obtain the specified length
+     * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static boolean[] copyOf(boolean[] original, int newLength) {
+        boolean[] copy = new boolean[newLength];
+        System.arraycopy(original, 0, copy, 0,
+                         Math.min(original.length, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>null</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     * <p>
+     * The resulting array is of exactly the same class as the original array.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with nulls to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static <T> T[] copyOfRange(T[] original, int from, int to) {
+        return copyOfRange(original, from, to, (Class<T[]>) original.getClass());
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>null</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     * The resulting array is of the class <tt>newType</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @param newType the class of the copy to be returned
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with nulls to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @throws ArrayStoreException if an element copied from
+     *     <tt>original</tt> is not of a runtime type that can be stored in
+     *     an array of class <tt>newType</tt>.
+     * @since 1.6
+     */
+    public static <T,U> T[] copyOfRange(U[] original, int from, int to, Class<? extends T[]> newType) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        T[] copy = ((Object)newType == (Object)Object[].class)
+            ? (T[]) new Object[newLength]
+            : (T[]) Array.newInstance(newType.getComponentType(), newLength);
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>(byte)0</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with zeros to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static byte[] copyOfRange(byte[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        byte[] copy = new byte[newLength];
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>(short)0</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with zeros to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static short[] copyOfRange(short[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        short[] copy = new short[newLength];
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>0</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with zeros to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static int[] copyOfRange(int[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        int[] copy = new int[newLength];
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>0L</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with zeros to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static long[] copyOfRange(long[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        long[] copy = new long[newLength];
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>'\\u000'</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with null characters to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static char[] copyOfRange(char[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        char[] copy = new char[newLength];
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>0f</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with zeros to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static float[] copyOfRange(float[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        float[] copy = new float[newLength];
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>0d</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with zeros to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static double[] copyOfRange(double[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        double[] copy = new double[newLength];
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    /**
+     * Copies the specified range of the specified array into a new array.
+     * The initial index of the range (<tt>from</tt>) must lie between zero
+     * and <tt>original.length</tt>, inclusive.  The value at
+     * <tt>original[from]</tt> is placed into the initial element of the copy
+     * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+     * Values from subsequent elements in the original array are placed into
+     * subsequent elements in the copy.  The final index of the range
+     * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
+     * may be greater than <tt>original.length</tt>, in which case
+     * <tt>false</tt> is placed in all elements of the copy whose index is
+     * greater than or equal to <tt>original.length - from</tt>.  The length
+     * of the returned array will be <tt>to - from</tt>.
+     *
+     * @param original the array from which a range is to be copied
+     * @param from the initial index of the range to be copied, inclusive
+     * @param to the final index of the range to be copied, exclusive.
+     *     (This index may lie outside the array.)
+     * @return a new array containing the specified range from the original array,
+     *     truncated or padded with false elements to obtain the required length
+     * @throws ArrayIndexOutOfBoundsException if {@code from < 0}
+     *     or {@code from > original.length}
+     * @throws IllegalArgumentException if <tt>from &gt; to</tt>
+     * @throws NullPointerException if <tt>original</tt> is null
+     * @since 1.6
+     */
+    public static boolean[] copyOfRange(boolean[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0)
+            throw new IllegalArgumentException(from + " > " + to);
+        boolean[] copy = new boolean[newLength];
+        System.arraycopy(original, from, copy, 0,
+                         Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    // Misc
+
+    /**
+     * Returns a fixed-size list backed by the specified array.  (Changes to
+     * the returned list "write through" to the array.)  This method acts
+     * as bridge between array-based and collection-based APIs, in
+     * combination with {@link Collection#toArray}.  The returned list is
+     * serializable and implements {@link RandomAccess}.
+     *
+     * <p>This method also provides a convenient way to create a fixed-size
+     * list initialized to contain several elements:
+     * <pre>
+     *     List&lt;String&gt; stooges = Arrays.asList("Larry", "Moe", "Curly");
+     * </pre>
+     *
+     * @param a the array by which the list will be backed
+     * @return a list view of the specified array
+     */
+    @SafeVarargs
+    public static <T> List<T> asList(T... a) {
+        return new ArrayList<>(a);
+    }
+
+    /**
+     * @serial include
+     */
+    private static class ArrayList<E> extends AbstractList<E>
+        implements RandomAccess, java.io.Serializable
+    {
+        private static final long serialVersionUID = -2764017481108945198L;
+        private final E[] a;
+
+        ArrayList(E[] array) {
+            if (array==null)
+                throw new NullPointerException();
+            a = array;
+        }
+
+        public int size() {
+            return a.length;
+        }
+
+        public Object[] toArray() {
+            return a.clone();
+        }
+
+        public <T> T[] toArray(T[] a) {
+            int size = size();
+            if (a.length < size)
+                return Arrays.copyOf(this.a, size,
+                                     (Class<? extends T[]>) a.getClass());
+            System.arraycopy(this.a, 0, a, 0, size);
+            if (a.length > size)
+                a[size] = null;
+            return a;
+        }
+
+        public E get(int index) {
+            return a[index];
+        }
+
+        public E set(int index, E element) {
+            E oldValue = a[index];
+            a[index] = element;
+            return oldValue;
+        }
+
+        public int indexOf(Object o) {
+            if (o==null) {
+                for (int i=0; i<a.length; i++)
+                    if (a[i]==null)
+                        return i;
+            } else {
+                for (int i=0; i<a.length; i++)
+                    if (o.equals(a[i]))
+                        return i;
+            }
+            return -1;
+        }
+
+        public boolean contains(Object o) {
+            return indexOf(o) != -1;
+        }
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.
+     * For any two <tt>long</tt> arrays <tt>a</tt> and <tt>b</tt>
+     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is the same value that would be
+     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+     * method on a {@link List} containing a sequence of {@link Long}
+     * instances representing the elements of <tt>a</tt> in the same order.
+     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+     *
+     * @param a the array whose hash value to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @since 1.5
+     */
+    public static int hashCode(long a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+        for (long element : a) {
+            int elementHash = (int)(element ^ (element >>> 32));
+            result = 31 * result + elementHash;
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.
+     * For any two non-null <tt>int</tt> arrays <tt>a</tt> and <tt>b</tt>
+     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is the same value that would be
+     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+     * method on a {@link List} containing a sequence of {@link Integer}
+     * instances representing the elements of <tt>a</tt> in the same order.
+     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+     *
+     * @param a the array whose hash value to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @since 1.5
+     */
+    public static int hashCode(int a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+        for (int element : a)
+            result = 31 * result + element;
+
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.
+     * For any two <tt>short</tt> arrays <tt>a</tt> and <tt>b</tt>
+     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is the same value that would be
+     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+     * method on a {@link List} containing a sequence of {@link Short}
+     * instances representing the elements of <tt>a</tt> in the same order.
+     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+     *
+     * @param a the array whose hash value to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @since 1.5
+     */
+    public static int hashCode(short a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+        for (short element : a)
+            result = 31 * result + element;
+
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.
+     * For any two <tt>char</tt> arrays <tt>a</tt> and <tt>b</tt>
+     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is the same value that would be
+     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+     * method on a {@link List} containing a sequence of {@link Character}
+     * instances representing the elements of <tt>a</tt> in the same order.
+     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+     *
+     * @param a the array whose hash value to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @since 1.5
+     */
+    public static int hashCode(char a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+        for (char element : a)
+            result = 31 * result + element;
+
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.
+     * For any two <tt>byte</tt> arrays <tt>a</tt> and <tt>b</tt>
+     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is the same value that would be
+     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+     * method on a {@link List} containing a sequence of {@link Byte}
+     * instances representing the elements of <tt>a</tt> in the same order.
+     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+     *
+     * @param a the array whose hash value to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @since 1.5
+     */
+    public static int hashCode(byte a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+        for (byte element : a)
+            result = 31 * result + element;
+
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.
+     * For any two <tt>boolean</tt> arrays <tt>a</tt> and <tt>b</tt>
+     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is the same value that would be
+     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+     * method on a {@link List} containing a sequence of {@link Boolean}
+     * instances representing the elements of <tt>a</tt> in the same order.
+     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+     *
+     * @param a the array whose hash value to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @since 1.5
+     */
+    public static int hashCode(boolean a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+        for (boolean element : a)
+            result = 31 * result + (element ? 1231 : 1237);
+
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.
+     * For any two <tt>float</tt> arrays <tt>a</tt> and <tt>b</tt>
+     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is the same value that would be
+     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+     * method on a {@link List} containing a sequence of {@link Float}
+     * instances representing the elements of <tt>a</tt> in the same order.
+     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+     *
+     * @param a the array whose hash value to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @since 1.5
+     */
+    public static int hashCode(float a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+        for (float element : a)
+            result = 31 * result + Float.floatToIntBits(element);
+
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.
+     * For any two <tt>double</tt> arrays <tt>a</tt> and <tt>b</tt>
+     * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is the same value that would be
+     * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+     * method on a {@link List} containing a sequence of {@link Double}
+     * instances representing the elements of <tt>a</tt> in the same order.
+     * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+     *
+     * @param a the array whose hash value to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @since 1.5
+     */
+    public static int hashCode(double a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+        for (double element : a) {
+            long bits = Double.doubleToLongBits(element);
+            result = 31 * result + (int)(bits ^ (bits >>> 32));
+        }
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the contents of the specified array.  If
+     * the array contains other arrays as elements, the hash code is based on
+     * their identities rather than their contents.  It is therefore
+     * acceptable to invoke this method on an array that contains itself as an
+     * element,  either directly or indirectly through one or more levels of
+     * arrays.
+     *
+     * <p>For any two arrays <tt>a</tt> and <tt>b</tt> such that
+     * <tt>Arrays.equals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+     *
+     * <p>The value returned by this method is equal to the value that would
+     * be returned by <tt>Arrays.asList(a).hashCode()</tt>, unless <tt>a</tt>
+     * is <tt>null</tt>, in which case <tt>0</tt> is returned.
+     *
+     * @param a the array whose content-based hash code to compute
+     * @return a content-based hash code for <tt>a</tt>
+     * @see #deepHashCode(Object[])
+     * @since 1.5
+     */
+    public static int hashCode(Object a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+
+        for (Object element : a)
+            result = 31 * result + (element == null ? 0 : element.hashCode());
+
+        return result;
+    }
+
+    /**
+     * Returns a hash code based on the "deep contents" of the specified
+     * array.  If the array contains other arrays as elements, the
+     * hash code is based on their contents and so on, ad infinitum.
+     * It is therefore unacceptable to invoke this method on an array that
+     * contains itself as an element, either directly or indirectly through
+     * one or more levels of arrays.  The behavior of such an invocation is
+     * undefined.
+     *
+     * <p>For any two arrays <tt>a</tt> and <tt>b</tt> such that
+     * <tt>Arrays.deepEquals(a, b)</tt>, it is also the case that
+     * <tt>Arrays.deepHashCode(a) == Arrays.deepHashCode(b)</tt>.
+     *
+     * <p>The computation of the value returned by this method is similar to
+     * that of the value returned by {@link List#hashCode()} on a list
+     * containing the same elements as <tt>a</tt> in the same order, with one
+     * difference: If an element <tt>e</tt> of <tt>a</tt> is itself an array,
+     * its hash code is computed not by calling <tt>e.hashCode()</tt>, but as
+     * by calling the appropriate overloading of <tt>Arrays.hashCode(e)</tt>
+     * if <tt>e</tt> is an array of a primitive type, or as by calling
+     * <tt>Arrays.deepHashCode(e)</tt> recursively if <tt>e</tt> is an array
+     * of a reference type.  If <tt>a</tt> is <tt>null</tt>, this method
+     * returns 0.
+     *
+     * @param a the array whose deep-content-based hash code to compute
+     * @return a deep-content-based hash code for <tt>a</tt>
+     * @see #hashCode(Object[])
+     * @since 1.5
+     */
+    public static int deepHashCode(Object a[]) {
+        if (a == null)
+            return 0;
+
+        int result = 1;
+
+        for (Object element : a) {
+            int elementHash = 0;
+            if (element instanceof Object[])
+                elementHash = deepHashCode((Object[]) element);
+            else if (element instanceof byte[])
+                elementHash = hashCode((byte[]) element);
+            else if (element instanceof short[])
+                elementHash = hashCode((short[]) element);
+            else if (element instanceof int[])
+                elementHash = hashCode((int[]) element);
+            else if (element instanceof long[])
+                elementHash = hashCode((long[]) element);
+            else if (element instanceof char[])
+                elementHash = hashCode((char[]) element);
+            else if (element instanceof float[])
+                elementHash = hashCode((float[]) element);
+            else if (element instanceof double[])
+                elementHash = hashCode((double[]) element);
+            else if (element instanceof boolean[])
+                elementHash = hashCode((boolean[]) element);
+            else if (element != null)
+                elementHash = element.hashCode();
+
+            result = 31 * result + elementHash;
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns <tt>true</tt> if the two specified arrays are <i>deeply
+     * equal</i> to one another.  Unlike the {@link #equals(Object[],Object[])}
+     * method, this method is appropriate for use with nested arrays of
+     * arbitrary depth.
+     *
+     * <p>Two array references are considered deeply equal if both
+     * are <tt>null</tt>, or if they refer to arrays that contain the same
+     * number of elements and all corresponding pairs of elements in the two
+     * arrays are deeply equal.
+     *
+     * <p>Two possibly <tt>null</tt> elements <tt>e1</tt> and <tt>e2</tt> are
+     * deeply equal if any of the following conditions hold:
+     * <ul>
+     *    <li> <tt>e1</tt> and <tt>e2</tt> are both arrays of object reference
+     *         types, and <tt>Arrays.deepEquals(e1, e2) would return true</tt>
+     *    <li> <tt>e1</tt> and <tt>e2</tt> are arrays of the same primitive
+     *         type, and the appropriate overloading of
+     *         <tt>Arrays.equals(e1, e2)</tt> would return true.
+     *    <li> <tt>e1 == e2</tt>
+     *    <li> <tt>e1.equals(e2)</tt> would return true.
+     * </ul>
+     * Note that this definition permits <tt>null</tt> elements at any depth.
+     *
+     * <p>If either of the specified arrays contain themselves as elements
+     * either directly or indirectly through one or more levels of arrays,
+     * the behavior of this method is undefined.
+     *
+     * @param a1 one array to be tested for equality
+     * @param a2 the other array to be tested for equality
+     * @return <tt>true</tt> if the two arrays are equal
+     * @see #equals(Object[],Object[])
+     * @see Objects#deepEquals(Object, Object)
+     * @since 1.5
+     */
+    public static boolean deepEquals(Object[] a1, Object[] a2) {
+        if (a1 == a2)
+            return true;
+        if (a1 == null || a2==null)
+            return false;
+        int length = a1.length;
+        if (a2.length != length)
+            return false;
+
+        for (int i = 0; i < length; i++) {
+            Object e1 = a1[i];
+            Object e2 = a2[i];
+
+            if (e1 == e2)
+                continue;
+            if (e1 == null)
+                return false;
+
+            // Figure out whether the two elements are equal
+            boolean eq = deepEquals0(e1, e2);
+
+            if (!eq)
+                return false;
+        }
+        return true;
+    }
+
+    static boolean deepEquals0(Object e1, Object e2) {
+        assert e1 != null;
+        boolean eq;
+        if (e1 instanceof Object[] && e2 instanceof Object[])
+            eq = deepEquals ((Object[]) e1, (Object[]) e2);
+        else if (e1 instanceof byte[] && e2 instanceof byte[])
+            eq = equals((byte[]) e1, (byte[]) e2);
+        else if (e1 instanceof short[] && e2 instanceof short[])
+            eq = equals((short[]) e1, (short[]) e2);
+        else if (e1 instanceof int[] && e2 instanceof int[])
+            eq = equals((int[]) e1, (int[]) e2);
+        else if (e1 instanceof long[] && e2 instanceof long[])
+            eq = equals((long[]) e1, (long[]) e2);
+        else if (e1 instanceof char[] && e2 instanceof char[])
+            eq = equals((char[]) e1, (char[]) e2);
+        else if (e1 instanceof float[] && e2 instanceof float[])
+            eq = equals((float[]) e1, (float[]) e2);
+        else if (e1 instanceof double[] && e2 instanceof double[])
+            eq = equals((double[]) e1, (double[]) e2);
+        else if (e1 instanceof boolean[] && e2 instanceof boolean[])
+            eq = equals((boolean[]) e1, (boolean[]) e2);
+        else
+            eq = e1.equals(e2);
+        return eq;
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * The string representation consists of a list of the array's elements,
+     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
+     * separated by the characters <tt>", "</tt> (a comma followed by a
+     * space).  Elements are converted to strings as by
+     * <tt>String.valueOf(long)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
+     * is <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @since 1.5
+     */
+    public static String toString(long[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * The string representation consists of a list of the array's elements,
+     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
+     * separated by the characters <tt>", "</tt> (a comma followed by a
+     * space).  Elements are converted to strings as by
+     * <tt>String.valueOf(int)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt> is
+     * <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @since 1.5
+     */
+    public static String toString(int[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * The string representation consists of a list of the array's elements,
+     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
+     * separated by the characters <tt>", "</tt> (a comma followed by a
+     * space).  Elements are converted to strings as by
+     * <tt>String.valueOf(short)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
+     * is <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @since 1.5
+     */
+    public static String toString(short[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * The string representation consists of a list of the array's elements,
+     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
+     * separated by the characters <tt>", "</tt> (a comma followed by a
+     * space).  Elements are converted to strings as by
+     * <tt>String.valueOf(char)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
+     * is <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @since 1.5
+     */
+    public static String toString(char[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * The string representation consists of a list of the array's elements,
+     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements
+     * are separated by the characters <tt>", "</tt> (a comma followed
+     * by a space).  Elements are converted to strings as by
+     * <tt>String.valueOf(byte)</tt>.  Returns <tt>"null"</tt> if
+     * <tt>a</tt> is <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @since 1.5
+     */
+    public static String toString(byte[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * The string representation consists of a list of the array's elements,
+     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
+     * separated by the characters <tt>", "</tt> (a comma followed by a
+     * space).  Elements are converted to strings as by
+     * <tt>String.valueOf(boolean)</tt>.  Returns <tt>"null"</tt> if
+     * <tt>a</tt> is <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @since 1.5
+     */
+    public static String toString(boolean[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * The string representation consists of a list of the array's elements,
+     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
+     * separated by the characters <tt>", "</tt> (a comma followed by a
+     * space).  Elements are converted to strings as by
+     * <tt>String.valueOf(float)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
+     * is <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @since 1.5
+     */
+    public static String toString(float[] a) {
+        if (a == null)
+            return "null";
+
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * The string representation consists of a list of the array's elements,
+     * enclosed in square brackets (<tt>"[]"</tt>).  Adjacent elements are
+     * separated by the characters <tt>", "</tt> (a comma followed by a
+     * space).  Elements are converted to strings as by
+     * <tt>String.valueOf(double)</tt>.  Returns <tt>"null"</tt> if <tt>a</tt>
+     * is <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @since 1.5
+     */
+    public static String toString(double[] a) {
+        if (a == null)
+            return "null";
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(a[i]);
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the contents of the specified array.
+     * If the array contains other arrays as elements, they are converted to
+     * strings by the {@link Object#toString} method inherited from
+     * <tt>Object</tt>, which describes their <i>identities</i> rather than
+     * their contents.
+     *
+     * <p>The value returned by this method is equal to the value that would
+     * be returned by <tt>Arrays.asList(a).toString()</tt>, unless <tt>a</tt>
+     * is <tt>null</tt>, in which case <tt>"null"</tt> is returned.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @see #deepToString(Object[])
+     * @since 1.5
+     */
+    public static String toString(Object[] a) {
+        if (a == null)
+            return "null";
+
+        int iMax = a.length - 1;
+        if (iMax == -1)
+            return "[]";
+
+        StringBuilder b = new StringBuilder();
+        b.append('[');
+        for (int i = 0; ; i++) {
+            b.append(String.valueOf(a[i]));
+            if (i == iMax)
+                return b.append(']').toString();
+            b.append(", ");
+        }
+    }
+
+    /**
+     * Returns a string representation of the "deep contents" of the specified
+     * array.  If the array contains other arrays as elements, the string
+     * representation contains their contents and so on.  This method is
+     * designed for converting multidimensional arrays to strings.
+     *
+     * <p>The string representation consists of a list of the array's
+     * elements, enclosed in square brackets (<tt>"[]"</tt>).  Adjacent
+     * elements are separated by the characters <tt>", "</tt> (a comma
+     * followed by a space).  Elements are converted to strings as by
+     * <tt>String.valueOf(Object)</tt>, unless they are themselves
+     * arrays.
+     *
+     * <p>If an element <tt>e</tt> is an array of a primitive type, it is
+     * converted to a string as by invoking the appropriate overloading of
+     * <tt>Arrays.toString(e)</tt>.  If an element <tt>e</tt> is an array of a
+     * reference type, it is converted to a string as by invoking
+     * this method recursively.
+     *
+     * <p>To avoid infinite recursion, if the specified array contains itself
+     * as an element, or contains an indirect reference to itself through one
+     * or more levels of arrays, the self-reference is converted to the string
+     * <tt>"[...]"</tt>.  For example, an array containing only a reference
+     * to itself would be rendered as <tt>"[[...]]"</tt>.
+     *
+     * <p>This method returns <tt>"null"</tt> if the specified array
+     * is <tt>null</tt>.
+     *
+     * @param a the array whose string representation to return
+     * @return a string representation of <tt>a</tt>
+     * @see #toString(Object[])
+     * @since 1.5
+     */
+    public static String deepToString(Object[] a) {
+        if (a == null)
+            return "null";
+
+        int bufLen = 20 * a.length;
+        if (a.length != 0 && bufLen <= 0)
+            bufLen = Integer.MAX_VALUE;
+        StringBuilder buf = new StringBuilder(bufLen);
+        deepToString(a, buf, new HashSet<Object[]>());
+        return buf.toString();
+    }
+
+    private static void deepToString(Object[] a, StringBuilder buf,
+                                     Set<Object[]> dejaVu) {
+        if (a == null) {
+            buf.append("null");
+            return;
+        }
+        int iMax = a.length - 1;
+        if (iMax == -1) {
+            buf.append("[]");
+            return;
+        }
+
+        dejaVu.add(a);
+        buf.append('[');
+        for (int i = 0; ; i++) {
+
+            Object element = a[i];
+            if (element == null) {
+                buf.append("null");
+            } else {
+                Class eClass = element.getClass();
+
+                if (eClass.isArray()) {
+                    if (eClass == byte[].class)
+                        buf.append(toString((byte[]) element));
+                    else if (eClass == short[].class)
+                        buf.append(toString((short[]) element));
+                    else if (eClass == int[].class)
+                        buf.append(toString((int[]) element));
+                    else if (eClass == long[].class)
+                        buf.append(toString((long[]) element));
+                    else if (eClass == char[].class)
+                        buf.append(toString((char[]) element));
+                    else if (eClass == float[].class)
+                        buf.append(toString((float[]) element));
+                    else if (eClass == double[].class)
+                        buf.append(toString((double[]) element));
+                    else if (eClass == boolean[].class)
+                        buf.append(toString((boolean[]) element));
+                    else { // element is an array of object references
+                        if (dejaVu.contains(element))
+                            buf.append("[...]");
+                        else
+                            deepToString((Object[])element, buf, dejaVu);
+                    }
+                } else {  // element is non-null and not an array
+                    buf.append(element.toString());
+                }
+            }
+            if (i == iMax)
+                break;
+            buf.append(", ");
+        }
+        buf.append(']');
+        dejaVu.remove(a);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Collection.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Collection.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,456 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * The root interface in the <i>collection hierarchy</i>.  A collection
+ * represents a group of objects, known as its <i>elements</i>.  Some
+ * collections allow duplicate elements and others do not.  Some are ordered
+ * and others unordered.  The JDK does not provide any <i>direct</i>
+ * implementations of this interface: it provides implementations of more
+ * specific subinterfaces like <tt>Set</tt> and <tt>List</tt>.  This interface
+ * is typically used to pass collections around and manipulate them where
+ * maximum generality is desired.
+ *
+ * <p><i>Bags</i> or <i>multisets</i> (unordered collections that may contain
+ * duplicate elements) should implement this interface directly.
+ *
+ * <p>All general-purpose <tt>Collection</tt> implementation classes (which
+ * typically implement <tt>Collection</tt> indirectly through one of its
+ * subinterfaces) should provide two "standard" constructors: a void (no
+ * arguments) constructor, which creates an empty collection, and a
+ * constructor with a single argument of type <tt>Collection</tt>, which
+ * creates a new collection with the same elements as its argument.  In
+ * effect, the latter constructor allows the user to copy any collection,
+ * producing an equivalent collection of the desired implementation type.
+ * There is no way to enforce this convention (as interfaces cannot contain
+ * constructors) but all of the general-purpose <tt>Collection</tt>
+ * implementations in the Java platform libraries comply.
+ *
+ * <p>The "destructive" methods contained in this interface, that is, the
+ * methods that modify the collection on which they operate, are specified to
+ * throw <tt>UnsupportedOperationException</tt> if this collection does not
+ * support the operation.  If this is the case, these methods may, but are not
+ * required to, throw an <tt>UnsupportedOperationException</tt> if the
+ * invocation would have no effect on the collection.  For example, invoking
+ * the {@link #addAll(Collection)} method on an unmodifiable collection may,
+ * but is not required to, throw the exception if the collection to be added
+ * is empty.
+ *
+ * <p><a name="optional-restrictions"/>
+ * Some collection implementations have restrictions on the elements that
+ * they may contain.  For example, some implementations prohibit null elements,
+ * and some have restrictions on the types of their elements.  Attempting to
+ * add an ineligible element throws an unchecked exception, typically
+ * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.  Attempting
+ * to query the presence of an ineligible element may throw an exception,
+ * or it may simply return false; some implementations will exhibit the former
+ * behavior and some will exhibit the latter.  More generally, attempting an
+ * operation on an ineligible element whose completion would not result in
+ * the insertion of an ineligible element into the collection may throw an
+ * exception or it may succeed, at the option of the implementation.
+ * Such exceptions are marked as "optional" in the specification for this
+ * interface.
+ *
+ * <p>It is up to each collection to determine its own synchronization
+ * policy.  In the absence of a stronger guarantee by the
+ * implementation, undefined behavior may result from the invocation
+ * of any method on a collection that is being mutated by another
+ * thread; this includes direct invocations, passing the collection to
+ * a method that might perform invocations, and using an existing
+ * iterator to examine the collection.
+ *
+ * <p>Many methods in Collections Framework interfaces are defined in
+ * terms of the {@link Object#equals(Object) equals} method.  For example,
+ * the specification for the {@link #contains(Object) contains(Object o)}
+ * method says: "returns <tt>true</tt> if and only if this collection
+ * contains at least one element <tt>e</tt> such that
+ * <tt>(o==null ? e==null : o.equals(e))</tt>."  This specification should
+ * <i>not</i> be construed to imply that invoking <tt>Collection.contains</tt>
+ * with a non-null argument <tt>o</tt> will cause <tt>o.equals(e)</tt> to be
+ * invoked for any element <tt>e</tt>.  Implementations are free to implement
+ * optimizations whereby the <tt>equals</tt> invocation is avoided, for
+ * example, by first comparing the hash codes of the two elements.  (The
+ * {@link Object#hashCode()} specification guarantees that two objects with
+ * unequal hash codes cannot be equal.)  More generally, implementations of
+ * the various Collections Framework interfaces are free to take advantage of
+ * the specified behavior of underlying {@link Object} methods wherever the
+ * implementor deems it appropriate.
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <E> the type of elements in this collection
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see     Set
+ * @see     List
+ * @see     Map
+ * @see     SortedSet
+ * @see     SortedMap
+ * @see     HashSet
+ * @see     TreeSet
+ * @see     ArrayList
+ * @see     LinkedList
+ * @see     Vector
+ * @see     Collections
+ * @see     Arrays
+ * @see     AbstractCollection
+ * @since 1.2
+ */
+
+public interface Collection<E> extends Iterable<E> {
+    // Query Operations
+
+    /**
+     * Returns the number of elements in this collection.  If this collection
+     * contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
+     * <tt>Integer.MAX_VALUE</tt>.
+     *
+     * @return the number of elements in this collection
+     */
+    int size();
+
+    /**
+     * Returns <tt>true</tt> if this collection contains no elements.
+     *
+     * @return <tt>true</tt> if this collection contains no elements
+     */
+    boolean isEmpty();
+
+    /**
+     * Returns <tt>true</tt> if this collection contains the specified element.
+     * More formally, returns <tt>true</tt> if and only if this collection
+     * contains at least one element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     *
+     * @param o element whose presence in this collection is to be tested
+     * @return <tt>true</tt> if this collection contains the specified
+     *         element
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this collection
+     *         (<a href="#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         collection does not permit null elements
+     *         (<a href="#optional-restrictions">optional</a>)
+     */
+    boolean contains(Object o);
+
+    /**
+     * Returns an iterator over the elements in this collection.  There are no
+     * guarantees concerning the order in which the elements are returned
+     * (unless this collection is an instance of some class that provides a
+     * guarantee).
+     *
+     * @return an <tt>Iterator</tt> over the elements in this collection
+     */
+    Iterator<E> iterator();
+
+    /**
+     * Returns an array containing all of the elements in this collection.
+     * If this collection makes any guarantees as to what order its elements
+     * are returned by its iterator, this method must return the elements in
+     * the same order.
+     *
+     * <p>The returned array will be "safe" in that no references to it are
+     * maintained by this collection.  (In other words, this method must
+     * allocate a new array even if this collection is backed by an array).
+     * The caller is thus free to modify the returned array.
+     *
+     * <p>This method acts as bridge between array-based and collection-based
+     * APIs.
+     *
+     * @return an array containing all of the elements in this collection
+     */
+    Object[] toArray();
+
+    /**
+     * Returns an array containing all of the elements in this collection;
+     * the runtime type of the returned array is that of the specified array.
+     * If the collection fits in the specified array, it is returned therein.
+     * Otherwise, a new array is allocated with the runtime type of the
+     * specified array and the size of this collection.
+     *
+     * <p>If this collection fits in the specified array with room to spare
+     * (i.e., the array has more elements than this collection), the element
+     * in the array immediately following the end of the collection is set to
+     * <tt>null</tt>.  (This is useful in determining the length of this
+     * collection <i>only</i> if the caller knows that this collection does
+     * not contain any <tt>null</tt> elements.)
+     *
+     * <p>If this collection makes any guarantees as to what order its elements
+     * are returned by its iterator, this method must return the elements in
+     * the same order.
+     *
+     * <p>Like the {@link #toArray()} method, this method acts as bridge between
+     * array-based and collection-based APIs.  Further, this method allows
+     * precise control over the runtime type of the output array, and may,
+     * under certain circumstances, be used to save allocation costs.
+     *
+     * <p>Suppose <tt>x</tt> is a collection known to contain only strings.
+     * The following code can be used to dump the collection into a newly
+     * allocated array of <tt>String</tt>:
+     *
+     * <pre>
+     *     String[] y = x.toArray(new String[0]);</pre>
+     *
+     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
+     * <tt>toArray()</tt>.
+     *
+     * @param a the array into which the elements of this collection are to be
+     *        stored, if it is big enough; otherwise, a new array of the same
+     *        runtime type is allocated for this purpose.
+     * @return an array containing all of the elements in this collection
+     * @throws ArrayStoreException if the runtime type of the specified array
+     *         is not a supertype of the runtime type of every element in
+     *         this collection
+     * @throws NullPointerException if the specified array is null
+     */
+    <T> T[] toArray(T[] a);
+
+    // Modification Operations
+
+    /**
+     * Ensures that this collection contains the specified element (optional
+     * operation).  Returns <tt>true</tt> if this collection changed as a
+     * result of the call.  (Returns <tt>false</tt> if this collection does
+     * not permit duplicates and already contains the specified element.)<p>
+     *
+     * Collections that support this operation may place limitations on what
+     * elements may be added to this collection.  In particular, some
+     * collections will refuse to add <tt>null</tt> elements, and others will
+     * impose restrictions on the type of elements that may be added.
+     * Collection classes should clearly specify in their documentation any
+     * restrictions on what elements may be added.<p>
+     *
+     * If a collection refuses to add a particular element for any reason
+     * other than that it already contains the element, it <i>must</i> throw
+     * an exception (rather than returning <tt>false</tt>).  This preserves
+     * the invariant that a collection always contains the specified element
+     * after this call returns.
+     *
+     * @param e element whose presence in this collection is to be ensured
+     * @return <tt>true</tt> if this collection changed as a result of the
+     *         call
+     * @throws UnsupportedOperationException if the <tt>add</tt> operation
+     *         is not supported by this collection
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this collection
+     * @throws NullPointerException if the specified element is null and this
+     *         collection does not permit null elements
+     * @throws IllegalArgumentException if some property of the element
+     *         prevents it from being added to this collection
+     * @throws IllegalStateException if the element cannot be added at this
+     *         time due to insertion restrictions
+     */
+    boolean add(E e);
+
+    /**
+     * Removes a single instance of the specified element from this
+     * collection, if it is present (optional operation).  More formally,
+     * removes an element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>, if
+     * this collection contains one or more such elements.  Returns
+     * <tt>true</tt> if this collection contained the specified element (or
+     * equivalently, if this collection changed as a result of the call).
+     *
+     * @param o element to be removed from this collection, if present
+     * @return <tt>true</tt> if an element was removed as a result of this call
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this collection
+     *         (<a href="#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         collection does not permit null elements
+     *         (<a href="#optional-restrictions">optional</a>)
+     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+     *         is not supported by this collection
+     */
+    boolean remove(Object o);
+
+
+    // Bulk Operations
+
+    /**
+     * Returns <tt>true</tt> if this collection contains all of the elements
+     * in the specified collection.
+     *
+     * @param  c collection to be checked for containment in this collection
+     * @return <tt>true</tt> if this collection contains all of the elements
+     *         in the specified collection
+     * @throws ClassCastException if the types of one or more elements
+     *         in the specified collection are incompatible with this
+     *         collection
+     *         (<a href="#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified collection contains one
+     *         or more null elements and this collection does not permit null
+     *         elements
+     *         (<a href="#optional-restrictions">optional</a>),
+     *         or if the specified collection is null.
+     * @see    #contains(Object)
+     */
+    boolean containsAll(Collection<?> c);
+
+    /**
+     * Adds all of the elements in the specified collection to this collection
+     * (optional operation).  The behavior of this operation is undefined if
+     * the specified collection is modified while the operation is in progress.
+     * (This implies that the behavior of this call is undefined if the
+     * specified collection is this collection, and this collection is
+     * nonempty.)
+     *
+     * @param c collection containing elements to be added to this collection
+     * @return <tt>true</tt> if this collection changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
+     *         is not supported by this collection
+     * @throws ClassCastException if the class of an element of the specified
+     *         collection prevents it from being added to this collection
+     * @throws NullPointerException if the specified collection contains a
+     *         null element and this collection does not permit null elements,
+     *         or if the specified collection is null
+     * @throws IllegalArgumentException if some property of an element of the
+     *         specified collection prevents it from being added to this
+     *         collection
+     * @throws IllegalStateException if not all the elements can be added at
+     *         this time due to insertion restrictions
+     * @see #add(Object)
+     */
+    boolean addAll(Collection<? extends E> c);
+
+    /**
+     * Removes all of this collection's elements that are also contained in the
+     * specified collection (optional operation).  After this call returns,
+     * this collection will contain no elements in common with the specified
+     * collection.
+     *
+     * @param c collection containing elements to be removed from this collection
+     * @return <tt>true</tt> if this collection changed as a result of the
+     *         call
+     * @throws UnsupportedOperationException if the <tt>removeAll</tt> method
+     *         is not supported by this collection
+     * @throws ClassCastException if the types of one or more elements
+     *         in this collection are incompatible with the specified
+     *         collection
+     *         (<a href="#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this collection contains one or more
+     *         null elements and the specified collection does not support
+     *         null elements
+     *         (<a href="#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see #remove(Object)
+     * @see #contains(Object)
+     */
+    boolean removeAll(Collection<?> c);
+
+    /**
+     * Retains only the elements in this collection that are contained in the
+     * specified collection (optional operation).  In other words, removes from
+     * this collection all of its elements that are not contained in the
+     * specified collection.
+     *
+     * @param c collection containing elements to be retained in this collection
+     * @return <tt>true</tt> if this collection changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
+     *         is not supported by this collection
+     * @throws ClassCastException if the types of one or more elements
+     *         in this collection are incompatible with the specified
+     *         collection
+     *         (<a href="#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this collection contains one or more
+     *         null elements and the specified collection does not permit null
+     *         elements
+     *         (<a href="#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see #remove(Object)
+     * @see #contains(Object)
+     */
+    boolean retainAll(Collection<?> c);
+
+    /**
+     * Removes all of the elements from this collection (optional operation).
+     * The collection will be empty after this method returns.
+     *
+     * @throws UnsupportedOperationException if the <tt>clear</tt> operation
+     *         is not supported by this collection
+     */
+    void clear();
+
+
+    // Comparison and hashing
+
+    /**
+     * Compares the specified object with this collection for equality. <p>
+     *
+     * While the <tt>Collection</tt> interface adds no stipulations to the
+     * general contract for the <tt>Object.equals</tt>, programmers who
+     * implement the <tt>Collection</tt> interface "directly" (in other words,
+     * create a class that is a <tt>Collection</tt> but is not a <tt>Set</tt>
+     * or a <tt>List</tt>) must exercise care if they choose to override the
+     * <tt>Object.equals</tt>.  It is not necessary to do so, and the simplest
+     * course of action is to rely on <tt>Object</tt>'s implementation, but
+     * the implementor may wish to implement a "value comparison" in place of
+     * the default "reference comparison."  (The <tt>List</tt> and
+     * <tt>Set</tt> interfaces mandate such value comparisons.)<p>
+     *
+     * The general contract for the <tt>Object.equals</tt> method states that
+     * equals must be symmetric (in other words, <tt>a.equals(b)</tt> if and
+     * only if <tt>b.equals(a)</tt>).  The contracts for <tt>List.equals</tt>
+     * and <tt>Set.equals</tt> state that lists are only equal to other lists,
+     * and sets to other sets.  Thus, a custom <tt>equals</tt> method for a
+     * collection class that implements neither the <tt>List</tt> nor
+     * <tt>Set</tt> interface must return <tt>false</tt> when this collection
+     * is compared to any list or set.  (By the same logic, it is not possible
+     * to write a class that correctly implements both the <tt>Set</tt> and
+     * <tt>List</tt> interfaces.)
+     *
+     * @param o object to be compared for equality with this collection
+     * @return <tt>true</tt> if the specified object is equal to this
+     * collection
+     *
+     * @see Object#equals(Object)
+     * @see Set#equals(Object)
+     * @see List#equals(Object)
+     */
+    boolean equals(Object o);
+
+    /**
+     * Returns the hash code value for this collection.  While the
+     * <tt>Collection</tt> interface adds no stipulations to the general
+     * contract for the <tt>Object.hashCode</tt> method, programmers should
+     * take note that any class that overrides the <tt>Object.equals</tt>
+     * method must also override the <tt>Object.hashCode</tt> method in order
+     * to satisfy the general contract for the <tt>Object.hashCode</tt> method.
+     * In particular, <tt>c1.equals(c2)</tt> implies that
+     * <tt>c1.hashCode()==c2.hashCode()</tt>.
+     *
+     * @return the hash code value for this collection
+     *
+     * @see Object#hashCode()
+     * @see Object#equals(Object)
+     */
+    int hashCode();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Collections.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Collections.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,3953 @@
+/*
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+import java.io.Serializable;
+import java.io.IOException;
+import java.lang.reflect.Array;
+
+/**
+ * This class consists exclusively of static methods that operate on or return
+ * collections.  It contains polymorphic algorithms that operate on
+ * collections, "wrappers", which return a new collection backed by a
+ * specified collection, and a few other odds and ends.
+ *
+ * <p>The methods of this class all throw a <tt>NullPointerException</tt>
+ * if the collections or class objects provided to them are null.
+ *
+ * <p>The documentation for the polymorphic algorithms contained in this class
+ * generally includes a brief description of the <i>implementation</i>.  Such
+ * descriptions should be regarded as <i>implementation notes</i>, rather than
+ * parts of the <i>specification</i>.  Implementors should feel free to
+ * substitute other algorithms, so long as the specification itself is adhered
+ * to.  (For example, the algorithm used by <tt>sort</tt> does not have to be
+ * a mergesort, but it does have to be <i>stable</i>.)
+ *
+ * <p>The "destructive" algorithms contained in this class, that is, the
+ * algorithms that modify the collection on which they operate, are specified
+ * to throw <tt>UnsupportedOperationException</tt> if the collection does not
+ * support the appropriate mutation primitive(s), such as the <tt>set</tt>
+ * method.  These algorithms may, but are not required to, throw this
+ * exception if an invocation would have no effect on the collection.  For
+ * example, invoking the <tt>sort</tt> method on an unmodifiable list that is
+ * already sorted may or may not throw <tt>UnsupportedOperationException</tt>.
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see     Collection
+ * @see     Set
+ * @see     List
+ * @see     Map
+ * @since   1.2
+ */
+
+public class Collections {
+    // Suppresses default constructor, ensuring non-instantiability.
+    private Collections() {
+    }
+
+    // Algorithms
+
+    /*
+     * Tuning parameters for algorithms - Many of the List algorithms have
+     * two implementations, one of which is appropriate for RandomAccess
+     * lists, the other for "sequential."  Often, the random access variant
+     * yields better performance on small sequential access lists.  The
+     * tuning parameters below determine the cutoff point for what constitutes
+     * a "small" sequential access list for each algorithm.  The values below
+     * were empirically determined to work well for LinkedList. Hopefully
+     * they should be reasonable for other sequential access List
+     * implementations.  Those doing performance work on this code would
+     * do well to validate the values of these parameters from time to time.
+     * (The first word of each tuning parameter name is the algorithm to which
+     * it applies.)
+     */
+    private static final int BINARYSEARCH_THRESHOLD   = 5000;
+    private static final int REVERSE_THRESHOLD        =   18;
+    private static final int SHUFFLE_THRESHOLD        =    5;
+    private static final int FILL_THRESHOLD           =   25;
+    private static final int ROTATE_THRESHOLD         =  100;
+    private static final int COPY_THRESHOLD           =   10;
+    private static final int REPLACEALL_THRESHOLD     =   11;
+    private static final int INDEXOFSUBLIST_THRESHOLD =   35;
+
+    /**
+     * Sorts the specified list into ascending order, according to the
+     * {@linkplain Comparable natural ordering} of its elements.
+     * All elements in the list must implement the {@link Comparable}
+     * interface.  Furthermore, all elements in the list must be
+     * <i>mutually comparable</i> (that is, {@code e1.compareTo(e2)}
+     * must not throw a {@code ClassCastException} for any elements
+     * {@code e1} and {@code e2} in the list).
+     *
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
+     *
+     * <p>The specified list must be modifiable, but need not be resizable.
+     *
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
+     *
+     * <p>This implementation dumps the specified list into an array, sorts
+     * the array, and iterates over the list resetting each element
+     * from the corresponding position in the array.  This avoids the
+     * n<sup>2</sup> log(n) performance that would result from attempting
+     * to sort a linked list in place.
+     *
+     * @param  list the list to be sorted.
+     * @throws ClassCastException if the list contains elements that are not
+     *         <i>mutually comparable</i> (for example, strings and integers).
+     * @throws UnsupportedOperationException if the specified list's
+     *         list-iterator does not support the {@code set} operation.
+     * @throws IllegalArgumentException (optional) if the implementation
+     *         detects that the natural ordering of the list elements is
+     *         found to violate the {@link Comparable} contract
+     */
+    public static <T extends Comparable<? super T>> void sort(List<T> list) {
+        Object[] a = list.toArray();
+        Arrays.sort(a);
+        ListIterator<T> i = list.listIterator();
+        for (int j=0; j<a.length; j++) {
+            i.next();
+            i.set((T)a[j]);
+        }
+    }
+
+    /**
+     * Sorts the specified list according to the order induced by the
+     * specified comparator.  All elements in the list must be <i>mutually
+     * comparable</i> using the specified comparator (that is,
+     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
+     * for any elements {@code e1} and {@code e2} in the list).
+     *
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
+     *
+     * <p>The specified list must be modifiable, but need not be resizable.
+     *
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
+     *
+     * <p>This implementation dumps the specified list into an array, sorts
+     * the array, and iterates over the list resetting each element
+     * from the corresponding position in the array.  This avoids the
+     * n<sup>2</sup> log(n) performance that would result from attempting
+     * to sort a linked list in place.
+     *
+     * @param  list the list to be sorted.
+     * @param  c the comparator to determine the order of the list.  A
+     *        {@code null} value indicates that the elements' <i>natural
+     *        ordering</i> should be used.
+     * @throws ClassCastException if the list contains elements that are not
+     *         <i>mutually comparable</i> using the specified comparator.
+     * @throws UnsupportedOperationException if the specified list's
+     *         list-iterator does not support the {@code set} operation.
+     * @throws IllegalArgumentException (optional) if the comparator is
+     *         found to violate the {@link Comparator} contract
+     */
+    public static <T> void sort(List<T> list, Comparator<? super T> c) {
+        Object[] a = list.toArray();
+        Arrays.sort(a, (Comparator)c);
+        ListIterator i = list.listIterator();
+        for (int j=0; j<a.length; j++) {
+            i.next();
+            i.set(a[j]);
+        }
+    }
+
+
+    /**
+     * Searches the specified list for the specified object using the binary
+     * search algorithm.  The list must be sorted into ascending order
+     * according to the {@linkplain Comparable natural ordering} of its
+     * elements (as by the {@link #sort(List)} method) prior to making this
+     * call.  If it is not sorted, the results are undefined.  If the list
+     * contains multiple elements equal to the specified object, there is no
+     * guarantee which one will be found.
+     *
+     * <p>This method runs in log(n) time for a "random access" list (which
+     * provides near-constant-time positional access).  If the specified list
+     * does not implement the {@link RandomAccess} interface and is large,
+     * this method will do an iterator-based binary search that performs
+     * O(n) link traversals and O(log n) element comparisons.
+     *
+     * @param  list the list to be searched.
+     * @param  key the key to be searched for.
+     * @return the index of the search key, if it is contained in the list;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the list: the index of the first
+     *         element greater than the key, or <tt>list.size()</tt> if all
+     *         elements in the list are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws ClassCastException if the list contains elements that are not
+     *         <i>mutually comparable</i> (for example, strings and
+     *         integers), or the search key is not mutually comparable
+     *         with the elements of the list.
+     */
+    public static <T>
+    int binarySearch(List<? extends Comparable<? super T>> list, T key) {
+        if (list instanceof RandomAccess || list.size()<BINARYSEARCH_THRESHOLD)
+            return Collections.indexedBinarySearch(list, key);
+        else
+            return Collections.iteratorBinarySearch(list, key);
+    }
+
+    private static <T>
+    int indexedBinarySearch(List<? extends Comparable<? super T>> list, T key)
+    {
+        int low = 0;
+        int high = list.size()-1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            Comparable<? super T> midVal = list.get(mid);
+            int cmp = midVal.compareTo(key);
+
+            if (cmp < 0)
+                low = mid + 1;
+            else if (cmp > 0)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found
+    }
+
+    private static <T>
+    int iteratorBinarySearch(List<? extends Comparable<? super T>> list, T key)
+    {
+        int low = 0;
+        int high = list.size()-1;
+        ListIterator<? extends Comparable<? super T>> i = list.listIterator();
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            Comparable<? super T> midVal = get(i, mid);
+            int cmp = midVal.compareTo(key);
+
+            if (cmp < 0)
+                low = mid + 1;
+            else if (cmp > 0)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found
+    }
+
+    /**
+     * Gets the ith element from the given list by repositioning the specified
+     * list listIterator.
+     */
+    private static <T> T get(ListIterator<? extends T> i, int index) {
+        T obj = null;
+        int pos = i.nextIndex();
+        if (pos <= index) {
+            do {
+                obj = i.next();
+            } while (pos++ < index);
+        } else {
+            do {
+                obj = i.previous();
+            } while (--pos > index);
+        }
+        return obj;
+    }
+
+    /**
+     * Searches the specified list for the specified object using the binary
+     * search algorithm.  The list must be sorted into ascending order
+     * according to the specified comparator (as by the
+     * {@link #sort(List, Comparator) sort(List, Comparator)}
+     * method), prior to making this call.  If it is
+     * not sorted, the results are undefined.  If the list contains multiple
+     * elements equal to the specified object, there is no guarantee which one
+     * will be found.
+     *
+     * <p>This method runs in log(n) time for a "random access" list (which
+     * provides near-constant-time positional access).  If the specified list
+     * does not implement the {@link RandomAccess} interface and is large,
+     * this method will do an iterator-based binary search that performs
+     * O(n) link traversals and O(log n) element comparisons.
+     *
+     * @param  list the list to be searched.
+     * @param  key the key to be searched for.
+     * @param  c the comparator by which the list is ordered.
+     *         A <tt>null</tt> value indicates that the elements'
+     *         {@linkplain Comparable natural ordering} should be used.
+     * @return the index of the search key, if it is contained in the list;
+     *         otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>.  The
+     *         <i>insertion point</i> is defined as the point at which the
+     *         key would be inserted into the list: the index of the first
+     *         element greater than the key, or <tt>list.size()</tt> if all
+     *         elements in the list are less than the specified key.  Note
+     *         that this guarantees that the return value will be &gt;= 0 if
+     *         and only if the key is found.
+     * @throws ClassCastException if the list contains elements that are not
+     *         <i>mutually comparable</i> using the specified comparator,
+     *         or the search key is not mutually comparable with the
+     *         elements of the list using this comparator.
+     */
+    public static <T> int binarySearch(List<? extends T> list, T key, Comparator<? super T> c) {
+        if (c==null)
+            return binarySearch((List) list, key);
+
+        if (list instanceof RandomAccess || list.size()<BINARYSEARCH_THRESHOLD)
+            return Collections.indexedBinarySearch(list, key, c);
+        else
+            return Collections.iteratorBinarySearch(list, key, c);
+    }
+
+    private static <T> int indexedBinarySearch(List<? extends T> l, T key, Comparator<? super T> c) {
+        int low = 0;
+        int high = l.size()-1;
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            T midVal = l.get(mid);
+            int cmp = c.compare(midVal, key);
+
+            if (cmp < 0)
+                low = mid + 1;
+            else if (cmp > 0)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found
+    }
+
+    private static <T> int iteratorBinarySearch(List<? extends T> l, T key, Comparator<? super T> c) {
+        int low = 0;
+        int high = l.size()-1;
+        ListIterator<? extends T> i = l.listIterator();
+
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            T midVal = get(i, mid);
+            int cmp = c.compare(midVal, key);
+
+            if (cmp < 0)
+                low = mid + 1;
+            else if (cmp > 0)
+                high = mid - 1;
+            else
+                return mid; // key found
+        }
+        return -(low + 1);  // key not found
+    }
+
+    private interface SelfComparable extends Comparable<SelfComparable> {}
+
+
+    /**
+     * Reverses the order of the elements in the specified list.<p>
+     *
+     * This method runs in linear time.
+     *
+     * @param  list the list whose elements are to be reversed.
+     * @throws UnsupportedOperationException if the specified list or
+     *         its list-iterator does not support the <tt>set</tt> operation.
+     */
+    public static void reverse(List<?> list) {
+        int size = list.size();
+        if (size < REVERSE_THRESHOLD || list instanceof RandomAccess) {
+            for (int i=0, mid=size>>1, j=size-1; i<mid; i++, j--)
+                swap(list, i, j);
+        } else {
+            ListIterator fwd = list.listIterator();
+            ListIterator rev = list.listIterator(size);
+            for (int i=0, mid=list.size()>>1; i<mid; i++) {
+                Object tmp = fwd.next();
+                fwd.set(rev.previous());
+                rev.set(tmp);
+            }
+        }
+    }
+
+    /**
+     * Randomly permutes the specified list using a default source of
+     * randomness.  All permutations occur with approximately equal
+     * likelihood.<p>
+     *
+     * The hedge "approximately" is used in the foregoing description because
+     * default source of randomness is only approximately an unbiased source
+     * of independently chosen bits. If it were a perfect source of randomly
+     * chosen bits, then the algorithm would choose permutations with perfect
+     * uniformity.<p>
+     *
+     * This implementation traverses the list backwards, from the last element
+     * up to the second, repeatedly swapping a randomly selected element into
+     * the "current position".  Elements are randomly selected from the
+     * portion of the list that runs from the first element to the current
+     * position, inclusive.<p>
+     *
+     * This method runs in linear time.  If the specified list does not
+     * implement the {@link RandomAccess} interface and is large, this
+     * implementation dumps the specified list into an array before shuffling
+     * it, and dumps the shuffled array back into the list.  This avoids the
+     * quadratic behavior that would result from shuffling a "sequential
+     * access" list in place.
+     *
+     * @param  list the list to be shuffled.
+     * @throws UnsupportedOperationException if the specified list or
+     *         its list-iterator does not support the <tt>set</tt> operation.
+     */
+    public static void shuffle(List<?> list) {
+        Random rnd = r;
+        if (rnd == null)
+            r = rnd = new Random();
+        shuffle(list, rnd);
+    }
+    private static Random r;
+
+    /**
+     * Randomly permute the specified list using the specified source of
+     * randomness.  All permutations occur with equal likelihood
+     * assuming that the source of randomness is fair.<p>
+     *
+     * This implementation traverses the list backwards, from the last element
+     * up to the second, repeatedly swapping a randomly selected element into
+     * the "current position".  Elements are randomly selected from the
+     * portion of the list that runs from the first element to the current
+     * position, inclusive.<p>
+     *
+     * This method runs in linear time.  If the specified list does not
+     * implement the {@link RandomAccess} interface and is large, this
+     * implementation dumps the specified list into an array before shuffling
+     * it, and dumps the shuffled array back into the list.  This avoids the
+     * quadratic behavior that would result from shuffling a "sequential
+     * access" list in place.
+     *
+     * @param  list the list to be shuffled.
+     * @param  rnd the source of randomness to use to shuffle the list.
+     * @throws UnsupportedOperationException if the specified list or its
+     *         list-iterator does not support the <tt>set</tt> operation.
+     */
+    public static void shuffle(List<?> list, Random rnd) {
+        int size = list.size();
+        if (size < SHUFFLE_THRESHOLD || list instanceof RandomAccess) {
+            for (int i=size; i>1; i--)
+                swap(list, i-1, rnd.nextInt(i));
+        } else {
+            Object arr[] = list.toArray();
+
+            // Shuffle array
+            for (int i=size; i>1; i--)
+                swap(arr, i-1, rnd.nextInt(i));
+
+            // Dump array back into list
+            ListIterator it = list.listIterator();
+            for (int i=0; i<arr.length; i++) {
+                it.next();
+                it.set(arr[i]);
+            }
+        }
+    }
+
+    /**
+     * Swaps the elements at the specified positions in the specified list.
+     * (If the specified positions are equal, invoking this method leaves
+     * the list unchanged.)
+     *
+     * @param list The list in which to swap elements.
+     * @param i the index of one element to be swapped.
+     * @param j the index of the other element to be swapped.
+     * @throws IndexOutOfBoundsException if either <tt>i</tt> or <tt>j</tt>
+     *         is out of range (i &lt; 0 || i &gt;= list.size()
+     *         || j &lt; 0 || j &gt;= list.size()).
+     * @since 1.4
+     */
+    public static void swap(List<?> list, int i, int j) {
+        final List l = list;
+        l.set(i, l.set(j, l.get(i)));
+    }
+
+    /**
+     * Swaps the two specified elements in the specified array.
+     */
+    private static void swap(Object[] arr, int i, int j) {
+        Object tmp = arr[i];
+        arr[i] = arr[j];
+        arr[j] = tmp;
+    }
+
+    /**
+     * Replaces all of the elements of the specified list with the specified
+     * element. <p>
+     *
+     * This method runs in linear time.
+     *
+     * @param  list the list to be filled with the specified element.
+     * @param  obj The element with which to fill the specified list.
+     * @throws UnsupportedOperationException if the specified list or its
+     *         list-iterator does not support the <tt>set</tt> operation.
+     */
+    public static <T> void fill(List<? super T> list, T obj) {
+        int size = list.size();
+
+        if (size < FILL_THRESHOLD || list instanceof RandomAccess) {
+            for (int i=0; i<size; i++)
+                list.set(i, obj);
+        } else {
+            ListIterator<? super T> itr = list.listIterator();
+            for (int i=0; i<size; i++) {
+                itr.next();
+                itr.set(obj);
+            }
+        }
+    }
+
+    /**
+     * Copies all of the elements from one list into another.  After the
+     * operation, the index of each copied element in the destination list
+     * will be identical to its index in the source list.  The destination
+     * list must be at least as long as the source list.  If it is longer, the
+     * remaining elements in the destination list are unaffected. <p>
+     *
+     * This method runs in linear time.
+     *
+     * @param  dest The destination list.
+     * @param  src The source list.
+     * @throws IndexOutOfBoundsException if the destination list is too small
+     *         to contain the entire source List.
+     * @throws UnsupportedOperationException if the destination list's
+     *         list-iterator does not support the <tt>set</tt> operation.
+     */
+    public static <T> void copy(List<? super T> dest, List<? extends T> src) {
+        int srcSize = src.size();
+        if (srcSize > dest.size())
+            throw new IndexOutOfBoundsException("Source does not fit in dest");
+
+        if (srcSize < COPY_THRESHOLD ||
+            (src instanceof RandomAccess && dest instanceof RandomAccess)) {
+            for (int i=0; i<srcSize; i++)
+                dest.set(i, src.get(i));
+        } else {
+            ListIterator<? super T> di=dest.listIterator();
+            ListIterator<? extends T> si=src.listIterator();
+            for (int i=0; i<srcSize; i++) {
+                di.next();
+                di.set(si.next());
+            }
+        }
+    }
+
+    /**
+     * Returns the minimum element of the given collection, according to the
+     * <i>natural ordering</i> of its elements.  All elements in the
+     * collection must implement the <tt>Comparable</tt> interface.
+     * Furthermore, all elements in the collection must be <i>mutually
+     * comparable</i> (that is, <tt>e1.compareTo(e2)</tt> must not throw a
+     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
+     * <tt>e2</tt> in the collection).<p>
+     *
+     * This method iterates over the entire collection, hence it requires
+     * time proportional to the size of the collection.
+     *
+     * @param  coll the collection whose minimum element is to be determined.
+     * @return the minimum element of the given collection, according
+     *         to the <i>natural ordering</i> of its elements.
+     * @throws ClassCastException if the collection contains elements that are
+     *         not <i>mutually comparable</i> (for example, strings and
+     *         integers).
+     * @throws NoSuchElementException if the collection is empty.
+     * @see Comparable
+     */
+    public static <T extends Object & Comparable<? super T>> T min(Collection<? extends T> coll) {
+        Iterator<? extends T> i = coll.iterator();
+        T candidate = i.next();
+
+        while (i.hasNext()) {
+            T next = i.next();
+            if (next.compareTo(candidate) < 0)
+                candidate = next;
+        }
+        return candidate;
+    }
+
+    /**
+     * Returns the minimum element of the given collection, according to the
+     * order induced by the specified comparator.  All elements in the
+     * collection must be <i>mutually comparable</i> by the specified
+     * comparator (that is, <tt>comp.compare(e1, e2)</tt> must not throw a
+     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
+     * <tt>e2</tt> in the collection).<p>
+     *
+     * This method iterates over the entire collection, hence it requires
+     * time proportional to the size of the collection.
+     *
+     * @param  coll the collection whose minimum element is to be determined.
+     * @param  comp the comparator with which to determine the minimum element.
+     *         A <tt>null</tt> value indicates that the elements' <i>natural
+     *         ordering</i> should be used.
+     * @return the minimum element of the given collection, according
+     *         to the specified comparator.
+     * @throws ClassCastException if the collection contains elements that are
+     *         not <i>mutually comparable</i> using the specified comparator.
+     * @throws NoSuchElementException if the collection is empty.
+     * @see Comparable
+     */
+    public static <T> T min(Collection<? extends T> coll, Comparator<? super T> comp) {
+        if (comp==null)
+            return (T)min((Collection<SelfComparable>) (Collection) coll);
+
+        Iterator<? extends T> i = coll.iterator();
+        T candidate = i.next();
+
+        while (i.hasNext()) {
+            T next = i.next();
+            if (comp.compare(next, candidate) < 0)
+                candidate = next;
+        }
+        return candidate;
+    }
+
+    /**
+     * Returns the maximum element of the given collection, according to the
+     * <i>natural ordering</i> of its elements.  All elements in the
+     * collection must implement the <tt>Comparable</tt> interface.
+     * Furthermore, all elements in the collection must be <i>mutually
+     * comparable</i> (that is, <tt>e1.compareTo(e2)</tt> must not throw a
+     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
+     * <tt>e2</tt> in the collection).<p>
+     *
+     * This method iterates over the entire collection, hence it requires
+     * time proportional to the size of the collection.
+     *
+     * @param  coll the collection whose maximum element is to be determined.
+     * @return the maximum element of the given collection, according
+     *         to the <i>natural ordering</i> of its elements.
+     * @throws ClassCastException if the collection contains elements that are
+     *         not <i>mutually comparable</i> (for example, strings and
+     *         integers).
+     * @throws NoSuchElementException if the collection is empty.
+     * @see Comparable
+     */
+    public static <T extends Object & Comparable<? super T>> T max(Collection<? extends T> coll) {
+        Iterator<? extends T> i = coll.iterator();
+        T candidate = i.next();
+
+        while (i.hasNext()) {
+            T next = i.next();
+            if (next.compareTo(candidate) > 0)
+                candidate = next;
+        }
+        return candidate;
+    }
+
+    /**
+     * Returns the maximum element of the given collection, according to the
+     * order induced by the specified comparator.  All elements in the
+     * collection must be <i>mutually comparable</i> by the specified
+     * comparator (that is, <tt>comp.compare(e1, e2)</tt> must not throw a
+     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
+     * <tt>e2</tt> in the collection).<p>
+     *
+     * This method iterates over the entire collection, hence it requires
+     * time proportional to the size of the collection.
+     *
+     * @param  coll the collection whose maximum element is to be determined.
+     * @param  comp the comparator with which to determine the maximum element.
+     *         A <tt>null</tt> value indicates that the elements' <i>natural
+     *        ordering</i> should be used.
+     * @return the maximum element of the given collection, according
+     *         to the specified comparator.
+     * @throws ClassCastException if the collection contains elements that are
+     *         not <i>mutually comparable</i> using the specified comparator.
+     * @throws NoSuchElementException if the collection is empty.
+     * @see Comparable
+     */
+    public static <T> T max(Collection<? extends T> coll, Comparator<? super T> comp) {
+        if (comp==null)
+            return (T)max((Collection<SelfComparable>) (Collection) coll);
+
+        Iterator<? extends T> i = coll.iterator();
+        T candidate = i.next();
+
+        while (i.hasNext()) {
+            T next = i.next();
+            if (comp.compare(next, candidate) > 0)
+                candidate = next;
+        }
+        return candidate;
+    }
+
+    /**
+     * Rotates the elements in the specified list by the specified distance.
+     * After calling this method, the element at index <tt>i</tt> will be
+     * the element previously at index <tt>(i - distance)</tt> mod
+     * <tt>list.size()</tt>, for all values of <tt>i</tt> between <tt>0</tt>
+     * and <tt>list.size()-1</tt>, inclusive.  (This method has no effect on
+     * the size of the list.)
+     *
+     * <p>For example, suppose <tt>list</tt> comprises<tt> [t, a, n, k, s]</tt>.
+     * After invoking <tt>Collections.rotate(list, 1)</tt> (or
+     * <tt>Collections.rotate(list, -4)</tt>), <tt>list</tt> will comprise
+     * <tt>[s, t, a, n, k]</tt>.
+     *
+     * <p>Note that this method can usefully be applied to sublists to
+     * move one or more elements within a list while preserving the
+     * order of the remaining elements.  For example, the following idiom
+     * moves the element at index <tt>j</tt> forward to position
+     * <tt>k</tt> (which must be greater than or equal to <tt>j</tt>):
+     * <pre>
+     *     Collections.rotate(list.subList(j, k+1), -1);
+     * </pre>
+     * To make this concrete, suppose <tt>list</tt> comprises
+     * <tt>[a, b, c, d, e]</tt>.  To move the element at index <tt>1</tt>
+     * (<tt>b</tt>) forward two positions, perform the following invocation:
+     * <pre>
+     *     Collections.rotate(l.subList(1, 4), -1);
+     * </pre>
+     * The resulting list is <tt>[a, c, d, b, e]</tt>.
+     *
+     * <p>To move more than one element forward, increase the absolute value
+     * of the rotation distance.  To move elements backward, use a positive
+     * shift distance.
+     *
+     * <p>If the specified list is small or implements the {@link
+     * RandomAccess} interface, this implementation exchanges the first
+     * element into the location it should go, and then repeatedly exchanges
+     * the displaced element into the location it should go until a displaced
+     * element is swapped into the first element.  If necessary, the process
+     * is repeated on the second and successive elements, until the rotation
+     * is complete.  If the specified list is large and doesn't implement the
+     * <tt>RandomAccess</tt> interface, this implementation breaks the
+     * list into two sublist views around index <tt>-distance mod size</tt>.
+     * Then the {@link #reverse(List)} method is invoked on each sublist view,
+     * and finally it is invoked on the entire list.  For a more complete
+     * description of both algorithms, see Section 2.3 of Jon Bentley's
+     * <i>Programming Pearls</i> (Addison-Wesley, 1986).
+     *
+     * @param list the list to be rotated.
+     * @param distance the distance to rotate the list.  There are no
+     *        constraints on this value; it may be zero, negative, or
+     *        greater than <tt>list.size()</tt>.
+     * @throws UnsupportedOperationException if the specified list or
+     *         its list-iterator does not support the <tt>set</tt> operation.
+     * @since 1.4
+     */
+    public static void rotate(List<?> list, int distance) {
+        if (list instanceof RandomAccess || list.size() < ROTATE_THRESHOLD)
+            rotate1(list, distance);
+        else
+            rotate2(list, distance);
+    }
+
+    private static <T> void rotate1(List<T> list, int distance) {
+        int size = list.size();
+        if (size == 0)
+            return;
+        distance = distance % size;
+        if (distance < 0)
+            distance += size;
+        if (distance == 0)
+            return;
+
+        for (int cycleStart = 0, nMoved = 0; nMoved != size; cycleStart++) {
+            T displaced = list.get(cycleStart);
+            int i = cycleStart;
+            do {
+                i += distance;
+                if (i >= size)
+                    i -= size;
+                displaced = list.set(i, displaced);
+                nMoved ++;
+            } while (i != cycleStart);
+        }
+    }
+
+    private static void rotate2(List<?> list, int distance) {
+        int size = list.size();
+        if (size == 0)
+            return;
+        int mid =  -distance % size;
+        if (mid < 0)
+            mid += size;
+        if (mid == 0)
+            return;
+
+        reverse(list.subList(0, mid));
+        reverse(list.subList(mid, size));
+        reverse(list);
+    }
+
+    /**
+     * Replaces all occurrences of one specified value in a list with another.
+     * More formally, replaces with <tt>newVal</tt> each element <tt>e</tt>
+     * in <tt>list</tt> such that
+     * <tt>(oldVal==null ? e==null : oldVal.equals(e))</tt>.
+     * (This method has no effect on the size of the list.)
+     *
+     * @param list the list in which replacement is to occur.
+     * @param oldVal the old value to be replaced.
+     * @param newVal the new value with which <tt>oldVal</tt> is to be
+     *        replaced.
+     * @return <tt>true</tt> if <tt>list</tt> contained one or more elements
+     *         <tt>e</tt> such that
+     *         <tt>(oldVal==null ?  e==null : oldVal.equals(e))</tt>.
+     * @throws UnsupportedOperationException if the specified list or
+     *         its list-iterator does not support the <tt>set</tt> operation.
+     * @since  1.4
+     */
+    public static <T> boolean replaceAll(List<T> list, T oldVal, T newVal) {
+        boolean result = false;
+        int size = list.size();
+        if (size < REPLACEALL_THRESHOLD || list instanceof RandomAccess) {
+            if (oldVal==null) {
+                for (int i=0; i<size; i++) {
+                    if (list.get(i)==null) {
+                        list.set(i, newVal);
+                        result = true;
+                    }
+                }
+            } else {
+                for (int i=0; i<size; i++) {
+                    if (oldVal.equals(list.get(i))) {
+                        list.set(i, newVal);
+                        result = true;
+                    }
+                }
+            }
+        } else {
+            ListIterator<T> itr=list.listIterator();
+            if (oldVal==null) {
+                for (int i=0; i<size; i++) {
+                    if (itr.next()==null) {
+                        itr.set(newVal);
+                        result = true;
+                    }
+                }
+            } else {
+                for (int i=0; i<size; i++) {
+                    if (oldVal.equals(itr.next())) {
+                        itr.set(newVal);
+                        result = true;
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Returns the starting position of the first occurrence of the specified
+     * target list within the specified source list, or -1 if there is no
+     * such occurrence.  More formally, returns the lowest index <tt>i</tt>
+     * such that <tt>source.subList(i, i+target.size()).equals(target)</tt>,
+     * or -1 if there is no such index.  (Returns -1 if
+     * <tt>target.size() > source.size()</tt>.)
+     *
+     * <p>This implementation uses the "brute force" technique of scanning
+     * over the source list, looking for a match with the target at each
+     * location in turn.
+     *
+     * @param source the list in which to search for the first occurrence
+     *        of <tt>target</tt>.
+     * @param target the list to search for as a subList of <tt>source</tt>.
+     * @return the starting position of the first occurrence of the specified
+     *         target list within the specified source list, or -1 if there
+     *         is no such occurrence.
+     * @since  1.4
+     */
+    public static int indexOfSubList(List<?> source, List<?> target) {
+        int sourceSize = source.size();
+        int targetSize = target.size();
+        int maxCandidate = sourceSize - targetSize;
+
+        if (sourceSize < INDEXOFSUBLIST_THRESHOLD ||
+            (source instanceof RandomAccess&&target instanceof RandomAccess)) {
+        nextCand:
+            for (int candidate = 0; candidate <= maxCandidate; candidate++) {
+                for (int i=0, j=candidate; i<targetSize; i++, j++)
+                    if (!eq(target.get(i), source.get(j)))
+                        continue nextCand;  // Element mismatch, try next cand
+                return candidate;  // All elements of candidate matched target
+            }
+        } else {  // Iterator version of above algorithm
+            ListIterator<?> si = source.listIterator();
+        nextCand:
+            for (int candidate = 0; candidate <= maxCandidate; candidate++) {
+                ListIterator<?> ti = target.listIterator();
+                for (int i=0; i<targetSize; i++) {
+                    if (!eq(ti.next(), si.next())) {
+                        // Back up source iterator to next candidate
+                        for (int j=0; j<i; j++)
+                            si.previous();
+                        continue nextCand;
+                    }
+                }
+                return candidate;
+            }
+        }
+        return -1;  // No candidate matched the target
+    }
+
+    /**
+     * Returns the starting position of the last occurrence of the specified
+     * target list within the specified source list, or -1 if there is no such
+     * occurrence.  More formally, returns the highest index <tt>i</tt>
+     * such that <tt>source.subList(i, i+target.size()).equals(target)</tt>,
+     * or -1 if there is no such index.  (Returns -1 if
+     * <tt>target.size() > source.size()</tt>.)
+     *
+     * <p>This implementation uses the "brute force" technique of iterating
+     * over the source list, looking for a match with the target at each
+     * location in turn.
+     *
+     * @param source the list in which to search for the last occurrence
+     *        of <tt>target</tt>.
+     * @param target the list to search for as a subList of <tt>source</tt>.
+     * @return the starting position of the last occurrence of the specified
+     *         target list within the specified source list, or -1 if there
+     *         is no such occurrence.
+     * @since  1.4
+     */
+    public static int lastIndexOfSubList(List<?> source, List<?> target) {
+        int sourceSize = source.size();
+        int targetSize = target.size();
+        int maxCandidate = sourceSize - targetSize;
+
+        if (sourceSize < INDEXOFSUBLIST_THRESHOLD ||
+            source instanceof RandomAccess) {   // Index access version
+        nextCand:
+            for (int candidate = maxCandidate; candidate >= 0; candidate--) {
+                for (int i=0, j=candidate; i<targetSize; i++, j++)
+                    if (!eq(target.get(i), source.get(j)))
+                        continue nextCand;  // Element mismatch, try next cand
+                return candidate;  // All elements of candidate matched target
+            }
+        } else {  // Iterator version of above algorithm
+            if (maxCandidate < 0)
+                return -1;
+            ListIterator<?> si = source.listIterator(maxCandidate);
+        nextCand:
+            for (int candidate = maxCandidate; candidate >= 0; candidate--) {
+                ListIterator<?> ti = target.listIterator();
+                for (int i=0; i<targetSize; i++) {
+                    if (!eq(ti.next(), si.next())) {
+                        if (candidate != 0) {
+                            // Back up source iterator to next candidate
+                            for (int j=0; j<=i+1; j++)
+                                si.previous();
+                        }
+                        continue nextCand;
+                    }
+                }
+                return candidate;
+            }
+        }
+        return -1;  // No candidate matched the target
+    }
+
+
+    // Unmodifiable Wrappers
+
+    /**
+     * Returns an unmodifiable view of the specified collection.  This method
+     * allows modules to provide users with "read-only" access to internal
+     * collections.  Query operations on the returned collection "read through"
+     * to the specified collection, and attempts to modify the returned
+     * collection, whether direct or via its iterator, result in an
+     * <tt>UnsupportedOperationException</tt>.<p>
+     *
+     * The returned collection does <i>not</i> pass the hashCode and equals
+     * operations through to the backing collection, but relies on
+     * <tt>Object</tt>'s <tt>equals</tt> and <tt>hashCode</tt> methods.  This
+     * is necessary to preserve the contracts of these operations in the case
+     * that the backing collection is a set or a list.<p>
+     *
+     * The returned collection will be serializable if the specified collection
+     * is serializable.
+     *
+     * @param  c the collection for which an unmodifiable view is to be
+     *         returned.
+     * @return an unmodifiable view of the specified collection.
+     */
+    public static <T> Collection<T> unmodifiableCollection(Collection<? extends T> c) {
+        return new UnmodifiableCollection<>(c);
+    }
+
+    /**
+     * @serial include
+     */
+    static class UnmodifiableCollection<E> implements Collection<E>, Serializable {
+        private static final long serialVersionUID = 1820017752578914078L;
+
+        final Collection<? extends E> c;
+
+        UnmodifiableCollection(Collection<? extends E> c) {
+            if (c==null)
+                throw new NullPointerException();
+            this.c = c;
+        }
+
+        public int size()                   {return c.size();}
+        public boolean isEmpty()            {return c.isEmpty();}
+        public boolean contains(Object o)   {return c.contains(o);}
+        public Object[] toArray()           {return c.toArray();}
+        public <T> T[] toArray(T[] a)       {return c.toArray(a);}
+        public String toString()            {return c.toString();}
+
+        public Iterator<E> iterator() {
+            return new Iterator<E>() {
+                private final Iterator<? extends E> i = c.iterator();
+
+                public boolean hasNext() {return i.hasNext();}
+                public E next()          {return i.next();}
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+            };
+        }
+
+        public boolean add(E e) {
+            throw new UnsupportedOperationException();
+        }
+        public boolean remove(Object o) {
+            throw new UnsupportedOperationException();
+        }
+
+        public boolean containsAll(Collection<?> coll) {
+            return c.containsAll(coll);
+        }
+        public boolean addAll(Collection<? extends E> coll) {
+            throw new UnsupportedOperationException();
+        }
+        public boolean removeAll(Collection<?> coll) {
+            throw new UnsupportedOperationException();
+        }
+        public boolean retainAll(Collection<?> coll) {
+            throw new UnsupportedOperationException();
+        }
+        public void clear() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Returns an unmodifiable view of the specified set.  This method allows
+     * modules to provide users with "read-only" access to internal sets.
+     * Query operations on the returned set "read through" to the specified
+     * set, and attempts to modify the returned set, whether direct or via its
+     * iterator, result in an <tt>UnsupportedOperationException</tt>.<p>
+     *
+     * The returned set will be serializable if the specified set
+     * is serializable.
+     *
+     * @param  s the set for which an unmodifiable view is to be returned.
+     * @return an unmodifiable view of the specified set.
+     */
+    public static <T> Set<T> unmodifiableSet(Set<? extends T> s) {
+        return new UnmodifiableSet<>(s);
+    }
+
+    /**
+     * @serial include
+     */
+    static class UnmodifiableSet<E> extends UnmodifiableCollection<E>
+                                 implements Set<E>, Serializable {
+        private static final long serialVersionUID = -9215047833775013803L;
+
+        UnmodifiableSet(Set<? extends E> s)     {super(s);}
+        public boolean equals(Object o) {return o == this || c.equals(o);}
+        public int hashCode()           {return c.hashCode();}
+    }
+
+    /**
+     * Returns an unmodifiable view of the specified sorted set.  This method
+     * allows modules to provide users with "read-only" access to internal
+     * sorted sets.  Query operations on the returned sorted set "read
+     * through" to the specified sorted set.  Attempts to modify the returned
+     * sorted set, whether direct, via its iterator, or via its
+     * <tt>subSet</tt>, <tt>headSet</tt>, or <tt>tailSet</tt> views, result in
+     * an <tt>UnsupportedOperationException</tt>.<p>
+     *
+     * The returned sorted set will be serializable if the specified sorted set
+     * is serializable.
+     *
+     * @param s the sorted set for which an unmodifiable view is to be
+     *        returned.
+     * @return an unmodifiable view of the specified sorted set.
+     */
+    public static <T> SortedSet<T> unmodifiableSortedSet(SortedSet<T> s) {
+        return new UnmodifiableSortedSet<>(s);
+    }
+
+    /**
+     * @serial include
+     */
+    static class UnmodifiableSortedSet<E>
+                             extends UnmodifiableSet<E>
+                             implements SortedSet<E>, Serializable {
+        private static final long serialVersionUID = -4929149591599911165L;
+        private final SortedSet<E> ss;
+
+        UnmodifiableSortedSet(SortedSet<E> s) {super(s); ss = s;}
+
+        public Comparator<? super E> comparator() {return ss.comparator();}
+
+        public SortedSet<E> subSet(E fromElement, E toElement) {
+            return new UnmodifiableSortedSet<>(ss.subSet(fromElement,toElement));
+        }
+        public SortedSet<E> headSet(E toElement) {
+            return new UnmodifiableSortedSet<>(ss.headSet(toElement));
+        }
+        public SortedSet<E> tailSet(E fromElement) {
+            return new UnmodifiableSortedSet<>(ss.tailSet(fromElement));
+        }
+
+        public E first()                   {return ss.first();}
+        public E last()                    {return ss.last();}
+    }
+
+    /**
+     * Returns an unmodifiable view of the specified list.  This method allows
+     * modules to provide users with "read-only" access to internal
+     * lists.  Query operations on the returned list "read through" to the
+     * specified list, and attempts to modify the returned list, whether
+     * direct or via its iterator, result in an
+     * <tt>UnsupportedOperationException</tt>.<p>
+     *
+     * The returned list will be serializable if the specified list
+     * is serializable. Similarly, the returned list will implement
+     * {@link RandomAccess} if the specified list does.
+     *
+     * @param  list the list for which an unmodifiable view is to be returned.
+     * @return an unmodifiable view of the specified list.
+     */
+    public static <T> List<T> unmodifiableList(List<? extends T> list) {
+        return (list instanceof RandomAccess ?
+                new UnmodifiableRandomAccessList<>(list) :
+                new UnmodifiableList<>(list));
+    }
+
+    /**
+     * @serial include
+     */
+    static class UnmodifiableList<E> extends UnmodifiableCollection<E>
+                                  implements List<E> {
+        private static final long serialVersionUID = -283967356065247728L;
+        final List<? extends E> list;
+
+        UnmodifiableList(List<? extends E> list) {
+            super(list);
+            this.list = list;
+        }
+
+        public boolean equals(Object o) {return o == this || list.equals(o);}
+        public int hashCode()           {return list.hashCode();}
+
+        public E get(int index) {return list.get(index);}
+        public E set(int index, E element) {
+            throw new UnsupportedOperationException();
+        }
+        public void add(int index, E element) {
+            throw new UnsupportedOperationException();
+        }
+        public E remove(int index) {
+            throw new UnsupportedOperationException();
+        }
+        public int indexOf(Object o)            {return list.indexOf(o);}
+        public int lastIndexOf(Object o)        {return list.lastIndexOf(o);}
+        public boolean addAll(int index, Collection<? extends E> c) {
+            throw new UnsupportedOperationException();
+        }
+        public ListIterator<E> listIterator()   {return listIterator(0);}
+
+        public ListIterator<E> listIterator(final int index) {
+            return new ListIterator<E>() {
+                private final ListIterator<? extends E> i
+                    = list.listIterator(index);
+
+                public boolean hasNext()     {return i.hasNext();}
+                public E next()              {return i.next();}
+                public boolean hasPrevious() {return i.hasPrevious();}
+                public E previous()          {return i.previous();}
+                public int nextIndex()       {return i.nextIndex();}
+                public int previousIndex()   {return i.previousIndex();}
+
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+                public void set(E e) {
+                    throw new UnsupportedOperationException();
+                }
+                public void add(E e) {
+                    throw new UnsupportedOperationException();
+                }
+            };
+        }
+
+        public List<E> subList(int fromIndex, int toIndex) {
+            return new UnmodifiableList<>(list.subList(fromIndex, toIndex));
+        }
+
+        /**
+         * UnmodifiableRandomAccessList instances are serialized as
+         * UnmodifiableList instances to allow them to be deserialized
+         * in pre-1.4 JREs (which do not have UnmodifiableRandomAccessList).
+         * This method inverts the transformation.  As a beneficial
+         * side-effect, it also grafts the RandomAccess marker onto
+         * UnmodifiableList instances that were serialized in pre-1.4 JREs.
+         *
+         * Note: Unfortunately, UnmodifiableRandomAccessList instances
+         * serialized in 1.4.1 and deserialized in 1.4 will become
+         * UnmodifiableList instances, as this method was missing in 1.4.
+         */
+        private Object readResolve() {
+            return (list instanceof RandomAccess
+                    ? new UnmodifiableRandomAccessList<>(list)
+                    : this);
+        }
+    }
+
+    /**
+     * @serial include
+     */
+    static class UnmodifiableRandomAccessList<E> extends UnmodifiableList<E>
+                                              implements RandomAccess
+    {
+        UnmodifiableRandomAccessList(List<? extends E> list) {
+            super(list);
+        }
+
+        public List<E> subList(int fromIndex, int toIndex) {
+            return new UnmodifiableRandomAccessList<>(
+                list.subList(fromIndex, toIndex));
+        }
+
+        private static final long serialVersionUID = -2542308836966382001L;
+
+        /**
+         * Allows instances to be deserialized in pre-1.4 JREs (which do
+         * not have UnmodifiableRandomAccessList).  UnmodifiableList has
+         * a readResolve method that inverts this transformation upon
+         * deserialization.
+         */
+        private Object writeReplace() {
+            return new UnmodifiableList<>(list);
+        }
+    }
+
+    /**
+     * Returns an unmodifiable view of the specified map.  This method
+     * allows modules to provide users with "read-only" access to internal
+     * maps.  Query operations on the returned map "read through"
+     * to the specified map, and attempts to modify the returned
+     * map, whether direct or via its collection views, result in an
+     * <tt>UnsupportedOperationException</tt>.<p>
+     *
+     * The returned map will be serializable if the specified map
+     * is serializable.
+     *
+     * @param  m the map for which an unmodifiable view is to be returned.
+     * @return an unmodifiable view of the specified map.
+     */
+    public static <K,V> Map<K,V> unmodifiableMap(Map<? extends K, ? extends V> m) {
+        return new UnmodifiableMap<>(m);
+    }
+
+    /**
+     * @serial include
+     */
+    private static class UnmodifiableMap<K,V> implements Map<K,V>, Serializable {
+        private static final long serialVersionUID = -1034234728574286014L;
+
+        private final Map<? extends K, ? extends V> m;
+
+        UnmodifiableMap(Map<? extends K, ? extends V> m) {
+            if (m==null)
+                throw new NullPointerException();
+            this.m = m;
+        }
+
+        public int size()                        {return m.size();}
+        public boolean isEmpty()                 {return m.isEmpty();}
+        public boolean containsKey(Object key)   {return m.containsKey(key);}
+        public boolean containsValue(Object val) {return m.containsValue(val);}
+        public V get(Object key)                 {return m.get(key);}
+
+        public V put(K key, V value) {
+            throw new UnsupportedOperationException();
+        }
+        public V remove(Object key) {
+            throw new UnsupportedOperationException();
+        }
+        public void putAll(Map<? extends K, ? extends V> m) {
+            throw new UnsupportedOperationException();
+        }
+        public void clear() {
+            throw new UnsupportedOperationException();
+        }
+
+        private transient Set<K> keySet = null;
+        private transient Set<Map.Entry<K,V>> entrySet = null;
+        private transient Collection<V> values = null;
+
+        public Set<K> keySet() {
+            if (keySet==null)
+                keySet = unmodifiableSet(m.keySet());
+            return keySet;
+        }
+
+        public Set<Map.Entry<K,V>> entrySet() {
+            if (entrySet==null)
+                entrySet = new UnmodifiableEntrySet<>(m.entrySet());
+            return entrySet;
+        }
+
+        public Collection<V> values() {
+            if (values==null)
+                values = unmodifiableCollection(m.values());
+            return values;
+        }
+
+        public boolean equals(Object o) {return o == this || m.equals(o);}
+        public int hashCode()           {return m.hashCode();}
+        public String toString()        {return m.toString();}
+
+        /**
+         * We need this class in addition to UnmodifiableSet as
+         * Map.Entries themselves permit modification of the backing Map
+         * via their setValue operation.  This class is subtle: there are
+         * many possible attacks that must be thwarted.
+         *
+         * @serial include
+         */
+        static class UnmodifiableEntrySet<K,V>
+            extends UnmodifiableSet<Map.Entry<K,V>> {
+            private static final long serialVersionUID = 7854390611657943733L;
+
+            UnmodifiableEntrySet(Set<? extends Map.Entry<? extends K, ? extends V>> s) {
+                super((Set)s);
+            }
+            public Iterator<Map.Entry<K,V>> iterator() {
+                return new Iterator<Map.Entry<K,V>>() {
+                    private final Iterator<? extends Map.Entry<? extends K, ? extends V>> i = c.iterator();
+
+                    public boolean hasNext() {
+                        return i.hasNext();
+                    }
+                    public Map.Entry<K,V> next() {
+                        return new UnmodifiableEntry<>(i.next());
+                    }
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+
+            public Object[] toArray() {
+                Object[] a = c.toArray();
+                for (int i=0; i<a.length; i++)
+                    a[i] = new UnmodifiableEntry<>((Map.Entry<K,V>)a[i]);
+                return a;
+            }
+
+            public <T> T[] toArray(T[] a) {
+                // We don't pass a to c.toArray, to avoid window of
+                // vulnerability wherein an unscrupulous multithreaded client
+                // could get his hands on raw (unwrapped) Entries from c.
+                Object[] arr = c.toArray(a.length==0 ? a : Arrays.copyOf(a, 0));
+
+                for (int i=0; i<arr.length; i++)
+                    arr[i] = new UnmodifiableEntry<>((Map.Entry<K,V>)arr[i]);
+
+                if (arr.length > a.length)
+                    return (T[])arr;
+
+                System.arraycopy(arr, 0, a, 0, arr.length);
+                if (a.length > arr.length)
+                    a[arr.length] = null;
+                return a;
+            }
+
+            /**
+             * This method is overridden to protect the backing set against
+             * an object with a nefarious equals function that senses
+             * that the equality-candidate is Map.Entry and calls its
+             * setValue method.
+             */
+            public boolean contains(Object o) {
+                if (!(o instanceof Map.Entry))
+                    return false;
+                return c.contains(
+                    new UnmodifiableEntry<>((Map.Entry<?,?>) o));
+            }
+
+            /**
+             * The next two methods are overridden to protect against
+             * an unscrupulous List whose contains(Object o) method senses
+             * when o is a Map.Entry, and calls o.setValue.
+             */
+            public boolean containsAll(Collection<?> coll) {
+                for (Object e : coll) {
+                    if (!contains(e)) // Invokes safe contains() above
+                        return false;
+                }
+                return true;
+            }
+            public boolean equals(Object o) {
+                if (o == this)
+                    return true;
+
+                if (!(o instanceof Set))
+                    return false;
+                Set s = (Set) o;
+                if (s.size() != c.size())
+                    return false;
+                return containsAll(s); // Invokes safe containsAll() above
+            }
+
+            /**
+             * This "wrapper class" serves two purposes: it prevents
+             * the client from modifying the backing Map, by short-circuiting
+             * the setValue method, and it protects the backing Map against
+             * an ill-behaved Map.Entry that attempts to modify another
+             * Map Entry when asked to perform an equality check.
+             */
+            private static class UnmodifiableEntry<K,V> implements Map.Entry<K,V> {
+                private Map.Entry<? extends K, ? extends V> e;
+
+                UnmodifiableEntry(Map.Entry<? extends K, ? extends V> e) {this.e = e;}
+
+                public K getKey()        {return e.getKey();}
+                public V getValue()      {return e.getValue();}
+                public V setValue(V value) {
+                    throw new UnsupportedOperationException();
+                }
+                public int hashCode()    {return e.hashCode();}
+                public boolean equals(Object o) {
+                    if (!(o instanceof Map.Entry))
+                        return false;
+                    Map.Entry t = (Map.Entry)o;
+                    return eq(e.getKey(),   t.getKey()) &&
+                           eq(e.getValue(), t.getValue());
+                }
+                public String toString() {return e.toString();}
+            }
+        }
+    }
+
+    /**
+     * Returns an unmodifiable view of the specified sorted map.  This method
+     * allows modules to provide users with "read-only" access to internal
+     * sorted maps.  Query operations on the returned sorted map "read through"
+     * to the specified sorted map.  Attempts to modify the returned
+     * sorted map, whether direct, via its collection views, or via its
+     * <tt>subMap</tt>, <tt>headMap</tt>, or <tt>tailMap</tt> views, result in
+     * an <tt>UnsupportedOperationException</tt>.<p>
+     *
+     * The returned sorted map will be serializable if the specified sorted map
+     * is serializable.
+     *
+     * @param m the sorted map for which an unmodifiable view is to be
+     *        returned.
+     * @return an unmodifiable view of the specified sorted map.
+     */
+    public static <K,V> SortedMap<K,V> unmodifiableSortedMap(SortedMap<K, ? extends V> m) {
+        return new UnmodifiableSortedMap<>(m);
+    }
+
+    /**
+     * @serial include
+     */
+    static class UnmodifiableSortedMap<K,V>
+          extends UnmodifiableMap<K,V>
+          implements SortedMap<K,V>, Serializable {
+        private static final long serialVersionUID = -8806743815996713206L;
+
+        private final SortedMap<K, ? extends V> sm;
+
+        UnmodifiableSortedMap(SortedMap<K, ? extends V> m) {super(m); sm = m;}
+
+        public Comparator<? super K> comparator() {return sm.comparator();}
+
+        public SortedMap<K,V> subMap(K fromKey, K toKey) {
+            return new UnmodifiableSortedMap<>(sm.subMap(fromKey, toKey));
+        }
+        public SortedMap<K,V> headMap(K toKey) {
+            return new UnmodifiableSortedMap<>(sm.headMap(toKey));
+        }
+        public SortedMap<K,V> tailMap(K fromKey) {
+            return new UnmodifiableSortedMap<>(sm.tailMap(fromKey));
+        }
+
+        public K firstKey()           {return sm.firstKey();}
+        public K lastKey()            {return sm.lastKey();}
+    }
+
+
+    // Synch Wrappers
+
+    /**
+     * Returns a synchronized (thread-safe) collection backed by the specified
+     * collection.  In order to guarantee serial access, it is critical that
+     * <strong>all</strong> access to the backing collection is accomplished
+     * through the returned collection.<p>
+     *
+     * It is imperative that the user manually synchronize on the returned
+     * collection when iterating over it:
+     * <pre>
+     *  Collection c = Collections.synchronizedCollection(myCollection);
+     *     ...
+     *  synchronized (c) {
+     *      Iterator i = c.iterator(); // Must be in the synchronized block
+     *      while (i.hasNext())
+     *         foo(i.next());
+     *  }
+     * </pre>
+     * Failure to follow this advice may result in non-deterministic behavior.
+     *
+     * <p>The returned collection does <i>not</i> pass the <tt>hashCode</tt>
+     * and <tt>equals</tt> operations through to the backing collection, but
+     * relies on <tt>Object</tt>'s equals and hashCode methods.  This is
+     * necessary to preserve the contracts of these operations in the case
+     * that the backing collection is a set or a list.<p>
+     *
+     * The returned collection will be serializable if the specified collection
+     * is serializable.
+     *
+     * @param  c the collection to be "wrapped" in a synchronized collection.
+     * @return a synchronized view of the specified collection.
+     */
+    public static <T> Collection<T> synchronizedCollection(Collection<T> c) {
+        return new SynchronizedCollection<>(c);
+    }
+
+    static <T> Collection<T> synchronizedCollection(Collection<T> c, Object mutex) {
+        return new SynchronizedCollection<>(c, mutex);
+    }
+
+    /**
+     * @serial include
+     */
+    static class SynchronizedCollection<E> implements Collection<E>, Serializable {
+        private static final long serialVersionUID = 3053995032091335093L;
+
+        final Collection<E> c;  // Backing Collection
+        final Object mutex;     // Object on which to synchronize
+
+        SynchronizedCollection(Collection<E> c) {
+            if (c==null)
+                throw new NullPointerException();
+            this.c = c;
+            mutex = this;
+        }
+        SynchronizedCollection(Collection<E> c, Object mutex) {
+            this.c = c;
+            this.mutex = mutex;
+        }
+
+        public int size() {
+            synchronized (mutex) {return c.size();}
+        }
+        public boolean isEmpty() {
+            synchronized (mutex) {return c.isEmpty();}
+        }
+        public boolean contains(Object o) {
+            synchronized (mutex) {return c.contains(o);}
+        }
+        public Object[] toArray() {
+            synchronized (mutex) {return c.toArray();}
+        }
+        public <T> T[] toArray(T[] a) {
+            synchronized (mutex) {return c.toArray(a);}
+        }
+
+        public Iterator<E> iterator() {
+            return c.iterator(); // Must be manually synched by user!
+        }
+
+        public boolean add(E e) {
+            synchronized (mutex) {return c.add(e);}
+        }
+        public boolean remove(Object o) {
+            synchronized (mutex) {return c.remove(o);}
+        }
+
+        public boolean containsAll(Collection<?> coll) {
+            synchronized (mutex) {return c.containsAll(coll);}
+        }
+        public boolean addAll(Collection<? extends E> coll) {
+            synchronized (mutex) {return c.addAll(coll);}
+        }
+        public boolean removeAll(Collection<?> coll) {
+            synchronized (mutex) {return c.removeAll(coll);}
+        }
+        public boolean retainAll(Collection<?> coll) {
+            synchronized (mutex) {return c.retainAll(coll);}
+        }
+        public void clear() {
+            synchronized (mutex) {c.clear();}
+        }
+        public String toString() {
+            synchronized (mutex) {return c.toString();}
+        }
+    }
+
+    /**
+     * Returns a synchronized (thread-safe) set backed by the specified
+     * set.  In order to guarantee serial access, it is critical that
+     * <strong>all</strong> access to the backing set is accomplished
+     * through the returned set.<p>
+     *
+     * It is imperative that the user manually synchronize on the returned
+     * set when iterating over it:
+     * <pre>
+     *  Set s = Collections.synchronizedSet(new HashSet());
+     *      ...
+     *  synchronized (s) {
+     *      Iterator i = s.iterator(); // Must be in the synchronized block
+     *      while (i.hasNext())
+     *          foo(i.next());
+     *  }
+     * </pre>
+     * Failure to follow this advice may result in non-deterministic behavior.
+     *
+     * <p>The returned set will be serializable if the specified set is
+     * serializable.
+     *
+     * @param  s the set to be "wrapped" in a synchronized set.
+     * @return a synchronized view of the specified set.
+     */
+    public static <T> Set<T> synchronizedSet(Set<T> s) {
+        return new SynchronizedSet<>(s);
+    }
+
+    static <T> Set<T> synchronizedSet(Set<T> s, Object mutex) {
+        return new SynchronizedSet<>(s, mutex);
+    }
+
+    /**
+     * @serial include
+     */
+    static class SynchronizedSet<E>
+          extends SynchronizedCollection<E>
+          implements Set<E> {
+        private static final long serialVersionUID = 487447009682186044L;
+
+        SynchronizedSet(Set<E> s) {
+            super(s);
+        }
+        SynchronizedSet(Set<E> s, Object mutex) {
+            super(s, mutex);
+        }
+
+        public boolean equals(Object o) {
+            synchronized (mutex) {return c.equals(o);}
+        }
+        public int hashCode() {
+            synchronized (mutex) {return c.hashCode();}
+        }
+    }
+
+    /**
+     * Returns a synchronized (thread-safe) sorted set backed by the specified
+     * sorted set.  In order to guarantee serial access, it is critical that
+     * <strong>all</strong> access to the backing sorted set is accomplished
+     * through the returned sorted set (or its views).<p>
+     *
+     * It is imperative that the user manually synchronize on the returned
+     * sorted set when iterating over it or any of its <tt>subSet</tt>,
+     * <tt>headSet</tt>, or <tt>tailSet</tt> views.
+     * <pre>
+     *  SortedSet s = Collections.synchronizedSortedSet(new TreeSet());
+     *      ...
+     *  synchronized (s) {
+     *      Iterator i = s.iterator(); // Must be in the synchronized block
+     *      while (i.hasNext())
+     *          foo(i.next());
+     *  }
+     * </pre>
+     * or:
+     * <pre>
+     *  SortedSet s = Collections.synchronizedSortedSet(new TreeSet());
+     *  SortedSet s2 = s.headSet(foo);
+     *      ...
+     *  synchronized (s) {  // Note: s, not s2!!!
+     *      Iterator i = s2.iterator(); // Must be in the synchronized block
+     *      while (i.hasNext())
+     *          foo(i.next());
+     *  }
+     * </pre>
+     * Failure to follow this advice may result in non-deterministic behavior.
+     *
+     * <p>The returned sorted set will be serializable if the specified
+     * sorted set is serializable.
+     *
+     * @param  s the sorted set to be "wrapped" in a synchronized sorted set.
+     * @return a synchronized view of the specified sorted set.
+     */
+    public static <T> SortedSet<T> synchronizedSortedSet(SortedSet<T> s) {
+        return new SynchronizedSortedSet<>(s);
+    }
+
+    /**
+     * @serial include
+     */
+    static class SynchronizedSortedSet<E>
+        extends SynchronizedSet<E>
+        implements SortedSet<E>
+    {
+        private static final long serialVersionUID = 8695801310862127406L;
+
+        private final SortedSet<E> ss;
+
+        SynchronizedSortedSet(SortedSet<E> s) {
+            super(s);
+            ss = s;
+        }
+        SynchronizedSortedSet(SortedSet<E> s, Object mutex) {
+            super(s, mutex);
+            ss = s;
+        }
+
+        public Comparator<? super E> comparator() {
+            synchronized (mutex) {return ss.comparator();}
+        }
+
+        public SortedSet<E> subSet(E fromElement, E toElement) {
+            synchronized (mutex) {
+                return new SynchronizedSortedSet<>(
+                    ss.subSet(fromElement, toElement), mutex);
+            }
+        }
+        public SortedSet<E> headSet(E toElement) {
+            synchronized (mutex) {
+                return new SynchronizedSortedSet<>(ss.headSet(toElement), mutex);
+            }
+        }
+        public SortedSet<E> tailSet(E fromElement) {
+            synchronized (mutex) {
+               return new SynchronizedSortedSet<>(ss.tailSet(fromElement),mutex);
+            }
+        }
+
+        public E first() {
+            synchronized (mutex) {return ss.first();}
+        }
+        public E last() {
+            synchronized (mutex) {return ss.last();}
+        }
+    }
+
+    /**
+     * Returns a synchronized (thread-safe) list backed by the specified
+     * list.  In order to guarantee serial access, it is critical that
+     * <strong>all</strong> access to the backing list is accomplished
+     * through the returned list.<p>
+     *
+     * It is imperative that the user manually synchronize on the returned
+     * list when iterating over it:
+     * <pre>
+     *  List list = Collections.synchronizedList(new ArrayList());
+     *      ...
+     *  synchronized (list) {
+     *      Iterator i = list.iterator(); // Must be in synchronized block
+     *      while (i.hasNext())
+     *          foo(i.next());
+     *  }
+     * </pre>
+     * Failure to follow this advice may result in non-deterministic behavior.
+     *
+     * <p>The returned list will be serializable if the specified list is
+     * serializable.
+     *
+     * @param  list the list to be "wrapped" in a synchronized list.
+     * @return a synchronized view of the specified list.
+     */
+    public static <T> List<T> synchronizedList(List<T> list) {
+        return (list instanceof RandomAccess ?
+                new SynchronizedRandomAccessList<>(list) :
+                new SynchronizedList<>(list));
+    }
+
+    static <T> List<T> synchronizedList(List<T> list, Object mutex) {
+        return (list instanceof RandomAccess ?
+                new SynchronizedRandomAccessList<>(list, mutex) :
+                new SynchronizedList<>(list, mutex));
+    }
+
+    /**
+     * @serial include
+     */
+    static class SynchronizedList<E>
+        extends SynchronizedCollection<E>
+        implements List<E> {
+        private static final long serialVersionUID = -7754090372962971524L;
+
+        final List<E> list;
+
+        SynchronizedList(List<E> list) {
+            super(list);
+            this.list = list;
+        }
+        SynchronizedList(List<E> list, Object mutex) {
+            super(list, mutex);
+            this.list = list;
+        }
+
+        public boolean equals(Object o) {
+            synchronized (mutex) {return list.equals(o);}
+        }
+        public int hashCode() {
+            synchronized (mutex) {return list.hashCode();}
+        }
+
+        public E get(int index) {
+            synchronized (mutex) {return list.get(index);}
+        }
+        public E set(int index, E element) {
+            synchronized (mutex) {return list.set(index, element);}
+        }
+        public void add(int index, E element) {
+            synchronized (mutex) {list.add(index, element);}
+        }
+        public E remove(int index) {
+            synchronized (mutex) {return list.remove(index);}
+        }
+
+        public int indexOf(Object o) {
+            synchronized (mutex) {return list.indexOf(o);}
+        }
+        public int lastIndexOf(Object o) {
+            synchronized (mutex) {return list.lastIndexOf(o);}
+        }
+
+        public boolean addAll(int index, Collection<? extends E> c) {
+            synchronized (mutex) {return list.addAll(index, c);}
+        }
+
+        public ListIterator<E> listIterator() {
+            return list.listIterator(); // Must be manually synched by user
+        }
+
+        public ListIterator<E> listIterator(int index) {
+            return list.listIterator(index); // Must be manually synched by user
+        }
+
+        public List<E> subList(int fromIndex, int toIndex) {
+            synchronized (mutex) {
+                return new SynchronizedList<>(list.subList(fromIndex, toIndex),
+                                            mutex);
+            }
+        }
+
+        /**
+         * SynchronizedRandomAccessList instances are serialized as
+         * SynchronizedList instances to allow them to be deserialized
+         * in pre-1.4 JREs (which do not have SynchronizedRandomAccessList).
+         * This method inverts the transformation.  As a beneficial
+         * side-effect, it also grafts the RandomAccess marker onto
+         * SynchronizedList instances that were serialized in pre-1.4 JREs.
+         *
+         * Note: Unfortunately, SynchronizedRandomAccessList instances
+         * serialized in 1.4.1 and deserialized in 1.4 will become
+         * SynchronizedList instances, as this method was missing in 1.4.
+         */
+        private Object readResolve() {
+            return (list instanceof RandomAccess
+                    ? new SynchronizedRandomAccessList<>(list)
+                    : this);
+        }
+    }
+
+    /**
+     * @serial include
+     */
+    static class SynchronizedRandomAccessList<E>
+        extends SynchronizedList<E>
+        implements RandomAccess {
+
+        SynchronizedRandomAccessList(List<E> list) {
+            super(list);
+        }
+
+        SynchronizedRandomAccessList(List<E> list, Object mutex) {
+            super(list, mutex);
+        }
+
+        public List<E> subList(int fromIndex, int toIndex) {
+            synchronized (mutex) {
+                return new SynchronizedRandomAccessList<>(
+                    list.subList(fromIndex, toIndex), mutex);
+            }
+        }
+
+        private static final long serialVersionUID = 1530674583602358482L;
+
+        /**
+         * Allows instances to be deserialized in pre-1.4 JREs (which do
+         * not have SynchronizedRandomAccessList).  SynchronizedList has
+         * a readResolve method that inverts this transformation upon
+         * deserialization.
+         */
+        private Object writeReplace() {
+            return new SynchronizedList<>(list);
+        }
+    }
+
+    /**
+     * Returns a synchronized (thread-safe) map backed by the specified
+     * map.  In order to guarantee serial access, it is critical that
+     * <strong>all</strong> access to the backing map is accomplished
+     * through the returned map.<p>
+     *
+     * It is imperative that the user manually synchronize on the returned
+     * map when iterating over any of its collection views:
+     * <pre>
+     *  Map m = Collections.synchronizedMap(new HashMap());
+     *      ...
+     *  Set s = m.keySet();  // Needn't be in synchronized block
+     *      ...
+     *  synchronized (m) {  // Synchronizing on m, not s!
+     *      Iterator i = s.iterator(); // Must be in synchronized block
+     *      while (i.hasNext())
+     *          foo(i.next());
+     *  }
+     * </pre>
+     * Failure to follow this advice may result in non-deterministic behavior.
+     *
+     * <p>The returned map will be serializable if the specified map is
+     * serializable.
+     *
+     * @param  m the map to be "wrapped" in a synchronized map.
+     * @return a synchronized view of the specified map.
+     */
+    public static <K,V> Map<K,V> synchronizedMap(Map<K,V> m) {
+        return new SynchronizedMap<>(m);
+    }
+
+    /**
+     * @serial include
+     */
+    private static class SynchronizedMap<K,V>
+        implements Map<K,V>, Serializable {
+        private static final long serialVersionUID = 1978198479659022715L;
+
+        private final Map<K,V> m;     // Backing Map
+        final Object      mutex;        // Object on which to synchronize
+
+        SynchronizedMap(Map<K,V> m) {
+            if (m==null)
+                throw new NullPointerException();
+            this.m = m;
+            mutex = this;
+        }
+
+        SynchronizedMap(Map<K,V> m, Object mutex) {
+            this.m = m;
+            this.mutex = mutex;
+        }
+
+        public int size() {
+            synchronized (mutex) {return m.size();}
+        }
+        public boolean isEmpty() {
+            synchronized (mutex) {return m.isEmpty();}
+        }
+        public boolean containsKey(Object key) {
+            synchronized (mutex) {return m.containsKey(key);}
+        }
+        public boolean containsValue(Object value) {
+            synchronized (mutex) {return m.containsValue(value);}
+        }
+        public V get(Object key) {
+            synchronized (mutex) {return m.get(key);}
+        }
+
+        public V put(K key, V value) {
+            synchronized (mutex) {return m.put(key, value);}
+        }
+        public V remove(Object key) {
+            synchronized (mutex) {return m.remove(key);}
+        }
+        public void putAll(Map<? extends K, ? extends V> map) {
+            synchronized (mutex) {m.putAll(map);}
+        }
+        public void clear() {
+            synchronized (mutex) {m.clear();}
+        }
+
+        private transient Set<K> keySet = null;
+        private transient Set<Map.Entry<K,V>> entrySet = null;
+        private transient Collection<V> values = null;
+
+        public Set<K> keySet() {
+            synchronized (mutex) {
+                if (keySet==null)
+                    keySet = new SynchronizedSet<>(m.keySet(), mutex);
+                return keySet;
+            }
+        }
+
+        public Set<Map.Entry<K,V>> entrySet() {
+            synchronized (mutex) {
+                if (entrySet==null)
+                    entrySet = new SynchronizedSet<>(m.entrySet(), mutex);
+                return entrySet;
+            }
+        }
+
+        public Collection<V> values() {
+            synchronized (mutex) {
+                if (values==null)
+                    values = new SynchronizedCollection<>(m.values(), mutex);
+                return values;
+            }
+        }
+
+        public boolean equals(Object o) {
+            synchronized (mutex) {return m.equals(o);}
+        }
+        public int hashCode() {
+            synchronized (mutex) {return m.hashCode();}
+        }
+        public String toString() {
+            synchronized (mutex) {return m.toString();}
+        }
+    }
+
+    /**
+     * Returns a synchronized (thread-safe) sorted map backed by the specified
+     * sorted map.  In order to guarantee serial access, it is critical that
+     * <strong>all</strong> access to the backing sorted map is accomplished
+     * through the returned sorted map (or its views).<p>
+     *
+     * It is imperative that the user manually synchronize on the returned
+     * sorted map when iterating over any of its collection views, or the
+     * collections views of any of its <tt>subMap</tt>, <tt>headMap</tt> or
+     * <tt>tailMap</tt> views.
+     * <pre>
+     *  SortedMap m = Collections.synchronizedSortedMap(new TreeMap());
+     *      ...
+     *  Set s = m.keySet();  // Needn't be in synchronized block
+     *      ...
+     *  synchronized (m) {  // Synchronizing on m, not s!
+     *      Iterator i = s.iterator(); // Must be in synchronized block
+     *      while (i.hasNext())
+     *          foo(i.next());
+     *  }
+     * </pre>
+     * or:
+     * <pre>
+     *  SortedMap m = Collections.synchronizedSortedMap(new TreeMap());
+     *  SortedMap m2 = m.subMap(foo, bar);
+     *      ...
+     *  Set s2 = m2.keySet();  // Needn't be in synchronized block
+     *      ...
+     *  synchronized (m) {  // Synchronizing on m, not m2 or s2!
+     *      Iterator i = s.iterator(); // Must be in synchronized block
+     *      while (i.hasNext())
+     *          foo(i.next());
+     *  }
+     * </pre>
+     * Failure to follow this advice may result in non-deterministic behavior.
+     *
+     * <p>The returned sorted map will be serializable if the specified
+     * sorted map is serializable.
+     *
+     * @param  m the sorted map to be "wrapped" in a synchronized sorted map.
+     * @return a synchronized view of the specified sorted map.
+     */
+    public static <K,V> SortedMap<K,V> synchronizedSortedMap(SortedMap<K,V> m) {
+        return new SynchronizedSortedMap<>(m);
+    }
+
+
+    /**
+     * @serial include
+     */
+    static class SynchronizedSortedMap<K,V>
+        extends SynchronizedMap<K,V>
+        implements SortedMap<K,V>
+    {
+        private static final long serialVersionUID = -8798146769416483793L;
+
+        private final SortedMap<K,V> sm;
+
+        SynchronizedSortedMap(SortedMap<K,V> m) {
+            super(m);
+            sm = m;
+        }
+        SynchronizedSortedMap(SortedMap<K,V> m, Object mutex) {
+            super(m, mutex);
+            sm = m;
+        }
+
+        public Comparator<? super K> comparator() {
+            synchronized (mutex) {return sm.comparator();}
+        }
+
+        public SortedMap<K,V> subMap(K fromKey, K toKey) {
+            synchronized (mutex) {
+                return new SynchronizedSortedMap<>(
+                    sm.subMap(fromKey, toKey), mutex);
+            }
+        }
+        public SortedMap<K,V> headMap(K toKey) {
+            synchronized (mutex) {
+                return new SynchronizedSortedMap<>(sm.headMap(toKey), mutex);
+            }
+        }
+        public SortedMap<K,V> tailMap(K fromKey) {
+            synchronized (mutex) {
+               return new SynchronizedSortedMap<>(sm.tailMap(fromKey),mutex);
+            }
+        }
+
+        public K firstKey() {
+            synchronized (mutex) {return sm.firstKey();}
+        }
+        public K lastKey() {
+            synchronized (mutex) {return sm.lastKey();}
+        }
+    }
+
+    // Dynamically typesafe collection wrappers
+
+    /**
+     * Returns a dynamically typesafe view of the specified collection.
+     * Any attempt to insert an element of the wrong type will result in an
+     * immediate {@link ClassCastException}.  Assuming a collection
+     * contains no incorrectly typed elements prior to the time a
+     * dynamically typesafe view is generated, and that all subsequent
+     * access to the collection takes place through the view, it is
+     * <i>guaranteed</i> that the collection cannot contain an incorrectly
+     * typed element.
+     *
+     * <p>The generics mechanism in the language provides compile-time
+     * (static) type checking, but it is possible to defeat this mechanism
+     * with unchecked casts.  Usually this is not a problem, as the compiler
+     * issues warnings on all such unchecked operations.  There are, however,
+     * times when static type checking alone is not sufficient.  For example,
+     * suppose a collection is passed to a third-party library and it is
+     * imperative that the library code not corrupt the collection by
+     * inserting an element of the wrong type.
+     *
+     * <p>Another use of dynamically typesafe views is debugging.  Suppose a
+     * program fails with a {@code ClassCastException}, indicating that an
+     * incorrectly typed element was put into a parameterized collection.
+     * Unfortunately, the exception can occur at any time after the erroneous
+     * element is inserted, so it typically provides little or no information
+     * as to the real source of the problem.  If the problem is reproducible,
+     * one can quickly determine its source by temporarily modifying the
+     * program to wrap the collection with a dynamically typesafe view.
+     * For example, this declaration:
+     *  <pre> {@code
+     *     Collection<String> c = new HashSet<String>();
+     * }</pre>
+     * may be replaced temporarily by this one:
+     *  <pre> {@code
+     *     Collection<String> c = Collections.checkedCollection(
+     *         new HashSet<String>(), String.class);
+     * }</pre>
+     * Running the program again will cause it to fail at the point where
+     * an incorrectly typed element is inserted into the collection, clearly
+     * identifying the source of the problem.  Once the problem is fixed, the
+     * modified declaration may be reverted back to the original.
+     *
+     * <p>The returned collection does <i>not</i> pass the hashCode and equals
+     * operations through to the backing collection, but relies on
+     * {@code Object}'s {@code equals} and {@code hashCode} methods.  This
+     * is necessary to preserve the contracts of these operations in the case
+     * that the backing collection is a set or a list.
+     *
+     * <p>The returned collection will be serializable if the specified
+     * collection is serializable.
+     *
+     * <p>Since {@code null} is considered to be a value of any reference
+     * type, the returned collection permits insertion of null elements
+     * whenever the backing collection does.
+     *
+     * @param c the collection for which a dynamically typesafe view is to be
+     *          returned
+     * @param type the type of element that {@code c} is permitted to hold
+     * @return a dynamically typesafe view of the specified collection
+     * @since 1.5
+     */
+    public static <E> Collection<E> checkedCollection(Collection<E> c,
+                                                      Class<E> type) {
+        return new CheckedCollection<>(c, type);
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T> T[] zeroLengthArray(Class<T> type) {
+        return (T[]) Array.newInstance(type, 0);
+    }
+
+    /**
+     * @serial include
+     */
+    static class CheckedCollection<E> implements Collection<E>, Serializable {
+        private static final long serialVersionUID = 1578914078182001775L;
+
+        final Collection<E> c;
+        final Class<E> type;
+
+        void typeCheck(Object o) {
+            if (o != null && !type.isInstance(o))
+                throw new ClassCastException(badElementMsg(o));
+        }
+
+        private String badElementMsg(Object o) {
+            return "Attempt to insert " + o.getClass() +
+                " element into collection with element type " + type;
+        }
+
+        CheckedCollection(Collection<E> c, Class<E> type) {
+            if (c==null || type == null)
+                throw new NullPointerException();
+            this.c = c;
+            this.type = type;
+        }
+
+        public int size()                 { return c.size(); }
+        public boolean isEmpty()          { return c.isEmpty(); }
+        public boolean contains(Object o) { return c.contains(o); }
+        public Object[] toArray()         { return c.toArray(); }
+        public <T> T[] toArray(T[] a)     { return c.toArray(a); }
+        public String toString()          { return c.toString(); }
+        public boolean remove(Object o)   { return c.remove(o); }
+        public void clear()               {        c.clear(); }
+
+        public boolean containsAll(Collection<?> coll) {
+            return c.containsAll(coll);
+        }
+        public boolean removeAll(Collection<?> coll) {
+            return c.removeAll(coll);
+        }
+        public boolean retainAll(Collection<?> coll) {
+            return c.retainAll(coll);
+        }
+
+        public Iterator<E> iterator() {
+            final Iterator<E> it = c.iterator();
+            return new Iterator<E>() {
+                public boolean hasNext() { return it.hasNext(); }
+                public E next()          { return it.next(); }
+                public void remove()     {        it.remove(); }};
+        }
+
+        public boolean add(E e) {
+            typeCheck(e);
+            return c.add(e);
+        }
+
+        private E[] zeroLengthElementArray = null; // Lazily initialized
+
+        private E[] zeroLengthElementArray() {
+            return zeroLengthElementArray != null ? zeroLengthElementArray :
+                (zeroLengthElementArray = zeroLengthArray(type));
+        }
+
+        @SuppressWarnings("unchecked")
+        Collection<E> checkedCopyOf(Collection<? extends E> coll) {
+            Object[] a = null;
+            try {
+                E[] z = zeroLengthElementArray();
+                a = coll.toArray(z);
+                // Defend against coll violating the toArray contract
+                if (a.getClass() != z.getClass())
+                    a = Arrays.copyOf(a, a.length, z.getClass());
+            } catch (ArrayStoreException ignore) {
+                // To get better and consistent diagnostics,
+                // we call typeCheck explicitly on each element.
+                // We call clone() to defend against coll retaining a
+                // reference to the returned array and storing a bad
+                // element into it after it has been type checked.
+                a = coll.toArray().clone();
+                for (Object o : a)
+                    typeCheck(o);
+            }
+            // A slight abuse of the type system, but safe here.
+            return (Collection<E>) Arrays.asList(a);
+        }
+
+        public boolean addAll(Collection<? extends E> coll) {
+            // Doing things this way insulates us from concurrent changes
+            // in the contents of coll and provides all-or-nothing
+            // semantics (which we wouldn't get if we type-checked each
+            // element as we added it)
+            return c.addAll(checkedCopyOf(coll));
+        }
+    }
+
+    /**
+     * Returns a dynamically typesafe view of the specified set.
+     * Any attempt to insert an element of the wrong type will result in
+     * an immediate {@link ClassCastException}.  Assuming a set contains
+     * no incorrectly typed elements prior to the time a dynamically typesafe
+     * view is generated, and that all subsequent access to the set
+     * takes place through the view, it is <i>guaranteed</i> that the
+     * set cannot contain an incorrectly typed element.
+     *
+     * <p>A discussion of the use of dynamically typesafe views may be
+     * found in the documentation for the {@link #checkedCollection
+     * checkedCollection} method.
+     *
+     * <p>The returned set will be serializable if the specified set is
+     * serializable.
+     *
+     * <p>Since {@code null} is considered to be a value of any reference
+     * type, the returned set permits insertion of null elements whenever
+     * the backing set does.
+     *
+     * @param s the set for which a dynamically typesafe view is to be
+     *          returned
+     * @param type the type of element that {@code s} is permitted to hold
+     * @return a dynamically typesafe view of the specified set
+     * @since 1.5
+     */
+    public static <E> Set<E> checkedSet(Set<E> s, Class<E> type) {
+        return new CheckedSet<>(s, type);
+    }
+
+    /**
+     * @serial include
+     */
+    static class CheckedSet<E> extends CheckedCollection<E>
+                                 implements Set<E>, Serializable
+    {
+        private static final long serialVersionUID = 4694047833775013803L;
+
+        CheckedSet(Set<E> s, Class<E> elementType) { super(s, elementType); }
+
+        public boolean equals(Object o) { return o == this || c.equals(o); }
+        public int hashCode()           { return c.hashCode(); }
+    }
+
+    /**
+     * Returns a dynamically typesafe view of the specified sorted set.
+     * Any attempt to insert an element of the wrong type will result in an
+     * immediate {@link ClassCastException}.  Assuming a sorted set
+     * contains no incorrectly typed elements prior to the time a
+     * dynamically typesafe view is generated, and that all subsequent
+     * access to the sorted set takes place through the view, it is
+     * <i>guaranteed</i> that the sorted set cannot contain an incorrectly
+     * typed element.
+     *
+     * <p>A discussion of the use of dynamically typesafe views may be
+     * found in the documentation for the {@link #checkedCollection
+     * checkedCollection} method.
+     *
+     * <p>The returned sorted set will be serializable if the specified sorted
+     * set is serializable.
+     *
+     * <p>Since {@code null} is considered to be a value of any reference
+     * type, the returned sorted set permits insertion of null elements
+     * whenever the backing sorted set does.
+     *
+     * @param s the sorted set for which a dynamically typesafe view is to be
+     *          returned
+     * @param type the type of element that {@code s} is permitted to hold
+     * @return a dynamically typesafe view of the specified sorted set
+     * @since 1.5
+     */
+    public static <E> SortedSet<E> checkedSortedSet(SortedSet<E> s,
+                                                    Class<E> type) {
+        return new CheckedSortedSet<>(s, type);
+    }
+
+    /**
+     * @serial include
+     */
+    static class CheckedSortedSet<E> extends CheckedSet<E>
+        implements SortedSet<E>, Serializable
+    {
+        private static final long serialVersionUID = 1599911165492914959L;
+        private final SortedSet<E> ss;
+
+        CheckedSortedSet(SortedSet<E> s, Class<E> type) {
+            super(s, type);
+            ss = s;
+        }
+
+        public Comparator<? super E> comparator() { return ss.comparator(); }
+        public E first()                   { return ss.first(); }
+        public E last()                    { return ss.last(); }
+
+        public SortedSet<E> subSet(E fromElement, E toElement) {
+            return checkedSortedSet(ss.subSet(fromElement,toElement), type);
+        }
+        public SortedSet<E> headSet(E toElement) {
+            return checkedSortedSet(ss.headSet(toElement), type);
+        }
+        public SortedSet<E> tailSet(E fromElement) {
+            return checkedSortedSet(ss.tailSet(fromElement), type);
+        }
+    }
+
+    /**
+     * Returns a dynamically typesafe view of the specified list.
+     * Any attempt to insert an element of the wrong type will result in
+     * an immediate {@link ClassCastException}.  Assuming a list contains
+     * no incorrectly typed elements prior to the time a dynamically typesafe
+     * view is generated, and that all subsequent access to the list
+     * takes place through the view, it is <i>guaranteed</i> that the
+     * list cannot contain an incorrectly typed element.
+     *
+     * <p>A discussion of the use of dynamically typesafe views may be
+     * found in the documentation for the {@link #checkedCollection
+     * checkedCollection} method.
+     *
+     * <p>The returned list will be serializable if the specified list
+     * is serializable.
+     *
+     * <p>Since {@code null} is considered to be a value of any reference
+     * type, the returned list permits insertion of null elements whenever
+     * the backing list does.
+     *
+     * @param list the list for which a dynamically typesafe view is to be
+     *             returned
+     * @param type the type of element that {@code list} is permitted to hold
+     * @return a dynamically typesafe view of the specified list
+     * @since 1.5
+     */
+    public static <E> List<E> checkedList(List<E> list, Class<E> type) {
+        return (list instanceof RandomAccess ?
+                new CheckedRandomAccessList<>(list, type) :
+                new CheckedList<>(list, type));
+    }
+
+    /**
+     * @serial include
+     */
+    static class CheckedList<E>
+        extends CheckedCollection<E>
+        implements List<E>
+    {
+        private static final long serialVersionUID = 65247728283967356L;
+        final List<E> list;
+
+        CheckedList(List<E> list, Class<E> type) {
+            super(list, type);
+            this.list = list;
+        }
+
+        public boolean equals(Object o)  { return o == this || list.equals(o); }
+        public int hashCode()            { return list.hashCode(); }
+        public E get(int index)          { return list.get(index); }
+        public E remove(int index)       { return list.remove(index); }
+        public int indexOf(Object o)     { return list.indexOf(o); }
+        public int lastIndexOf(Object o) { return list.lastIndexOf(o); }
+
+        public E set(int index, E element) {
+            typeCheck(element);
+            return list.set(index, element);
+        }
+
+        public void add(int index, E element) {
+            typeCheck(element);
+            list.add(index, element);
+        }
+
+        public boolean addAll(int index, Collection<? extends E> c) {
+            return list.addAll(index, checkedCopyOf(c));
+        }
+        public ListIterator<E> listIterator()   { return listIterator(0); }
+
+        public ListIterator<E> listIterator(final int index) {
+            final ListIterator<E> i = list.listIterator(index);
+
+            return new ListIterator<E>() {
+                public boolean hasNext()     { return i.hasNext(); }
+                public E next()              { return i.next(); }
+                public boolean hasPrevious() { return i.hasPrevious(); }
+                public E previous()          { return i.previous(); }
+                public int nextIndex()       { return i.nextIndex(); }
+                public int previousIndex()   { return i.previousIndex(); }
+                public void remove()         {        i.remove(); }
+
+                public void set(E e) {
+                    typeCheck(e);
+                    i.set(e);
+                }
+
+                public void add(E e) {
+                    typeCheck(e);
+                    i.add(e);
+                }
+            };
+        }
+
+        public List<E> subList(int fromIndex, int toIndex) {
+            return new CheckedList<>(list.subList(fromIndex, toIndex), type);
+        }
+    }
+
+    /**
+     * @serial include
+     */
+    static class CheckedRandomAccessList<E> extends CheckedList<E>
+                                            implements RandomAccess
+    {
+        private static final long serialVersionUID = 1638200125423088369L;
+
+        CheckedRandomAccessList(List<E> list, Class<E> type) {
+            super(list, type);
+        }
+
+        public List<E> subList(int fromIndex, int toIndex) {
+            return new CheckedRandomAccessList<>(
+                list.subList(fromIndex, toIndex), type);
+        }
+    }
+
+    /**
+     * Returns a dynamically typesafe view of the specified map.
+     * Any attempt to insert a mapping whose key or value have the wrong
+     * type will result in an immediate {@link ClassCastException}.
+     * Similarly, any attempt to modify the value currently associated with
+     * a key will result in an immediate {@link ClassCastException},
+     * whether the modification is attempted directly through the map
+     * itself, or through a {@link Map.Entry} instance obtained from the
+     * map's {@link Map#entrySet() entry set} view.
+     *
+     * <p>Assuming a map contains no incorrectly typed keys or values
+     * prior to the time a dynamically typesafe view is generated, and
+     * that all subsequent access to the map takes place through the view
+     * (or one of its collection views), it is <i>guaranteed</i> that the
+     * map cannot contain an incorrectly typed key or value.
+     *
+     * <p>A discussion of the use of dynamically typesafe views may be
+     * found in the documentation for the {@link #checkedCollection
+     * checkedCollection} method.
+     *
+     * <p>The returned map will be serializable if the specified map is
+     * serializable.
+     *
+     * <p>Since {@code null} is considered to be a value of any reference
+     * type, the returned map permits insertion of null keys or values
+     * whenever the backing map does.
+     *
+     * @param m the map for which a dynamically typesafe view is to be
+     *          returned
+     * @param keyType the type of key that {@code m} is permitted to hold
+     * @param valueType the type of value that {@code m} is permitted to hold
+     * @return a dynamically typesafe view of the specified map
+     * @since 1.5
+     */
+    public static <K, V> Map<K, V> checkedMap(Map<K, V> m,
+                                              Class<K> keyType,
+                                              Class<V> valueType) {
+        return new CheckedMap<>(m, keyType, valueType);
+    }
+
+
+    /**
+     * @serial include
+     */
+    private static class CheckedMap<K,V>
+        implements Map<K,V>, Serializable
+    {
+        private static final long serialVersionUID = 5742860141034234728L;
+
+        private final Map<K, V> m;
+        final Class<K> keyType;
+        final Class<V> valueType;
+
+        private void typeCheck(Object key, Object value) {
+            if (key != null && !keyType.isInstance(key))
+                throw new ClassCastException(badKeyMsg(key));
+
+            if (value != null && !valueType.isInstance(value))
+                throw new ClassCastException(badValueMsg(value));
+        }
+
+        private String badKeyMsg(Object key) {
+            return "Attempt to insert " + key.getClass() +
+                " key into map with key type " + keyType;
+        }
+
+        private String badValueMsg(Object value) {
+            return "Attempt to insert " + value.getClass() +
+                " value into map with value type " + valueType;
+        }
+
+        CheckedMap(Map<K, V> m, Class<K> keyType, Class<V> valueType) {
+            if (m == null || keyType == null || valueType == null)
+                throw new NullPointerException();
+            this.m = m;
+            this.keyType = keyType;
+            this.valueType = valueType;
+        }
+
+        public int size()                      { return m.size(); }
+        public boolean isEmpty()               { return m.isEmpty(); }
+        public boolean containsKey(Object key) { return m.containsKey(key); }
+        public boolean containsValue(Object v) { return m.containsValue(v); }
+        public V get(Object key)               { return m.get(key); }
+        public V remove(Object key)            { return m.remove(key); }
+        public void clear()                    { m.clear(); }
+        public Set<K> keySet()                 { return m.keySet(); }
+        public Collection<V> values()          { return m.values(); }
+        public boolean equals(Object o)        { return o == this || m.equals(o); }
+        public int hashCode()                  { return m.hashCode(); }
+        public String toString()               { return m.toString(); }
+
+        public V put(K key, V value) {
+            typeCheck(key, value);
+            return m.put(key, value);
+        }
+
+        @SuppressWarnings("unchecked")
+        public void putAll(Map<? extends K, ? extends V> t) {
+            // Satisfy the following goals:
+            // - good diagnostics in case of type mismatch
+            // - all-or-nothing semantics
+            // - protection from malicious t
+            // - correct behavior if t is a concurrent map
+            Object[] entries = t.entrySet().toArray();
+            List<Map.Entry<K,V>> checked = new ArrayList<>(entries.length);
+            for (Object o : entries) {
+                Map.Entry<?,?> e = (Map.Entry<?,?>) o;
+                Object k = e.getKey();
+                Object v = e.getValue();
+                typeCheck(k, v);
+                checked.add(
+                    new AbstractMap.SimpleImmutableEntry<>((K) k, (V) v));
+            }
+            for (Map.Entry<K,V> e : checked)
+                m.put(e.getKey(), e.getValue());
+        }
+
+        private transient Set<Map.Entry<K,V>> entrySet = null;
+
+        public Set<Map.Entry<K,V>> entrySet() {
+            if (entrySet==null)
+                entrySet = new CheckedEntrySet<>(m.entrySet(), valueType);
+            return entrySet;
+        }
+
+        /**
+         * We need this class in addition to CheckedSet as Map.Entry permits
+         * modification of the backing Map via the setValue operation.  This
+         * class is subtle: there are many possible attacks that must be
+         * thwarted.
+         *
+         * @serial exclude
+         */
+        static class CheckedEntrySet<K,V> implements Set<Map.Entry<K,V>> {
+            private final Set<Map.Entry<K,V>> s;
+            private final Class<V> valueType;
+
+            CheckedEntrySet(Set<Map.Entry<K, V>> s, Class<V> valueType) {
+                this.s = s;
+                this.valueType = valueType;
+            }
+
+            public int size()        { return s.size(); }
+            public boolean isEmpty() { return s.isEmpty(); }
+            public String toString() { return s.toString(); }
+            public int hashCode()    { return s.hashCode(); }
+            public void clear()      {        s.clear(); }
+
+            public boolean add(Map.Entry<K, V> e) {
+                throw new UnsupportedOperationException();
+            }
+            public boolean addAll(Collection<? extends Map.Entry<K, V>> coll) {
+                throw new UnsupportedOperationException();
+            }
+
+            public Iterator<Map.Entry<K,V>> iterator() {
+                final Iterator<Map.Entry<K, V>> i = s.iterator();
+                final Class<V> valueType = this.valueType;
+
+                return new Iterator<Map.Entry<K,V>>() {
+                    public boolean hasNext() { return i.hasNext(); }
+                    public void remove()     { i.remove(); }
+
+                    public Map.Entry<K,V> next() {
+                        return checkedEntry(i.next(), valueType);
+                    }
+                };
+            }
+
+            @SuppressWarnings("unchecked")
+            public Object[] toArray() {
+                Object[] source = s.toArray();
+
+                /*
+                 * Ensure that we don't get an ArrayStoreException even if
+                 * s.toArray returns an array of something other than Object
+                 */
+                Object[] dest = (CheckedEntry.class.isInstance(
+                    source.getClass().getComponentType()) ? source :
+                                 new Object[source.length]);
+
+                for (int i = 0; i < source.length; i++)
+                    dest[i] = checkedEntry((Map.Entry<K,V>)source[i],
+                                           valueType);
+                return dest;
+            }
+
+            @SuppressWarnings("unchecked")
+            public <T> T[] toArray(T[] a) {
+                // We don't pass a to s.toArray, to avoid window of
+                // vulnerability wherein an unscrupulous multithreaded client
+                // could get his hands on raw (unwrapped) Entries from s.
+                T[] arr = s.toArray(a.length==0 ? a : Arrays.copyOf(a, 0));
+
+                for (int i=0; i<arr.length; i++)
+                    arr[i] = (T) checkedEntry((Map.Entry<K,V>)arr[i],
+                                              valueType);
+                if (arr.length > a.length)
+                    return arr;
+
+                System.arraycopy(arr, 0, a, 0, arr.length);
+                if (a.length > arr.length)
+                    a[arr.length] = null;
+                return a;
+            }
+
+            /**
+             * This method is overridden to protect the backing set against
+             * an object with a nefarious equals function that senses
+             * that the equality-candidate is Map.Entry and calls its
+             * setValue method.
+             */
+            public boolean contains(Object o) {
+                if (!(o instanceof Map.Entry))
+                    return false;
+                Map.Entry<?,?> e = (Map.Entry<?,?>) o;
+                return s.contains(
+                    (e instanceof CheckedEntry) ? e : checkedEntry(e, valueType));
+            }
+
+            /**
+             * The bulk collection methods are overridden to protect
+             * against an unscrupulous collection whose contains(Object o)
+             * method senses when o is a Map.Entry, and calls o.setValue.
+             */
+            public boolean containsAll(Collection<?> c) {
+                for (Object o : c)
+                    if (!contains(o)) // Invokes safe contains() above
+                        return false;
+                return true;
+            }
+
+            public boolean remove(Object o) {
+                if (!(o instanceof Map.Entry))
+                    return false;
+                return s.remove(new AbstractMap.SimpleImmutableEntry
+                                <>((Map.Entry<?,?>)o));
+            }
+
+            public boolean removeAll(Collection<?> c) {
+                return batchRemove(c, false);
+            }
+            public boolean retainAll(Collection<?> c) {
+                return batchRemove(c, true);
+            }
+            private boolean batchRemove(Collection<?> c, boolean complement) {
+                boolean modified = false;
+                Iterator<Map.Entry<K,V>> it = iterator();
+                while (it.hasNext()) {
+                    if (c.contains(it.next()) != complement) {
+                        it.remove();
+                        modified = true;
+                    }
+                }
+                return modified;
+            }
+
+            public boolean equals(Object o) {
+                if (o == this)
+                    return true;
+                if (!(o instanceof Set))
+                    return false;
+                Set<?> that = (Set<?>) o;
+                return that.size() == s.size()
+                    && containsAll(that); // Invokes safe containsAll() above
+            }
+
+            static <K,V,T> CheckedEntry<K,V,T> checkedEntry(Map.Entry<K,V> e,
+                                                            Class<T> valueType) {
+                return new CheckedEntry<>(e, valueType);
+            }
+
+            /**
+             * This "wrapper class" serves two purposes: it prevents
+             * the client from modifying the backing Map, by short-circuiting
+             * the setValue method, and it protects the backing Map against
+             * an ill-behaved Map.Entry that attempts to modify another
+             * Map.Entry when asked to perform an equality check.
+             */
+            private static class CheckedEntry<K,V,T> implements Map.Entry<K,V> {
+                private final Map.Entry<K, V> e;
+                private final Class<T> valueType;
+
+                CheckedEntry(Map.Entry<K, V> e, Class<T> valueType) {
+                    this.e = e;
+                    this.valueType = valueType;
+                }
+
+                public K getKey()        { return e.getKey(); }
+                public V getValue()      { return e.getValue(); }
+                public int hashCode()    { return e.hashCode(); }
+                public String toString() { return e.toString(); }
+
+                public V setValue(V value) {
+                    if (value != null && !valueType.isInstance(value))
+                        throw new ClassCastException(badValueMsg(value));
+                    return e.setValue(value);
+                }
+
+                private String badValueMsg(Object value) {
+                    return "Attempt to insert " + value.getClass() +
+                        " value into map with value type " + valueType;
+                }
+
+                public boolean equals(Object o) {
+                    if (o == this)
+                        return true;
+                    if (!(o instanceof Map.Entry))
+                        return false;
+                    return e.equals(new AbstractMap.SimpleImmutableEntry
+                                    <>((Map.Entry<?,?>)o));
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a dynamically typesafe view of the specified sorted map.
+     * Any attempt to insert a mapping whose key or value have the wrong
+     * type will result in an immediate {@link ClassCastException}.
+     * Similarly, any attempt to modify the value currently associated with
+     * a key will result in an immediate {@link ClassCastException},
+     * whether the modification is attempted directly through the map
+     * itself, or through a {@link Map.Entry} instance obtained from the
+     * map's {@link Map#entrySet() entry set} view.
+     *
+     * <p>Assuming a map contains no incorrectly typed keys or values
+     * prior to the time a dynamically typesafe view is generated, and
+     * that all subsequent access to the map takes place through the view
+     * (or one of its collection views), it is <i>guaranteed</i> that the
+     * map cannot contain an incorrectly typed key or value.
+     *
+     * <p>A discussion of the use of dynamically typesafe views may be
+     * found in the documentation for the {@link #checkedCollection
+     * checkedCollection} method.
+     *
+     * <p>The returned map will be serializable if the specified map is
+     * serializable.
+     *
+     * <p>Since {@code null} is considered to be a value of any reference
+     * type, the returned map permits insertion of null keys or values
+     * whenever the backing map does.
+     *
+     * @param m the map for which a dynamically typesafe view is to be
+     *          returned
+     * @param keyType the type of key that {@code m} is permitted to hold
+     * @param valueType the type of value that {@code m} is permitted to hold
+     * @return a dynamically typesafe view of the specified map
+     * @since 1.5
+     */
+    public static <K,V> SortedMap<K,V> checkedSortedMap(SortedMap<K, V> m,
+                                                        Class<K> keyType,
+                                                        Class<V> valueType) {
+        return new CheckedSortedMap<>(m, keyType, valueType);
+    }
+
+    /**
+     * @serial include
+     */
+    static class CheckedSortedMap<K,V> extends CheckedMap<K,V>
+        implements SortedMap<K,V>, Serializable
+    {
+        private static final long serialVersionUID = 1599671320688067438L;
+
+        private final SortedMap<K, V> sm;
+
+        CheckedSortedMap(SortedMap<K, V> m,
+                         Class<K> keyType, Class<V> valueType) {
+            super(m, keyType, valueType);
+            sm = m;
+        }
+
+        public Comparator<? super K> comparator() { return sm.comparator(); }
+        public K firstKey()                       { return sm.firstKey(); }
+        public K lastKey()                        { return sm.lastKey(); }
+
+        public SortedMap<K,V> subMap(K fromKey, K toKey) {
+            return checkedSortedMap(sm.subMap(fromKey, toKey),
+                                    keyType, valueType);
+        }
+        public SortedMap<K,V> headMap(K toKey) {
+            return checkedSortedMap(sm.headMap(toKey), keyType, valueType);
+        }
+        public SortedMap<K,V> tailMap(K fromKey) {
+            return checkedSortedMap(sm.tailMap(fromKey), keyType, valueType);
+        }
+    }
+
+    // Empty collections
+
+    /**
+     * Returns an iterator that has no elements.  More precisely,
+     *
+     * <ul compact>
+     *
+     * <li>{@link Iterator#hasNext hasNext} always returns {@code
+     * false}.
+     *
+     * <li>{@link Iterator#next next} always throws {@link
+     * NoSuchElementException}.
+     *
+     * <li>{@link Iterator#remove remove} always throws {@link
+     * IllegalStateException}.
+     *
+     * </ul>
+     *
+     * <p>Implementations of this method are permitted, but not
+     * required, to return the same object from multiple invocations.
+     *
+     * @return an empty iterator
+     * @since 1.7
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Iterator<T> emptyIterator() {
+        return (Iterator<T>) EmptyIterator.EMPTY_ITERATOR;
+    }
+
+    private static class EmptyIterator<E> implements Iterator<E> {
+        static final EmptyIterator<Object> EMPTY_ITERATOR
+            = new EmptyIterator<>();
+
+        public boolean hasNext() { return false; }
+        public E next() { throw new NoSuchElementException(); }
+        public void remove() { throw new IllegalStateException(); }
+    }
+
+    /**
+     * Returns a list iterator that has no elements.  More precisely,
+     *
+     * <ul compact>
+     *
+     * <li>{@link Iterator#hasNext hasNext} and {@link
+     * ListIterator#hasPrevious hasPrevious} always return {@code
+     * false}.
+     *
+     * <li>{@link Iterator#next next} and {@link ListIterator#previous
+     * previous} always throw {@link NoSuchElementException}.
+     *
+     * <li>{@link Iterator#remove remove} and {@link ListIterator#set
+     * set} always throw {@link IllegalStateException}.
+     *
+     * <li>{@link ListIterator#add add} always throws {@link
+     * UnsupportedOperationException}.
+     *
+     * <li>{@link ListIterator#nextIndex nextIndex} always returns
+     * {@code 0} .
+     *
+     * <li>{@link ListIterator#previousIndex previousIndex} always
+     * returns {@code -1}.
+     *
+     * </ul>
+     *
+     * <p>Implementations of this method are permitted, but not
+     * required, to return the same object from multiple invocations.
+     *
+     * @return an empty list iterator
+     * @since 1.7
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> ListIterator<T> emptyListIterator() {
+        return (ListIterator<T>) EmptyListIterator.EMPTY_ITERATOR;
+    }
+
+    private static class EmptyListIterator<E>
+        extends EmptyIterator<E>
+        implements ListIterator<E>
+    {
+        static final EmptyListIterator<Object> EMPTY_ITERATOR
+            = new EmptyListIterator<>();
+
+        public boolean hasPrevious() { return false; }
+        public E previous() { throw new NoSuchElementException(); }
+        public int nextIndex()     { return 0; }
+        public int previousIndex() { return -1; }
+        public void set(E e) { throw new IllegalStateException(); }
+        public void add(E e) { throw new UnsupportedOperationException(); }
+    }
+
+    /**
+     * Returns an enumeration that has no elements.  More precisely,
+     *
+     * <ul compact>
+     *
+     * <li>{@link Enumeration#hasMoreElements hasMoreElements} always
+     * returns {@code false}.
+     *
+     * <li> {@link Enumeration#nextElement nextElement} always throws
+     * {@link NoSuchElementException}.
+     *
+     * </ul>
+     *
+     * <p>Implementations of this method are permitted, but not
+     * required, to return the same object from multiple invocations.
+     *
+     * @return an empty enumeration
+     * @since 1.7
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Enumeration<T> emptyEnumeration() {
+        return (Enumeration<T>) EmptyEnumeration.EMPTY_ENUMERATION;
+    }
+
+    private static class EmptyEnumeration<E> implements Enumeration<E> {
+        static final EmptyEnumeration<Object> EMPTY_ENUMERATION
+            = new EmptyEnumeration<>();
+
+        public boolean hasMoreElements() { return false; }
+        public E nextElement() { throw new NoSuchElementException(); }
+    }
+
+    /**
+     * The empty set (immutable).  This set is serializable.
+     *
+     * @see #emptySet()
+     */
+    @SuppressWarnings("unchecked")
+    public static final Set EMPTY_SET = new EmptySet<>();
+
+    /**
+     * Returns the empty set (immutable).  This set is serializable.
+     * Unlike the like-named field, this method is parameterized.
+     *
+     * <p>This example illustrates the type-safe way to obtain an empty set:
+     * <pre>
+     *     Set&lt;String&gt; s = Collections.emptySet();
+     * </pre>
+     * Implementation note:  Implementations of this method need not
+     * create a separate <tt>Set</tt> object for each call.   Using this
+     * method is likely to have comparable cost to using the like-named
+     * field.  (Unlike this method, the field does not provide type safety.)
+     *
+     * @see #EMPTY_SET
+     * @since 1.5
+     */
+    @SuppressWarnings("unchecked")
+    public static final <T> Set<T> emptySet() {
+        return (Set<T>) EMPTY_SET;
+    }
+
+    /**
+     * @serial include
+     */
+    private static class EmptySet<E>
+        extends AbstractSet<E>
+        implements Serializable
+    {
+        private static final long serialVersionUID = 1582296315990362920L;
+
+        public Iterator<E> iterator() { return emptyIterator(); }
+
+        public int size() {return 0;}
+        public boolean isEmpty() {return true;}
+
+        public boolean contains(Object obj) {return false;}
+        public boolean containsAll(Collection<?> c) { return c.isEmpty(); }
+
+        public Object[] toArray() { return new Object[0]; }
+
+        public <T> T[] toArray(T[] a) {
+            if (a.length > 0)
+                a[0] = null;
+            return a;
+        }
+
+        // Preserves singleton property
+        private Object readResolve() {
+            return EMPTY_SET;
+        }
+    }
+
+    /**
+     * The empty list (immutable).  This list is serializable.
+     *
+     * @see #emptyList()
+     */
+    @SuppressWarnings("unchecked")
+    public static final List EMPTY_LIST = new EmptyList<>();
+
+    /**
+     * Returns the empty list (immutable).  This list is serializable.
+     *
+     * <p>This example illustrates the type-safe way to obtain an empty list:
+     * <pre>
+     *     List&lt;String&gt; s = Collections.emptyList();
+     * </pre>
+     * Implementation note:  Implementations of this method need not
+     * create a separate <tt>List</tt> object for each call.   Using this
+     * method is likely to have comparable cost to using the like-named
+     * field.  (Unlike this method, the field does not provide type safety.)
+     *
+     * @see #EMPTY_LIST
+     * @since 1.5
+     */
+    @SuppressWarnings("unchecked")
+    public static final <T> List<T> emptyList() {
+        return (List<T>) EMPTY_LIST;
+    }
+
+    /**
+     * @serial include
+     */
+    private static class EmptyList<E>
+        extends AbstractList<E>
+        implements RandomAccess, Serializable {
+        private static final long serialVersionUID = 8842843931221139166L;
+
+        public Iterator<E> iterator() {
+            return emptyIterator();
+        }
+        public ListIterator<E> listIterator() {
+            return emptyListIterator();
+        }
+
+        public int size() {return 0;}
+        public boolean isEmpty() {return true;}
+
+        public boolean contains(Object obj) {return false;}
+        public boolean containsAll(Collection<?> c) { return c.isEmpty(); }
+
+        public Object[] toArray() { return new Object[0]; }
+
+        public <T> T[] toArray(T[] a) {
+            if (a.length > 0)
+                a[0] = null;
+            return a;
+        }
+
+        public E get(int index) {
+            throw new IndexOutOfBoundsException("Index: "+index);
+        }
+
+        public boolean equals(Object o) {
+            return (o instanceof List) && ((List<?>)o).isEmpty();
+        }
+
+        public int hashCode() { return 1; }
+
+        // Preserves singleton property
+        private Object readResolve() {
+            return EMPTY_LIST;
+        }
+    }
+
+    /**
+     * The empty map (immutable).  This map is serializable.
+     *
+     * @see #emptyMap()
+     * @since 1.3
+     */
+    @SuppressWarnings("unchecked")
+    public static final Map EMPTY_MAP = new EmptyMap<>();
+
+    /**
+     * Returns the empty map (immutable).  This map is serializable.
+     *
+     * <p>This example illustrates the type-safe way to obtain an empty set:
+     * <pre>
+     *     Map&lt;String, Date&gt; s = Collections.emptyMap();
+     * </pre>
+     * Implementation note:  Implementations of this method need not
+     * create a separate <tt>Map</tt> object for each call.   Using this
+     * method is likely to have comparable cost to using the like-named
+     * field.  (Unlike this method, the field does not provide type safety.)
+     *
+     * @see #EMPTY_MAP
+     * @since 1.5
+     */
+    @SuppressWarnings("unchecked")
+    public static final <K,V> Map<K,V> emptyMap() {
+        return (Map<K,V>) EMPTY_MAP;
+    }
+
+    /**
+     * @serial include
+     */
+    private static class EmptyMap<K,V>
+        extends AbstractMap<K,V>
+        implements Serializable
+    {
+        private static final long serialVersionUID = 6428348081105594320L;
+
+        public int size()                          {return 0;}
+        public boolean isEmpty()                   {return true;}
+        public boolean containsKey(Object key)     {return false;}
+        public boolean containsValue(Object value) {return false;}
+        public V get(Object key)                   {return null;}
+        public Set<K> keySet()                     {return emptySet();}
+        public Collection<V> values()              {return emptySet();}
+        public Set<Map.Entry<K,V>> entrySet()      {return emptySet();}
+
+        public boolean equals(Object o) {
+            return (o instanceof Map) && ((Map<?,?>)o).isEmpty();
+        }
+
+        public int hashCode()                      {return 0;}
+
+        // Preserves singleton property
+        private Object readResolve() {
+            return EMPTY_MAP;
+        }
+    }
+
+    // Singleton collections
+
+    /**
+     * Returns an immutable set containing only the specified object.
+     * The returned set is serializable.
+     *
+     * @param o the sole object to be stored in the returned set.
+     * @return an immutable set containing only the specified object.
+     */
+    public static <T> Set<T> singleton(T o) {
+        return new SingletonSet<>(o);
+    }
+
+    static <E> Iterator<E> singletonIterator(final E e) {
+        return new Iterator<E>() {
+            private boolean hasNext = true;
+            public boolean hasNext() {
+                return hasNext;
+            }
+            public E next() {
+                if (hasNext) {
+                    hasNext = false;
+                    return e;
+                }
+                throw new NoSuchElementException();
+            }
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    /**
+     * @serial include
+     */
+    private static class SingletonSet<E>
+        extends AbstractSet<E>
+        implements Serializable
+    {
+        private static final long serialVersionUID = 3193687207550431679L;
+
+        private final E element;
+
+        SingletonSet(E e) {element = e;}
+
+        public Iterator<E> iterator() {
+            return singletonIterator(element);
+        }
+
+        public int size() {return 1;}
+
+        public boolean contains(Object o) {return eq(o, element);}
+    }
+
+    /**
+     * Returns an immutable list containing only the specified object.
+     * The returned list is serializable.
+     *
+     * @param o the sole object to be stored in the returned list.
+     * @return an immutable list containing only the specified object.
+     * @since 1.3
+     */
+    public static <T> List<T> singletonList(T o) {
+        return new SingletonList<>(o);
+    }
+
+    /**
+     * @serial include
+     */
+    private static class SingletonList<E>
+        extends AbstractList<E>
+        implements RandomAccess, Serializable {
+
+        private static final long serialVersionUID = 3093736618740652951L;
+
+        private final E element;
+
+        SingletonList(E obj)                {element = obj;}
+
+        public Iterator<E> iterator() {
+            return singletonIterator(element);
+        }
+
+        public int size()                   {return 1;}
+
+        public boolean contains(Object obj) {return eq(obj, element);}
+
+        public E get(int index) {
+            if (index != 0)
+              throw new IndexOutOfBoundsException("Index: "+index+", Size: 1");
+            return element;
+        }
+    }
+
+    /**
+     * Returns an immutable map, mapping only the specified key to the
+     * specified value.  The returned map is serializable.
+     *
+     * @param key the sole key to be stored in the returned map.
+     * @param value the value to which the returned map maps <tt>key</tt>.
+     * @return an immutable map containing only the specified key-value
+     *         mapping.
+     * @since 1.3
+     */
+    public static <K,V> Map<K,V> singletonMap(K key, V value) {
+        return new SingletonMap<>(key, value);
+    }
+
+    /**
+     * @serial include
+     */
+    private static class SingletonMap<K,V>
+          extends AbstractMap<K,V>
+          implements Serializable {
+        private static final long serialVersionUID = -6979724477215052911L;
+
+        private final K k;
+        private final V v;
+
+        SingletonMap(K key, V value) {
+            k = key;
+            v = value;
+        }
+
+        public int size()                          {return 1;}
+
+        public boolean isEmpty()                   {return false;}
+
+        public boolean containsKey(Object key)     {return eq(key, k);}
+
+        public boolean containsValue(Object value) {return eq(value, v);}
+
+        public V get(Object key)                   {return (eq(key, k) ? v : null);}
+
+        private transient Set<K> keySet = null;
+        private transient Set<Map.Entry<K,V>> entrySet = null;
+        private transient Collection<V> values = null;
+
+        public Set<K> keySet() {
+            if (keySet==null)
+                keySet = singleton(k);
+            return keySet;
+        }
+
+        public Set<Map.Entry<K,V>> entrySet() {
+            if (entrySet==null)
+                entrySet = Collections.<Map.Entry<K,V>>singleton(
+                    new SimpleImmutableEntry<>(k, v));
+            return entrySet;
+        }
+
+        public Collection<V> values() {
+            if (values==null)
+                values = singleton(v);
+            return values;
+        }
+
+    }
+
+    // Miscellaneous
+
+    /**
+     * Returns an immutable list consisting of <tt>n</tt> copies of the
+     * specified object.  The newly allocated data object is tiny (it contains
+     * a single reference to the data object).  This method is useful in
+     * combination with the <tt>List.addAll</tt> method to grow lists.
+     * The returned list is serializable.
+     *
+     * @param  n the number of elements in the returned list.
+     * @param  o the element to appear repeatedly in the returned list.
+     * @return an immutable list consisting of <tt>n</tt> copies of the
+     *         specified object.
+     * @throws IllegalArgumentException if {@code n < 0}
+     * @see    List#addAll(Collection)
+     * @see    List#addAll(int, Collection)
+     */
+    public static <T> List<T> nCopies(int n, T o) {
+        if (n < 0)
+            throw new IllegalArgumentException("List length = " + n);
+        return new CopiesList<>(n, o);
+    }
+
+    /**
+     * @serial include
+     */
+    private static class CopiesList<E>
+        extends AbstractList<E>
+        implements RandomAccess, Serializable
+    {
+        private static final long serialVersionUID = 2739099268398711800L;
+
+        final int n;
+        final E element;
+
+        CopiesList(int n, E e) {
+            assert n >= 0;
+            this.n = n;
+            element = e;
+        }
+
+        public int size() {
+            return n;
+        }
+
+        public boolean contains(Object obj) {
+            return n != 0 && eq(obj, element);
+        }
+
+        public int indexOf(Object o) {
+            return contains(o) ? 0 : -1;
+        }
+
+        public int lastIndexOf(Object o) {
+            return contains(o) ? n - 1 : -1;
+        }
+
+        public E get(int index) {
+            if (index < 0 || index >= n)
+                throw new IndexOutOfBoundsException("Index: "+index+
+                                                    ", Size: "+n);
+            return element;
+        }
+
+        public Object[] toArray() {
+            final Object[] a = new Object[n];
+            if (element != null)
+                Arrays.fill(a, 0, n, element);
+            return a;
+        }
+
+        public <T> T[] toArray(T[] a) {
+            final int n = this.n;
+            if (a.length < n) {
+                a = (T[])java.lang.reflect.Array
+                    .newInstance(a.getClass().getComponentType(), n);
+                if (element != null)
+                    Arrays.fill(a, 0, n, element);
+            } else {
+                Arrays.fill(a, 0, n, element);
+                if (a.length > n)
+                    a[n] = null;
+            }
+            return a;
+        }
+
+        public List<E> subList(int fromIndex, int toIndex) {
+            if (fromIndex < 0)
+                throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
+            if (toIndex > n)
+                throw new IndexOutOfBoundsException("toIndex = " + toIndex);
+            if (fromIndex > toIndex)
+                throw new IllegalArgumentException("fromIndex(" + fromIndex +
+                                                   ") > toIndex(" + toIndex + ")");
+            return new CopiesList<>(toIndex - fromIndex, element);
+        }
+    }
+
+    /**
+     * Returns a comparator that imposes the reverse of the <em>natural
+     * ordering</em> on a collection of objects that implement the
+     * {@code Comparable} interface.  (The natural ordering is the ordering
+     * imposed by the objects' own {@code compareTo} method.)  This enables a
+     * simple idiom for sorting (or maintaining) collections (or arrays) of
+     * objects that implement the {@code Comparable} interface in
+     * reverse-natural-order.  For example, suppose {@code a} is an array of
+     * strings. Then: <pre>
+     *          Arrays.sort(a, Collections.reverseOrder());
+     * </pre> sorts the array in reverse-lexicographic (alphabetical) order.<p>
+     *
+     * The returned comparator is serializable.
+     *
+     * @return A comparator that imposes the reverse of the <i>natural
+     *         ordering</i> on a collection of objects that implement
+     *         the <tt>Comparable</tt> interface.
+     * @see Comparable
+     */
+    public static <T> Comparator<T> reverseOrder() {
+        return (Comparator<T>) ReverseComparator.REVERSE_ORDER;
+    }
+
+    /**
+     * @serial include
+     */
+    private static class ReverseComparator
+        implements Comparator<Comparable<Object>>, Serializable {
+
+        private static final long serialVersionUID = 7207038068494060240L;
+
+        static final ReverseComparator REVERSE_ORDER
+            = new ReverseComparator();
+
+        public int compare(Comparable<Object> c1, Comparable<Object> c2) {
+            return c2.compareTo(c1);
+        }
+
+        private Object readResolve() { return reverseOrder(); }
+    }
+
+    /**
+     * Returns a comparator that imposes the reverse ordering of the specified
+     * comparator.  If the specified comparator is {@code null}, this method is
+     * equivalent to {@link #reverseOrder()} (in other words, it returns a
+     * comparator that imposes the reverse of the <em>natural ordering</em> on
+     * a collection of objects that implement the Comparable interface).
+     *
+     * <p>The returned comparator is serializable (assuming the specified
+     * comparator is also serializable or {@code null}).
+     *
+     * @param cmp a comparator who's ordering is to be reversed by the returned
+     * comparator or {@code null}
+     * @return A comparator that imposes the reverse ordering of the
+     *         specified comparator.
+     * @since 1.5
+     */
+    public static <T> Comparator<T> reverseOrder(Comparator<T> cmp) {
+        if (cmp == null)
+            return reverseOrder();
+
+        if (cmp instanceof ReverseComparator2)
+            return ((ReverseComparator2<T>)cmp).cmp;
+
+        return new ReverseComparator2<>(cmp);
+    }
+
+    /**
+     * @serial include
+     */
+    private static class ReverseComparator2<T> implements Comparator<T>,
+        Serializable
+    {
+        private static final long serialVersionUID = 4374092139857L;
+
+        /**
+         * The comparator specified in the static factory.  This will never
+         * be null, as the static factory returns a ReverseComparator
+         * instance if its argument is null.
+         *
+         * @serial
+         */
+        final Comparator<T> cmp;
+
+        ReverseComparator2(Comparator<T> cmp) {
+            assert cmp != null;
+            this.cmp = cmp;
+        }
+
+        public int compare(T t1, T t2) {
+            return cmp.compare(t2, t1);
+        }
+
+        public boolean equals(Object o) {
+            return (o == this) ||
+                (o instanceof ReverseComparator2 &&
+                 cmp.equals(((ReverseComparator2)o).cmp));
+        }
+
+        public int hashCode() {
+            return cmp.hashCode() ^ Integer.MIN_VALUE;
+        }
+    }
+
+    /**
+     * Returns an enumeration over the specified collection.  This provides
+     * interoperability with legacy APIs that require an enumeration
+     * as input.
+     *
+     * @param c the collection for which an enumeration is to be returned.
+     * @return an enumeration over the specified collection.
+     * @see Enumeration
+     */
+    public static <T> Enumeration<T> enumeration(final Collection<T> c) {
+        return new Enumeration<T>() {
+            private final Iterator<T> i = c.iterator();
+
+            public boolean hasMoreElements() {
+                return i.hasNext();
+            }
+
+            public T nextElement() {
+                return i.next();
+            }
+        };
+    }
+
+    /**
+     * Returns an array list containing the elements returned by the
+     * specified enumeration in the order they are returned by the
+     * enumeration.  This method provides interoperability between
+     * legacy APIs that return enumerations and new APIs that require
+     * collections.
+     *
+     * @param e enumeration providing elements for the returned
+     *          array list
+     * @return an array list containing the elements returned
+     *         by the specified enumeration.
+     * @since 1.4
+     * @see Enumeration
+     * @see ArrayList
+     */
+    public static <T> ArrayList<T> list(Enumeration<T> e) {
+        ArrayList<T> l = new ArrayList<>();
+        while (e.hasMoreElements())
+            l.add(e.nextElement());
+        return l;
+    }
+
+    /**
+     * Returns true if the specified arguments are equal, or both null.
+     */
+    static boolean eq(Object o1, Object o2) {
+        return o1==null ? o2==null : o1.equals(o2);
+    }
+
+    /**
+     * Returns the number of elements in the specified collection equal to the
+     * specified object.  More formally, returns the number of elements
+     * <tt>e</tt> in the collection such that
+     * <tt>(o == null ? e == null : o.equals(e))</tt>.
+     *
+     * @param c the collection in which to determine the frequency
+     *     of <tt>o</tt>
+     * @param o the object whose frequency is to be determined
+     * @throws NullPointerException if <tt>c</tt> is null
+     * @since 1.5
+     */
+    public static int frequency(Collection<?> c, Object o) {
+        int result = 0;
+        if (o == null) {
+            for (Object e : c)
+                if (e == null)
+                    result++;
+        } else {
+            for (Object e : c)
+                if (o.equals(e))
+                    result++;
+        }
+        return result;
+    }
+
+    /**
+     * Returns {@code true} if the two specified collections have no
+     * elements in common.
+     *
+     * <p>Care must be exercised if this method is used on collections that
+     * do not comply with the general contract for {@code Collection}.
+     * Implementations may elect to iterate over either collection and test
+     * for containment in the other collection (or to perform any equivalent
+     * computation).  If either collection uses a nonstandard equality test
+     * (as does a {@link SortedSet} whose ordering is not <em>compatible with
+     * equals</em>, or the key set of an {@link IdentityHashMap}), both
+     * collections must use the same nonstandard equality test, or the
+     * result of this method is undefined.
+     *
+     * <p>Care must also be exercised when using collections that have
+     * restrictions on the elements that they may contain. Collection
+     * implementations are allowed to throw exceptions for any operation
+     * involving elements they deem ineligible. For absolute safety the
+     * specified collections should contain only elements which are
+     * eligible elements for both collections.
+     *
+     * <p>Note that it is permissible to pass the same collection in both
+     * parameters, in which case the method will return {@code true} if and
+     * only if the collection is empty.
+     *
+     * @param c1 a collection
+     * @param c2 a collection
+     * @return {@code true} if the two specified collections have no
+     * elements in common.
+     * @throws NullPointerException if either collection is {@code null}.
+     * @throws NullPointerException if one collection contains a {@code null}
+     * element and {@code null} is not an eligible element for the other collection.
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws ClassCastException if one collection contains an element that is
+     * of a type which is ineligible for the other collection.
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @since 1.5
+     */
+    public static boolean disjoint(Collection<?> c1, Collection<?> c2) {
+        // The collection to be used for contains(). Preference is given to
+        // the collection who's contains() has lower O() complexity.
+        Collection<?> contains = c2;
+        // The collection to be iterated. If the collections' contains() impl
+        // are of different O() complexity, the collection with slower
+        // contains() will be used for iteration. For collections who's
+        // contains() are of the same complexity then best performance is
+        // achieved by iterating the smaller collection.
+        Collection<?> iterate = c1;
+
+        // Performance optimization cases. The heuristics:
+        //   1. Generally iterate over c1.
+        //   2. If c1 is a Set then iterate over c2.
+        //   3. If either collection is empty then result is always true.
+        //   4. Iterate over the smaller Collection.
+        if (c1 instanceof Set) {
+            // Use c1 for contains as a Set's contains() is expected to perform
+            // better than O(N/2)
+            iterate = c2;
+            contains = c1;
+        } else if (!(c2 instanceof Set)) {
+            // Both are mere Collections. Iterate over smaller collection.
+            // Example: If c1 contains 3 elements and c2 contains 50 elements and
+            // assuming contains() requires ceiling(N/2) comparisons then
+            // checking for all c1 elements in c2 would require 75 comparisons
+            // (3 * ceiling(50/2)) vs. checking all c2 elements in c1 requiring
+            // 100 comparisons (50 * ceiling(3/2)).
+            int c1size = c1.size();
+            int c2size = c2.size();
+            if (c1size == 0 || c2size == 0) {
+                // At least one collection is empty. Nothing will match.
+                return true;
+            }
+
+            if (c1size > c2size) {
+                iterate = c2;
+                contains = c1;
+            }
+        }
+
+        for (Object e : iterate) {
+            if (contains.contains(e)) {
+               // Found a common element. Collections are not disjoint.
+                return false;
+            }
+        }
+
+        // No common elements were found.
+        return true;
+    }
+
+    /**
+     * Adds all of the specified elements to the specified collection.
+     * Elements to be added may be specified individually or as an array.
+     * The behavior of this convenience method is identical to that of
+     * <tt>c.addAll(Arrays.asList(elements))</tt>, but this method is likely
+     * to run significantly faster under most implementations.
+     *
+     * <p>When elements are specified individually, this method provides a
+     * convenient way to add a few elements to an existing collection:
+     * <pre>
+     *     Collections.addAll(flavors, "Peaches 'n Plutonium", "Rocky Racoon");
+     * </pre>
+     *
+     * @param c the collection into which <tt>elements</tt> are to be inserted
+     * @param elements the elements to insert into <tt>c</tt>
+     * @return <tt>true</tt> if the collection changed as a result of the call
+     * @throws UnsupportedOperationException if <tt>c</tt> does not support
+     *         the <tt>add</tt> operation
+     * @throws NullPointerException if <tt>elements</tt> contains one or more
+     *         null values and <tt>c</tt> does not permit null elements, or
+     *         if <tt>c</tt> or <tt>elements</tt> are <tt>null</tt>
+     * @throws IllegalArgumentException if some property of a value in
+     *         <tt>elements</tt> prevents it from being added to <tt>c</tt>
+     * @see Collection#addAll(Collection)
+     * @since 1.5
+     */
+    @SafeVarargs
+    public static <T> boolean addAll(Collection<? super T> c, T... elements) {
+        boolean result = false;
+        for (T element : elements)
+            result |= c.add(element);
+        return result;
+    }
+
+    /**
+     * Returns a set backed by the specified map.  The resulting set displays
+     * the same ordering, concurrency, and performance characteristics as the
+     * backing map.  In essence, this factory method provides a {@link Set}
+     * implementation corresponding to any {@link Map} implementation.  There
+     * is no need to use this method on a {@link Map} implementation that
+     * already has a corresponding {@link Set} implementation (such as {@link
+     * HashMap} or {@link TreeMap}).
+     *
+     * <p>Each method invocation on the set returned by this method results in
+     * exactly one method invocation on the backing map or its <tt>keySet</tt>
+     * view, with one exception.  The <tt>addAll</tt> method is implemented
+     * as a sequence of <tt>put</tt> invocations on the backing map.
+     *
+     * <p>The specified map must be empty at the time this method is invoked,
+     * and should not be accessed directly after this method returns.  These
+     * conditions are ensured if the map is created empty, passed directly
+     * to this method, and no reference to the map is retained, as illustrated
+     * in the following code fragment:
+     * <pre>
+     *    Set&lt;Object&gt; weakHashSet = Collections.newSetFromMap(
+     *        new WeakHashMap&lt;Object, Boolean&gt;());
+     * </pre>
+     *
+     * @param map the backing map
+     * @return the set backed by the map
+     * @throws IllegalArgumentException if <tt>map</tt> is not empty
+     * @since 1.6
+     */
+    public static <E> Set<E> newSetFromMap(Map<E, Boolean> map) {
+        return new SetFromMap<>(map);
+    }
+
+    /**
+     * @serial include
+     */
+    private static class SetFromMap<E> extends AbstractSet<E>
+        implements Set<E>, Serializable
+    {
+        private final Map<E, Boolean> m;  // The backing map
+        private transient Set<E> s;       // Its keySet
+
+        SetFromMap(Map<E, Boolean> map) {
+            if (!map.isEmpty())
+                throw new IllegalArgumentException("Map is non-empty");
+            m = map;
+            s = map.keySet();
+        }
+
+        public void clear()               {        m.clear(); }
+        public int size()                 { return m.size(); }
+        public boolean isEmpty()          { return m.isEmpty(); }
+        public boolean contains(Object o) { return m.containsKey(o); }
+        public boolean remove(Object o)   { return m.remove(o) != null; }
+        public boolean add(E e) { return m.put(e, Boolean.TRUE) == null; }
+        public Iterator<E> iterator()     { return s.iterator(); }
+        public Object[] toArray()         { return s.toArray(); }
+        public <T> T[] toArray(T[] a)     { return s.toArray(a); }
+        public String toString()          { return s.toString(); }
+        public int hashCode()             { return s.hashCode(); }
+        public boolean equals(Object o)   { return o == this || s.equals(o); }
+        public boolean containsAll(Collection<?> c) {return s.containsAll(c);}
+        public boolean removeAll(Collection<?> c)   {return s.removeAll(c);}
+        public boolean retainAll(Collection<?> c)   {return s.retainAll(c);}
+        // addAll is the only inherited implementation
+
+        private static final long serialVersionUID = 2454657854757543876L;
+
+    }
+
+    /**
+     * Returns a view of a {@link Deque} as a Last-in-first-out (Lifo)
+     * {@link Queue}. Method <tt>add</tt> is mapped to <tt>push</tt>,
+     * <tt>remove</tt> is mapped to <tt>pop</tt> and so on. This
+     * view can be useful when you would like to use a method
+     * requiring a <tt>Queue</tt> but you need Lifo ordering.
+     *
+     * <p>Each method invocation on the queue returned by this method
+     * results in exactly one method invocation on the backing deque, with
+     * one exception.  The {@link Queue#addAll addAll} method is
+     * implemented as a sequence of {@link Deque#addFirst addFirst}
+     * invocations on the backing deque.
+     *
+     * @param deque the deque
+     * @return the queue
+     * @since  1.6
+     */
+    public static <T> Queue<T> asLifoQueue(Deque<T> deque) {
+        return new AsLIFOQueue<>(deque);
+    }
+
+    /**
+     * @serial include
+     */
+    static class AsLIFOQueue<E> extends AbstractQueue<E>
+        implements Queue<E>, Serializable {
+        private static final long serialVersionUID = 1802017725587941708L;
+        private final Deque<E> q;
+        AsLIFOQueue(Deque<E> q)           { this.q = q; }
+        public boolean add(E e)           { q.addFirst(e); return true; }
+        public boolean offer(E e)         { return q.offerFirst(e); }
+        public E poll()                   { return q.pollFirst(); }
+        public E remove()                 { return q.removeFirst(); }
+        public E peek()                   { return q.peekFirst(); }
+        public E element()                { return q.getFirst(); }
+        public void clear()               {        q.clear(); }
+        public int size()                 { return q.size(); }
+        public boolean isEmpty()          { return q.isEmpty(); }
+        public boolean contains(Object o) { return q.contains(o); }
+        public boolean remove(Object o)   { return q.remove(o); }
+        public Iterator<E> iterator()     { return q.iterator(); }
+        public Object[] toArray()         { return q.toArray(); }
+        public <T> T[] toArray(T[] a)     { return q.toArray(a); }
+        public String toString()          { return q.toString(); }
+        public boolean containsAll(Collection<?> c) {return q.containsAll(c);}
+        public boolean removeAll(Collection<?> c)   {return q.removeAll(c);}
+        public boolean retainAll(Collection<?> c)   {return q.retainAll(c);}
+        // We use inherited addAll; forwarding addAll would be wrong
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/ComparableTimSort.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/ComparableTimSort.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,896 @@
+/*
+ * Copyright 2009 Google Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+
+/**
+ * This is a near duplicate of {@link TimSort}, modified for use with
+ * arrays of objects that implement {@link Comparable}, instead of using
+ * explicit comparators.
+ *
+ * <p>If you are using an optimizing VM, you may find that ComparableTimSort
+ * offers no performance benefit over TimSort in conjunction with a
+ * comparator that simply returns {@code ((Comparable)first).compareTo(Second)}.
+ * If this is the case, you are better off deleting ComparableTimSort to
+ * eliminate the code duplication.  (See Arrays.java for details.)
+ *
+ * @author Josh Bloch
+ */
+class ComparableTimSort {
+    /**
+     * This is the minimum sized sequence that will be merged.  Shorter
+     * sequences will be lengthened by calling binarySort.  If the entire
+     * array is less than this length, no merges will be performed.
+     *
+     * This constant should be a power of two.  It was 64 in Tim Peter's C
+     * implementation, but 32 was empirically determined to work better in
+     * this implementation.  In the unlikely event that you set this constant
+     * to be a number that's not a power of two, you'll need to change the
+     * {@link #minRunLength} computation.
+     *
+     * If you decrease this constant, you must change the stackLen
+     * computation in the TimSort constructor, or you risk an
+     * ArrayOutOfBounds exception.  See listsort.txt for a discussion
+     * of the minimum stack length required as a function of the length
+     * of the array being sorted and the minimum merge sequence length.
+     */
+    private static final int MIN_MERGE = 32;
+
+    /**
+     * The array being sorted.
+     */
+    private final Object[] a;
+
+    /**
+     * When we get into galloping mode, we stay there until both runs win less
+     * often than MIN_GALLOP consecutive times.
+     */
+    private static final int  MIN_GALLOP = 7;
+
+    /**
+     * This controls when we get *into* galloping mode.  It is initialized
+     * to MIN_GALLOP.  The mergeLo and mergeHi methods nudge it higher for
+     * random data, and lower for highly structured data.
+     */
+    private int minGallop = MIN_GALLOP;
+
+    /**
+     * Maximum initial size of tmp array, which is used for merging.  The array
+     * can grow to accommodate demand.
+     *
+     * Unlike Tim's original C version, we do not allocate this much storage
+     * when sorting smaller arrays.  This change was required for performance.
+     */
+    private static final int INITIAL_TMP_STORAGE_LENGTH = 256;
+
+    /**
+     * Temp storage for merges.
+     */
+    private Object[] tmp;
+
+    /**
+     * A stack of pending runs yet to be merged.  Run i starts at
+     * address base[i] and extends for len[i] elements.  It's always
+     * true (so long as the indices are in bounds) that:
+     *
+     *     runBase[i] + runLen[i] == runBase[i + 1]
+     *
+     * so we could cut the storage for this, but it's a minor amount,
+     * and keeping all the info explicit simplifies the code.
+     */
+    private int stackSize = 0;  // Number of pending runs on stack
+    private final int[] runBase;
+    private final int[] runLen;
+
+    /**
+     * Creates a TimSort instance to maintain the state of an ongoing sort.
+     *
+     * @param a the array to be sorted
+     */
+    private ComparableTimSort(Object[] a) {
+        this.a = a;
+
+        // Allocate temp storage (which may be increased later if necessary)
+        int len = a.length;
+        @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+        Object[] newArray = new Object[len < 2 * INITIAL_TMP_STORAGE_LENGTH ?
+                                       len >>> 1 : INITIAL_TMP_STORAGE_LENGTH];
+        tmp = newArray;
+
+        /*
+         * Allocate runs-to-be-merged stack (which cannot be expanded).  The
+         * stack length requirements are described in listsort.txt.  The C
+         * version always uses the same stack length (85), but this was
+         * measured to be too expensive when sorting "mid-sized" arrays (e.g.,
+         * 100 elements) in Java.  Therefore, we use smaller (but sufficiently
+         * large) stack lengths for smaller arrays.  The "magic numbers" in the
+         * computation below must be changed if MIN_MERGE is decreased.  See
+         * the MIN_MERGE declaration above for more information.
+         */
+        int stackLen = (len <    120  ?  5 :
+                        len <   1542  ? 10 :
+                        len < 119151  ? 19 : 40);
+        runBase = new int[stackLen];
+        runLen = new int[stackLen];
+    }
+
+    /*
+     * The next two methods (which are package private and static) constitute
+     * the entire API of this class.  Each of these methods obeys the contract
+     * of the public method with the same signature in java.util.Arrays.
+     */
+
+    static void sort(Object[] a) {
+          sort(a, 0, a.length);
+    }
+
+    static void sort(Object[] a, int lo, int hi) {
+        rangeCheck(a.length, lo, hi);
+        int nRemaining  = hi - lo;
+        if (nRemaining < 2)
+            return;  // Arrays of size 0 and 1 are always sorted
+
+        // If array is small, do a "mini-TimSort" with no merges
+        if (nRemaining < MIN_MERGE) {
+            int initRunLen = countRunAndMakeAscending(a, lo, hi);
+            binarySort(a, lo, hi, lo + initRunLen);
+            return;
+        }
+
+        /**
+         * March over the array once, left to right, finding natural runs,
+         * extending short natural runs to minRun elements, and merging runs
+         * to maintain stack invariant.
+         */
+        ComparableTimSort ts = new ComparableTimSort(a);
+        int minRun = minRunLength(nRemaining);
+        do {
+            // Identify next run
+            int runLen = countRunAndMakeAscending(a, lo, hi);
+
+            // If run is short, extend to min(minRun, nRemaining)
+            if (runLen < minRun) {
+                int force = nRemaining <= minRun ? nRemaining : minRun;
+                binarySort(a, lo, lo + force, lo + runLen);
+                runLen = force;
+            }
+
+            // Push run onto pending-run stack, and maybe merge
+            ts.pushRun(lo, runLen);
+            ts.mergeCollapse();
+
+            // Advance to find next run
+            lo += runLen;
+            nRemaining -= runLen;
+        } while (nRemaining != 0);
+
+        // Merge all remaining runs to complete sort
+        assert lo == hi;
+        ts.mergeForceCollapse();
+        assert ts.stackSize == 1;
+    }
+
+    /**
+     * Sorts the specified portion of the specified array using a binary
+     * insertion sort.  This is the best method for sorting small numbers
+     * of elements.  It requires O(n log n) compares, but O(n^2) data
+     * movement (worst case).
+     *
+     * If the initial part of the specified range is already sorted,
+     * this method can take advantage of it: the method assumes that the
+     * elements from index {@code lo}, inclusive, to {@code start},
+     * exclusive are already sorted.
+     *
+     * @param a the array in which a range is to be sorted
+     * @param lo the index of the first element in the range to be sorted
+     * @param hi the index after the last element in the range to be sorted
+     * @param start the index of the first element in the range that is
+     *        not already known to be sorted ({@code lo <= start <= hi})
+     */
+    @SuppressWarnings("fallthrough")
+    private static void binarySort(Object[] a, int lo, int hi, int start) {
+        assert lo <= start && start <= hi;
+        if (start == lo)
+            start++;
+        for ( ; start < hi; start++) {
+            @SuppressWarnings("unchecked")
+            Comparable<Object> pivot = (Comparable) a[start];
+
+            // Set left (and right) to the index where a[start] (pivot) belongs
+            int left = lo;
+            int right = start;
+            assert left <= right;
+            /*
+             * Invariants:
+             *   pivot >= all in [lo, left).
+             *   pivot <  all in [right, start).
+             */
+            while (left < right) {
+                int mid = (left + right) >>> 1;
+                if (pivot.compareTo(a[mid]) < 0)
+                    right = mid;
+                else
+                    left = mid + 1;
+            }
+            assert left == right;
+
+            /*
+             * The invariants still hold: pivot >= all in [lo, left) and
+             * pivot < all in [left, start), so pivot belongs at left.  Note
+             * that if there are elements equal to pivot, left points to the
+             * first slot after them -- that's why this sort is stable.
+             * Slide elements over to make room for pivot.
+             */
+            int n = start - left;  // The number of elements to move
+            // Switch is just an optimization for arraycopy in default case
+            switch (n) {
+                case 2:  a[left + 2] = a[left + 1];
+                case 1:  a[left + 1] = a[left];
+                         break;
+                default: System.arraycopy(a, left, a, left + 1, n);
+            }
+            a[left] = pivot;
+        }
+    }
+
+    /**
+     * Returns the length of the run beginning at the specified position in
+     * the specified array and reverses the run if it is descending (ensuring
+     * that the run will always be ascending when the method returns).
+     *
+     * A run is the longest ascending sequence with:
+     *
+     *    a[lo] <= a[lo + 1] <= a[lo + 2] <= ...
+     *
+     * or the longest descending sequence with:
+     *
+     *    a[lo] >  a[lo + 1] >  a[lo + 2] >  ...
+     *
+     * For its intended use in a stable mergesort, the strictness of the
+     * definition of "descending" is needed so that the call can safely
+     * reverse a descending sequence without violating stability.
+     *
+     * @param a the array in which a run is to be counted and possibly reversed
+     * @param lo index of the first element in the run
+     * @param hi index after the last element that may be contained in the run.
+              It is required that {@code lo < hi}.
+     * @return  the length of the run beginning at the specified position in
+     *          the specified array
+     */
+    @SuppressWarnings("unchecked")
+    private static int countRunAndMakeAscending(Object[] a, int lo, int hi) {
+        assert lo < hi;
+        int runHi = lo + 1;
+        if (runHi == hi)
+            return 1;
+
+        // Find end of run, and reverse range if descending
+        if (((Comparable) a[runHi++]).compareTo(a[lo]) < 0) { // Descending
+            while (runHi < hi && ((Comparable) a[runHi]).compareTo(a[runHi - 1]) < 0)
+                runHi++;
+            reverseRange(a, lo, runHi);
+        } else {                              // Ascending
+            while (runHi < hi && ((Comparable) a[runHi]).compareTo(a[runHi - 1]) >= 0)
+                runHi++;
+        }
+
+        return runHi - lo;
+    }
+
+    /**
+     * Reverse the specified range of the specified array.
+     *
+     * @param a the array in which a range is to be reversed
+     * @param lo the index of the first element in the range to be reversed
+     * @param hi the index after the last element in the range to be reversed
+     */
+    private static void reverseRange(Object[] a, int lo, int hi) {
+        hi--;
+        while (lo < hi) {
+            Object t = a[lo];
+            a[lo++] = a[hi];
+            a[hi--] = t;
+        }
+    }
+
+    /**
+     * Returns the minimum acceptable run length for an array of the specified
+     * length. Natural runs shorter than this will be extended with
+     * {@link #binarySort}.
+     *
+     * Roughly speaking, the computation is:
+     *
+     *  If n < MIN_MERGE, return n (it's too small to bother with fancy stuff).
+     *  Else if n is an exact power of 2, return MIN_MERGE/2.
+     *  Else return an int k, MIN_MERGE/2 <= k <= MIN_MERGE, such that n/k
+     *   is close to, but strictly less than, an exact power of 2.
+     *
+     * For the rationale, see listsort.txt.
+     *
+     * @param n the length of the array to be sorted
+     * @return the length of the minimum run to be merged
+     */
+    private static int minRunLength(int n) {
+        assert n >= 0;
+        int r = 0;      // Becomes 1 if any 1 bits are shifted off
+        while (n >= MIN_MERGE) {
+            r |= (n & 1);
+            n >>= 1;
+        }
+        return n + r;
+    }
+
+    /**
+     * Pushes the specified run onto the pending-run stack.
+     *
+     * @param runBase index of the first element in the run
+     * @param runLen  the number of elements in the run
+     */
+    private void pushRun(int runBase, int runLen) {
+        this.runBase[stackSize] = runBase;
+        this.runLen[stackSize] = runLen;
+        stackSize++;
+    }
+
+    /**
+     * Examines the stack of runs waiting to be merged and merges adjacent runs
+     * until the stack invariants are reestablished:
+     *
+     *     1. runLen[i - 3] > runLen[i - 2] + runLen[i - 1]
+     *     2. runLen[i - 2] > runLen[i - 1]
+     *
+     * This method is called each time a new run is pushed onto the stack,
+     * so the invariants are guaranteed to hold for i < stackSize upon
+     * entry to the method.
+     */
+    private void mergeCollapse() {
+        while (stackSize > 1) {
+            int n = stackSize - 2;
+            if (n > 0 && runLen[n-1] <= runLen[n] + runLen[n+1]) {
+                if (runLen[n - 1] < runLen[n + 1])
+                    n--;
+                mergeAt(n);
+            } else if (runLen[n] <= runLen[n + 1]) {
+                mergeAt(n);
+            } else {
+                break; // Invariant is established
+            }
+        }
+    }
+
+    /**
+     * Merges all runs on the stack until only one remains.  This method is
+     * called once, to complete the sort.
+     */
+    private void mergeForceCollapse() {
+        while (stackSize > 1) {
+            int n = stackSize - 2;
+            if (n > 0 && runLen[n - 1] < runLen[n + 1])
+                n--;
+            mergeAt(n);
+        }
+    }
+
+    /**
+     * Merges the two runs at stack indices i and i+1.  Run i must be
+     * the penultimate or antepenultimate run on the stack.  In other words,
+     * i must be equal to stackSize-2 or stackSize-3.
+     *
+     * @param i stack index of the first of the two runs to merge
+     */
+    @SuppressWarnings("unchecked")
+    private void mergeAt(int i) {
+        assert stackSize >= 2;
+        assert i >= 0;
+        assert i == stackSize - 2 || i == stackSize - 3;
+
+        int base1 = runBase[i];
+        int len1 = runLen[i];
+        int base2 = runBase[i + 1];
+        int len2 = runLen[i + 1];
+        assert len1 > 0 && len2 > 0;
+        assert base1 + len1 == base2;
+
+        /*
+         * Record the length of the combined runs; if i is the 3rd-last
+         * run now, also slide over the last run (which isn't involved
+         * in this merge).  The current run (i+1) goes away in any case.
+         */
+        runLen[i] = len1 + len2;
+        if (i == stackSize - 3) {
+            runBase[i + 1] = runBase[i + 2];
+            runLen[i + 1] = runLen[i + 2];
+        }
+        stackSize--;
+
+        /*
+         * Find where the first element of run2 goes in run1. Prior elements
+         * in run1 can be ignored (because they're already in place).
+         */
+        int k = gallopRight((Comparable<Object>) a[base2], a, base1, len1, 0);
+        assert k >= 0;
+        base1 += k;
+        len1 -= k;
+        if (len1 == 0)
+            return;
+
+        /*
+         * Find where the last element of run1 goes in run2. Subsequent elements
+         * in run2 can be ignored (because they're already in place).
+         */
+        len2 = gallopLeft((Comparable<Object>) a[base1 + len1 - 1], a,
+                base2, len2, len2 - 1);
+        assert len2 >= 0;
+        if (len2 == 0)
+            return;
+
+        // Merge remaining runs, using tmp array with min(len1, len2) elements
+        if (len1 <= len2)
+            mergeLo(base1, len1, base2, len2);
+        else
+            mergeHi(base1, len1, base2, len2);
+    }
+
+    /**
+     * Locates the position at which to insert the specified key into the
+     * specified sorted range; if the range contains an element equal to key,
+     * returns the index of the leftmost equal element.
+     *
+     * @param key the key whose insertion point to search for
+     * @param a the array in which to search
+     * @param base the index of the first element in the range
+     * @param len the length of the range; must be > 0
+     * @param hint the index at which to begin the search, 0 <= hint < n.
+     *     The closer hint is to the result, the faster this method will run.
+     * @return the int k,  0 <= k <= n such that a[b + k - 1] < key <= a[b + k],
+     *    pretending that a[b - 1] is minus infinity and a[b + n] is infinity.
+     *    In other words, key belongs at index b + k; or in other words,
+     *    the first k elements of a should precede key, and the last n - k
+     *    should follow it.
+     */
+    private static int gallopLeft(Comparable<Object> key, Object[] a,
+            int base, int len, int hint) {
+        assert len > 0 && hint >= 0 && hint < len;
+
+        int lastOfs = 0;
+        int ofs = 1;
+        if (key.compareTo(a[base + hint]) > 0) {
+            // Gallop right until a[base+hint+lastOfs] < key <= a[base+hint+ofs]
+            int maxOfs = len - hint;
+            while (ofs < maxOfs && key.compareTo(a[base + hint + ofs]) > 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to base
+            lastOfs += hint;
+            ofs += hint;
+        } else { // key <= a[base + hint]
+            // Gallop left until a[base+hint-ofs] < key <= a[base+hint-lastOfs]
+            final int maxOfs = hint + 1;
+            while (ofs < maxOfs && key.compareTo(a[base + hint - ofs]) <= 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to base
+            int tmp = lastOfs;
+            lastOfs = hint - ofs;
+            ofs = hint - tmp;
+        }
+        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
+
+        /*
+         * Now a[base+lastOfs] < key <= a[base+ofs], so key belongs somewhere
+         * to the right of lastOfs but no farther right than ofs.  Do a binary
+         * search, with invariant a[base + lastOfs - 1] < key <= a[base + ofs].
+         */
+        lastOfs++;
+        while (lastOfs < ofs) {
+            int m = lastOfs + ((ofs - lastOfs) >>> 1);
+
+            if (key.compareTo(a[base + m]) > 0)
+                lastOfs = m + 1;  // a[base + m] < key
+            else
+                ofs = m;          // key <= a[base + m]
+        }
+        assert lastOfs == ofs;    // so a[base + ofs - 1] < key <= a[base + ofs]
+        return ofs;
+    }
+
+    /**
+     * Like gallopLeft, except that if the range contains an element equal to
+     * key, gallopRight returns the index after the rightmost equal element.
+     *
+     * @param key the key whose insertion point to search for
+     * @param a the array in which to search
+     * @param base the index of the first element in the range
+     * @param len the length of the range; must be > 0
+     * @param hint the index at which to begin the search, 0 <= hint < n.
+     *     The closer hint is to the result, the faster this method will run.
+     * @return the int k,  0 <= k <= n such that a[b + k - 1] <= key < a[b + k]
+     */
+    private static int gallopRight(Comparable<Object> key, Object[] a,
+            int base, int len, int hint) {
+        assert len > 0 && hint >= 0 && hint < len;
+
+        int ofs = 1;
+        int lastOfs = 0;
+        if (key.compareTo(a[base + hint]) < 0) {
+            // Gallop left until a[b+hint - ofs] <= key < a[b+hint - lastOfs]
+            int maxOfs = hint + 1;
+            while (ofs < maxOfs && key.compareTo(a[base + hint - ofs]) < 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to b
+            int tmp = lastOfs;
+            lastOfs = hint - ofs;
+            ofs = hint - tmp;
+        } else { // a[b + hint] <= key
+            // Gallop right until a[b+hint + lastOfs] <= key < a[b+hint + ofs]
+            int maxOfs = len - hint;
+            while (ofs < maxOfs && key.compareTo(a[base + hint + ofs]) >= 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to b
+            lastOfs += hint;
+            ofs += hint;
+        }
+        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
+
+        /*
+         * Now a[b + lastOfs] <= key < a[b + ofs], so key belongs somewhere to
+         * the right of lastOfs but no farther right than ofs.  Do a binary
+         * search, with invariant a[b + lastOfs - 1] <= key < a[b + ofs].
+         */
+        lastOfs++;
+        while (lastOfs < ofs) {
+            int m = lastOfs + ((ofs - lastOfs) >>> 1);
+
+            if (key.compareTo(a[base + m]) < 0)
+                ofs = m;          // key < a[b + m]
+            else
+                lastOfs = m + 1;  // a[b + m] <= key
+        }
+        assert lastOfs == ofs;    // so a[b + ofs - 1] <= key < a[b + ofs]
+        return ofs;
+    }
+
+    /**
+     * Merges two adjacent runs in place, in a stable fashion.  The first
+     * element of the first run must be greater than the first element of the
+     * second run (a[base1] > a[base2]), and the last element of the first run
+     * (a[base1 + len1-1]) must be greater than all elements of the second run.
+     *
+     * For performance, this method should be called only when len1 <= len2;
+     * its twin, mergeHi should be called if len1 >= len2.  (Either method
+     * may be called if len1 == len2.)
+     *
+     * @param base1 index of first element in first run to be merged
+     * @param len1  length of first run to be merged (must be > 0)
+     * @param base2 index of first element in second run to be merged
+     *        (must be aBase + aLen)
+     * @param len2  length of second run to be merged (must be > 0)
+     */
+    @SuppressWarnings("unchecked")
+    private void mergeLo(int base1, int len1, int base2, int len2) {
+        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
+
+        // Copy first run into temp array
+        Object[] a = this.a; // For performance
+        Object[] tmp = ensureCapacity(len1);
+        System.arraycopy(a, base1, tmp, 0, len1);
+
+        int cursor1 = 0;       // Indexes into tmp array
+        int cursor2 = base2;   // Indexes int a
+        int dest = base1;      // Indexes int a
+
+        // Move first element of second run and deal with degenerate cases
+        a[dest++] = a[cursor2++];
+        if (--len2 == 0) {
+            System.arraycopy(tmp, cursor1, a, dest, len1);
+            return;
+        }
+        if (len1 == 1) {
+            System.arraycopy(a, cursor2, a, dest, len2);
+            a[dest + len2] = tmp[cursor1]; // Last elt of run 1 to end of merge
+            return;
+        }
+
+        int minGallop = this.minGallop;  // Use local variable for performance
+    outer:
+        while (true) {
+            int count1 = 0; // Number of times in a row that first run won
+            int count2 = 0; // Number of times in a row that second run won
+
+            /*
+             * Do the straightforward thing until (if ever) one run starts
+             * winning consistently.
+             */
+            do {
+                assert len1 > 1 && len2 > 0;
+                if (((Comparable) a[cursor2]).compareTo(tmp[cursor1]) < 0) {
+                    a[dest++] = a[cursor2++];
+                    count2++;
+                    count1 = 0;
+                    if (--len2 == 0)
+                        break outer;
+                } else {
+                    a[dest++] = tmp[cursor1++];
+                    count1++;
+                    count2 = 0;
+                    if (--len1 == 1)
+                        break outer;
+                }
+            } while ((count1 | count2) < minGallop);
+
+            /*
+             * One run is winning so consistently that galloping may be a
+             * huge win. So try that, and continue galloping until (if ever)
+             * neither run appears to be winning consistently anymore.
+             */
+            do {
+                assert len1 > 1 && len2 > 0;
+                count1 = gallopRight((Comparable) a[cursor2], tmp, cursor1, len1, 0);
+                if (count1 != 0) {
+                    System.arraycopy(tmp, cursor1, a, dest, count1);
+                    dest += count1;
+                    cursor1 += count1;
+                    len1 -= count1;
+                    if (len1 <= 1)  // len1 == 1 || len1 == 0
+                        break outer;
+                }
+                a[dest++] = a[cursor2++];
+                if (--len2 == 0)
+                    break outer;
+
+                count2 = gallopLeft((Comparable) tmp[cursor1], a, cursor2, len2, 0);
+                if (count2 != 0) {
+                    System.arraycopy(a, cursor2, a, dest, count2);
+                    dest += count2;
+                    cursor2 += count2;
+                    len2 -= count2;
+                    if (len2 == 0)
+                        break outer;
+                }
+                a[dest++] = tmp[cursor1++];
+                if (--len1 == 1)
+                    break outer;
+                minGallop--;
+            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
+            if (minGallop < 0)
+                minGallop = 0;
+            minGallop += 2;  // Penalize for leaving gallop mode
+        }  // End of "outer" loop
+        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
+
+        if (len1 == 1) {
+            assert len2 > 0;
+            System.arraycopy(a, cursor2, a, dest, len2);
+            a[dest + len2] = tmp[cursor1]; //  Last elt of run 1 to end of merge
+        } else if (len1 == 0) {
+            throw new IllegalArgumentException(
+                "Comparison method violates its general contract!");
+        } else {
+            assert len2 == 0;
+            assert len1 > 1;
+            System.arraycopy(tmp, cursor1, a, dest, len1);
+        }
+    }
+
+    /**
+     * Like mergeLo, except that this method should be called only if
+     * len1 >= len2; mergeLo should be called if len1 <= len2.  (Either method
+     * may be called if len1 == len2.)
+     *
+     * @param base1 index of first element in first run to be merged
+     * @param len1  length of first run to be merged (must be > 0)
+     * @param base2 index of first element in second run to be merged
+     *        (must be aBase + aLen)
+     * @param len2  length of second run to be merged (must be > 0)
+     */
+    @SuppressWarnings("unchecked")
+    private void mergeHi(int base1, int len1, int base2, int len2) {
+        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
+
+        // Copy second run into temp array
+        Object[] a = this.a; // For performance
+        Object[] tmp = ensureCapacity(len2);
+        System.arraycopy(a, base2, tmp, 0, len2);
+
+        int cursor1 = base1 + len1 - 1;  // Indexes into a
+        int cursor2 = len2 - 1;          // Indexes into tmp array
+        int dest = base2 + len2 - 1;     // Indexes into a
+
+        // Move last element of first run and deal with degenerate cases
+        a[dest--] = a[cursor1--];
+        if (--len1 == 0) {
+            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
+            return;
+        }
+        if (len2 == 1) {
+            dest -= len1;
+            cursor1 -= len1;
+            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
+            a[dest] = tmp[cursor2];
+            return;
+        }
+
+        int minGallop = this.minGallop;  // Use local variable for performance
+    outer:
+        while (true) {
+            int count1 = 0; // Number of times in a row that first run won
+            int count2 = 0; // Number of times in a row that second run won
+
+            /*
+             * Do the straightforward thing until (if ever) one run
+             * appears to win consistently.
+             */
+            do {
+                assert len1 > 0 && len2 > 1;
+                if (((Comparable) tmp[cursor2]).compareTo(a[cursor1]) < 0) {
+                    a[dest--] = a[cursor1--];
+                    count1++;
+                    count2 = 0;
+                    if (--len1 == 0)
+                        break outer;
+                } else {
+                    a[dest--] = tmp[cursor2--];
+                    count2++;
+                    count1 = 0;
+                    if (--len2 == 1)
+                        break outer;
+                }
+            } while ((count1 | count2) < minGallop);
+
+            /*
+             * One run is winning so consistently that galloping may be a
+             * huge win. So try that, and continue galloping until (if ever)
+             * neither run appears to be winning consistently anymore.
+             */
+            do {
+                assert len1 > 0 && len2 > 1;
+                count1 = len1 - gallopRight((Comparable) tmp[cursor2], a, base1, len1, len1 - 1);
+                if (count1 != 0) {
+                    dest -= count1;
+                    cursor1 -= count1;
+                    len1 -= count1;
+                    System.arraycopy(a, cursor1 + 1, a, dest + 1, count1);
+                    if (len1 == 0)
+                        break outer;
+                }
+                a[dest--] = tmp[cursor2--];
+                if (--len2 == 1)
+                    break outer;
+
+                count2 = len2 - gallopLeft((Comparable) a[cursor1], tmp, 0, len2, len2 - 1);
+                if (count2 != 0) {
+                    dest -= count2;
+                    cursor2 -= count2;
+                    len2 -= count2;
+                    System.arraycopy(tmp, cursor2 + 1, a, dest + 1, count2);
+                    if (len2 <= 1)
+                        break outer; // len2 == 1 || len2 == 0
+                }
+                a[dest--] = a[cursor1--];
+                if (--len1 == 0)
+                    break outer;
+                minGallop--;
+            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
+            if (minGallop < 0)
+                minGallop = 0;
+            minGallop += 2;  // Penalize for leaving gallop mode
+        }  // End of "outer" loop
+        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
+
+        if (len2 == 1) {
+            assert len1 > 0;
+            dest -= len1;
+            cursor1 -= len1;
+            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
+            a[dest] = tmp[cursor2];  // Move first elt of run2 to front of merge
+        } else if (len2 == 0) {
+            throw new IllegalArgumentException(
+                "Comparison method violates its general contract!");
+        } else {
+            assert len1 == 0;
+            assert len2 > 0;
+            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
+        }
+    }
+
+    /**
+     * Ensures that the external array tmp has at least the specified
+     * number of elements, increasing its size if necessary.  The size
+     * increases exponentially to ensure amortized linear time complexity.
+     *
+     * @param minCapacity the minimum required capacity of the tmp array
+     * @return tmp, whether or not it grew
+     */
+    private Object[]  ensureCapacity(int minCapacity) {
+        if (tmp.length < minCapacity) {
+            // Compute smallest power of 2 > minCapacity
+            int newSize = minCapacity;
+            newSize |= newSize >> 1;
+            newSize |= newSize >> 2;
+            newSize |= newSize >> 4;
+            newSize |= newSize >> 8;
+            newSize |= newSize >> 16;
+            newSize++;
+
+            if (newSize < 0) // Not bloody likely!
+                newSize = minCapacity;
+            else
+                newSize = Math.min(newSize, a.length >>> 1);
+
+            @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+            Object[] newArray = new Object[newSize];
+            tmp = newArray;
+        }
+        return tmp;
+    }
+
+    /**
+     * Checks that fromIndex and toIndex are in range, and throws an
+     * appropriate exception if they aren't.
+     *
+     * @param arrayLen the length of the array
+     * @param fromIndex the index of the first element of the range
+     * @param toIndex the index after the last element of the range
+     * @throws IllegalArgumentException if fromIndex > toIndex
+     * @throws ArrayIndexOutOfBoundsException if fromIndex < 0
+     *         or toIndex > arrayLen
+     */
+    private static void rangeCheck(int arrayLen, int fromIndex, int toIndex) {
+        if (fromIndex > toIndex)
+            throw new IllegalArgumentException("fromIndex(" + fromIndex +
+                       ") > toIndex(" + toIndex+")");
+        if (fromIndex < 0)
+            throw new ArrayIndexOutOfBoundsException(fromIndex);
+        if (toIndex > arrayLen)
+            throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/ConcurrentModificationException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/ConcurrentModificationException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * This exception may be thrown by methods that have detected concurrent
+ * modification of an object when such modification is not permissible.
+ * <p>
+ * For example, it is not generally permissible for one thread to modify a Collection
+ * while another thread is iterating over it.  In general, the results of the
+ * iteration are undefined under these circumstances.  Some Iterator
+ * implementations (including those of all the general purpose collection implementations
+ * provided by the JRE) may choose to throw this exception if this behavior is
+ * detected.  Iterators that do this are known as <i>fail-fast</i> iterators,
+ * as they fail quickly and cleanly, rather that risking arbitrary,
+ * non-deterministic behavior at an undetermined time in the future.
+ * <p>
+ * Note that this exception does not always indicate that an object has
+ * been concurrently modified by a <i>different</i> thread.  If a single
+ * thread issues a sequence of method invocations that violates the
+ * contract of an object, the object may throw this exception.  For
+ * example, if a thread modifies a collection directly while it is
+ * iterating over the collection with a fail-fast iterator, the iterator
+ * will throw this exception.
+ *
+ * <p>Note that fail-fast behavior cannot be guaranteed as it is, generally
+ * speaking, impossible to make any hard guarantees in the presence of
+ * unsynchronized concurrent modification.  Fail-fast operations
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness: <i>{@code ConcurrentModificationException}
+ * should be used only to detect bugs.</i>
+ *
+ * @author  Josh Bloch
+ * @see     Collection
+ * @see     Iterator
+ * @see     ListIterator
+ * @see     Vector
+ * @see     LinkedList
+ * @see     HashSet
+ * @see     Hashtable
+ * @see     TreeMap
+ * @see     AbstractList
+ * @since   1.2
+ */
+public class ConcurrentModificationException extends RuntimeException {
+    private static final long serialVersionUID = -3666751008965953603L;
+
+    /**
+     * Constructs a ConcurrentModificationException with no
+     * detail message.
+     */
+    public ConcurrentModificationException() {
+    }
+
+    /**
+     * Constructs a {@code ConcurrentModificationException} with the
+     * specified detail message.
+     *
+     * @param message the detail message pertaining to this exception.
+     */
+    public ConcurrentModificationException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail
+     * message of {@code (cause==null ? null : cause.toString())} (which
+     * typically contains the class and detail message of {@code cause}.
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link Throwable#getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.7
+     */
+    public ConcurrentModificationException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message and
+     * cause.
+     *
+     * <p>Note that the detail message associated with <code>cause</code> is
+     * <i>not</i> automatically incorporated in this exception's detail
+     * message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link Throwable#getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link Throwable#getCause()} method).  (A {@code null} value
+     *         is permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since 1.7
+     */
+    public ConcurrentModificationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Deque.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Deque.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,584 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea and Josh Bloch with assistance from members of
+ * JCP JSR-166 Expert Group and released to the public domain, as explained
+ * at http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util;
+
+/**
+ * A linear collection that supports element insertion and removal at
+ * both ends.  The name <i>deque</i> is short for "double ended queue"
+ * and is usually pronounced "deck".  Most <tt>Deque</tt>
+ * implementations place no fixed limits on the number of elements
+ * they may contain, but this interface supports capacity-restricted
+ * deques as well as those with no fixed size limit.
+ *
+ * <p>This interface defines methods to access the elements at both
+ * ends of the deque.  Methods are provided to insert, remove, and
+ * examine the element.  Each of these methods exists in two forms:
+ * one throws an exception if the operation fails, the other returns a
+ * special value (either <tt>null</tt> or <tt>false</tt>, depending on
+ * the operation).  The latter form of the insert operation is
+ * designed specifically for use with capacity-restricted
+ * <tt>Deque</tt> implementations; in most implementations, insert
+ * operations cannot fail.
+ *
+ * <p>The twelve methods described above are summarized in the
+ * following table:
+ *
+ * <p>
+ * <table BORDER CELLPADDING=3 CELLSPACING=1>
+ *  <tr>
+ *    <td></td>
+ *    <td ALIGN=CENTER COLSPAN = 2> <b>First Element (Head)</b></td>
+ *    <td ALIGN=CENTER COLSPAN = 2> <b>Last Element (Tail)</b></td>
+ *  </tr>
+ *  <tr>
+ *    <td></td>
+ *    <td ALIGN=CENTER><em>Throws exception</em></td>
+ *    <td ALIGN=CENTER><em>Special value</em></td>
+ *    <td ALIGN=CENTER><em>Throws exception</em></td>
+ *    <td ALIGN=CENTER><em>Special value</em></td>
+ *  </tr>
+ *  <tr>
+ *    <td><b>Insert</b></td>
+ *    <td>{@link #addFirst addFirst(e)}</td>
+ *    <td>{@link #offerFirst offerFirst(e)}</td>
+ *    <td>{@link #addLast addLast(e)}</td>
+ *    <td>{@link #offerLast offerLast(e)}</td>
+ *  </tr>
+ *  <tr>
+ *    <td><b>Remove</b></td>
+ *    <td>{@link #removeFirst removeFirst()}</td>
+ *    <td>{@link #pollFirst pollFirst()}</td>
+ *    <td>{@link #removeLast removeLast()}</td>
+ *    <td>{@link #pollLast pollLast()}</td>
+ *  </tr>
+ *  <tr>
+ *    <td><b>Examine</b></td>
+ *    <td>{@link #getFirst getFirst()}</td>
+ *    <td>{@link #peekFirst peekFirst()}</td>
+ *    <td>{@link #getLast getLast()}</td>
+ *    <td>{@link #peekLast peekLast()}</td>
+ *  </tr>
+ * </table>
+ *
+ * <p>This interface extends the {@link Queue} interface.  When a deque is
+ * used as a queue, FIFO (First-In-First-Out) behavior results.  Elements are
+ * added at the end of the deque and removed from the beginning.  The methods
+ * inherited from the <tt>Queue</tt> interface are precisely equivalent to
+ * <tt>Deque</tt> methods as indicated in the following table:
+ *
+ * <p>
+ * <table BORDER CELLPADDING=3 CELLSPACING=1>
+ *  <tr>
+ *    <td ALIGN=CENTER> <b><tt>Queue</tt> Method</b></td>
+ *    <td ALIGN=CENTER> <b>Equivalent <tt>Deque</tt> Method</b></td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link java.util.Queue#add add(e)}</td>
+ *    <td>{@link #addLast addLast(e)}</td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link java.util.Queue#offer offer(e)}</td>
+ *    <td>{@link #offerLast offerLast(e)}</td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link java.util.Queue#remove remove()}</td>
+ *    <td>{@link #removeFirst removeFirst()}</td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link java.util.Queue#poll poll()}</td>
+ *    <td>{@link #pollFirst pollFirst()}</td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link java.util.Queue#element element()}</td>
+ *    <td>{@link #getFirst getFirst()}</td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link java.util.Queue#peek peek()}</td>
+ *    <td>{@link #peek peekFirst()}</td>
+ *  </tr>
+ * </table>
+ *
+ * <p>Deques can also be used as LIFO (Last-In-First-Out) stacks.  This
+ * interface should be used in preference to the legacy {@link Stack} class.
+ * When a deque is used as a stack, elements are pushed and popped from the
+ * beginning of the deque.  Stack methods are precisely equivalent to
+ * <tt>Deque</tt> methods as indicated in the table below:
+ *
+ * <p>
+ * <table BORDER CELLPADDING=3 CELLSPACING=1>
+ *  <tr>
+ *    <td ALIGN=CENTER> <b>Stack Method</b></td>
+ *    <td ALIGN=CENTER> <b>Equivalent <tt>Deque</tt> Method</b></td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link #push push(e)}</td>
+ *    <td>{@link #addFirst addFirst(e)}</td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link #pop pop()}</td>
+ *    <td>{@link #removeFirst removeFirst()}</td>
+ *  </tr>
+ *  <tr>
+ *    <td>{@link #peek peek()}</td>
+ *    <td>{@link #peekFirst peekFirst()}</td>
+ *  </tr>
+ * </table>
+ *
+ * <p>Note that the {@link #peek peek} method works equally well when
+ * a deque is used as a queue or a stack; in either case, elements are
+ * drawn from the beginning of the deque.
+ *
+ * <p>This interface provides two methods to remove interior
+ * elements, {@link #removeFirstOccurrence removeFirstOccurrence} and
+ * {@link #removeLastOccurrence removeLastOccurrence}.
+ *
+ * <p>Unlike the {@link List} interface, this interface does not
+ * provide support for indexed access to elements.
+ *
+ * <p>While <tt>Deque</tt> implementations are not strictly required
+ * to prohibit the insertion of null elements, they are strongly
+ * encouraged to do so.  Users of any <tt>Deque</tt> implementations
+ * that do allow null elements are strongly encouraged <i>not</i> to
+ * take advantage of the ability to insert nulls.  This is so because
+ * <tt>null</tt> is used as a special return value by various methods
+ * to indicated that the deque is empty.
+ *
+ * <p><tt>Deque</tt> implementations generally do not define
+ * element-based versions of the <tt>equals</tt> and <tt>hashCode</tt>
+ * methods, but instead inherit the identity-based versions from class
+ * <tt>Object</tt>.
+ *
+ * <p>This interface is a member of the <a
+ * href="{@docRoot}/../technotes/guides/collections/index.html"> Java Collections
+ * Framework</a>.
+ *
+ * @author Doug Lea
+ * @author Josh Bloch
+ * @since  1.6
+ * @param <E> the type of elements held in this collection
+ */
+
+public interface Deque<E> extends Queue<E> {
+    /**
+     * Inserts the specified element at the front of this deque if it is
+     * possible to do so immediately without violating capacity restrictions.
+     * When using a capacity-restricted deque, it is generally preferable to
+     * use method {@link #offerFirst}.
+     *
+     * @param e the element to add
+     * @throws IllegalStateException if the element cannot be added at this
+     *         time due to capacity restrictions
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this deque
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this deque
+     */
+    void addFirst(E e);
+
+    /**
+     * Inserts the specified element at the end of this deque if it is
+     * possible to do so immediately without violating capacity restrictions.
+     * When using a capacity-restricted deque, it is generally preferable to
+     * use method {@link #offerLast}.
+     *
+     * <p>This method is equivalent to {@link #add}.
+     *
+     * @param e the element to add
+     * @throws IllegalStateException if the element cannot be added at this
+     *         time due to capacity restrictions
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this deque
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this deque
+     */
+    void addLast(E e);
+
+    /**
+     * Inserts the specified element at the front of this deque unless it would
+     * violate capacity restrictions.  When using a capacity-restricted deque,
+     * this method is generally preferable to the {@link #addFirst} method,
+     * which can fail to insert an element only by throwing an exception.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> if the element was added to this deque, else
+     *         <tt>false</tt>
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this deque
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this deque
+     */
+    boolean offerFirst(E e);
+
+    /**
+     * Inserts the specified element at the end of this deque unless it would
+     * violate capacity restrictions.  When using a capacity-restricted deque,
+     * this method is generally preferable to the {@link #addLast} method,
+     * which can fail to insert an element only by throwing an exception.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> if the element was added to this deque, else
+     *         <tt>false</tt>
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this deque
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this deque
+     */
+    boolean offerLast(E e);
+
+    /**
+     * Retrieves and removes the first element of this deque.  This method
+     * differs from {@link #pollFirst pollFirst} only in that it throws an
+     * exception if this deque is empty.
+     *
+     * @return the head of this deque
+     * @throws NoSuchElementException if this deque is empty
+     */
+    E removeFirst();
+
+    /**
+     * Retrieves and removes the last element of this deque.  This method
+     * differs from {@link #pollLast pollLast} only in that it throws an
+     * exception if this deque is empty.
+     *
+     * @return the tail of this deque
+     * @throws NoSuchElementException if this deque is empty
+     */
+    E removeLast();
+
+    /**
+     * Retrieves and removes the first element of this deque,
+     * or returns <tt>null</tt> if this deque is empty.
+     *
+     * @return the head of this deque, or <tt>null</tt> if this deque is empty
+     */
+    E pollFirst();
+
+    /**
+     * Retrieves and removes the last element of this deque,
+     * or returns <tt>null</tt> if this deque is empty.
+     *
+     * @return the tail of this deque, or <tt>null</tt> if this deque is empty
+     */
+    E pollLast();
+
+    /**
+     * Retrieves, but does not remove, the first element of this deque.
+     *
+     * This method differs from {@link #peekFirst peekFirst} only in that it
+     * throws an exception if this deque is empty.
+     *
+     * @return the head of this deque
+     * @throws NoSuchElementException if this deque is empty
+     */
+    E getFirst();
+
+    /**
+     * Retrieves, but does not remove, the last element of this deque.
+     * This method differs from {@link #peekLast peekLast} only in that it
+     * throws an exception if this deque is empty.
+     *
+     * @return the tail of this deque
+     * @throws NoSuchElementException if this deque is empty
+     */
+    E getLast();
+
+    /**
+     * Retrieves, but does not remove, the first element of this deque,
+     * or returns <tt>null</tt> if this deque is empty.
+     *
+     * @return the head of this deque, or <tt>null</tt> if this deque is empty
+     */
+    E peekFirst();
+
+    /**
+     * Retrieves, but does not remove, the last element of this deque,
+     * or returns <tt>null</tt> if this deque is empty.
+     *
+     * @return the tail of this deque, or <tt>null</tt> if this deque is empty
+     */
+    E peekLast();
+
+    /**
+     * Removes the first occurrence of the specified element from this deque.
+     * If the deque does not contain the element, it is unchanged.
+     * More formally, removes the first element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
+     * (if such an element exists).
+     * Returns <tt>true</tt> if this deque contained the specified element
+     * (or equivalently, if this deque changed as a result of the call).
+     *
+     * @param o element to be removed from this deque, if present
+     * @return <tt>true</tt> if an element was removed as a result of this call
+     * @throws ClassCastException if the class of the specified element
+     *         is incompatible with this deque
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    boolean removeFirstOccurrence(Object o);
+
+    /**
+     * Removes the last occurrence of the specified element from this deque.
+     * If the deque does not contain the element, it is unchanged.
+     * More formally, removes the last element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
+     * (if such an element exists).
+     * Returns <tt>true</tt> if this deque contained the specified element
+     * (or equivalently, if this deque changed as a result of the call).
+     *
+     * @param o element to be removed from this deque, if present
+     * @return <tt>true</tt> if an element was removed as a result of this call
+     * @throws ClassCastException if the class of the specified element
+     *         is incompatible with this deque
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    boolean removeLastOccurrence(Object o);
+
+    // *** Queue methods ***
+
+    /**
+     * Inserts the specified element into the queue represented by this deque
+     * (in other words, at the tail of this deque) if it is possible to do so
+     * immediately without violating capacity restrictions, returning
+     * <tt>true</tt> upon success and throwing an
+     * <tt>IllegalStateException</tt> if no space is currently available.
+     * When using a capacity-restricted deque, it is generally preferable to
+     * use {@link #offer(Object) offer}.
+     *
+     * <p>This method is equivalent to {@link #addLast}.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> (as specified by {@link Collection#add})
+     * @throws IllegalStateException if the element cannot be added at this
+     *         time due to capacity restrictions
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this deque
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this deque
+     */
+    boolean add(E e);
+
+    /**
+     * Inserts the specified element into the queue represented by this deque
+     * (in other words, at the tail of this deque) if it is possible to do so
+     * immediately without violating capacity restrictions, returning
+     * <tt>true</tt> upon success and <tt>false</tt> if no space is currently
+     * available.  When using a capacity-restricted deque, this method is
+     * generally preferable to the {@link #add} method, which can fail to
+     * insert an element only by throwing an exception.
+     *
+     * <p>This method is equivalent to {@link #offerLast}.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> if the element was added to this deque, else
+     *         <tt>false</tt>
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this deque
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this deque
+     */
+    boolean offer(E e);
+
+    /**
+     * Retrieves and removes the head of the queue represented by this deque
+     * (in other words, the first element of this deque).
+     * This method differs from {@link #poll poll} only in that it throws an
+     * exception if this deque is empty.
+     *
+     * <p>This method is equivalent to {@link #removeFirst()}.
+     *
+     * @return the head of the queue represented by this deque
+     * @throws NoSuchElementException if this deque is empty
+     */
+    E remove();
+
+    /**
+     * Retrieves and removes the head of the queue represented by this deque
+     * (in other words, the first element of this deque), or returns
+     * <tt>null</tt> if this deque is empty.
+     *
+     * <p>This method is equivalent to {@link #pollFirst()}.
+     *
+     * @return the first element of this deque, or <tt>null</tt> if
+     *         this deque is empty
+     */
+    E poll();
+
+    /**
+     * Retrieves, but does not remove, the head of the queue represented by
+     * this deque (in other words, the first element of this deque).
+     * This method differs from {@link #peek peek} only in that it throws an
+     * exception if this deque is empty.
+     *
+     * <p>This method is equivalent to {@link #getFirst()}.
+     *
+     * @return the head of the queue represented by this deque
+     * @throws NoSuchElementException if this deque is empty
+     */
+    E element();
+
+    /**
+     * Retrieves, but does not remove, the head of the queue represented by
+     * this deque (in other words, the first element of this deque), or
+     * returns <tt>null</tt> if this deque is empty.
+     *
+     * <p>This method is equivalent to {@link #peekFirst()}.
+     *
+     * @return the head of the queue represented by this deque, or
+     *         <tt>null</tt> if this deque is empty
+     */
+    E peek();
+
+
+    // *** Stack methods ***
+
+    /**
+     * Pushes an element onto the stack represented by this deque (in other
+     * words, at the head of this deque) if it is possible to do so
+     * immediately without violating capacity restrictions, returning
+     * <tt>true</tt> upon success and throwing an
+     * <tt>IllegalStateException</tt> if no space is currently available.
+     *
+     * <p>This method is equivalent to {@link #addFirst}.
+     *
+     * @param e the element to push
+     * @throws IllegalStateException if the element cannot be added at this
+     *         time due to capacity restrictions
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this deque
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this deque
+     */
+    void push(E e);
+
+    /**
+     * Pops an element from the stack represented by this deque.  In other
+     * words, removes and returns the first element of this deque.
+     *
+     * <p>This method is equivalent to {@link #removeFirst()}.
+     *
+     * @return the element at the front of this deque (which is the top
+     *         of the stack represented by this deque)
+     * @throws NoSuchElementException if this deque is empty
+     */
+    E pop();
+
+
+    // *** Collection methods ***
+
+    /**
+     * Removes the first occurrence of the specified element from this deque.
+     * If the deque does not contain the element, it is unchanged.
+     * More formally, removes the first element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>
+     * (if such an element exists).
+     * Returns <tt>true</tt> if this deque contained the specified element
+     * (or equivalently, if this deque changed as a result of the call).
+     *
+     * <p>This method is equivalent to {@link #removeFirstOccurrence}.
+     *
+     * @param o element to be removed from this deque, if present
+     * @return <tt>true</tt> if an element was removed as a result of this call
+     * @throws ClassCastException if the class of the specified element
+     *         is incompatible with this deque
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    boolean remove(Object o);
+
+    /**
+     * Returns <tt>true</tt> if this deque contains the specified element.
+     * More formally, returns <tt>true</tt> if and only if this deque contains
+     * at least one element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     *
+     * @param o element whose presence in this deque is to be tested
+     * @return <tt>true</tt> if this deque contains the specified element
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this deque
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         deque does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    boolean contains(Object o);
+
+    /**
+     * Returns the number of elements in this deque.
+     *
+     * @return the number of elements in this deque
+     */
+    public int size();
+
+    /**
+     * Returns an iterator over the elements in this deque in proper sequence.
+     * The elements will be returned in order from first (head) to last (tail).
+     *
+     * @return an iterator over the elements in this deque in proper sequence
+     */
+    Iterator<E> iterator();
+
+    /**
+     * Returns an iterator over the elements in this deque in reverse
+     * sequential order.  The elements will be returned in order from
+     * last (tail) to first (head).
+     *
+     * @return an iterator over the elements in this deque in reverse
+     * sequence
+     */
+    Iterator<E> descendingIterator();
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Dictionary.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Dictionary.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * The <code>Dictionary</code> class is the abstract parent of any
+ * class, such as <code>Hashtable</code>, which maps keys to values.
+ * Every key and every value is an object. In any one <tt>Dictionary</tt>
+ * object, every key is associated with at most one value. Given a
+ * <tt>Dictionary</tt> and a key, the associated element can be looked up.
+ * Any non-<code>null</code> object can be used as a key and as a value.
+ * <p>
+ * As a rule, the <code>equals</code> method should be used by
+ * implementations of this class to decide if two keys are the same.
+ * <p>
+ * <strong>NOTE: This class is obsolete.  New implementations should
+ * implement the Map interface, rather than extending this class.</strong>
+ *
+ * @author  unascribed
+ * @see     java.util.Map
+ * @see     java.lang.Object#equals(java.lang.Object)
+ * @see     java.lang.Object#hashCode()
+ * @see     java.util.Hashtable
+ * @since   JDK1.0
+ */
+public abstract
+class Dictionary<K,V> {
+    /**
+     * Sole constructor.  (For invocation by subclass constructors, typically
+     * implicit.)
+     */
+    public Dictionary() {
+    }
+
+    /**
+     * Returns the number of entries (distinct keys) in this dictionary.
+     *
+     * @return  the number of keys in this dictionary.
+     */
+    abstract public int size();
+
+    /**
+     * Tests if this dictionary maps no keys to value. The general contract
+     * for the <tt>isEmpty</tt> method is that the result is true if and only
+     * if this dictionary contains no entries.
+     *
+     * @return  <code>true</code> if this dictionary maps no keys to values;
+     *          <code>false</code> otherwise.
+     */
+    abstract public boolean isEmpty();
+
+    /**
+     * Returns an enumeration of the keys in this dictionary. The general
+     * contract for the keys method is that an <tt>Enumeration</tt> object
+     * is returned that will generate all the keys for which this dictionary
+     * contains entries.
+     *
+     * @return  an enumeration of the keys in this dictionary.
+     * @see     java.util.Dictionary#elements()
+     * @see     java.util.Enumeration
+     */
+    abstract public Enumeration<K> keys();
+
+    /**
+     * Returns an enumeration of the values in this dictionary. The general
+     * contract for the <tt>elements</tt> method is that an
+     * <tt>Enumeration</tt> is returned that will generate all the elements
+     * contained in entries in this dictionary.
+     *
+     * @return  an enumeration of the values in this dictionary.
+     * @see     java.util.Dictionary#keys()
+     * @see     java.util.Enumeration
+     */
+    abstract public Enumeration<V> elements();
+
+    /**
+     * Returns the value to which the key is mapped in this dictionary.
+     * The general contract for the <tt>isEmpty</tt> method is that if this
+     * dictionary contains an entry for the specified key, the associated
+     * value is returned; otherwise, <tt>null</tt> is returned.
+     *
+     * @return  the value to which the key is mapped in this dictionary;
+     * @param   key   a key in this dictionary.
+     *          <code>null</code> if the key is not mapped to any value in
+     *          this dictionary.
+     * @exception NullPointerException if the <tt>key</tt> is <tt>null</tt>.
+     * @see     java.util.Dictionary#put(java.lang.Object, java.lang.Object)
+     */
+    abstract public V get(Object key);
+
+    /**
+     * Maps the specified <code>key</code> to the specified
+     * <code>value</code> in this dictionary. Neither the key nor the
+     * value can be <code>null</code>.
+     * <p>
+     * If this dictionary already contains an entry for the specified
+     * <tt>key</tt>, the value already in this dictionary for that
+     * <tt>key</tt> is returned, after modifying the entry to contain the
+     *  new element. <p>If this dictionary does not already have an entry
+     *  for the specified <tt>key</tt>, an entry is created for the
+     *  specified <tt>key</tt> and <tt>value</tt>, and <tt>null</tt> is
+     *  returned.
+     * <p>
+     * The <code>value</code> can be retrieved by calling the
+     * <code>get</code> method with a <code>key</code> that is equal to
+     * the original <code>key</code>.
+     *
+     * @param      key     the hashtable key.
+     * @param      value   the value.
+     * @return     the previous value to which the <code>key</code> was mapped
+     *             in this dictionary, or <code>null</code> if the key did not
+     *             have a previous mapping.
+     * @exception  NullPointerException  if the <code>key</code> or
+     *               <code>value</code> is <code>null</code>.
+     * @see        java.lang.Object#equals(java.lang.Object)
+     * @see        java.util.Dictionary#get(java.lang.Object)
+     */
+    abstract public V put(K key, V value);
+
+    /**
+     * Removes the <code>key</code> (and its corresponding
+     * <code>value</code>) from this dictionary. This method does nothing
+     * if the <code>key</code> is not in this dictionary.
+     *
+     * @param   key   the key that needs to be removed.
+     * @return  the value to which the <code>key</code> had been mapped in this
+     *          dictionary, or <code>null</code> if the key did not have a
+     *          mapping.
+     * @exception NullPointerException if <tt>key</tt> is <tt>null</tt>.
+     */
+    abstract public V remove(Object key);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/DualPivotQuicksort.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/DualPivotQuicksort.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,3018 @@
+/*
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * This class implements the Dual-Pivot Quicksort algorithm by
+ * Vladimir Yaroslavskiy, Jon Bentley, and Josh Bloch. The algorithm
+ * offers O(n log(n)) performance on many data sets that cause other
+ * quicksorts to degrade to quadratic performance, and is typically
+ * faster than traditional (one-pivot) Quicksort implementations.
+ *
+ * @author Vladimir Yaroslavskiy
+ * @author Jon Bentley
+ * @author Josh Bloch
+ *
+ * @version 2011.02.11 m765.827.12i:5\7pm
+ * @since 1.7
+ */
+final class DualPivotQuicksort {
+
+    /**
+     * Prevents instantiation.
+     */
+    private DualPivotQuicksort() {}
+
+    /*
+     * Tuning parameters.
+     */
+
+    /**
+     * The maximum number of runs in merge sort.
+     */
+    private static final int MAX_RUN_COUNT = 67;
+
+    /**
+     * The maximum length of run in merge sort.
+     */
+    private static final int MAX_RUN_LENGTH = 33;
+
+    /**
+     * If the length of an array to be sorted is less than this
+     * constant, Quicksort is used in preference to merge sort.
+     */
+    private static final int QUICKSORT_THRESHOLD = 286;
+
+    /**
+     * If the length of an array to be sorted is less than this
+     * constant, insertion sort is used in preference to Quicksort.
+     */
+    private static final int INSERTION_SORT_THRESHOLD = 47;
+
+    /**
+     * If the length of a byte array to be sorted is greater than this
+     * constant, counting sort is used in preference to insertion sort.
+     */
+    private static final int COUNTING_SORT_THRESHOLD_FOR_BYTE = 29;
+
+    /**
+     * If the length of a short or char array to be sorted is greater
+     * than this constant, counting sort is used in preference to Quicksort.
+     */
+    private static final int COUNTING_SORT_THRESHOLD_FOR_SHORT_OR_CHAR = 3200;
+
+    /*
+     * Sorting methods for seven primitive types.
+     */
+
+    /**
+     * Sorts the specified array.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(int[] a) {
+        sort(a, 0, a.length - 1);
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    public static void sort(int[] a, int left, int right) {
+        // Use Quicksort on small arrays
+        if (right - left < QUICKSORT_THRESHOLD) {
+            sort(a, left, right, true);
+            return;
+        }
+
+        /*
+         * Index run[i] is the start of i-th run
+         * (ascending or descending sequence).
+         */
+        int[] run = new int[MAX_RUN_COUNT + 1];
+        int count = 0; run[0] = left;
+
+        // Check if the array is nearly sorted
+        for (int k = left; k < right; run[count] = k) {
+            if (a[k] < a[k + 1]) { // ascending
+                while (++k <= right && a[k - 1] <= a[k]);
+            } else if (a[k] > a[k + 1]) { // descending
+                while (++k <= right && a[k - 1] >= a[k]);
+                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
+                    int t = a[lo]; a[lo] = a[hi]; a[hi] = t;
+                }
+            } else { // equal
+                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
+                    if (--m == 0) {
+                        sort(a, left, right, true);
+                        return;
+                    }
+                }
+            }
+
+            /*
+             * The array is not highly structured,
+             * use Quicksort instead of merge sort.
+             */
+            if (++count == MAX_RUN_COUNT) {
+                sort(a, left, right, true);
+                return;
+            }
+        }
+
+        // Check special cases
+        if (run[count] == right++) { // The last run contains one element
+            run[++count] = right;
+        } else if (count == 1) { // The array is already sorted
+            return;
+        }
+
+        /*
+         * Create temporary array, which is used for merging.
+         * Implementation note: variable "right" is increased by 1.
+         */
+        int[] b; byte odd = 0;
+        for (int n = 1; (n <<= 1) < count; odd ^= 1);
+
+        if (odd == 0) {
+            b = a; a = new int[b.length];
+            for (int i = left - 1; ++i < right; a[i] = b[i]);
+        } else {
+            b = new int[a.length];
+        }
+
+        // Merging
+        for (int last; count > 1; count = last) {
+            for (int k = (last = 0) + 2; k <= count; k += 2) {
+                int hi = run[k], mi = run[k - 1];
+                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
+                    if (q >= hi || p < mi && a[p] <= a[q]) {
+                        b[i] = a[p++];
+                    } else {
+                        b[i] = a[q++];
+                    }
+                }
+                run[++last] = hi;
+            }
+            if ((count & 1) != 0) {
+                for (int i = right, lo = run[count - 1]; --i >= lo;
+                    b[i] = a[i]
+                );
+                run[++last] = right;
+            }
+            int[] t = a; a = b; b = t;
+        }
+    }
+
+    /**
+     * Sorts the specified range of the array by Dual-Pivot Quicksort.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     * @param leftmost indicates if this part is the leftmost in the range
+     */
+    private static void sort(int[] a, int left, int right, boolean leftmost) {
+        int length = right - left + 1;
+
+        // Use insertion sort on tiny arrays
+        if (length < INSERTION_SORT_THRESHOLD) {
+            if (leftmost) {
+                /*
+                 * Traditional (without sentinel) insertion sort,
+                 * optimized for server VM, is used in case of
+                 * the leftmost part.
+                 */
+                for (int i = left, j = i; i < right; j = ++i) {
+                    int ai = a[i + 1];
+                    while (ai < a[j]) {
+                        a[j + 1] = a[j];
+                        if (j-- == left) {
+                            break;
+                        }
+                    }
+                    a[j + 1] = ai;
+                }
+            } else {
+                /*
+                 * Skip the longest ascending sequence.
+                 */
+                do {
+                    if (left >= right) {
+                        return;
+                    }
+                } while (a[++left] >= a[left - 1]);
+
+                /*
+                 * Every element from adjoining part plays the role
+                 * of sentinel, therefore this allows us to avoid the
+                 * left range check on each iteration. Moreover, we use
+                 * the more optimized algorithm, so called pair insertion
+                 * sort, which is faster (in the context of Quicksort)
+                 * than traditional implementation of insertion sort.
+                 */
+                for (int k = left; ++left <= right; k = ++left) {
+                    int a1 = a[k], a2 = a[left];
+
+                    if (a1 < a2) {
+                        a2 = a1; a1 = a[left];
+                    }
+                    while (a1 < a[--k]) {
+                        a[k + 2] = a[k];
+                    }
+                    a[++k + 1] = a1;
+
+                    while (a2 < a[--k]) {
+                        a[k + 1] = a[k];
+                    }
+                    a[k + 1] = a2;
+                }
+                int last = a[right];
+
+                while (last < a[--right]) {
+                    a[right + 1] = a[right];
+                }
+                a[right + 1] = last;
+            }
+            return;
+        }
+
+        // Inexpensive approximation of length / 7
+        int seventh = (length >> 3) + (length >> 6) + 1;
+
+        /*
+         * Sort five evenly spaced elements around (and including) the
+         * center element in the range. These elements will be used for
+         * pivot selection as described below. The choice for spacing
+         * these elements was empirically determined to work well on
+         * a wide variety of inputs.
+         */
+        int e3 = (left + right) >>> 1; // The midpoint
+        int e2 = e3 - seventh;
+        int e1 = e2 - seventh;
+        int e4 = e3 + seventh;
+        int e5 = e4 + seventh;
+
+        // Sort these elements using insertion sort
+        if (a[e2] < a[e1]) { int t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
+
+        if (a[e3] < a[e2]) { int t = a[e3]; a[e3] = a[e2]; a[e2] = t;
+            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+        }
+        if (a[e4] < a[e3]) { int t = a[e4]; a[e4] = a[e3]; a[e3] = t;
+            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+            }
+        }
+        if (a[e5] < a[e4]) { int t = a[e5]; a[e5] = a[e4]; a[e4] = t;
+            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
+                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+                }
+            }
+        }
+
+        // Pointers
+        int less  = left;  // The index of the first element of center part
+        int great = right; // The index before the first element of right part
+
+        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
+            /*
+             * Use the second and fourth of the five sorted elements as pivots.
+             * These values are inexpensive approximations of the first and
+             * second terciles of the array. Note that pivot1 <= pivot2.
+             */
+            int pivot1 = a[e2];
+            int pivot2 = a[e4];
+
+            /*
+             * The first and the last elements to be sorted are moved to the
+             * locations formerly occupied by the pivots. When partitioning
+             * is complete, the pivots are swapped back into their final
+             * positions, and excluded from subsequent sorting.
+             */
+            a[e2] = a[left];
+            a[e4] = a[right];
+
+            /*
+             * Skip elements, which are less or greater than pivot values.
+             */
+            while (a[++less] < pivot1);
+            while (a[--great] > pivot2);
+
+            /*
+             * Partitioning:
+             *
+             *   left part           center part                   right part
+             * +--------------------------------------------------------------+
+             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
+             * +--------------------------------------------------------------+
+             *               ^                          ^       ^
+             *               |                          |       |
+             *              less                        k     great
+             *
+             * Invariants:
+             *
+             *              all in (left, less)   < pivot1
+             *    pivot1 <= all in [less, k)     <= pivot2
+             *              all in (great, right) > pivot2
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            outer:
+            for (int k = less - 1; ++k <= great; ) {
+                int ak = a[k];
+                if (ak < pivot1) { // Move a[k] to left part
+                    a[k] = a[less];
+                    /*
+                     * Here and below we use "a[i] = b; i++;" instead
+                     * of "a[i++] = b;" due to performance issue.
+                     */
+                    a[less] = ak;
+                    ++less;
+                } else if (ak > pivot2) { // Move a[k] to right part
+                    while (a[great] > pivot2) {
+                        if (great-- == k) {
+                            break outer;
+                        }
+                    }
+                    if (a[great] < pivot1) { // a[great] <= pivot2
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // pivot1 <= a[great] <= pivot2
+                        a[k] = a[great];
+                    }
+                    /*
+                     * Here and below we use "a[i] = b; i--;" instead
+                     * of "a[i--] = b;" due to performance issue.
+                     */
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            // Swap pivots into their final positions
+            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
+            a[right] = a[great + 1]; a[great + 1] = pivot2;
+
+            // Sort left and right parts recursively, excluding known pivots
+            sort(a, left, less - 2, leftmost);
+            sort(a, great + 2, right, false);
+
+            /*
+             * If center part is too large (comprises > 4/7 of the array),
+             * swap internal pivot values to ends.
+             */
+            if (less < e1 && e5 < great) {
+                /*
+                 * Skip elements, which are equal to pivot values.
+                 */
+                while (a[less] == pivot1) {
+                    ++less;
+                }
+
+                while (a[great] == pivot2) {
+                    --great;
+                }
+
+                /*
+                 * Partitioning:
+                 *
+                 *   left part         center part                  right part
+                 * +----------------------------------------------------------+
+                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
+                 * +----------------------------------------------------------+
+                 *              ^                        ^       ^
+                 *              |                        |       |
+                 *             less                      k     great
+                 *
+                 * Invariants:
+                 *
+                 *              all in (*,  less) == pivot1
+                 *     pivot1 < all in [less,  k)  < pivot2
+                 *              all in (great, *) == pivot2
+                 *
+                 * Pointer k is the first index of ?-part.
+                 */
+                outer:
+                for (int k = less - 1; ++k <= great; ) {
+                    int ak = a[k];
+                    if (ak == pivot1) { // Move a[k] to left part
+                        a[k] = a[less];
+                        a[less] = ak;
+                        ++less;
+                    } else if (ak == pivot2) { // Move a[k] to right part
+                        while (a[great] == pivot2) {
+                            if (great-- == k) {
+                                break outer;
+                            }
+                        }
+                        if (a[great] == pivot1) { // a[great] < pivot2
+                            a[k] = a[less];
+                            /*
+                             * Even though a[great] equals to pivot1, the
+                             * assignment a[less] = pivot1 may be incorrect,
+                             * if a[great] and pivot1 are floating-point zeros
+                             * of different signs. Therefore in float and
+                             * double sorting methods we have to use more
+                             * accurate assignment a[less] = a[great].
+                             */
+                            a[less] = pivot1;
+                            ++less;
+                        } else { // pivot1 < a[great] < pivot2
+                            a[k] = a[great];
+                        }
+                        a[great] = ak;
+                        --great;
+                    }
+                }
+            }
+
+            // Sort center part recursively
+            sort(a, less, great, false);
+
+        } else { // Partitioning with one pivot
+            /*
+             * Use the third of the five sorted elements as pivot.
+             * This value is inexpensive approximation of the median.
+             */
+            int pivot = a[e3];
+
+            /*
+             * Partitioning degenerates to the traditional 3-way
+             * (or "Dutch National Flag") schema:
+             *
+             *   left part    center part              right part
+             * +-------------------------------------------------+
+             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
+             * +-------------------------------------------------+
+             *              ^              ^        ^
+             *              |              |        |
+             *             less            k      great
+             *
+             * Invariants:
+             *
+             *   all in (left, less)   < pivot
+             *   all in [less, k)     == pivot
+             *   all in (great, right) > pivot
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            for (int k = less; k <= great; ++k) {
+                if (a[k] == pivot) {
+                    continue;
+                }
+                int ak = a[k];
+                if (ak < pivot) { // Move a[k] to left part
+                    a[k] = a[less];
+                    a[less] = ak;
+                    ++less;
+                } else { // a[k] > pivot - Move a[k] to right part
+                    while (a[great] > pivot) {
+                        --great;
+                    }
+                    if (a[great] < pivot) { // a[great] <= pivot
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // a[great] == pivot
+                        /*
+                         * Even though a[great] equals to pivot, the
+                         * assignment a[k] = pivot may be incorrect,
+                         * if a[great] and pivot are floating-point
+                         * zeros of different signs. Therefore in float
+                         * and double sorting methods we have to use
+                         * more accurate assignment a[k] = a[great].
+                         */
+                        a[k] = pivot;
+                    }
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            /*
+             * Sort left and right parts recursively.
+             * All elements from center part are equal
+             * and, therefore, already sorted.
+             */
+            sort(a, left, less - 1, leftmost);
+            sort(a, great + 1, right, false);
+        }
+    }
+
+    /**
+     * Sorts the specified array.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(long[] a) {
+        sort(a, 0, a.length - 1);
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    public static void sort(long[] a, int left, int right) {
+        // Use Quicksort on small arrays
+        if (right - left < QUICKSORT_THRESHOLD) {
+            sort(a, left, right, true);
+            return;
+        }
+
+        /*
+         * Index run[i] is the start of i-th run
+         * (ascending or descending sequence).
+         */
+        int[] run = new int[MAX_RUN_COUNT + 1];
+        int count = 0; run[0] = left;
+
+        // Check if the array is nearly sorted
+        for (int k = left; k < right; run[count] = k) {
+            if (a[k] < a[k + 1]) { // ascending
+                while (++k <= right && a[k - 1] <= a[k]);
+            } else if (a[k] > a[k + 1]) { // descending
+                while (++k <= right && a[k - 1] >= a[k]);
+                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
+                    long t = a[lo]; a[lo] = a[hi]; a[hi] = t;
+                }
+            } else { // equal
+                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
+                    if (--m == 0) {
+                        sort(a, left, right, true);
+                        return;
+                    }
+                }
+            }
+
+            /*
+             * The array is not highly structured,
+             * use Quicksort instead of merge sort.
+             */
+            if (++count == MAX_RUN_COUNT) {
+                sort(a, left, right, true);
+                return;
+            }
+        }
+
+        // Check special cases
+        if (run[count] == right++) { // The last run contains one element
+            run[++count] = right;
+        } else if (count == 1) { // The array is already sorted
+            return;
+        }
+
+        /*
+         * Create temporary array, which is used for merging.
+         * Implementation note: variable "right" is increased by 1.
+         */
+        long[] b; byte odd = 0;
+        for (int n = 1; (n <<= 1) < count; odd ^= 1);
+
+        if (odd == 0) {
+            b = a; a = new long[b.length];
+            for (int i = left - 1; ++i < right; a[i] = b[i]);
+        } else {
+            b = new long[a.length];
+        }
+
+        // Merging
+        for (int last; count > 1; count = last) {
+            for (int k = (last = 0) + 2; k <= count; k += 2) {
+                int hi = run[k], mi = run[k - 1];
+                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
+                    if (q >= hi || p < mi && a[p] <= a[q]) {
+                        b[i] = a[p++];
+                    } else {
+                        b[i] = a[q++];
+                    }
+                }
+                run[++last] = hi;
+            }
+            if ((count & 1) != 0) {
+                for (int i = right, lo = run[count - 1]; --i >= lo;
+                    b[i] = a[i]
+                );
+                run[++last] = right;
+            }
+            long[] t = a; a = b; b = t;
+        }
+    }
+
+    /**
+     * Sorts the specified range of the array by Dual-Pivot Quicksort.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     * @param leftmost indicates if this part is the leftmost in the range
+     */
+    private static void sort(long[] a, int left, int right, boolean leftmost) {
+        int length = right - left + 1;
+
+        // Use insertion sort on tiny arrays
+        if (length < INSERTION_SORT_THRESHOLD) {
+            if (leftmost) {
+                /*
+                 * Traditional (without sentinel) insertion sort,
+                 * optimized for server VM, is used in case of
+                 * the leftmost part.
+                 */
+                for (int i = left, j = i; i < right; j = ++i) {
+                    long ai = a[i + 1];
+                    while (ai < a[j]) {
+                        a[j + 1] = a[j];
+                        if (j-- == left) {
+                            break;
+                        }
+                    }
+                    a[j + 1] = ai;
+                }
+            } else {
+                /*
+                 * Skip the longest ascending sequence.
+                 */
+                do {
+                    if (left >= right) {
+                        return;
+                    }
+                } while (a[++left] >= a[left - 1]);
+
+                /*
+                 * Every element from adjoining part plays the role
+                 * of sentinel, therefore this allows us to avoid the
+                 * left range check on each iteration. Moreover, we use
+                 * the more optimized algorithm, so called pair insertion
+                 * sort, which is faster (in the context of Quicksort)
+                 * than traditional implementation of insertion sort.
+                 */
+                for (int k = left; ++left <= right; k = ++left) {
+                    long a1 = a[k], a2 = a[left];
+
+                    if (a1 < a2) {
+                        a2 = a1; a1 = a[left];
+                    }
+                    while (a1 < a[--k]) {
+                        a[k + 2] = a[k];
+                    }
+                    a[++k + 1] = a1;
+
+                    while (a2 < a[--k]) {
+                        a[k + 1] = a[k];
+                    }
+                    a[k + 1] = a2;
+                }
+                long last = a[right];
+
+                while (last < a[--right]) {
+                    a[right + 1] = a[right];
+                }
+                a[right + 1] = last;
+            }
+            return;
+        }
+
+        // Inexpensive approximation of length / 7
+        int seventh = (length >> 3) + (length >> 6) + 1;
+
+        /*
+         * Sort five evenly spaced elements around (and including) the
+         * center element in the range. These elements will be used for
+         * pivot selection as described below. The choice for spacing
+         * these elements was empirically determined to work well on
+         * a wide variety of inputs.
+         */
+        int e3 = (left + right) >>> 1; // The midpoint
+        int e2 = e3 - seventh;
+        int e1 = e2 - seventh;
+        int e4 = e3 + seventh;
+        int e5 = e4 + seventh;
+
+        // Sort these elements using insertion sort
+        if (a[e2] < a[e1]) { long t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
+
+        if (a[e3] < a[e2]) { long t = a[e3]; a[e3] = a[e2]; a[e2] = t;
+            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+        }
+        if (a[e4] < a[e3]) { long t = a[e4]; a[e4] = a[e3]; a[e3] = t;
+            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+            }
+        }
+        if (a[e5] < a[e4]) { long t = a[e5]; a[e5] = a[e4]; a[e4] = t;
+            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
+                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+                }
+            }
+        }
+
+        // Pointers
+        int less  = left;  // The index of the first element of center part
+        int great = right; // The index before the first element of right part
+
+        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
+            /*
+             * Use the second and fourth of the five sorted elements as pivots.
+             * These values are inexpensive approximations of the first and
+             * second terciles of the array. Note that pivot1 <= pivot2.
+             */
+            long pivot1 = a[e2];
+            long pivot2 = a[e4];
+
+            /*
+             * The first and the last elements to be sorted are moved to the
+             * locations formerly occupied by the pivots. When partitioning
+             * is complete, the pivots are swapped back into their final
+             * positions, and excluded from subsequent sorting.
+             */
+            a[e2] = a[left];
+            a[e4] = a[right];
+
+            /*
+             * Skip elements, which are less or greater than pivot values.
+             */
+            while (a[++less] < pivot1);
+            while (a[--great] > pivot2);
+
+            /*
+             * Partitioning:
+             *
+             *   left part           center part                   right part
+             * +--------------------------------------------------------------+
+             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
+             * +--------------------------------------------------------------+
+             *               ^                          ^       ^
+             *               |                          |       |
+             *              less                        k     great
+             *
+             * Invariants:
+             *
+             *              all in (left, less)   < pivot1
+             *    pivot1 <= all in [less, k)     <= pivot2
+             *              all in (great, right) > pivot2
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            outer:
+            for (int k = less - 1; ++k <= great; ) {
+                long ak = a[k];
+                if (ak < pivot1) { // Move a[k] to left part
+                    a[k] = a[less];
+                    /*
+                     * Here and below we use "a[i] = b; i++;" instead
+                     * of "a[i++] = b;" due to performance issue.
+                     */
+                    a[less] = ak;
+                    ++less;
+                } else if (ak > pivot2) { // Move a[k] to right part
+                    while (a[great] > pivot2) {
+                        if (great-- == k) {
+                            break outer;
+                        }
+                    }
+                    if (a[great] < pivot1) { // a[great] <= pivot2
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // pivot1 <= a[great] <= pivot2
+                        a[k] = a[great];
+                    }
+                    /*
+                     * Here and below we use "a[i] = b; i--;" instead
+                     * of "a[i--] = b;" due to performance issue.
+                     */
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            // Swap pivots into their final positions
+            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
+            a[right] = a[great + 1]; a[great + 1] = pivot2;
+
+            // Sort left and right parts recursively, excluding known pivots
+            sort(a, left, less - 2, leftmost);
+            sort(a, great + 2, right, false);
+
+            /*
+             * If center part is too large (comprises > 4/7 of the array),
+             * swap internal pivot values to ends.
+             */
+            if (less < e1 && e5 < great) {
+                /*
+                 * Skip elements, which are equal to pivot values.
+                 */
+                while (a[less] == pivot1) {
+                    ++less;
+                }
+
+                while (a[great] == pivot2) {
+                    --great;
+                }
+
+                /*
+                 * Partitioning:
+                 *
+                 *   left part         center part                  right part
+                 * +----------------------------------------------------------+
+                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
+                 * +----------------------------------------------------------+
+                 *              ^                        ^       ^
+                 *              |                        |       |
+                 *             less                      k     great
+                 *
+                 * Invariants:
+                 *
+                 *              all in (*,  less) == pivot1
+                 *     pivot1 < all in [less,  k)  < pivot2
+                 *              all in (great, *) == pivot2
+                 *
+                 * Pointer k is the first index of ?-part.
+                 */
+                outer:
+                for (int k = less - 1; ++k <= great; ) {
+                    long ak = a[k];
+                    if (ak == pivot1) { // Move a[k] to left part
+                        a[k] = a[less];
+                        a[less] = ak;
+                        ++less;
+                    } else if (ak == pivot2) { // Move a[k] to right part
+                        while (a[great] == pivot2) {
+                            if (great-- == k) {
+                                break outer;
+                            }
+                        }
+                        if (a[great] == pivot1) { // a[great] < pivot2
+                            a[k] = a[less];
+                            /*
+                             * Even though a[great] equals to pivot1, the
+                             * assignment a[less] = pivot1 may be incorrect,
+                             * if a[great] and pivot1 are floating-point zeros
+                             * of different signs. Therefore in float and
+                             * double sorting methods we have to use more
+                             * accurate assignment a[less] = a[great].
+                             */
+                            a[less] = pivot1;
+                            ++less;
+                        } else { // pivot1 < a[great] < pivot2
+                            a[k] = a[great];
+                        }
+                        a[great] = ak;
+                        --great;
+                    }
+                }
+            }
+
+            // Sort center part recursively
+            sort(a, less, great, false);
+
+        } else { // Partitioning with one pivot
+            /*
+             * Use the third of the five sorted elements as pivot.
+             * This value is inexpensive approximation of the median.
+             */
+            long pivot = a[e3];
+
+            /*
+             * Partitioning degenerates to the traditional 3-way
+             * (or "Dutch National Flag") schema:
+             *
+             *   left part    center part              right part
+             * +-------------------------------------------------+
+             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
+             * +-------------------------------------------------+
+             *              ^              ^        ^
+             *              |              |        |
+             *             less            k      great
+             *
+             * Invariants:
+             *
+             *   all in (left, less)   < pivot
+             *   all in [less, k)     == pivot
+             *   all in (great, right) > pivot
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            for (int k = less; k <= great; ++k) {
+                if (a[k] == pivot) {
+                    continue;
+                }
+                long ak = a[k];
+                if (ak < pivot) { // Move a[k] to left part
+                    a[k] = a[less];
+                    a[less] = ak;
+                    ++less;
+                } else { // a[k] > pivot - Move a[k] to right part
+                    while (a[great] > pivot) {
+                        --great;
+                    }
+                    if (a[great] < pivot) { // a[great] <= pivot
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // a[great] == pivot
+                        /*
+                         * Even though a[great] equals to pivot, the
+                         * assignment a[k] = pivot may be incorrect,
+                         * if a[great] and pivot are floating-point
+                         * zeros of different signs. Therefore in float
+                         * and double sorting methods we have to use
+                         * more accurate assignment a[k] = a[great].
+                         */
+                        a[k] = pivot;
+                    }
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            /*
+             * Sort left and right parts recursively.
+             * All elements from center part are equal
+             * and, therefore, already sorted.
+             */
+            sort(a, left, less - 1, leftmost);
+            sort(a, great + 1, right, false);
+        }
+    }
+
+    /**
+     * Sorts the specified array.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(short[] a) {
+        sort(a, 0, a.length - 1);
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    public static void sort(short[] a, int left, int right) {
+        // Use counting sort on large arrays
+        if (right - left > COUNTING_SORT_THRESHOLD_FOR_SHORT_OR_CHAR) {
+            int[] count = new int[NUM_SHORT_VALUES];
+
+            for (int i = left - 1; ++i <= right;
+                count[a[i] - Short.MIN_VALUE]++
+            );
+            for (int i = NUM_SHORT_VALUES, k = right + 1; k > left; ) {
+                while (count[--i] == 0);
+                short value = (short) (i + Short.MIN_VALUE);
+                int s = count[i];
+
+                do {
+                    a[--k] = value;
+                } while (--s > 0);
+            }
+        } else { // Use Dual-Pivot Quicksort on small arrays
+            doSort(a, left, right);
+        }
+    }
+
+    /** The number of distinct short values. */
+    private static final int NUM_SHORT_VALUES = 1 << 16;
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    private static void doSort(short[] a, int left, int right) {
+        // Use Quicksort on small arrays
+        if (right - left < QUICKSORT_THRESHOLD) {
+            sort(a, left, right, true);
+            return;
+        }
+
+        /*
+         * Index run[i] is the start of i-th run
+         * (ascending or descending sequence).
+         */
+        int[] run = new int[MAX_RUN_COUNT + 1];
+        int count = 0; run[0] = left;
+
+        // Check if the array is nearly sorted
+        for (int k = left; k < right; run[count] = k) {
+            if (a[k] < a[k + 1]) { // ascending
+                while (++k <= right && a[k - 1] <= a[k]);
+            } else if (a[k] > a[k + 1]) { // descending
+                while (++k <= right && a[k - 1] >= a[k]);
+                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
+                    short t = a[lo]; a[lo] = a[hi]; a[hi] = t;
+                }
+            } else { // equal
+                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
+                    if (--m == 0) {
+                        sort(a, left, right, true);
+                        return;
+                    }
+                }
+            }
+
+            /*
+             * The array is not highly structured,
+             * use Quicksort instead of merge sort.
+             */
+            if (++count == MAX_RUN_COUNT) {
+                sort(a, left, right, true);
+                return;
+            }
+        }
+
+        // Check special cases
+        if (run[count] == right++) { // The last run contains one element
+            run[++count] = right;
+        } else if (count == 1) { // The array is already sorted
+            return;
+        }
+
+        /*
+         * Create temporary array, which is used for merging.
+         * Implementation note: variable "right" is increased by 1.
+         */
+        short[] b; byte odd = 0;
+        for (int n = 1; (n <<= 1) < count; odd ^= 1);
+
+        if (odd == 0) {
+            b = a; a = new short[b.length];
+            for (int i = left - 1; ++i < right; a[i] = b[i]);
+        } else {
+            b = new short[a.length];
+        }
+
+        // Merging
+        for (int last; count > 1; count = last) {
+            for (int k = (last = 0) + 2; k <= count; k += 2) {
+                int hi = run[k], mi = run[k - 1];
+                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
+                    if (q >= hi || p < mi && a[p] <= a[q]) {
+                        b[i] = a[p++];
+                    } else {
+                        b[i] = a[q++];
+                    }
+                }
+                run[++last] = hi;
+            }
+            if ((count & 1) != 0) {
+                for (int i = right, lo = run[count - 1]; --i >= lo;
+                    b[i] = a[i]
+                );
+                run[++last] = right;
+            }
+            short[] t = a; a = b; b = t;
+        }
+    }
+
+    /**
+     * Sorts the specified range of the array by Dual-Pivot Quicksort.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     * @param leftmost indicates if this part is the leftmost in the range
+     */
+    private static void sort(short[] a, int left, int right, boolean leftmost) {
+        int length = right - left + 1;
+
+        // Use insertion sort on tiny arrays
+        if (length < INSERTION_SORT_THRESHOLD) {
+            if (leftmost) {
+                /*
+                 * Traditional (without sentinel) insertion sort,
+                 * optimized for server VM, is used in case of
+                 * the leftmost part.
+                 */
+                for (int i = left, j = i; i < right; j = ++i) {
+                    short ai = a[i + 1];
+                    while (ai < a[j]) {
+                        a[j + 1] = a[j];
+                        if (j-- == left) {
+                            break;
+                        }
+                    }
+                    a[j + 1] = ai;
+                }
+            } else {
+                /*
+                 * Skip the longest ascending sequence.
+                 */
+                do {
+                    if (left >= right) {
+                        return;
+                    }
+                } while (a[++left] >= a[left - 1]);
+
+                /*
+                 * Every element from adjoining part plays the role
+                 * of sentinel, therefore this allows us to avoid the
+                 * left range check on each iteration. Moreover, we use
+                 * the more optimized algorithm, so called pair insertion
+                 * sort, which is faster (in the context of Quicksort)
+                 * than traditional implementation of insertion sort.
+                 */
+                for (int k = left; ++left <= right; k = ++left) {
+                    short a1 = a[k], a2 = a[left];
+
+                    if (a1 < a2) {
+                        a2 = a1; a1 = a[left];
+                    }
+                    while (a1 < a[--k]) {
+                        a[k + 2] = a[k];
+                    }
+                    a[++k + 1] = a1;
+
+                    while (a2 < a[--k]) {
+                        a[k + 1] = a[k];
+                    }
+                    a[k + 1] = a2;
+                }
+                short last = a[right];
+
+                while (last < a[--right]) {
+                    a[right + 1] = a[right];
+                }
+                a[right + 1] = last;
+            }
+            return;
+        }
+
+        // Inexpensive approximation of length / 7
+        int seventh = (length >> 3) + (length >> 6) + 1;
+
+        /*
+         * Sort five evenly spaced elements around (and including) the
+         * center element in the range. These elements will be used for
+         * pivot selection as described below. The choice for spacing
+         * these elements was empirically determined to work well on
+         * a wide variety of inputs.
+         */
+        int e3 = (left + right) >>> 1; // The midpoint
+        int e2 = e3 - seventh;
+        int e1 = e2 - seventh;
+        int e4 = e3 + seventh;
+        int e5 = e4 + seventh;
+
+        // Sort these elements using insertion sort
+        if (a[e2] < a[e1]) { short t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
+
+        if (a[e3] < a[e2]) { short t = a[e3]; a[e3] = a[e2]; a[e2] = t;
+            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+        }
+        if (a[e4] < a[e3]) { short t = a[e4]; a[e4] = a[e3]; a[e3] = t;
+            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+            }
+        }
+        if (a[e5] < a[e4]) { short t = a[e5]; a[e5] = a[e4]; a[e4] = t;
+            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
+                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+                }
+            }
+        }
+
+        // Pointers
+        int less  = left;  // The index of the first element of center part
+        int great = right; // The index before the first element of right part
+
+        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
+            /*
+             * Use the second and fourth of the five sorted elements as pivots.
+             * These values are inexpensive approximations of the first and
+             * second terciles of the array. Note that pivot1 <= pivot2.
+             */
+            short pivot1 = a[e2];
+            short pivot2 = a[e4];
+
+            /*
+             * The first and the last elements to be sorted are moved to the
+             * locations formerly occupied by the pivots. When partitioning
+             * is complete, the pivots are swapped back into their final
+             * positions, and excluded from subsequent sorting.
+             */
+            a[e2] = a[left];
+            a[e4] = a[right];
+
+            /*
+             * Skip elements, which are less or greater than pivot values.
+             */
+            while (a[++less] < pivot1);
+            while (a[--great] > pivot2);
+
+            /*
+             * Partitioning:
+             *
+             *   left part           center part                   right part
+             * +--------------------------------------------------------------+
+             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
+             * +--------------------------------------------------------------+
+             *               ^                          ^       ^
+             *               |                          |       |
+             *              less                        k     great
+             *
+             * Invariants:
+             *
+             *              all in (left, less)   < pivot1
+             *    pivot1 <= all in [less, k)     <= pivot2
+             *              all in (great, right) > pivot2
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            outer:
+            for (int k = less - 1; ++k <= great; ) {
+                short ak = a[k];
+                if (ak < pivot1) { // Move a[k] to left part
+                    a[k] = a[less];
+                    /*
+                     * Here and below we use "a[i] = b; i++;" instead
+                     * of "a[i++] = b;" due to performance issue.
+                     */
+                    a[less] = ak;
+                    ++less;
+                } else if (ak > pivot2) { // Move a[k] to right part
+                    while (a[great] > pivot2) {
+                        if (great-- == k) {
+                            break outer;
+                        }
+                    }
+                    if (a[great] < pivot1) { // a[great] <= pivot2
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // pivot1 <= a[great] <= pivot2
+                        a[k] = a[great];
+                    }
+                    /*
+                     * Here and below we use "a[i] = b; i--;" instead
+                     * of "a[i--] = b;" due to performance issue.
+                     */
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            // Swap pivots into their final positions
+            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
+            a[right] = a[great + 1]; a[great + 1] = pivot2;
+
+            // Sort left and right parts recursively, excluding known pivots
+            sort(a, left, less - 2, leftmost);
+            sort(a, great + 2, right, false);
+
+            /*
+             * If center part is too large (comprises > 4/7 of the array),
+             * swap internal pivot values to ends.
+             */
+            if (less < e1 && e5 < great) {
+                /*
+                 * Skip elements, which are equal to pivot values.
+                 */
+                while (a[less] == pivot1) {
+                    ++less;
+                }
+
+                while (a[great] == pivot2) {
+                    --great;
+                }
+
+                /*
+                 * Partitioning:
+                 *
+                 *   left part         center part                  right part
+                 * +----------------------------------------------------------+
+                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
+                 * +----------------------------------------------------------+
+                 *              ^                        ^       ^
+                 *              |                        |       |
+                 *             less                      k     great
+                 *
+                 * Invariants:
+                 *
+                 *              all in (*,  less) == pivot1
+                 *     pivot1 < all in [less,  k)  < pivot2
+                 *              all in (great, *) == pivot2
+                 *
+                 * Pointer k is the first index of ?-part.
+                 */
+                outer:
+                for (int k = less - 1; ++k <= great; ) {
+                    short ak = a[k];
+                    if (ak == pivot1) { // Move a[k] to left part
+                        a[k] = a[less];
+                        a[less] = ak;
+                        ++less;
+                    } else if (ak == pivot2) { // Move a[k] to right part
+                        while (a[great] == pivot2) {
+                            if (great-- == k) {
+                                break outer;
+                            }
+                        }
+                        if (a[great] == pivot1) { // a[great] < pivot2
+                            a[k] = a[less];
+                            /*
+                             * Even though a[great] equals to pivot1, the
+                             * assignment a[less] = pivot1 may be incorrect,
+                             * if a[great] and pivot1 are floating-point zeros
+                             * of different signs. Therefore in float and
+                             * double sorting methods we have to use more
+                             * accurate assignment a[less] = a[great].
+                             */
+                            a[less] = pivot1;
+                            ++less;
+                        } else { // pivot1 < a[great] < pivot2
+                            a[k] = a[great];
+                        }
+                        a[great] = ak;
+                        --great;
+                    }
+                }
+            }
+
+            // Sort center part recursively
+            sort(a, less, great, false);
+
+        } else { // Partitioning with one pivot
+            /*
+             * Use the third of the five sorted elements as pivot.
+             * This value is inexpensive approximation of the median.
+             */
+            short pivot = a[e3];
+
+            /*
+             * Partitioning degenerates to the traditional 3-way
+             * (or "Dutch National Flag") schema:
+             *
+             *   left part    center part              right part
+             * +-------------------------------------------------+
+             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
+             * +-------------------------------------------------+
+             *              ^              ^        ^
+             *              |              |        |
+             *             less            k      great
+             *
+             * Invariants:
+             *
+             *   all in (left, less)   < pivot
+             *   all in [less, k)     == pivot
+             *   all in (great, right) > pivot
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            for (int k = less; k <= great; ++k) {
+                if (a[k] == pivot) {
+                    continue;
+                }
+                short ak = a[k];
+                if (ak < pivot) { // Move a[k] to left part
+                    a[k] = a[less];
+                    a[less] = ak;
+                    ++less;
+                } else { // a[k] > pivot - Move a[k] to right part
+                    while (a[great] > pivot) {
+                        --great;
+                    }
+                    if (a[great] < pivot) { // a[great] <= pivot
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // a[great] == pivot
+                        /*
+                         * Even though a[great] equals to pivot, the
+                         * assignment a[k] = pivot may be incorrect,
+                         * if a[great] and pivot are floating-point
+                         * zeros of different signs. Therefore in float
+                         * and double sorting methods we have to use
+                         * more accurate assignment a[k] = a[great].
+                         */
+                        a[k] = pivot;
+                    }
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            /*
+             * Sort left and right parts recursively.
+             * All elements from center part are equal
+             * and, therefore, already sorted.
+             */
+            sort(a, left, less - 1, leftmost);
+            sort(a, great + 1, right, false);
+        }
+    }
+
+    /**
+     * Sorts the specified array.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(char[] a) {
+        sort(a, 0, a.length - 1);
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    public static void sort(char[] a, int left, int right) {
+        // Use counting sort on large arrays
+        if (right - left > COUNTING_SORT_THRESHOLD_FOR_SHORT_OR_CHAR) {
+            int[] count = new int[NUM_CHAR_VALUES];
+
+            for (int i = left - 1; ++i <= right;
+                count[a[i]]++
+            );
+            for (int i = NUM_CHAR_VALUES, k = right + 1; k > left; ) {
+                while (count[--i] == 0);
+                char value = (char) i;
+                int s = count[i];
+
+                do {
+                    a[--k] = value;
+                } while (--s > 0);
+            }
+        } else { // Use Dual-Pivot Quicksort on small arrays
+            doSort(a, left, right);
+        }
+    }
+
+    /** The number of distinct char values. */
+    private static final int NUM_CHAR_VALUES = 1 << 16;
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    private static void doSort(char[] a, int left, int right) {
+        // Use Quicksort on small arrays
+        if (right - left < QUICKSORT_THRESHOLD) {
+            sort(a, left, right, true);
+            return;
+        }
+
+        /*
+         * Index run[i] is the start of i-th run
+         * (ascending or descending sequence).
+         */
+        int[] run = new int[MAX_RUN_COUNT + 1];
+        int count = 0; run[0] = left;
+
+        // Check if the array is nearly sorted
+        for (int k = left; k < right; run[count] = k) {
+            if (a[k] < a[k + 1]) { // ascending
+                while (++k <= right && a[k - 1] <= a[k]);
+            } else if (a[k] > a[k + 1]) { // descending
+                while (++k <= right && a[k - 1] >= a[k]);
+                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
+                    char t = a[lo]; a[lo] = a[hi]; a[hi] = t;
+                }
+            } else { // equal
+                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
+                    if (--m == 0) {
+                        sort(a, left, right, true);
+                        return;
+                    }
+                }
+            }
+
+            /*
+             * The array is not highly structured,
+             * use Quicksort instead of merge sort.
+             */
+            if (++count == MAX_RUN_COUNT) {
+                sort(a, left, right, true);
+                return;
+            }
+        }
+
+        // Check special cases
+        if (run[count] == right++) { // The last run contains one element
+            run[++count] = right;
+        } else if (count == 1) { // The array is already sorted
+            return;
+        }
+
+        /*
+         * Create temporary array, which is used for merging.
+         * Implementation note: variable "right" is increased by 1.
+         */
+        char[] b; byte odd = 0;
+        for (int n = 1; (n <<= 1) < count; odd ^= 1);
+
+        if (odd == 0) {
+            b = a; a = new char[b.length];
+            for (int i = left - 1; ++i < right; a[i] = b[i]);
+        } else {
+            b = new char[a.length];
+        }
+
+        // Merging
+        for (int last; count > 1; count = last) {
+            for (int k = (last = 0) + 2; k <= count; k += 2) {
+                int hi = run[k], mi = run[k - 1];
+                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
+                    if (q >= hi || p < mi && a[p] <= a[q]) {
+                        b[i] = a[p++];
+                    } else {
+                        b[i] = a[q++];
+                    }
+                }
+                run[++last] = hi;
+            }
+            if ((count & 1) != 0) {
+                for (int i = right, lo = run[count - 1]; --i >= lo;
+                    b[i] = a[i]
+                );
+                run[++last] = right;
+            }
+            char[] t = a; a = b; b = t;
+        }
+    }
+
+    /**
+     * Sorts the specified range of the array by Dual-Pivot Quicksort.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     * @param leftmost indicates if this part is the leftmost in the range
+     */
+    private static void sort(char[] a, int left, int right, boolean leftmost) {
+        int length = right - left + 1;
+
+        // Use insertion sort on tiny arrays
+        if (length < INSERTION_SORT_THRESHOLD) {
+            if (leftmost) {
+                /*
+                 * Traditional (without sentinel) insertion sort,
+                 * optimized for server VM, is used in case of
+                 * the leftmost part.
+                 */
+                for (int i = left, j = i; i < right; j = ++i) {
+                    char ai = a[i + 1];
+                    while (ai < a[j]) {
+                        a[j + 1] = a[j];
+                        if (j-- == left) {
+                            break;
+                        }
+                    }
+                    a[j + 1] = ai;
+                }
+            } else {
+                /*
+                 * Skip the longest ascending sequence.
+                 */
+                do {
+                    if (left >= right) {
+                        return;
+                    }
+                } while (a[++left] >= a[left - 1]);
+
+                /*
+                 * Every element from adjoining part plays the role
+                 * of sentinel, therefore this allows us to avoid the
+                 * left range check on each iteration. Moreover, we use
+                 * the more optimized algorithm, so called pair insertion
+                 * sort, which is faster (in the context of Quicksort)
+                 * than traditional implementation of insertion sort.
+                 */
+                for (int k = left; ++left <= right; k = ++left) {
+                    char a1 = a[k], a2 = a[left];
+
+                    if (a1 < a2) {
+                        a2 = a1; a1 = a[left];
+                    }
+                    while (a1 < a[--k]) {
+                        a[k + 2] = a[k];
+                    }
+                    a[++k + 1] = a1;
+
+                    while (a2 < a[--k]) {
+                        a[k + 1] = a[k];
+                    }
+                    a[k + 1] = a2;
+                }
+                char last = a[right];
+
+                while (last < a[--right]) {
+                    a[right + 1] = a[right];
+                }
+                a[right + 1] = last;
+            }
+            return;
+        }
+
+        // Inexpensive approximation of length / 7
+        int seventh = (length >> 3) + (length >> 6) + 1;
+
+        /*
+         * Sort five evenly spaced elements around (and including) the
+         * center element in the range. These elements will be used for
+         * pivot selection as described below. The choice for spacing
+         * these elements was empirically determined to work well on
+         * a wide variety of inputs.
+         */
+        int e3 = (left + right) >>> 1; // The midpoint
+        int e2 = e3 - seventh;
+        int e1 = e2 - seventh;
+        int e4 = e3 + seventh;
+        int e5 = e4 + seventh;
+
+        // Sort these elements using insertion sort
+        if (a[e2] < a[e1]) { char t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
+
+        if (a[e3] < a[e2]) { char t = a[e3]; a[e3] = a[e2]; a[e2] = t;
+            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+        }
+        if (a[e4] < a[e3]) { char t = a[e4]; a[e4] = a[e3]; a[e3] = t;
+            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+            }
+        }
+        if (a[e5] < a[e4]) { char t = a[e5]; a[e5] = a[e4]; a[e4] = t;
+            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
+                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+                }
+            }
+        }
+
+        // Pointers
+        int less  = left;  // The index of the first element of center part
+        int great = right; // The index before the first element of right part
+
+        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
+            /*
+             * Use the second and fourth of the five sorted elements as pivots.
+             * These values are inexpensive approximations of the first and
+             * second terciles of the array. Note that pivot1 <= pivot2.
+             */
+            char pivot1 = a[e2];
+            char pivot2 = a[e4];
+
+            /*
+             * The first and the last elements to be sorted are moved to the
+             * locations formerly occupied by the pivots. When partitioning
+             * is complete, the pivots are swapped back into their final
+             * positions, and excluded from subsequent sorting.
+             */
+            a[e2] = a[left];
+            a[e4] = a[right];
+
+            /*
+             * Skip elements, which are less or greater than pivot values.
+             */
+            while (a[++less] < pivot1);
+            while (a[--great] > pivot2);
+
+            /*
+             * Partitioning:
+             *
+             *   left part           center part                   right part
+             * +--------------------------------------------------------------+
+             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
+             * +--------------------------------------------------------------+
+             *               ^                          ^       ^
+             *               |                          |       |
+             *              less                        k     great
+             *
+             * Invariants:
+             *
+             *              all in (left, less)   < pivot1
+             *    pivot1 <= all in [less, k)     <= pivot2
+             *              all in (great, right) > pivot2
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            outer:
+            for (int k = less - 1; ++k <= great; ) {
+                char ak = a[k];
+                if (ak < pivot1) { // Move a[k] to left part
+                    a[k] = a[less];
+                    /*
+                     * Here and below we use "a[i] = b; i++;" instead
+                     * of "a[i++] = b;" due to performance issue.
+                     */
+                    a[less] = ak;
+                    ++less;
+                } else if (ak > pivot2) { // Move a[k] to right part
+                    while (a[great] > pivot2) {
+                        if (great-- == k) {
+                            break outer;
+                        }
+                    }
+                    if (a[great] < pivot1) { // a[great] <= pivot2
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // pivot1 <= a[great] <= pivot2
+                        a[k] = a[great];
+                    }
+                    /*
+                     * Here and below we use "a[i] = b; i--;" instead
+                     * of "a[i--] = b;" due to performance issue.
+                     */
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            // Swap pivots into their final positions
+            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
+            a[right] = a[great + 1]; a[great + 1] = pivot2;
+
+            // Sort left and right parts recursively, excluding known pivots
+            sort(a, left, less - 2, leftmost);
+            sort(a, great + 2, right, false);
+
+            /*
+             * If center part is too large (comprises > 4/7 of the array),
+             * swap internal pivot values to ends.
+             */
+            if (less < e1 && e5 < great) {
+                /*
+                 * Skip elements, which are equal to pivot values.
+                 */
+                while (a[less] == pivot1) {
+                    ++less;
+                }
+
+                while (a[great] == pivot2) {
+                    --great;
+                }
+
+                /*
+                 * Partitioning:
+                 *
+                 *   left part         center part                  right part
+                 * +----------------------------------------------------------+
+                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
+                 * +----------------------------------------------------------+
+                 *              ^                        ^       ^
+                 *              |                        |       |
+                 *             less                      k     great
+                 *
+                 * Invariants:
+                 *
+                 *              all in (*,  less) == pivot1
+                 *     pivot1 < all in [less,  k)  < pivot2
+                 *              all in (great, *) == pivot2
+                 *
+                 * Pointer k is the first index of ?-part.
+                 */
+                outer:
+                for (int k = less - 1; ++k <= great; ) {
+                    char ak = a[k];
+                    if (ak == pivot1) { // Move a[k] to left part
+                        a[k] = a[less];
+                        a[less] = ak;
+                        ++less;
+                    } else if (ak == pivot2) { // Move a[k] to right part
+                        while (a[great] == pivot2) {
+                            if (great-- == k) {
+                                break outer;
+                            }
+                        }
+                        if (a[great] == pivot1) { // a[great] < pivot2
+                            a[k] = a[less];
+                            /*
+                             * Even though a[great] equals to pivot1, the
+                             * assignment a[less] = pivot1 may be incorrect,
+                             * if a[great] and pivot1 are floating-point zeros
+                             * of different signs. Therefore in float and
+                             * double sorting methods we have to use more
+                             * accurate assignment a[less] = a[great].
+                             */
+                            a[less] = pivot1;
+                            ++less;
+                        } else { // pivot1 < a[great] < pivot2
+                            a[k] = a[great];
+                        }
+                        a[great] = ak;
+                        --great;
+                    }
+                }
+            }
+
+            // Sort center part recursively
+            sort(a, less, great, false);
+
+        } else { // Partitioning with one pivot
+            /*
+             * Use the third of the five sorted elements as pivot.
+             * This value is inexpensive approximation of the median.
+             */
+            char pivot = a[e3];
+
+            /*
+             * Partitioning degenerates to the traditional 3-way
+             * (or "Dutch National Flag") schema:
+             *
+             *   left part    center part              right part
+             * +-------------------------------------------------+
+             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
+             * +-------------------------------------------------+
+             *              ^              ^        ^
+             *              |              |        |
+             *             less            k      great
+             *
+             * Invariants:
+             *
+             *   all in (left, less)   < pivot
+             *   all in [less, k)     == pivot
+             *   all in (great, right) > pivot
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            for (int k = less; k <= great; ++k) {
+                if (a[k] == pivot) {
+                    continue;
+                }
+                char ak = a[k];
+                if (ak < pivot) { // Move a[k] to left part
+                    a[k] = a[less];
+                    a[less] = ak;
+                    ++less;
+                } else { // a[k] > pivot - Move a[k] to right part
+                    while (a[great] > pivot) {
+                        --great;
+                    }
+                    if (a[great] < pivot) { // a[great] <= pivot
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // a[great] == pivot
+                        /*
+                         * Even though a[great] equals to pivot, the
+                         * assignment a[k] = pivot may be incorrect,
+                         * if a[great] and pivot are floating-point
+                         * zeros of different signs. Therefore in float
+                         * and double sorting methods we have to use
+                         * more accurate assignment a[k] = a[great].
+                         */
+                        a[k] = pivot;
+                    }
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            /*
+             * Sort left and right parts recursively.
+             * All elements from center part are equal
+             * and, therefore, already sorted.
+             */
+            sort(a, left, less - 1, leftmost);
+            sort(a, great + 1, right, false);
+        }
+    }
+
+    /** The number of distinct byte values. */
+    private static final int NUM_BYTE_VALUES = 1 << 8;
+
+    /**
+     * Sorts the specified array.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(byte[] a) {
+        sort(a, 0, a.length - 1);
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    public static void sort(byte[] a, int left, int right) {
+        // Use counting sort on large arrays
+        if (right - left > COUNTING_SORT_THRESHOLD_FOR_BYTE) {
+            int[] count = new int[NUM_BYTE_VALUES];
+
+            for (int i = left - 1; ++i <= right;
+                count[a[i] - Byte.MIN_VALUE]++
+            );
+            for (int i = NUM_BYTE_VALUES, k = right + 1; k > left; ) {
+                while (count[--i] == 0);
+                byte value = (byte) (i + Byte.MIN_VALUE);
+                int s = count[i];
+
+                do {
+                    a[--k] = value;
+                } while (--s > 0);
+            }
+        } else { // Use insertion sort on small arrays
+            for (int i = left, j = i; i < right; j = ++i) {
+                byte ai = a[i + 1];
+                while (ai < a[j]) {
+                    a[j + 1] = a[j];
+                    if (j-- == left) {
+                        break;
+                    }
+                }
+                a[j + 1] = ai;
+            }
+        }
+    }
+
+    /**
+     * Sorts the specified array.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(float[] a) {
+        sort(a, 0, a.length - 1);
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    public static void sort(float[] a, int left, int right) {
+        /*
+         * Phase 1: Move NaNs to the end of the array.
+         */
+        while (left <= right && Float.isNaN(a[right])) {
+            --right;
+        }
+        for (int k = right; --k >= left; ) {
+            float ak = a[k];
+            if (ak != ak) { // a[k] is NaN
+                a[k] = a[right];
+                a[right] = ak;
+                --right;
+            }
+        }
+
+        /*
+         * Phase 2: Sort everything except NaNs (which are already in place).
+         */
+        doSort(a, left, right);
+
+        /*
+         * Phase 3: Place negative zeros before positive zeros.
+         */
+        int hi = right;
+
+        /*
+         * Find the first zero, or first positive, or last negative element.
+         */
+        while (left < hi) {
+            int middle = (left + hi) >>> 1;
+            float middleValue = a[middle];
+
+            if (middleValue < 0.0f) {
+                left = middle + 1;
+            } else {
+                hi = middle;
+            }
+        }
+
+        /*
+         * Skip the last negative value (if any) or all leading negative zeros.
+         */
+        while (left <= right && Float.floatToRawIntBits(a[left]) < 0) {
+            ++left;
+        }
+
+        /*
+         * Move negative zeros to the beginning of the sub-range.
+         *
+         * Partitioning:
+         *
+         * +----------------------------------------------------+
+         * |   < 0.0   |   -0.0   |   0.0   |   ?  ( >= 0.0 )   |
+         * +----------------------------------------------------+
+         *              ^          ^         ^
+         *              |          |         |
+         *             left        p         k
+         *
+         * Invariants:
+         *
+         *   all in (*,  left)  <  0.0
+         *   all in [left,  p) == -0.0
+         *   all in [p,     k) ==  0.0
+         *   all in [k, right] >=  0.0
+         *
+         * Pointer k is the first index of ?-part.
+         */
+        for (int k = left, p = left - 1; ++k <= right; ) {
+            float ak = a[k];
+            if (ak != 0.0f) {
+                break;
+            }
+            if (Float.floatToRawIntBits(ak) < 0) { // ak is -0.0f
+                a[k] = 0.0f;
+                a[++p] = -0.0f;
+            }
+        }
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    private static void doSort(float[] a, int left, int right) {
+        // Use Quicksort on small arrays
+        if (right - left < QUICKSORT_THRESHOLD) {
+            sort(a, left, right, true);
+            return;
+        }
+
+        /*
+         * Index run[i] is the start of i-th run
+         * (ascending or descending sequence).
+         */
+        int[] run = new int[MAX_RUN_COUNT + 1];
+        int count = 0; run[0] = left;
+
+        // Check if the array is nearly sorted
+        for (int k = left; k < right; run[count] = k) {
+            if (a[k] < a[k + 1]) { // ascending
+                while (++k <= right && a[k - 1] <= a[k]);
+            } else if (a[k] > a[k + 1]) { // descending
+                while (++k <= right && a[k - 1] >= a[k]);
+                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
+                    float t = a[lo]; a[lo] = a[hi]; a[hi] = t;
+                }
+            } else { // equal
+                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
+                    if (--m == 0) {
+                        sort(a, left, right, true);
+                        return;
+                    }
+                }
+            }
+
+            /*
+             * The array is not highly structured,
+             * use Quicksort instead of merge sort.
+             */
+            if (++count == MAX_RUN_COUNT) {
+                sort(a, left, right, true);
+                return;
+            }
+        }
+
+        // Check special cases
+        if (run[count] == right++) { // The last run contains one element
+            run[++count] = right;
+        } else if (count == 1) { // The array is already sorted
+            return;
+        }
+
+        /*
+         * Create temporary array, which is used for merging.
+         * Implementation note: variable "right" is increased by 1.
+         */
+        float[] b; byte odd = 0;
+        for (int n = 1; (n <<= 1) < count; odd ^= 1);
+
+        if (odd == 0) {
+            b = a; a = new float[b.length];
+            for (int i = left - 1; ++i < right; a[i] = b[i]);
+        } else {
+            b = new float[a.length];
+        }
+
+        // Merging
+        for (int last; count > 1; count = last) {
+            for (int k = (last = 0) + 2; k <= count; k += 2) {
+                int hi = run[k], mi = run[k - 1];
+                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
+                    if (q >= hi || p < mi && a[p] <= a[q]) {
+                        b[i] = a[p++];
+                    } else {
+                        b[i] = a[q++];
+                    }
+                }
+                run[++last] = hi;
+            }
+            if ((count & 1) != 0) {
+                for (int i = right, lo = run[count - 1]; --i >= lo;
+                    b[i] = a[i]
+                );
+                run[++last] = right;
+            }
+            float[] t = a; a = b; b = t;
+        }
+    }
+
+    /**
+     * Sorts the specified range of the array by Dual-Pivot Quicksort.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     * @param leftmost indicates if this part is the leftmost in the range
+     */
+    private static void sort(float[] a, int left, int right, boolean leftmost) {
+        int length = right - left + 1;
+
+        // Use insertion sort on tiny arrays
+        if (length < INSERTION_SORT_THRESHOLD) {
+            if (leftmost) {
+                /*
+                 * Traditional (without sentinel) insertion sort,
+                 * optimized for server VM, is used in case of
+                 * the leftmost part.
+                 */
+                for (int i = left, j = i; i < right; j = ++i) {
+                    float ai = a[i + 1];
+                    while (ai < a[j]) {
+                        a[j + 1] = a[j];
+                        if (j-- == left) {
+                            break;
+                        }
+                    }
+                    a[j + 1] = ai;
+                }
+            } else {
+                /*
+                 * Skip the longest ascending sequence.
+                 */
+                do {
+                    if (left >= right) {
+                        return;
+                    }
+                } while (a[++left] >= a[left - 1]);
+
+                /*
+                 * Every element from adjoining part plays the role
+                 * of sentinel, therefore this allows us to avoid the
+                 * left range check on each iteration. Moreover, we use
+                 * the more optimized algorithm, so called pair insertion
+                 * sort, which is faster (in the context of Quicksort)
+                 * than traditional implementation of insertion sort.
+                 */
+                for (int k = left; ++left <= right; k = ++left) {
+                    float a1 = a[k], a2 = a[left];
+
+                    if (a1 < a2) {
+                        a2 = a1; a1 = a[left];
+                    }
+                    while (a1 < a[--k]) {
+                        a[k + 2] = a[k];
+                    }
+                    a[++k + 1] = a1;
+
+                    while (a2 < a[--k]) {
+                        a[k + 1] = a[k];
+                    }
+                    a[k + 1] = a2;
+                }
+                float last = a[right];
+
+                while (last < a[--right]) {
+                    a[right + 1] = a[right];
+                }
+                a[right + 1] = last;
+            }
+            return;
+        }
+
+        // Inexpensive approximation of length / 7
+        int seventh = (length >> 3) + (length >> 6) + 1;
+
+        /*
+         * Sort five evenly spaced elements around (and including) the
+         * center element in the range. These elements will be used for
+         * pivot selection as described below. The choice for spacing
+         * these elements was empirically determined to work well on
+         * a wide variety of inputs.
+         */
+        int e3 = (left + right) >>> 1; // The midpoint
+        int e2 = e3 - seventh;
+        int e1 = e2 - seventh;
+        int e4 = e3 + seventh;
+        int e5 = e4 + seventh;
+
+        // Sort these elements using insertion sort
+        if (a[e2] < a[e1]) { float t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
+
+        if (a[e3] < a[e2]) { float t = a[e3]; a[e3] = a[e2]; a[e2] = t;
+            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+        }
+        if (a[e4] < a[e3]) { float t = a[e4]; a[e4] = a[e3]; a[e3] = t;
+            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+            }
+        }
+        if (a[e5] < a[e4]) { float t = a[e5]; a[e5] = a[e4]; a[e4] = t;
+            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
+                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+                }
+            }
+        }
+
+        // Pointers
+        int less  = left;  // The index of the first element of center part
+        int great = right; // The index before the first element of right part
+
+        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
+            /*
+             * Use the second and fourth of the five sorted elements as pivots.
+             * These values are inexpensive approximations of the first and
+             * second terciles of the array. Note that pivot1 <= pivot2.
+             */
+            float pivot1 = a[e2];
+            float pivot2 = a[e4];
+
+            /*
+             * The first and the last elements to be sorted are moved to the
+             * locations formerly occupied by the pivots. When partitioning
+             * is complete, the pivots are swapped back into their final
+             * positions, and excluded from subsequent sorting.
+             */
+            a[e2] = a[left];
+            a[e4] = a[right];
+
+            /*
+             * Skip elements, which are less or greater than pivot values.
+             */
+            while (a[++less] < pivot1);
+            while (a[--great] > pivot2);
+
+            /*
+             * Partitioning:
+             *
+             *   left part           center part                   right part
+             * +--------------------------------------------------------------+
+             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
+             * +--------------------------------------------------------------+
+             *               ^                          ^       ^
+             *               |                          |       |
+             *              less                        k     great
+             *
+             * Invariants:
+             *
+             *              all in (left, less)   < pivot1
+             *    pivot1 <= all in [less, k)     <= pivot2
+             *              all in (great, right) > pivot2
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            outer:
+            for (int k = less - 1; ++k <= great; ) {
+                float ak = a[k];
+                if (ak < pivot1) { // Move a[k] to left part
+                    a[k] = a[less];
+                    /*
+                     * Here and below we use "a[i] = b; i++;" instead
+                     * of "a[i++] = b;" due to performance issue.
+                     */
+                    a[less] = ak;
+                    ++less;
+                } else if (ak > pivot2) { // Move a[k] to right part
+                    while (a[great] > pivot2) {
+                        if (great-- == k) {
+                            break outer;
+                        }
+                    }
+                    if (a[great] < pivot1) { // a[great] <= pivot2
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // pivot1 <= a[great] <= pivot2
+                        a[k] = a[great];
+                    }
+                    /*
+                     * Here and below we use "a[i] = b; i--;" instead
+                     * of "a[i--] = b;" due to performance issue.
+                     */
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            // Swap pivots into their final positions
+            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
+            a[right] = a[great + 1]; a[great + 1] = pivot2;
+
+            // Sort left and right parts recursively, excluding known pivots
+            sort(a, left, less - 2, leftmost);
+            sort(a, great + 2, right, false);
+
+            /*
+             * If center part is too large (comprises > 4/7 of the array),
+             * swap internal pivot values to ends.
+             */
+            if (less < e1 && e5 < great) {
+                /*
+                 * Skip elements, which are equal to pivot values.
+                 */
+                while (a[less] == pivot1) {
+                    ++less;
+                }
+
+                while (a[great] == pivot2) {
+                    --great;
+                }
+
+                /*
+                 * Partitioning:
+                 *
+                 *   left part         center part                  right part
+                 * +----------------------------------------------------------+
+                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
+                 * +----------------------------------------------------------+
+                 *              ^                        ^       ^
+                 *              |                        |       |
+                 *             less                      k     great
+                 *
+                 * Invariants:
+                 *
+                 *              all in (*,  less) == pivot1
+                 *     pivot1 < all in [less,  k)  < pivot2
+                 *              all in (great, *) == pivot2
+                 *
+                 * Pointer k is the first index of ?-part.
+                 */
+                outer:
+                for (int k = less - 1; ++k <= great; ) {
+                    float ak = a[k];
+                    if (ak == pivot1) { // Move a[k] to left part
+                        a[k] = a[less];
+                        a[less] = ak;
+                        ++less;
+                    } else if (ak == pivot2) { // Move a[k] to right part
+                        while (a[great] == pivot2) {
+                            if (great-- == k) {
+                                break outer;
+                            }
+                        }
+                        if (a[great] == pivot1) { // a[great] < pivot2
+                            a[k] = a[less];
+                            /*
+                             * Even though a[great] equals to pivot1, the
+                             * assignment a[less] = pivot1 may be incorrect,
+                             * if a[great] and pivot1 are floating-point zeros
+                             * of different signs. Therefore in float and
+                             * double sorting methods we have to use more
+                             * accurate assignment a[less] = a[great].
+                             */
+                            a[less] = a[great];
+                            ++less;
+                        } else { // pivot1 < a[great] < pivot2
+                            a[k] = a[great];
+                        }
+                        a[great] = ak;
+                        --great;
+                    }
+                }
+            }
+
+            // Sort center part recursively
+            sort(a, less, great, false);
+
+        } else { // Partitioning with one pivot
+            /*
+             * Use the third of the five sorted elements as pivot.
+             * This value is inexpensive approximation of the median.
+             */
+            float pivot = a[e3];
+
+            /*
+             * Partitioning degenerates to the traditional 3-way
+             * (or "Dutch National Flag") schema:
+             *
+             *   left part    center part              right part
+             * +-------------------------------------------------+
+             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
+             * +-------------------------------------------------+
+             *              ^              ^        ^
+             *              |              |        |
+             *             less            k      great
+             *
+             * Invariants:
+             *
+             *   all in (left, less)   < pivot
+             *   all in [less, k)     == pivot
+             *   all in (great, right) > pivot
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            for (int k = less; k <= great; ++k) {
+                if (a[k] == pivot) {
+                    continue;
+                }
+                float ak = a[k];
+                if (ak < pivot) { // Move a[k] to left part
+                    a[k] = a[less];
+                    a[less] = ak;
+                    ++less;
+                } else { // a[k] > pivot - Move a[k] to right part
+                    while (a[great] > pivot) {
+                        --great;
+                    }
+                    if (a[great] < pivot) { // a[great] <= pivot
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // a[great] == pivot
+                        /*
+                         * Even though a[great] equals to pivot, the
+                         * assignment a[k] = pivot may be incorrect,
+                         * if a[great] and pivot are floating-point
+                         * zeros of different signs. Therefore in float
+                         * and double sorting methods we have to use
+                         * more accurate assignment a[k] = a[great].
+                         */
+                        a[k] = a[great];
+                    }
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            /*
+             * Sort left and right parts recursively.
+             * All elements from center part are equal
+             * and, therefore, already sorted.
+             */
+            sort(a, left, less - 1, leftmost);
+            sort(a, great + 1, right, false);
+        }
+    }
+
+    /**
+     * Sorts the specified array.
+     *
+     * @param a the array to be sorted
+     */
+    public static void sort(double[] a) {
+        sort(a, 0, a.length - 1);
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    public static void sort(double[] a, int left, int right) {
+        /*
+         * Phase 1: Move NaNs to the end of the array.
+         */
+        while (left <= right && Double.isNaN(a[right])) {
+            --right;
+        }
+        for (int k = right; --k >= left; ) {
+            double ak = a[k];
+            if (ak != ak) { // a[k] is NaN
+                a[k] = a[right];
+                a[right] = ak;
+                --right;
+            }
+        }
+
+        /*
+         * Phase 2: Sort everything except NaNs (which are already in place).
+         */
+        doSort(a, left, right);
+
+        /*
+         * Phase 3: Place negative zeros before positive zeros.
+         */
+        int hi = right;
+
+        /*
+         * Find the first zero, or first positive, or last negative element.
+         */
+        while (left < hi) {
+            int middle = (left + hi) >>> 1;
+            double middleValue = a[middle];
+
+            if (middleValue < 0.0d) {
+                left = middle + 1;
+            } else {
+                hi = middle;
+            }
+        }
+
+        /*
+         * Skip the last negative value (if any) or all leading negative zeros.
+         */
+        while (left <= right && Double.doubleToRawLongBits(a[left]) < 0) {
+            ++left;
+        }
+
+        /*
+         * Move negative zeros to the beginning of the sub-range.
+         *
+         * Partitioning:
+         *
+         * +----------------------------------------------------+
+         * |   < 0.0   |   -0.0   |   0.0   |   ?  ( >= 0.0 )   |
+         * +----------------------------------------------------+
+         *              ^          ^         ^
+         *              |          |         |
+         *             left        p         k
+         *
+         * Invariants:
+         *
+         *   all in (*,  left)  <  0.0
+         *   all in [left,  p) == -0.0
+         *   all in [p,     k) ==  0.0
+         *   all in [k, right] >=  0.0
+         *
+         * Pointer k is the first index of ?-part.
+         */
+        for (int k = left, p = left - 1; ++k <= right; ) {
+            double ak = a[k];
+            if (ak != 0.0d) {
+                break;
+            }
+            if (Double.doubleToRawLongBits(ak) < 0) { // ak is -0.0d
+                a[k] = 0.0d;
+                a[++p] = -0.0d;
+            }
+        }
+    }
+
+    /**
+     * Sorts the specified range of the array.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     */
+    private static void doSort(double[] a, int left, int right) {
+        // Use Quicksort on small arrays
+        if (right - left < QUICKSORT_THRESHOLD) {
+            sort(a, left, right, true);
+            return;
+        }
+
+        /*
+         * Index run[i] is the start of i-th run
+         * (ascending or descending sequence).
+         */
+        int[] run = new int[MAX_RUN_COUNT + 1];
+        int count = 0; run[0] = left;
+
+        // Check if the array is nearly sorted
+        for (int k = left; k < right; run[count] = k) {
+            if (a[k] < a[k + 1]) { // ascending
+                while (++k <= right && a[k - 1] <= a[k]);
+            } else if (a[k] > a[k + 1]) { // descending
+                while (++k <= right && a[k - 1] >= a[k]);
+                for (int lo = run[count] - 1, hi = k; ++lo < --hi; ) {
+                    double t = a[lo]; a[lo] = a[hi]; a[hi] = t;
+                }
+            } else { // equal
+                for (int m = MAX_RUN_LENGTH; ++k <= right && a[k - 1] == a[k]; ) {
+                    if (--m == 0) {
+                        sort(a, left, right, true);
+                        return;
+                    }
+                }
+            }
+
+            /*
+             * The array is not highly structured,
+             * use Quicksort instead of merge sort.
+             */
+            if (++count == MAX_RUN_COUNT) {
+                sort(a, left, right, true);
+                return;
+            }
+        }
+
+        // Check special cases
+        if (run[count] == right++) { // The last run contains one element
+            run[++count] = right;
+        } else if (count == 1) { // The array is already sorted
+            return;
+        }
+
+        /*
+         * Create temporary array, which is used for merging.
+         * Implementation note: variable "right" is increased by 1.
+         */
+        double[] b; byte odd = 0;
+        for (int n = 1; (n <<= 1) < count; odd ^= 1);
+
+        if (odd == 0) {
+            b = a; a = new double[b.length];
+            for (int i = left - 1; ++i < right; a[i] = b[i]);
+        } else {
+            b = new double[a.length];
+        }
+
+        // Merging
+        for (int last; count > 1; count = last) {
+            for (int k = (last = 0) + 2; k <= count; k += 2) {
+                int hi = run[k], mi = run[k - 1];
+                for (int i = run[k - 2], p = i, q = mi; i < hi; ++i) {
+                    if (q >= hi || p < mi && a[p] <= a[q]) {
+                        b[i] = a[p++];
+                    } else {
+                        b[i] = a[q++];
+                    }
+                }
+                run[++last] = hi;
+            }
+            if ((count & 1) != 0) {
+                for (int i = right, lo = run[count - 1]; --i >= lo;
+                    b[i] = a[i]
+                );
+                run[++last] = right;
+            }
+            double[] t = a; a = b; b = t;
+        }
+    }
+
+    /**
+     * Sorts the specified range of the array by Dual-Pivot Quicksort.
+     *
+     * @param a the array to be sorted
+     * @param left the index of the first element, inclusive, to be sorted
+     * @param right the index of the last element, inclusive, to be sorted
+     * @param leftmost indicates if this part is the leftmost in the range
+     */
+    private static void sort(double[] a, int left, int right, boolean leftmost) {
+        int length = right - left + 1;
+
+        // Use insertion sort on tiny arrays
+        if (length < INSERTION_SORT_THRESHOLD) {
+            if (leftmost) {
+                /*
+                 * Traditional (without sentinel) insertion sort,
+                 * optimized for server VM, is used in case of
+                 * the leftmost part.
+                 */
+                for (int i = left, j = i; i < right; j = ++i) {
+                    double ai = a[i + 1];
+                    while (ai < a[j]) {
+                        a[j + 1] = a[j];
+                        if (j-- == left) {
+                            break;
+                        }
+                    }
+                    a[j + 1] = ai;
+                }
+            } else {
+                /*
+                 * Skip the longest ascending sequence.
+                 */
+                do {
+                    if (left >= right) {
+                        return;
+                    }
+                } while (a[++left] >= a[left - 1]);
+
+                /*
+                 * Every element from adjoining part plays the role
+                 * of sentinel, therefore this allows us to avoid the
+                 * left range check on each iteration. Moreover, we use
+                 * the more optimized algorithm, so called pair insertion
+                 * sort, which is faster (in the context of Quicksort)
+                 * than traditional implementation of insertion sort.
+                 */
+                for (int k = left; ++left <= right; k = ++left) {
+                    double a1 = a[k], a2 = a[left];
+
+                    if (a1 < a2) {
+                        a2 = a1; a1 = a[left];
+                    }
+                    while (a1 < a[--k]) {
+                        a[k + 2] = a[k];
+                    }
+                    a[++k + 1] = a1;
+
+                    while (a2 < a[--k]) {
+                        a[k + 1] = a[k];
+                    }
+                    a[k + 1] = a2;
+                }
+                double last = a[right];
+
+                while (last < a[--right]) {
+                    a[right + 1] = a[right];
+                }
+                a[right + 1] = last;
+            }
+            return;
+        }
+
+        // Inexpensive approximation of length / 7
+        int seventh = (length >> 3) + (length >> 6) + 1;
+
+        /*
+         * Sort five evenly spaced elements around (and including) the
+         * center element in the range. These elements will be used for
+         * pivot selection as described below. The choice for spacing
+         * these elements was empirically determined to work well on
+         * a wide variety of inputs.
+         */
+        int e3 = (left + right) >>> 1; // The midpoint
+        int e2 = e3 - seventh;
+        int e1 = e2 - seventh;
+        int e4 = e3 + seventh;
+        int e5 = e4 + seventh;
+
+        // Sort these elements using insertion sort
+        if (a[e2] < a[e1]) { double t = a[e2]; a[e2] = a[e1]; a[e1] = t; }
+
+        if (a[e3] < a[e2]) { double t = a[e3]; a[e3] = a[e2]; a[e2] = t;
+            if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+        }
+        if (a[e4] < a[e3]) { double t = a[e4]; a[e4] = a[e3]; a[e3] = t;
+            if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+            }
+        }
+        if (a[e5] < a[e4]) { double t = a[e5]; a[e5] = a[e4]; a[e4] = t;
+            if (t < a[e3]) { a[e4] = a[e3]; a[e3] = t;
+                if (t < a[e2]) { a[e3] = a[e2]; a[e2] = t;
+                    if (t < a[e1]) { a[e2] = a[e1]; a[e1] = t; }
+                }
+            }
+        }
+
+        // Pointers
+        int less  = left;  // The index of the first element of center part
+        int great = right; // The index before the first element of right part
+
+        if (a[e1] != a[e2] && a[e2] != a[e3] && a[e3] != a[e4] && a[e4] != a[e5]) {
+            /*
+             * Use the second and fourth of the five sorted elements as pivots.
+             * These values are inexpensive approximations of the first and
+             * second terciles of the array. Note that pivot1 <= pivot2.
+             */
+            double pivot1 = a[e2];
+            double pivot2 = a[e4];
+
+            /*
+             * The first and the last elements to be sorted are moved to the
+             * locations formerly occupied by the pivots. When partitioning
+             * is complete, the pivots are swapped back into their final
+             * positions, and excluded from subsequent sorting.
+             */
+            a[e2] = a[left];
+            a[e4] = a[right];
+
+            /*
+             * Skip elements, which are less or greater than pivot values.
+             */
+            while (a[++less] < pivot1);
+            while (a[--great] > pivot2);
+
+            /*
+             * Partitioning:
+             *
+             *   left part           center part                   right part
+             * +--------------------------------------------------------------+
+             * |  < pivot1  |  pivot1 <= && <= pivot2  |    ?    |  > pivot2  |
+             * +--------------------------------------------------------------+
+             *               ^                          ^       ^
+             *               |                          |       |
+             *              less                        k     great
+             *
+             * Invariants:
+             *
+             *              all in (left, less)   < pivot1
+             *    pivot1 <= all in [less, k)     <= pivot2
+             *              all in (great, right) > pivot2
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            outer:
+            for (int k = less - 1; ++k <= great; ) {
+                double ak = a[k];
+                if (ak < pivot1) { // Move a[k] to left part
+                    a[k] = a[less];
+                    /*
+                     * Here and below we use "a[i] = b; i++;" instead
+                     * of "a[i++] = b;" due to performance issue.
+                     */
+                    a[less] = ak;
+                    ++less;
+                } else if (ak > pivot2) { // Move a[k] to right part
+                    while (a[great] > pivot2) {
+                        if (great-- == k) {
+                            break outer;
+                        }
+                    }
+                    if (a[great] < pivot1) { // a[great] <= pivot2
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // pivot1 <= a[great] <= pivot2
+                        a[k] = a[great];
+                    }
+                    /*
+                     * Here and below we use "a[i] = b; i--;" instead
+                     * of "a[i--] = b;" due to performance issue.
+                     */
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            // Swap pivots into their final positions
+            a[left]  = a[less  - 1]; a[less  - 1] = pivot1;
+            a[right] = a[great + 1]; a[great + 1] = pivot2;
+
+            // Sort left and right parts recursively, excluding known pivots
+            sort(a, left, less - 2, leftmost);
+            sort(a, great + 2, right, false);
+
+            /*
+             * If center part is too large (comprises > 4/7 of the array),
+             * swap internal pivot values to ends.
+             */
+            if (less < e1 && e5 < great) {
+                /*
+                 * Skip elements, which are equal to pivot values.
+                 */
+                while (a[less] == pivot1) {
+                    ++less;
+                }
+
+                while (a[great] == pivot2) {
+                    --great;
+                }
+
+                /*
+                 * Partitioning:
+                 *
+                 *   left part         center part                  right part
+                 * +----------------------------------------------------------+
+                 * | == pivot1 |  pivot1 < && < pivot2  |    ?    | == pivot2 |
+                 * +----------------------------------------------------------+
+                 *              ^                        ^       ^
+                 *              |                        |       |
+                 *             less                      k     great
+                 *
+                 * Invariants:
+                 *
+                 *              all in (*,  less) == pivot1
+                 *     pivot1 < all in [less,  k)  < pivot2
+                 *              all in (great, *) == pivot2
+                 *
+                 * Pointer k is the first index of ?-part.
+                 */
+                outer:
+                for (int k = less - 1; ++k <= great; ) {
+                    double ak = a[k];
+                    if (ak == pivot1) { // Move a[k] to left part
+                        a[k] = a[less];
+                        a[less] = ak;
+                        ++less;
+                    } else if (ak == pivot2) { // Move a[k] to right part
+                        while (a[great] == pivot2) {
+                            if (great-- == k) {
+                                break outer;
+                            }
+                        }
+                        if (a[great] == pivot1) { // a[great] < pivot2
+                            a[k] = a[less];
+                            /*
+                             * Even though a[great] equals to pivot1, the
+                             * assignment a[less] = pivot1 may be incorrect,
+                             * if a[great] and pivot1 are floating-point zeros
+                             * of different signs. Therefore in float and
+                             * double sorting methods we have to use more
+                             * accurate assignment a[less] = a[great].
+                             */
+                            a[less] = a[great];
+                            ++less;
+                        } else { // pivot1 < a[great] < pivot2
+                            a[k] = a[great];
+                        }
+                        a[great] = ak;
+                        --great;
+                    }
+                }
+            }
+
+            // Sort center part recursively
+            sort(a, less, great, false);
+
+        } else { // Partitioning with one pivot
+            /*
+             * Use the third of the five sorted elements as pivot.
+             * This value is inexpensive approximation of the median.
+             */
+            double pivot = a[e3];
+
+            /*
+             * Partitioning degenerates to the traditional 3-way
+             * (or "Dutch National Flag") schema:
+             *
+             *   left part    center part              right part
+             * +-------------------------------------------------+
+             * |  < pivot  |   == pivot   |     ?    |  > pivot  |
+             * +-------------------------------------------------+
+             *              ^              ^        ^
+             *              |              |        |
+             *             less            k      great
+             *
+             * Invariants:
+             *
+             *   all in (left, less)   < pivot
+             *   all in [less, k)     == pivot
+             *   all in (great, right) > pivot
+             *
+             * Pointer k is the first index of ?-part.
+             */
+            for (int k = less; k <= great; ++k) {
+                if (a[k] == pivot) {
+                    continue;
+                }
+                double ak = a[k];
+                if (ak < pivot) { // Move a[k] to left part
+                    a[k] = a[less];
+                    a[less] = ak;
+                    ++less;
+                } else { // a[k] > pivot - Move a[k] to right part
+                    while (a[great] > pivot) {
+                        --great;
+                    }
+                    if (a[great] < pivot) { // a[great] <= pivot
+                        a[k] = a[less];
+                        a[less] = a[great];
+                        ++less;
+                    } else { // a[great] == pivot
+                        /*
+                         * Even though a[great] equals to pivot, the
+                         * assignment a[k] = pivot may be incorrect,
+                         * if a[great] and pivot are floating-point
+                         * zeros of different signs. Therefore in float
+                         * and double sorting methods we have to use
+                         * more accurate assignment a[k] = a[great].
+                         */
+                        a[k] = a[great];
+                    }
+                    a[great] = ak;
+                    --great;
+                }
+            }
+
+            /*
+             * Sort left and right parts recursively.
+             * All elements from center part are equal
+             * and, therefore, already sorted.
+             */
+            sort(a, left, less - 1, leftmost);
+            sort(a, great + 1, right, false);
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/EmptyStackException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/EmptyStackException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * Thrown by methods in the <code>Stack</code> class to indicate
+ * that the stack is empty.
+ *
+ * @author  Jonathan Payne
+ * @see     java.util.Stack
+ * @since   JDK1.0
+ */
+public
+class EmptyStackException extends RuntimeException {
+    private static final long serialVersionUID = 5084686378493302095L;
+
+    /**
+     * Constructs a new <code>EmptyStackException</code> with <tt>null</tt>
+     * as its error message string.
+     */
+    public EmptyStackException() {
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/EventListener.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/EventListener.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * A tagging interface that all event listener interfaces must extend.
+ * @since JDK1.1
+ */
+public interface EventListener {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/EventListenerProxy.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/EventListenerProxy.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * An abstract wrapper class for an {@code EventListener} class
+ * which associates a set of additional parameters with the listener.
+ * Subclasses must provide the storage and accessor methods
+ * for the additional arguments or parameters.
+ * <p>
+ * For example, a bean which supports named properties
+ * would have a two argument method signature for adding
+ * a {@code PropertyChangeListener} for a property:
+ * <pre>
+ * public void addPropertyChangeListener(String propertyName,
+ *                                       PropertyChangeListener listener)
+ * </pre>
+ * If the bean also implemented the zero argument get listener method:
+ * <pre>
+ * public PropertyChangeListener[] getPropertyChangeListeners()
+ * </pre>
+ * then the array may contain inner {@code PropertyChangeListeners}
+ * which are also {@code PropertyChangeListenerProxy} objects.
+ * <p>
+ * If the calling method is interested in retrieving the named property
+ * then it would have to test the element to see if it is a proxy class.
+ *
+ * @since 1.4
+ */
+public abstract class EventListenerProxy<T extends EventListener>
+        implements EventListener {
+
+    private final T listener;
+
+    /**
+     * Creates a proxy for the specified listener.
+     *
+     * @param listener  the listener object
+     */
+    public EventListenerProxy(T listener) {
+        this.listener = listener;
+    }
+
+    /**
+     * Returns the listener associated with the proxy.
+     *
+     * @return  the listener associated with the proxy
+     */
+    public T getListener() {
+        return this.listener;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/EventObject.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/EventObject.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * <p>
+ * The root class from which all event state objects shall be derived.
+ * <p>
+ * All Events are constructed with a reference to the object, the "source",
+ * that is logically deemed to be the object upon which the Event in question
+ * initially occurred upon.
+ *
+ * @since JDK1.1
+ */
+
+public class EventObject implements java.io.Serializable {
+
+    private static final long serialVersionUID = 5516075349620653480L;
+
+    /**
+     * The object on which the Event initially occurred.
+     */
+    protected transient Object  source;
+
+    /**
+     * Constructs a prototypical Event.
+     *
+     * @param    source    The object on which the Event initially occurred.
+     * @exception  IllegalArgumentException  if source is null.
+     */
+    public EventObject(Object source) {
+        if (source == null)
+            throw new IllegalArgumentException("null source");
+
+        this.source = source;
+    }
+
+    /**
+     * The object on which the Event initially occurred.
+     *
+     * @return   The object on which the Event initially occurred.
+     */
+    public Object getSource() {
+        return source;
+    }
+
+    /**
+     * Returns a String representation of this EventObject.
+     *
+     * @return  A a String representation of this EventObject.
+     */
+    public String toString() {
+        return getClass().getName() + "[source=" + source + "]";
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/HashMap.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/HashMap.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,990 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+import java.io.*;
+
+/**
+ * Hash table based implementation of the <tt>Map</tt> interface.  This
+ * implementation provides all of the optional map operations, and permits
+ * <tt>null</tt> values and the <tt>null</tt> key.  (The <tt>HashMap</tt>
+ * class is roughly equivalent to <tt>Hashtable</tt>, except that it is
+ * unsynchronized and permits nulls.)  This class makes no guarantees as to
+ * the order of the map; in particular, it does not guarantee that the order
+ * will remain constant over time.
+ *
+ * <p>This implementation provides constant-time performance for the basic
+ * operations (<tt>get</tt> and <tt>put</tt>), assuming the hash function
+ * disperses the elements properly among the buckets.  Iteration over
+ * collection views requires time proportional to the "capacity" of the
+ * <tt>HashMap</tt> instance (the number of buckets) plus its size (the number
+ * of key-value mappings).  Thus, it's very important not to set the initial
+ * capacity too high (or the load factor too low) if iteration performance is
+ * important.
+ *
+ * <p>An instance of <tt>HashMap</tt> has two parameters that affect its
+ * performance: <i>initial capacity</i> and <i>load factor</i>.  The
+ * <i>capacity</i> is the number of buckets in the hash table, and the initial
+ * capacity is simply the capacity at the time the hash table is created.  The
+ * <i>load factor</i> is a measure of how full the hash table is allowed to
+ * get before its capacity is automatically increased.  When the number of
+ * entries in the hash table exceeds the product of the load factor and the
+ * current capacity, the hash table is <i>rehashed</i> (that is, internal data
+ * structures are rebuilt) so that the hash table has approximately twice the
+ * number of buckets.
+ *
+ * <p>As a general rule, the default load factor (.75) offers a good tradeoff
+ * between time and space costs.  Higher values decrease the space overhead
+ * but increase the lookup cost (reflected in most of the operations of the
+ * <tt>HashMap</tt> class, including <tt>get</tt> and <tt>put</tt>).  The
+ * expected number of entries in the map and its load factor should be taken
+ * into account when setting its initial capacity, so as to minimize the
+ * number of rehash operations.  If the initial capacity is greater
+ * than the maximum number of entries divided by the load factor, no
+ * rehash operations will ever occur.
+ *
+ * <p>If many mappings are to be stored in a <tt>HashMap</tt> instance,
+ * creating it with a sufficiently large capacity will allow the mappings to
+ * be stored more efficiently than letting it perform automatic rehashing as
+ * needed to grow the table.
+ *
+ * <p><strong>Note that this implementation is not synchronized.</strong>
+ * If multiple threads access a hash map concurrently, and at least one of
+ * the threads modifies the map structurally, it <i>must</i> be
+ * synchronized externally.  (A structural modification is any operation
+ * that adds or deletes one or more mappings; merely changing the value
+ * associated with a key that an instance already contains is not a
+ * structural modification.)  This is typically accomplished by
+ * synchronizing on some object that naturally encapsulates the map.
+ *
+ * If no such object exists, the map should be "wrapped" using the
+ * {@link Collections#synchronizedMap Collections.synchronizedMap}
+ * method.  This is best done at creation time, to prevent accidental
+ * unsynchronized access to the map:<pre>
+ *   Map m = Collections.synchronizedMap(new HashMap(...));</pre>
+ *
+ * <p>The iterators returned by all of this class's "collection view methods"
+ * are <i>fail-fast</i>: if the map is structurally modified at any time after
+ * the iterator is created, in any way except through the iterator's own
+ * <tt>remove</tt> method, the iterator will throw a
+ * {@link ConcurrentModificationException}.  Thus, in the face of concurrent
+ * modification, the iterator fails quickly and cleanly, rather than risking
+ * arbitrary, non-deterministic behavior at an undetermined time in the
+ * future.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness: <i>the fail-fast behavior of iterators
+ * should be used only to detect bugs.</i>
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <K> the type of keys maintained by this map
+ * @param <V> the type of mapped values
+ *
+ * @author  Doug Lea
+ * @author  Josh Bloch
+ * @author  Arthur van Hoff
+ * @author  Neal Gafter
+ * @see     Object#hashCode()
+ * @see     Collection
+ * @see     Map
+ * @see     TreeMap
+ * @see     Hashtable
+ * @since   1.2
+ */
+
+public class HashMap<K,V>
+    extends AbstractMap<K,V>
+    implements Map<K,V>, Cloneable, Serializable
+{
+
+    /**
+     * The default initial capacity - MUST be a power of two.
+     */
+    static final int DEFAULT_INITIAL_CAPACITY = 16;
+
+    /**
+     * The maximum capacity, used if a higher value is implicitly specified
+     * by either of the constructors with arguments.
+     * MUST be a power of two <= 1<<30.
+     */
+    static final int MAXIMUM_CAPACITY = 1 << 30;
+
+    /**
+     * The load factor used when none specified in constructor.
+     */
+    static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+    /**
+     * The table, resized as necessary. Length MUST Always be a power of two.
+     */
+    transient Entry[] table;
+
+    /**
+     * The number of key-value mappings contained in this map.
+     */
+    transient int size;
+
+    /**
+     * The next size value at which to resize (capacity * load factor).
+     * @serial
+     */
+    int threshold;
+
+    /**
+     * The load factor for the hash table.
+     *
+     * @serial
+     */
+    final float loadFactor;
+
+    /**
+     * The number of times this HashMap has been structurally modified
+     * Structural modifications are those that change the number of mappings in
+     * the HashMap or otherwise modify its internal structure (e.g.,
+     * rehash).  This field is used to make iterators on Collection-views of
+     * the HashMap fail-fast.  (See ConcurrentModificationException).
+     */
+    transient int modCount;
+
+    /**
+     * Constructs an empty <tt>HashMap</tt> with the specified initial
+     * capacity and load factor.
+     *
+     * @param  initialCapacity the initial capacity
+     * @param  loadFactor      the load factor
+     * @throws IllegalArgumentException if the initial capacity is negative
+     *         or the load factor is nonpositive
+     */
+    public HashMap(int initialCapacity, float loadFactor) {
+        if (initialCapacity < 0)
+            throw new IllegalArgumentException("Illegal initial capacity: " +
+                                               initialCapacity);
+        if (initialCapacity > MAXIMUM_CAPACITY)
+            initialCapacity = MAXIMUM_CAPACITY;
+        if (loadFactor <= 0 || Float.isNaN(loadFactor))
+            throw new IllegalArgumentException("Illegal load factor: " +
+                                               loadFactor);
+
+        // Find a power of 2 >= initialCapacity
+        int capacity = 1;
+        while (capacity < initialCapacity)
+            capacity <<= 1;
+
+        this.loadFactor = loadFactor;
+        threshold = (int)(capacity * loadFactor);
+        table = new Entry[capacity];
+        init();
+    }
+
+    /**
+     * Constructs an empty <tt>HashMap</tt> with the specified initial
+     * capacity and the default load factor (0.75).
+     *
+     * @param  initialCapacity the initial capacity.
+     * @throws IllegalArgumentException if the initial capacity is negative.
+     */
+    public HashMap(int initialCapacity) {
+        this(initialCapacity, DEFAULT_LOAD_FACTOR);
+    }
+
+    /**
+     * Constructs an empty <tt>HashMap</tt> with the default initial capacity
+     * (16) and the default load factor (0.75).
+     */
+    public HashMap() {
+        this.loadFactor = DEFAULT_LOAD_FACTOR;
+        threshold = (int)(DEFAULT_INITIAL_CAPACITY * DEFAULT_LOAD_FACTOR);
+        table = new Entry[DEFAULT_INITIAL_CAPACITY];
+        init();
+    }
+
+    /**
+     * Constructs a new <tt>HashMap</tt> with the same mappings as the
+     * specified <tt>Map</tt>.  The <tt>HashMap</tt> is created with
+     * default load factor (0.75) and an initial capacity sufficient to
+     * hold the mappings in the specified <tt>Map</tt>.
+     *
+     * @param   m the map whose mappings are to be placed in this map
+     * @throws  NullPointerException if the specified map is null
+     */
+    public HashMap(Map<? extends K, ? extends V> m) {
+        this(Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1,
+                      DEFAULT_INITIAL_CAPACITY), DEFAULT_LOAD_FACTOR);
+        putAllForCreate(m);
+    }
+
+    // internal utilities
+
+    /**
+     * Initialization hook for subclasses. This method is called
+     * in all constructors and pseudo-constructors (clone, readObject)
+     * after HashMap has been initialized but before any entries have
+     * been inserted.  (In the absence of this method, readObject would
+     * require explicit knowledge of subclasses.)
+     */
+    void init() {
+    }
+
+    /**
+     * Applies a supplemental hash function to a given hashCode, which
+     * defends against poor quality hash functions.  This is critical
+     * because HashMap uses power-of-two length hash tables, that
+     * otherwise encounter collisions for hashCodes that do not differ
+     * in lower bits. Note: Null keys always map to hash 0, thus index 0.
+     */
+    static int hash(int h) {
+        // This function ensures that hashCodes that differ only by
+        // constant multiples at each bit position have a bounded
+        // number of collisions (approximately 8 at default load factor).
+        h ^= (h >>> 20) ^ (h >>> 12);
+        return h ^ (h >>> 7) ^ (h >>> 4);
+    }
+
+    /**
+     * Returns index for hash code h.
+     */
+    static int indexFor(int h, int length) {
+        return h & (length-1);
+    }
+
+    /**
+     * Returns the number of key-value mappings in this map.
+     *
+     * @return the number of key-value mappings in this map
+     */
+    public int size() {
+        return size;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this map contains no key-value mappings.
+     *
+     * @return <tt>true</tt> if this map contains no key-value mappings
+     */
+    public boolean isEmpty() {
+        return size == 0;
+    }
+
+    /**
+     * Returns the value to which the specified key is mapped,
+     * or {@code null} if this map contains no mapping for the key.
+     *
+     * <p>More formally, if this map contains a mapping from a key
+     * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
+     * key.equals(k))}, then this method returns {@code v}; otherwise
+     * it returns {@code null}.  (There can be at most one such mapping.)
+     *
+     * <p>A return value of {@code null} does not <i>necessarily</i>
+     * indicate that the map contains no mapping for the key; it's also
+     * possible that the map explicitly maps the key to {@code null}.
+     * The {@link #containsKey containsKey} operation may be used to
+     * distinguish these two cases.
+     *
+     * @see #put(Object, Object)
+     */
+    public V get(Object key) {
+        if (key == null)
+            return getForNullKey();
+        int hash = hash(key.hashCode());
+        for (Entry<K,V> e = table[indexFor(hash, table.length)];
+             e != null;
+             e = e.next) {
+            Object k;
+            if (e.hash == hash && ((k = e.key) == key || key.equals(k)))
+                return e.value;
+        }
+        return null;
+    }
+
+    /**
+     * Offloaded version of get() to look up null keys.  Null keys map
+     * to index 0.  This null case is split out into separate methods
+     * for the sake of performance in the two most commonly used
+     * operations (get and put), but incorporated with conditionals in
+     * others.
+     */
+    private V getForNullKey() {
+        for (Entry<K,V> e = table[0]; e != null; e = e.next) {
+            if (e.key == null)
+                return e.value;
+        }
+        return null;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this map contains a mapping for the
+     * specified key.
+     *
+     * @param   key   The key whose presence in this map is to be tested
+     * @return <tt>true</tt> if this map contains a mapping for the specified
+     * key.
+     */
+    public boolean containsKey(Object key) {
+        return getEntry(key) != null;
+    }
+
+    /**
+     * Returns the entry associated with the specified key in the
+     * HashMap.  Returns null if the HashMap contains no mapping
+     * for the key.
+     */
+    final Entry<K,V> getEntry(Object key) {
+        int hash = (key == null) ? 0 : hash(key.hashCode());
+        for (Entry<K,V> e = table[indexFor(hash, table.length)];
+             e != null;
+             e = e.next) {
+            Object k;
+            if (e.hash == hash &&
+                ((k = e.key) == key || (key != null && key.equals(k))))
+                return e;
+        }
+        return null;
+    }
+
+
+    /**
+     * Associates the specified value with the specified key in this map.
+     * If the map previously contained a mapping for the key, the old
+     * value is replaced.
+     *
+     * @param key key with which the specified value is to be associated
+     * @param value value to be associated with the specified key
+     * @return the previous value associated with <tt>key</tt>, or
+     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     *         (A <tt>null</tt> return can also indicate that the map
+     *         previously associated <tt>null</tt> with <tt>key</tt>.)
+     */
+    public V put(K key, V value) {
+        if (key == null)
+            return putForNullKey(value);
+        int hash = hash(key.hashCode());
+        int i = indexFor(hash, table.length);
+        for (Entry<K,V> e = table[i]; e != null; e = e.next) {
+            Object k;
+            if (e.hash == hash && ((k = e.key) == key || key.equals(k))) {
+                V oldValue = e.value;
+                e.value = value;
+                e.recordAccess(this);
+                return oldValue;
+            }
+        }
+
+        modCount++;
+        addEntry(hash, key, value, i);
+        return null;
+    }
+
+    /**
+     * Offloaded version of put for null keys
+     */
+    private V putForNullKey(V value) {
+        for (Entry<K,V> e = table[0]; e != null; e = e.next) {
+            if (e.key == null) {
+                V oldValue = e.value;
+                e.value = value;
+                e.recordAccess(this);
+                return oldValue;
+            }
+        }
+        modCount++;
+        addEntry(0, null, value, 0);
+        return null;
+    }
+
+    /**
+     * This method is used instead of put by constructors and
+     * pseudoconstructors (clone, readObject).  It does not resize the table,
+     * check for comodification, etc.  It calls createEntry rather than
+     * addEntry.
+     */
+    private void putForCreate(K key, V value) {
+        int hash = (key == null) ? 0 : hash(key.hashCode());
+        int i = indexFor(hash, table.length);
+
+        /**
+         * Look for preexisting entry for key.  This will never happen for
+         * clone or deserialize.  It will only happen for construction if the
+         * input Map is a sorted map whose ordering is inconsistent w/ equals.
+         */
+        for (Entry<K,V> e = table[i]; e != null; e = e.next) {
+            Object k;
+            if (e.hash == hash &&
+                ((k = e.key) == key || (key != null && key.equals(k)))) {
+                e.value = value;
+                return;
+            }
+        }
+
+        createEntry(hash, key, value, i);
+    }
+
+    private void putAllForCreate(Map<? extends K, ? extends V> m) {
+        for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
+            putForCreate(e.getKey(), e.getValue());
+    }
+
+    /**
+     * Rehashes the contents of this map into a new array with a
+     * larger capacity.  This method is called automatically when the
+     * number of keys in this map reaches its threshold.
+     *
+     * If current capacity is MAXIMUM_CAPACITY, this method does not
+     * resize the map, but sets threshold to Integer.MAX_VALUE.
+     * This has the effect of preventing future calls.
+     *
+     * @param newCapacity the new capacity, MUST be a power of two;
+     *        must be greater than current capacity unless current
+     *        capacity is MAXIMUM_CAPACITY (in which case value
+     *        is irrelevant).
+     */
+    void resize(int newCapacity) {
+        Entry[] oldTable = table;
+        int oldCapacity = oldTable.length;
+        if (oldCapacity == MAXIMUM_CAPACITY) {
+            threshold = Integer.MAX_VALUE;
+            return;
+        }
+
+        Entry[] newTable = new Entry[newCapacity];
+        transfer(newTable);
+        table = newTable;
+        threshold = (int)(newCapacity * loadFactor);
+    }
+
+    /**
+     * Transfers all entries from current table to newTable.
+     */
+    void transfer(Entry[] newTable) {
+        Entry[] src = table;
+        int newCapacity = newTable.length;
+        for (int j = 0; j < src.length; j++) {
+            Entry<K,V> e = src[j];
+            if (e != null) {
+                src[j] = null;
+                do {
+                    Entry<K,V> next = e.next;
+                    int i = indexFor(e.hash, newCapacity);
+                    e.next = newTable[i];
+                    newTable[i] = e;
+                    e = next;
+                } while (e != null);
+            }
+        }
+    }
+
+    /**
+     * Copies all of the mappings from the specified map to this map.
+     * These mappings will replace any mappings that this map had for
+     * any of the keys currently in the specified map.
+     *
+     * @param m mappings to be stored in this map
+     * @throws NullPointerException if the specified map is null
+     */
+    public void putAll(Map<? extends K, ? extends V> m) {
+        int numKeysToBeAdded = m.size();
+        if (numKeysToBeAdded == 0)
+            return;
+
+        /*
+         * Expand the map if the map if the number of mappings to be added
+         * is greater than or equal to threshold.  This is conservative; the
+         * obvious condition is (m.size() + size) >= threshold, but this
+         * condition could result in a map with twice the appropriate capacity,
+         * if the keys to be added overlap with the keys already in this map.
+         * By using the conservative calculation, we subject ourself
+         * to at most one extra resize.
+         */
+        if (numKeysToBeAdded > threshold) {
+            int targetCapacity = (int)(numKeysToBeAdded / loadFactor + 1);
+            if (targetCapacity > MAXIMUM_CAPACITY)
+                targetCapacity = MAXIMUM_CAPACITY;
+            int newCapacity = table.length;
+            while (newCapacity < targetCapacity)
+                newCapacity <<= 1;
+            if (newCapacity > table.length)
+                resize(newCapacity);
+        }
+
+        for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
+            put(e.getKey(), e.getValue());
+    }
+
+    /**
+     * Removes the mapping for the specified key from this map if present.
+     *
+     * @param  key key whose mapping is to be removed from the map
+     * @return the previous value associated with <tt>key</tt>, or
+     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     *         (A <tt>null</tt> return can also indicate that the map
+     *         previously associated <tt>null</tt> with <tt>key</tt>.)
+     */
+    public V remove(Object key) {
+        Entry<K,V> e = removeEntryForKey(key);
+        return (e == null ? null : e.value);
+    }
+
+    /**
+     * Removes and returns the entry associated with the specified key
+     * in the HashMap.  Returns null if the HashMap contains no mapping
+     * for this key.
+     */
+    final Entry<K,V> removeEntryForKey(Object key) {
+        int hash = (key == null) ? 0 : hash(key.hashCode());
+        int i = indexFor(hash, table.length);
+        Entry<K,V> prev = table[i];
+        Entry<K,V> e = prev;
+
+        while (e != null) {
+            Entry<K,V> next = e.next;
+            Object k;
+            if (e.hash == hash &&
+                ((k = e.key) == key || (key != null && key.equals(k)))) {
+                modCount++;
+                size--;
+                if (prev == e)
+                    table[i] = next;
+                else
+                    prev.next = next;
+                e.recordRemoval(this);
+                return e;
+            }
+            prev = e;
+            e = next;
+        }
+
+        return e;
+    }
+
+    /**
+     * Special version of remove for EntrySet.
+     */
+    final Entry<K,V> removeMapping(Object o) {
+        if (!(o instanceof Map.Entry))
+            return null;
+
+        Map.Entry<K,V> entry = (Map.Entry<K,V>) o;
+        Object key = entry.getKey();
+        int hash = (key == null) ? 0 : hash(key.hashCode());
+        int i = indexFor(hash, table.length);
+        Entry<K,V> prev = table[i];
+        Entry<K,V> e = prev;
+
+        while (e != null) {
+            Entry<K,V> next = e.next;
+            if (e.hash == hash && e.equals(entry)) {
+                modCount++;
+                size--;
+                if (prev == e)
+                    table[i] = next;
+                else
+                    prev.next = next;
+                e.recordRemoval(this);
+                return e;
+            }
+            prev = e;
+            e = next;
+        }
+
+        return e;
+    }
+
+    /**
+     * Removes all of the mappings from this map.
+     * The map will be empty after this call returns.
+     */
+    public void clear() {
+        modCount++;
+        Entry[] tab = table;
+        for (int i = 0; i < tab.length; i++)
+            tab[i] = null;
+        size = 0;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this map maps one or more keys to the
+     * specified value.
+     *
+     * @param value value whose presence in this map is to be tested
+     * @return <tt>true</tt> if this map maps one or more keys to the
+     *         specified value
+     */
+    public boolean containsValue(Object value) {
+        if (value == null)
+            return containsNullValue();
+
+        Entry[] tab = table;
+        for (int i = 0; i < tab.length ; i++)
+            for (Entry e = tab[i] ; e != null ; e = e.next)
+                if (value.equals(e.value))
+                    return true;
+        return false;
+    }
+
+    /**
+     * Special-case code for containsValue with null argument
+     */
+    private boolean containsNullValue() {
+        Entry[] tab = table;
+        for (int i = 0; i < tab.length ; i++)
+            for (Entry e = tab[i] ; e != null ; e = e.next)
+                if (e.value == null)
+                    return true;
+        return false;
+    }
+
+    /**
+     * Returns a shallow copy of this <tt>HashMap</tt> instance: the keys and
+     * values themselves are not cloned.
+     *
+     * @return a shallow copy of this map
+     */
+    public Object clone() {
+        HashMap<K,V> result = null;
+        try {
+            result = (HashMap<K,V>)super.clone();
+        } catch (CloneNotSupportedException e) {
+            // assert false;
+        }
+        result.table = new Entry[table.length];
+        result.entrySet = null;
+        result.modCount = 0;
+        result.size = 0;
+        result.init();
+        result.putAllForCreate(this);
+
+        return result;
+    }
+
+    static class Entry<K,V> implements Map.Entry<K,V> {
+        final K key;
+        V value;
+        Entry<K,V> next;
+        final int hash;
+
+        /**
+         * Creates new entry.
+         */
+        Entry(int h, K k, V v, Entry<K,V> n) {
+            value = v;
+            next = n;
+            key = k;
+            hash = h;
+        }
+
+        public final K getKey() {
+            return key;
+        }
+
+        public final V getValue() {
+            return value;
+        }
+
+        public final V setValue(V newValue) {
+            V oldValue = value;
+            value = newValue;
+            return oldValue;
+        }
+
+        public final boolean equals(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry e = (Map.Entry)o;
+            Object k1 = getKey();
+            Object k2 = e.getKey();
+            if (k1 == k2 || (k1 != null && k1.equals(k2))) {
+                Object v1 = getValue();
+                Object v2 = e.getValue();
+                if (v1 == v2 || (v1 != null && v1.equals(v2)))
+                    return true;
+            }
+            return false;
+        }
+
+        public final int hashCode() {
+            return (key==null   ? 0 : key.hashCode()) ^
+                   (value==null ? 0 : value.hashCode());
+        }
+
+        public final String toString() {
+            return getKey() + "=" + getValue();
+        }
+
+        /**
+         * This method is invoked whenever the value in an entry is
+         * overwritten by an invocation of put(k,v) for a key k that's already
+         * in the HashMap.
+         */
+        void recordAccess(HashMap<K,V> m) {
+        }
+
+        /**
+         * This method is invoked whenever the entry is
+         * removed from the table.
+         */
+        void recordRemoval(HashMap<K,V> m) {
+        }
+    }
+
+    /**
+     * Adds a new entry with the specified key, value and hash code to
+     * the specified bucket.  It is the responsibility of this
+     * method to resize the table if appropriate.
+     *
+     * Subclass overrides this to alter the behavior of put method.
+     */
+    void addEntry(int hash, K key, V value, int bucketIndex) {
+        Entry<K,V> e = table[bucketIndex];
+        table[bucketIndex] = new Entry<>(hash, key, value, e);
+        if (size++ >= threshold)
+            resize(2 * table.length);
+    }
+
+    /**
+     * Like addEntry except that this version is used when creating entries
+     * as part of Map construction or "pseudo-construction" (cloning,
+     * deserialization).  This version needn't worry about resizing the table.
+     *
+     * Subclass overrides this to alter the behavior of HashMap(Map),
+     * clone, and readObject.
+     */
+    void createEntry(int hash, K key, V value, int bucketIndex) {
+        Entry<K,V> e = table[bucketIndex];
+        table[bucketIndex] = new Entry<>(hash, key, value, e);
+        size++;
+    }
+
+    private abstract class HashIterator<E> implements Iterator<E> {
+        Entry<K,V> next;        // next entry to return
+        int expectedModCount;   // For fast-fail
+        int index;              // current slot
+        Entry<K,V> current;     // current entry
+
+        HashIterator() {
+            expectedModCount = modCount;
+            if (size > 0) { // advance to first entry
+                Entry[] t = table;
+                while (index < t.length && (next = t[index++]) == null)
+                    ;
+            }
+        }
+
+        public final boolean hasNext() {
+            return next != null;
+        }
+
+        final Entry<K,V> nextEntry() {
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+            Entry<K,V> e = next;
+            if (e == null)
+                throw new NoSuchElementException();
+
+            if ((next = e.next) == null) {
+                Entry[] t = table;
+                while (index < t.length && (next = t[index++]) == null)
+                    ;
+            }
+            current = e;
+            return e;
+        }
+
+        public void remove() {
+            if (current == null)
+                throw new IllegalStateException();
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+            Object k = current.key;
+            current = null;
+            HashMap.this.removeEntryForKey(k);
+            expectedModCount = modCount;
+        }
+
+    }
+
+    private final class ValueIterator extends HashIterator<V> {
+        public V next() {
+            return nextEntry().value;
+        }
+    }
+
+    private final class KeyIterator extends HashIterator<K> {
+        public K next() {
+            return nextEntry().getKey();
+        }
+    }
+
+    private final class EntryIterator extends HashIterator<Map.Entry<K,V>> {
+        public Map.Entry<K,V> next() {
+            return nextEntry();
+        }
+    }
+
+    // Subclass overrides these to alter behavior of views' iterator() method
+    Iterator<K> newKeyIterator()   {
+        return new KeyIterator();
+    }
+    Iterator<V> newValueIterator()   {
+        return new ValueIterator();
+    }
+    Iterator<Map.Entry<K,V>> newEntryIterator()   {
+        return new EntryIterator();
+    }
+
+
+    // Views
+
+    private transient Set<Map.Entry<K,V>> entrySet = null;
+
+    /**
+     * Returns a {@link Set} view of the keys contained in this map.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own <tt>remove</tt> operation), the results of
+     * the iteration are undefined.  The set supports element removal,
+     * which removes the corresponding mapping from the map, via the
+     * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+     * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+     * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
+     * operations.
+     */
+    public Set<K> keySet() {
+        Set<K> ks = keySet;
+        return (ks != null ? ks : (keySet = new KeySet()));
+    }
+
+    private final class KeySet extends AbstractSet<K> {
+        public Iterator<K> iterator() {
+            return newKeyIterator();
+        }
+        public int size() {
+            return size;
+        }
+        public boolean contains(Object o) {
+            return containsKey(o);
+        }
+        public boolean remove(Object o) {
+            return HashMap.this.removeEntryForKey(o) != null;
+        }
+        public void clear() {
+            HashMap.this.clear();
+        }
+    }
+
+    /**
+     * Returns a {@link Collection} view of the values contained in this map.
+     * The collection is backed by the map, so changes to the map are
+     * reflected in the collection, and vice-versa.  If the map is
+     * modified while an iteration over the collection is in progress
+     * (except through the iterator's own <tt>remove</tt> operation),
+     * the results of the iteration are undefined.  The collection
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
+     * <tt>retainAll</tt> and <tt>clear</tt> operations.  It does not
+     * support the <tt>add</tt> or <tt>addAll</tt> operations.
+     */
+    public Collection<V> values() {
+        Collection<V> vs = values;
+        return (vs != null ? vs : (values = new Values()));
+    }
+
+    private final class Values extends AbstractCollection<V> {
+        public Iterator<V> iterator() {
+            return newValueIterator();
+        }
+        public int size() {
+            return size;
+        }
+        public boolean contains(Object o) {
+            return containsValue(o);
+        }
+        public void clear() {
+            HashMap.this.clear();
+        }
+    }
+
+    /**
+     * Returns a {@link Set} view of the mappings contained in this map.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own <tt>remove</tt> operation, or through the
+     * <tt>setValue</tt> operation on a map entry returned by the
+     * iterator) the results of the iteration are undefined.  The set
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
+     * <tt>clear</tt> operations.  It does not support the
+     * <tt>add</tt> or <tt>addAll</tt> operations.
+     *
+     * @return a set view of the mappings contained in this map
+     */
+    public Set<Map.Entry<K,V>> entrySet() {
+        return entrySet0();
+    }
+
+    private Set<Map.Entry<K,V>> entrySet0() {
+        Set<Map.Entry<K,V>> es = entrySet;
+        return es != null ? es : (entrySet = new EntrySet());
+    }
+
+    private final class EntrySet extends AbstractSet<Map.Entry<K,V>> {
+        public Iterator<Map.Entry<K,V>> iterator() {
+            return newEntryIterator();
+        }
+        public boolean contains(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry<K,V> e = (Map.Entry<K,V>) o;
+            Entry<K,V> candidate = getEntry(e.getKey());
+            return candidate != null && candidate.equals(e);
+        }
+        public boolean remove(Object o) {
+            return removeMapping(o) != null;
+        }
+        public int size() {
+            return size;
+        }
+        public void clear() {
+            HashMap.this.clear();
+        }
+    }
+
+
+    private static final long serialVersionUID = 362498820763181265L;
+
+
+    // These methods are used when serializing HashSets
+    int   capacity()     { return table.length; }
+    float loadFactor()   { return loadFactor;   }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/HashSet.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/HashSet.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * This class implements the <tt>Set</tt> interface, backed by a hash table
+ * (actually a <tt>HashMap</tt> instance).  It makes no guarantees as to the
+ * iteration order of the set; in particular, it does not guarantee that the
+ * order will remain constant over time.  This class permits the <tt>null</tt>
+ * element.
+ *
+ * <p>This class offers constant time performance for the basic operations
+ * (<tt>add</tt>, <tt>remove</tt>, <tt>contains</tt> and <tt>size</tt>),
+ * assuming the hash function disperses the elements properly among the
+ * buckets.  Iterating over this set requires time proportional to the sum of
+ * the <tt>HashSet</tt> instance's size (the number of elements) plus the
+ * "capacity" of the backing <tt>HashMap</tt> instance (the number of
+ * buckets).  Thus, it's very important not to set the initial capacity too
+ * high (or the load factor too low) if iteration performance is important.
+ *
+ * <p><strong>Note that this implementation is not synchronized.</strong>
+ * If multiple threads access a hash set concurrently, and at least one of
+ * the threads modifies the set, it <i>must</i> be synchronized externally.
+ * This is typically accomplished by synchronizing on some object that
+ * naturally encapsulates the set.
+ *
+ * If no such object exists, the set should be "wrapped" using the
+ * {@link Collections#synchronizedSet Collections.synchronizedSet}
+ * method.  This is best done at creation time, to prevent accidental
+ * unsynchronized access to the set:<pre>
+ *   Set s = Collections.synchronizedSet(new HashSet(...));</pre>
+ *
+ * <p>The iterators returned by this class's <tt>iterator</tt> method are
+ * <i>fail-fast</i>: if the set is modified at any time after the iterator is
+ * created, in any way except through the iterator's own <tt>remove</tt>
+ * method, the Iterator throws a {@link ConcurrentModificationException}.
+ * Thus, in the face of concurrent modification, the iterator fails quickly
+ * and cleanly, rather than risking arbitrary, non-deterministic behavior at
+ * an undetermined time in the future.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness: <i>the fail-fast behavior of iterators
+ * should be used only to detect bugs.</i>
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <E> the type of elements maintained by this set
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see     Collection
+ * @see     Set
+ * @see     TreeSet
+ * @see     HashMap
+ * @since   1.2
+ */
+
+public class HashSet<E>
+    extends AbstractSet<E>
+    implements Set<E>, Cloneable, java.io.Serializable
+{
+    static final long serialVersionUID = -5024744406713321676L;
+
+    private transient HashMap<E,Object> map;
+
+    // Dummy value to associate with an Object in the backing Map
+    private static final Object PRESENT = new Object();
+
+    /**
+     * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
+     * default initial capacity (16) and load factor (0.75).
+     */
+    public HashSet() {
+        map = new HashMap<>();
+    }
+
+    /**
+     * Constructs a new set containing the elements in the specified
+     * collection.  The <tt>HashMap</tt> is created with default load factor
+     * (0.75) and an initial capacity sufficient to contain the elements in
+     * the specified collection.
+     *
+     * @param c the collection whose elements are to be placed into this set
+     * @throws NullPointerException if the specified collection is null
+     */
+    public HashSet(Collection<? extends E> c) {
+        map = new HashMap<>(Math.max((int) (c.size()/.75f) + 1, 16));
+        addAll(c);
+    }
+
+    /**
+     * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
+     * the specified initial capacity and the specified load factor.
+     *
+     * @param      initialCapacity   the initial capacity of the hash map
+     * @param      loadFactor        the load factor of the hash map
+     * @throws     IllegalArgumentException if the initial capacity is less
+     *             than zero, or if the load factor is nonpositive
+     */
+    public HashSet(int initialCapacity, float loadFactor) {
+        map = new HashMap<>(initialCapacity, loadFactor);
+    }
+
+    /**
+     * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
+     * the specified initial capacity and default load factor (0.75).
+     *
+     * @param      initialCapacity   the initial capacity of the hash table
+     * @throws     IllegalArgumentException if the initial capacity is less
+     *             than zero
+     */
+    public HashSet(int initialCapacity) {
+        map = new HashMap<>(initialCapacity);
+    }
+
+    /**
+     * Constructs a new, empty linked hash set.  (This package private
+     * constructor is only used by LinkedHashSet.) The backing
+     * HashMap instance is a LinkedHashMap with the specified initial
+     * capacity and the specified load factor.
+     *
+     * @param      initialCapacity   the initial capacity of the hash map
+     * @param      loadFactor        the load factor of the hash map
+     * @param      dummy             ignored (distinguishes this
+     *             constructor from other int, float constructor.)
+     * @throws     IllegalArgumentException if the initial capacity is less
+     *             than zero, or if the load factor is nonpositive
+     */
+    HashSet(int initialCapacity, float loadFactor, boolean dummy) {
+        map = new LinkedHashMap<>(initialCapacity, loadFactor);
+    }
+
+    /**
+     * Returns an iterator over the elements in this set.  The elements
+     * are returned in no particular order.
+     *
+     * @return an Iterator over the elements in this set
+     * @see ConcurrentModificationException
+     */
+    public Iterator<E> iterator() {
+        return map.keySet().iterator();
+    }
+
+    /**
+     * Returns the number of elements in this set (its cardinality).
+     *
+     * @return the number of elements in this set (its cardinality)
+     */
+    public int size() {
+        return map.size();
+    }
+
+    /**
+     * Returns <tt>true</tt> if this set contains no elements.
+     *
+     * @return <tt>true</tt> if this set contains no elements
+     */
+    public boolean isEmpty() {
+        return map.isEmpty();
+    }
+
+    /**
+     * Returns <tt>true</tt> if this set contains the specified element.
+     * More formally, returns <tt>true</tt> if and only if this set
+     * contains an element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     *
+     * @param o element whose presence in this set is to be tested
+     * @return <tt>true</tt> if this set contains the specified element
+     */
+    public boolean contains(Object o) {
+        return map.containsKey(o);
+    }
+
+    /**
+     * Adds the specified element to this set if it is not already present.
+     * More formally, adds the specified element <tt>e</tt> to this set if
+     * this set contains no element <tt>e2</tt> such that
+     * <tt>(e==null&nbsp;?&nbsp;e2==null&nbsp;:&nbsp;e.equals(e2))</tt>.
+     * If this set already contains the element, the call leaves the set
+     * unchanged and returns <tt>false</tt>.
+     *
+     * @param e element to be added to this set
+     * @return <tt>true</tt> if this set did not already contain the specified
+     * element
+     */
+    public boolean add(E e) {
+        return map.put(e, PRESENT)==null;
+    }
+
+    /**
+     * Removes the specified element from this set if it is present.
+     * More formally, removes an element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>,
+     * if this set contains such an element.  Returns <tt>true</tt> if
+     * this set contained the element (or equivalently, if this set
+     * changed as a result of the call).  (This set will not contain the
+     * element once the call returns.)
+     *
+     * @param o object to be removed from this set, if present
+     * @return <tt>true</tt> if the set contained the specified element
+     */
+    public boolean remove(Object o) {
+        return map.remove(o)==PRESENT;
+    }
+
+    /**
+     * Removes all of the elements from this set.
+     * The set will be empty after this call returns.
+     */
+    public void clear() {
+        map.clear();
+    }
+
+    /**
+     * Returns a shallow copy of this <tt>HashSet</tt> instance: the elements
+     * themselves are not cloned.
+     *
+     * @return a shallow copy of this set
+     */
+    public Object clone() {
+        try {
+            HashSet<E> newSet = (HashSet<E>) super.clone();
+            newSet.map = (HashMap<E, Object>) map.clone();
+            return newSet;
+        } catch (CloneNotSupportedException e) {
+            throw new InternalError();
+        }
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Hashtable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Hashtable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1005 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+import java.io.*;
+
+/**
+ * This class implements a hash table, which maps keys to values. Any
+ * non-<code>null</code> object can be used as a key or as a value. <p>
+ *
+ * To successfully store and retrieve objects from a hashtable, the
+ * objects used as keys must implement the <code>hashCode</code>
+ * method and the <code>equals</code> method. <p>
+ *
+ * An instance of <code>Hashtable</code> has two parameters that affect its
+ * performance: <i>initial capacity</i> and <i>load factor</i>.  The
+ * <i>capacity</i> is the number of <i>buckets</i> in the hash table, and the
+ * <i>initial capacity</i> is simply the capacity at the time the hash table
+ * is created.  Note that the hash table is <i>open</i>: in the case of a "hash
+ * collision", a single bucket stores multiple entries, which must be searched
+ * sequentially.  The <i>load factor</i> is a measure of how full the hash
+ * table is allowed to get before its capacity is automatically increased.
+ * The initial capacity and load factor parameters are merely hints to
+ * the implementation.  The exact details as to when and whether the rehash
+ * method is invoked are implementation-dependent.<p>
+ *
+ * Generally, the default load factor (.75) offers a good tradeoff between
+ * time and space costs.  Higher values decrease the space overhead but
+ * increase the time cost to look up an entry (which is reflected in most
+ * <tt>Hashtable</tt> operations, including <tt>get</tt> and <tt>put</tt>).<p>
+ *
+ * The initial capacity controls a tradeoff between wasted space and the
+ * need for <code>rehash</code> operations, which are time-consuming.
+ * No <code>rehash</code> operations will <i>ever</i> occur if the initial
+ * capacity is greater than the maximum number of entries the
+ * <tt>Hashtable</tt> will contain divided by its load factor.  However,
+ * setting the initial capacity too high can waste space.<p>
+ *
+ * If many entries are to be made into a <code>Hashtable</code>,
+ * creating it with a sufficiently large capacity may allow the
+ * entries to be inserted more efficiently than letting it perform
+ * automatic rehashing as needed to grow the table. <p>
+ *
+ * This example creates a hashtable of numbers. It uses the names of
+ * the numbers as keys:
+ * <pre>   {@code
+ *   Hashtable<String, Integer> numbers
+ *     = new Hashtable<String, Integer>();
+ *   numbers.put("one", 1);
+ *   numbers.put("two", 2);
+ *   numbers.put("three", 3);}</pre>
+ *
+ * <p>To retrieve a number, use the following code:
+ * <pre>   {@code
+ *   Integer n = numbers.get("two");
+ *   if (n != null) {
+ *     System.out.println("two = " + n);
+ *   }}</pre>
+ *
+ * <p>The iterators returned by the <tt>iterator</tt> method of the collections
+ * returned by all of this class's "collection view methods" are
+ * <em>fail-fast</em>: if the Hashtable is structurally modified at any time
+ * after the iterator is created, in any way except through the iterator's own
+ * <tt>remove</tt> method, the iterator will throw a {@link
+ * ConcurrentModificationException}.  Thus, in the face of concurrent
+ * modification, the iterator fails quickly and cleanly, rather than risking
+ * arbitrary, non-deterministic behavior at an undetermined time in the future.
+ * The Enumerations returned by Hashtable's keys and elements methods are
+ * <em>not</em> fail-fast.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness: <i>the fail-fast behavior of iterators
+ * should be used only to detect bugs.</i>
+ *
+ * <p>As of the Java 2 platform v1.2, this class was retrofitted to
+ * implement the {@link Map} interface, making it a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ *
+ * Java Collections Framework</a>.  Unlike the new collection
+ * implementations, {@code Hashtable} is synchronized.  If a
+ * thread-safe implementation is not needed, it is recommended to use
+ * {@link HashMap} in place of {@code Hashtable}.  If a thread-safe
+ * highly-concurrent implementation is desired, then it is recommended
+ * to use {@link java.util.concurrent.ConcurrentHashMap} in place of
+ * {@code Hashtable}.
+ *
+ * @author  Arthur van Hoff
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see     Object#equals(java.lang.Object)
+ * @see     Object#hashCode()
+ * @see     Hashtable#rehash()
+ * @see     Collection
+ * @see     Map
+ * @see     HashMap
+ * @see     TreeMap
+ * @since JDK1.0
+ */
+public class Hashtable<K,V>
+    extends Dictionary<K,V>
+    implements Map<K,V>, Cloneable, java.io.Serializable {
+
+    /**
+     * The hash table data.
+     */
+    private transient Entry[] table;
+
+    /**
+     * The total number of entries in the hash table.
+     */
+    private transient int count;
+
+    /**
+     * The table is rehashed when its size exceeds this threshold.  (The
+     * value of this field is (int)(capacity * loadFactor).)
+     *
+     * @serial
+     */
+    private int threshold;
+
+    /**
+     * The load factor for the hashtable.
+     *
+     * @serial
+     */
+    private float loadFactor;
+
+    /**
+     * The number of times this Hashtable has been structurally modified
+     * Structural modifications are those that change the number of entries in
+     * the Hashtable or otherwise modify its internal structure (e.g.,
+     * rehash).  This field is used to make iterators on Collection-views of
+     * the Hashtable fail-fast.  (See ConcurrentModificationException).
+     */
+    private transient int modCount = 0;
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = 1421746759512286392L;
+
+    /**
+     * Constructs a new, empty hashtable with the specified initial
+     * capacity and the specified load factor.
+     *
+     * @param      initialCapacity   the initial capacity of the hashtable.
+     * @param      loadFactor        the load factor of the hashtable.
+     * @exception  IllegalArgumentException  if the initial capacity is less
+     *             than zero, or if the load factor is nonpositive.
+     */
+    public Hashtable(int initialCapacity, float loadFactor) {
+        if (initialCapacity < 0)
+            throw new IllegalArgumentException("Illegal Capacity: "+
+                                               initialCapacity);
+        if (loadFactor <= 0 || Float.isNaN(loadFactor))
+            throw new IllegalArgumentException("Illegal Load: "+loadFactor);
+
+        if (initialCapacity==0)
+            initialCapacity = 1;
+        this.loadFactor = loadFactor;
+        table = new Entry[initialCapacity];
+        threshold = (int)(initialCapacity * loadFactor);
+    }
+
+    /**
+     * Constructs a new, empty hashtable with the specified initial capacity
+     * and default load factor (0.75).
+     *
+     * @param     initialCapacity   the initial capacity of the hashtable.
+     * @exception IllegalArgumentException if the initial capacity is less
+     *              than zero.
+     */
+    public Hashtable(int initialCapacity) {
+        this(initialCapacity, 0.75f);
+    }
+
+    /**
+     * Constructs a new, empty hashtable with a default initial capacity (11)
+     * and load factor (0.75).
+     */
+    public Hashtable() {
+        this(11, 0.75f);
+    }
+
+    /**
+     * Constructs a new hashtable with the same mappings as the given
+     * Map.  The hashtable is created with an initial capacity sufficient to
+     * hold the mappings in the given Map and a default load factor (0.75).
+     *
+     * @param t the map whose mappings are to be placed in this map.
+     * @throws NullPointerException if the specified map is null.
+     * @since   1.2
+     */
+    public Hashtable(Map<? extends K, ? extends V> t) {
+        this(Math.max(2*t.size(), 11), 0.75f);
+        putAll(t);
+    }
+
+    /**
+     * Returns the number of keys in this hashtable.
+     *
+     * @return  the number of keys in this hashtable.
+     */
+    public synchronized int size() {
+        return count;
+    }
+
+    /**
+     * Tests if this hashtable maps no keys to values.
+     *
+     * @return  <code>true</code> if this hashtable maps no keys to values;
+     *          <code>false</code> otherwise.
+     */
+    public synchronized boolean isEmpty() {
+        return count == 0;
+    }
+
+    /**
+     * Returns an enumeration of the keys in this hashtable.
+     *
+     * @return  an enumeration of the keys in this hashtable.
+     * @see     Enumeration
+     * @see     #elements()
+     * @see     #keySet()
+     * @see     Map
+     */
+    public synchronized Enumeration<K> keys() {
+        return this.<K>getEnumeration(KEYS);
+    }
+
+    /**
+     * Returns an enumeration of the values in this hashtable.
+     * Use the Enumeration methods on the returned object to fetch the elements
+     * sequentially.
+     *
+     * @return  an enumeration of the values in this hashtable.
+     * @see     java.util.Enumeration
+     * @see     #keys()
+     * @see     #values()
+     * @see     Map
+     */
+    public synchronized Enumeration<V> elements() {
+        return this.<V>getEnumeration(VALUES);
+    }
+
+    /**
+     * Tests if some key maps into the specified value in this hashtable.
+     * This operation is more expensive than the {@link #containsKey
+     * containsKey} method.
+     *
+     * <p>Note that this method is identical in functionality to
+     * {@link #containsValue containsValue}, (which is part of the
+     * {@link Map} interface in the collections framework).
+     *
+     * @param      value   a value to search for
+     * @return     <code>true</code> if and only if some key maps to the
+     *             <code>value</code> argument in this hashtable as
+     *             determined by the <tt>equals</tt> method;
+     *             <code>false</code> otherwise.
+     * @exception  NullPointerException  if the value is <code>null</code>
+     */
+    public synchronized boolean contains(Object value) {
+        if (value == null) {
+            throw new NullPointerException();
+        }
+
+        Entry tab[] = table;
+        for (int i = tab.length ; i-- > 0 ;) {
+            for (Entry<K,V> e = tab[i] ; e != null ; e = e.next) {
+                if (e.value.equals(value)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if this hashtable maps one or more keys to this value.
+     *
+     * <p>Note that this method is identical in functionality to {@link
+     * #contains contains} (which predates the {@link Map} interface).
+     *
+     * @param value value whose presence in this hashtable is to be tested
+     * @return <tt>true</tt> if this map maps one or more keys to the
+     *         specified value
+     * @throws NullPointerException  if the value is <code>null</code>
+     * @since 1.2
+     */
+    public boolean containsValue(Object value) {
+        return contains(value);
+    }
+
+    /**
+     * Tests if the specified object is a key in this hashtable.
+     *
+     * @param   key   possible key
+     * @return  <code>true</code> if and only if the specified object
+     *          is a key in this hashtable, as determined by the
+     *          <tt>equals</tt> method; <code>false</code> otherwise.
+     * @throws  NullPointerException  if the key is <code>null</code>
+     * @see     #contains(Object)
+     */
+    public synchronized boolean containsKey(Object key) {
+        Entry tab[] = table;
+        int hash = key.hashCode();
+        int index = (hash & 0x7FFFFFFF) % tab.length;
+        for (Entry<K,V> e = tab[index] ; e != null ; e = e.next) {
+            if ((e.hash == hash) && e.key.equals(key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns the value to which the specified key is mapped,
+     * or {@code null} if this map contains no mapping for the key.
+     *
+     * <p>More formally, if this map contains a mapping from a key
+     * {@code k} to a value {@code v} such that {@code (key.equals(k))},
+     * then this method returns {@code v}; otherwise it returns
+     * {@code null}.  (There can be at most one such mapping.)
+     *
+     * @param key the key whose associated value is to be returned
+     * @return the value to which the specified key is mapped, or
+     *         {@code null} if this map contains no mapping for the key
+     * @throws NullPointerException if the specified key is null
+     * @see     #put(Object, Object)
+     */
+    public synchronized V get(Object key) {
+        Entry tab[] = table;
+        int hash = key.hashCode();
+        int index = (hash & 0x7FFFFFFF) % tab.length;
+        for (Entry<K,V> e = tab[index] ; e != null ; e = e.next) {
+            if ((e.hash == hash) && e.key.equals(key)) {
+                return e.value;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * The maximum size of array to allocate.
+     * Some VMs reserve some header words in an array.
+     * Attempts to allocate larger arrays may result in
+     * OutOfMemoryError: Requested array size exceeds VM limit
+     */
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    /**
+     * Increases the capacity of and internally reorganizes this
+     * hashtable, in order to accommodate and access its entries more
+     * efficiently.  This method is called automatically when the
+     * number of keys in the hashtable exceeds this hashtable's capacity
+     * and load factor.
+     */
+    protected void rehash() {
+        int oldCapacity = table.length;
+        Entry[] oldMap = table;
+
+        // overflow-conscious code
+        int newCapacity = (oldCapacity << 1) + 1;
+        if (newCapacity - MAX_ARRAY_SIZE > 0) {
+            if (oldCapacity == MAX_ARRAY_SIZE)
+                // Keep running with MAX_ARRAY_SIZE buckets
+                return;
+            newCapacity = MAX_ARRAY_SIZE;
+        }
+        Entry[] newMap = new Entry[newCapacity];
+
+        modCount++;
+        threshold = (int)(newCapacity * loadFactor);
+        table = newMap;
+
+        for (int i = oldCapacity ; i-- > 0 ;) {
+            for (Entry<K,V> old = oldMap[i] ; old != null ; ) {
+                Entry<K,V> e = old;
+                old = old.next;
+
+                int index = (e.hash & 0x7FFFFFFF) % newCapacity;
+                e.next = newMap[index];
+                newMap[index] = e;
+            }
+        }
+    }
+
+    /**
+     * Maps the specified <code>key</code> to the specified
+     * <code>value</code> in this hashtable. Neither the key nor the
+     * value can be <code>null</code>. <p>
+     *
+     * The value can be retrieved by calling the <code>get</code> method
+     * with a key that is equal to the original key.
+     *
+     * @param      key     the hashtable key
+     * @param      value   the value
+     * @return     the previous value of the specified key in this hashtable,
+     *             or <code>null</code> if it did not have one
+     * @exception  NullPointerException  if the key or value is
+     *               <code>null</code>
+     * @see     Object#equals(Object)
+     * @see     #get(Object)
+     */
+    public synchronized V put(K key, V value) {
+        // Make sure the value is not null
+        if (value == null) {
+            throw new NullPointerException();
+        }
+
+        // Makes sure the key is not already in the hashtable.
+        Entry tab[] = table;
+        int hash = key.hashCode();
+        int index = (hash & 0x7FFFFFFF) % tab.length;
+        for (Entry<K,V> e = tab[index] ; e != null ; e = e.next) {
+            if ((e.hash == hash) && e.key.equals(key)) {
+                V old = e.value;
+                e.value = value;
+                return old;
+            }
+        }
+
+        modCount++;
+        if (count >= threshold) {
+            // Rehash the table if the threshold is exceeded
+            rehash();
+
+            tab = table;
+            index = (hash & 0x7FFFFFFF) % tab.length;
+        }
+
+        // Creates the new entry.
+        Entry<K,V> e = tab[index];
+        tab[index] = new Entry<>(hash, key, value, e);
+        count++;
+        return null;
+    }
+
+    /**
+     * Removes the key (and its corresponding value) from this
+     * hashtable. This method does nothing if the key is not in the hashtable.
+     *
+     * @param   key   the key that needs to be removed
+     * @return  the value to which the key had been mapped in this hashtable,
+     *          or <code>null</code> if the key did not have a mapping
+     * @throws  NullPointerException  if the key is <code>null</code>
+     */
+    public synchronized V remove(Object key) {
+        Entry tab[] = table;
+        int hash = key.hashCode();
+        int index = (hash & 0x7FFFFFFF) % tab.length;
+        for (Entry<K,V> e = tab[index], prev = null ; e != null ; prev = e, e = e.next) {
+            if ((e.hash == hash) && e.key.equals(key)) {
+                modCount++;
+                if (prev != null) {
+                    prev.next = e.next;
+                } else {
+                    tab[index] = e.next;
+                }
+                count--;
+                V oldValue = e.value;
+                e.value = null;
+                return oldValue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Copies all of the mappings from the specified map to this hashtable.
+     * These mappings will replace any mappings that this hashtable had for any
+     * of the keys currently in the specified map.
+     *
+     * @param t mappings to be stored in this map
+     * @throws NullPointerException if the specified map is null
+     * @since 1.2
+     */
+    public synchronized void putAll(Map<? extends K, ? extends V> t) {
+        for (Map.Entry<? extends K, ? extends V> e : t.entrySet())
+            put(e.getKey(), e.getValue());
+    }
+
+    /**
+     * Clears this hashtable so that it contains no keys.
+     */
+    public synchronized void clear() {
+        Entry tab[] = table;
+        modCount++;
+        for (int index = tab.length; --index >= 0; )
+            tab[index] = null;
+        count = 0;
+    }
+
+    /**
+     * Creates a shallow copy of this hashtable. All the structure of the
+     * hashtable itself is copied, but the keys and values are not cloned.
+     * This is a relatively expensive operation.
+     *
+     * @return  a clone of the hashtable
+     */
+    public synchronized Object clone() {
+        try {
+            Hashtable<K,V> t = (Hashtable<K,V>) super.clone();
+            t.table = new Entry[table.length];
+            for (int i = table.length ; i-- > 0 ; ) {
+                t.table[i] = (table[i] != null)
+                    ? (Entry<K,V>) table[i].clone() : null;
+            }
+            t.keySet = null;
+            t.entrySet = null;
+            t.values = null;
+            t.modCount = 0;
+            return t;
+        } catch (CloneNotSupportedException e) {
+            // this shouldn't happen, since we are Cloneable
+            throw new InternalError();
+        }
+    }
+
+    /**
+     * Returns a string representation of this <tt>Hashtable</tt> object
+     * in the form of a set of entries, enclosed in braces and separated
+     * by the ASCII characters "<tt>,&nbsp;</tt>" (comma and space). Each
+     * entry is rendered as the key, an equals sign <tt>=</tt>, and the
+     * associated element, where the <tt>toString</tt> method is used to
+     * convert the key and element to strings.
+     *
+     * @return  a string representation of this hashtable
+     */
+    public synchronized String toString() {
+        int max = size() - 1;
+        if (max == -1)
+            return "{}";
+
+        StringBuilder sb = new StringBuilder();
+        Iterator<Map.Entry<K,V>> it = entrySet().iterator();
+
+        sb.append('{');
+        for (int i = 0; ; i++) {
+            Map.Entry<K,V> e = it.next();
+            K key = e.getKey();
+            V value = e.getValue();
+            sb.append(key   == this ? "(this Map)" : key.toString());
+            sb.append('=');
+            sb.append(value == this ? "(this Map)" : value.toString());
+
+            if (i == max)
+                return sb.append('}').toString();
+            sb.append(", ");
+        }
+    }
+
+
+    private <T> Enumeration<T> getEnumeration(int type) {
+        if (count == 0) {
+            return Collections.emptyEnumeration();
+        } else {
+            return new Enumerator<>(type, false);
+        }
+    }
+
+    private <T> Iterator<T> getIterator(int type) {
+        if (count == 0) {
+            return Collections.emptyIterator();
+        } else {
+            return new Enumerator<>(type, true);
+        }
+    }
+
+    // Views
+
+    /**
+     * Each of these fields are initialized to contain an instance of the
+     * appropriate view the first time this view is requested.  The views are
+     * stateless, so there's no reason to create more than one of each.
+     */
+    private transient volatile Set<K> keySet = null;
+    private transient volatile Set<Map.Entry<K,V>> entrySet = null;
+    private transient volatile Collection<V> values = null;
+
+    /**
+     * Returns a {@link Set} view of the keys contained in this map.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own <tt>remove</tt> operation), the results of
+     * the iteration are undefined.  The set supports element removal,
+     * which removes the corresponding mapping from the map, via the
+     * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+     * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+     * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
+     * operations.
+     *
+     * @since 1.2
+     */
+    public Set<K> keySet() {
+        if (keySet == null)
+            keySet = Collections.synchronizedSet(new KeySet(), this);
+        return keySet;
+    }
+
+    private class KeySet extends AbstractSet<K> {
+        public Iterator<K> iterator() {
+            return getIterator(KEYS);
+        }
+        public int size() {
+            return count;
+        }
+        public boolean contains(Object o) {
+            return containsKey(o);
+        }
+        public boolean remove(Object o) {
+            return Hashtable.this.remove(o) != null;
+        }
+        public void clear() {
+            Hashtable.this.clear();
+        }
+    }
+
+    /**
+     * Returns a {@link Set} view of the mappings contained in this map.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own <tt>remove</tt> operation, or through the
+     * <tt>setValue</tt> operation on a map entry returned by the
+     * iterator) the results of the iteration are undefined.  The set
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
+     * <tt>clear</tt> operations.  It does not support the
+     * <tt>add</tt> or <tt>addAll</tt> operations.
+     *
+     * @since 1.2
+     */
+    public Set<Map.Entry<K,V>> entrySet() {
+        if (entrySet==null)
+            entrySet = Collections.synchronizedSet(new EntrySet(), this);
+        return entrySet;
+    }
+
+    private class EntrySet extends AbstractSet<Map.Entry<K,V>> {
+        public Iterator<Map.Entry<K,V>> iterator() {
+            return getIterator(ENTRIES);
+        }
+
+        public boolean add(Map.Entry<K,V> o) {
+            return super.add(o);
+        }
+
+        public boolean contains(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry entry = (Map.Entry)o;
+            Object key = entry.getKey();
+            Entry[] tab = table;
+            int hash = key.hashCode();
+            int index = (hash & 0x7FFFFFFF) % tab.length;
+
+            for (Entry e = tab[index]; e != null; e = e.next)
+                if (e.hash==hash && e.equals(entry))
+                    return true;
+            return false;
+        }
+
+        public boolean remove(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry<K,V> entry = (Map.Entry<K,V>) o;
+            K key = entry.getKey();
+            Entry[] tab = table;
+            int hash = key.hashCode();
+            int index = (hash & 0x7FFFFFFF) % tab.length;
+
+            for (Entry<K,V> e = tab[index], prev = null; e != null;
+                 prev = e, e = e.next) {
+                if (e.hash==hash && e.equals(entry)) {
+                    modCount++;
+                    if (prev != null)
+                        prev.next = e.next;
+                    else
+                        tab[index] = e.next;
+
+                    count--;
+                    e.value = null;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public int size() {
+            return count;
+        }
+
+        public void clear() {
+            Hashtable.this.clear();
+        }
+    }
+
+    /**
+     * Returns a {@link Collection} view of the values contained in this map.
+     * The collection is backed by the map, so changes to the map are
+     * reflected in the collection, and vice-versa.  If the map is
+     * modified while an iteration over the collection is in progress
+     * (except through the iterator's own <tt>remove</tt> operation),
+     * the results of the iteration are undefined.  The collection
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
+     * <tt>retainAll</tt> and <tt>clear</tt> operations.  It does not
+     * support the <tt>add</tt> or <tt>addAll</tt> operations.
+     *
+     * @since 1.2
+     */
+    public Collection<V> values() {
+        if (values==null)
+            values = Collections.synchronizedCollection(new ValueCollection(),
+                                                        this);
+        return values;
+    }
+
+    private class ValueCollection extends AbstractCollection<V> {
+        public Iterator<V> iterator() {
+            return getIterator(VALUES);
+        }
+        public int size() {
+            return count;
+        }
+        public boolean contains(Object o) {
+            return containsValue(o);
+        }
+        public void clear() {
+            Hashtable.this.clear();
+        }
+    }
+
+    // Comparison and hashing
+
+    /**
+     * Compares the specified Object with this Map for equality,
+     * as per the definition in the Map interface.
+     *
+     * @param  o object to be compared for equality with this hashtable
+     * @return true if the specified Object is equal to this Map
+     * @see Map#equals(Object)
+     * @since 1.2
+     */
+    public synchronized boolean equals(Object o) {
+        if (o == this)
+            return true;
+
+        if (!(o instanceof Map))
+            return false;
+        Map<K,V> t = (Map<K,V>) o;
+        if (t.size() != size())
+            return false;
+
+        try {
+            Iterator<Map.Entry<K,V>> i = entrySet().iterator();
+            while (i.hasNext()) {
+                Map.Entry<K,V> e = i.next();
+                K key = e.getKey();
+                V value = e.getValue();
+                if (value == null) {
+                    if (!(t.get(key)==null && t.containsKey(key)))
+                        return false;
+                } else {
+                    if (!value.equals(t.get(key)))
+                        return false;
+                }
+            }
+        } catch (ClassCastException unused)   {
+            return false;
+        } catch (NullPointerException unused) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the hash code value for this Map as per the definition in the
+     * Map interface.
+     *
+     * @see Map#hashCode()
+     * @since 1.2
+     */
+    public synchronized int hashCode() {
+        /*
+         * This code detects the recursion caused by computing the hash code
+         * of a self-referential hash table and prevents the stack overflow
+         * that would otherwise result.  This allows certain 1.1-era
+         * applets with self-referential hash tables to work.  This code
+         * abuses the loadFactor field to do double-duty as a hashCode
+         * in progress flag, so as not to worsen the space performance.
+         * A negative load factor indicates that hash code computation is
+         * in progress.
+         */
+        int h = 0;
+        if (count == 0 || loadFactor < 0)
+            return h;  // Returns zero
+
+        loadFactor = -loadFactor;  // Mark hashCode computation in progress
+        Entry[] tab = table;
+        for (int i = 0; i < tab.length; i++)
+            for (Entry e = tab[i]; e != null; e = e.next)
+                h += e.key.hashCode() ^ e.value.hashCode();
+        loadFactor = -loadFactor;  // Mark hashCode computation complete
+
+        return h;
+    }
+
+    /**
+     * Hashtable collision list.
+     */
+    private static class Entry<K,V> implements Map.Entry<K,V> {
+        int hash;
+        K key;
+        V value;
+        Entry<K,V> next;
+
+        protected Entry(int hash, K key, V value, Entry<K,V> next) {
+            this.hash = hash;
+            this.key = key;
+            this.value = value;
+            this.next = next;
+        }
+
+        protected Object clone() {
+            return new Entry<>(hash, key, value,
+                                  (next==null ? null : (Entry<K,V>) next.clone()));
+        }
+
+        // Map.Entry Ops
+
+        public K getKey() {
+            return key;
+        }
+
+        public V getValue() {
+            return value;
+        }
+
+        public V setValue(V value) {
+            if (value == null)
+                throw new NullPointerException();
+
+            V oldValue = this.value;
+            this.value = value;
+            return oldValue;
+        }
+
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry e = (Map.Entry)o;
+
+            return (key==null ? e.getKey()==null : key.equals(e.getKey())) &&
+               (value==null ? e.getValue()==null : value.equals(e.getValue()));
+        }
+
+        public int hashCode() {
+            return hash ^ (value==null ? 0 : value.hashCode());
+        }
+
+        public String toString() {
+            return key.toString()+"="+value.toString();
+        }
+    }
+
+    // Types of Enumerations/Iterations
+    private static final int KEYS = 0;
+    private static final int VALUES = 1;
+    private static final int ENTRIES = 2;
+
+    /**
+     * A hashtable enumerator class.  This class implements both the
+     * Enumeration and Iterator interfaces, but individual instances
+     * can be created with the Iterator methods disabled.  This is necessary
+     * to avoid unintentionally increasing the capabilities granted a user
+     * by passing an Enumeration.
+     */
+    private class Enumerator<T> implements Enumeration<T>, Iterator<T> {
+        Entry[] table = Hashtable.this.table;
+        int index = table.length;
+        Entry<K,V> entry = null;
+        Entry<K,V> lastReturned = null;
+        int type;
+
+        /**
+         * Indicates whether this Enumerator is serving as an Iterator
+         * or an Enumeration.  (true -> Iterator).
+         */
+        boolean iterator;
+
+        /**
+         * The modCount value that the iterator believes that the backing
+         * Hashtable should have.  If this expectation is violated, the iterator
+         * has detected concurrent modification.
+         */
+        protected int expectedModCount = modCount;
+
+        Enumerator(int type, boolean iterator) {
+            this.type = type;
+            this.iterator = iterator;
+        }
+
+        public boolean hasMoreElements() {
+            Entry<K,V> e = entry;
+            int i = index;
+            Entry[] t = table;
+            /* Use locals for faster loop iteration */
+            while (e == null && i > 0) {
+                e = t[--i];
+            }
+            entry = e;
+            index = i;
+            return e != null;
+        }
+
+        public T nextElement() {
+            Entry<K,V> et = entry;
+            int i = index;
+            Entry[] t = table;
+            /* Use locals for faster loop iteration */
+            while (et == null && i > 0) {
+                et = t[--i];
+            }
+            entry = et;
+            index = i;
+            if (et != null) {
+                Entry<K,V> e = lastReturned = entry;
+                entry = e.next;
+                return type == KEYS ? (T)e.key : (type == VALUES ? (T)e.value : (T)e);
+            }
+            throw new NoSuchElementException("Hashtable Enumerator");
+        }
+
+        // Iterator methods
+        public boolean hasNext() {
+            return hasMoreElements();
+        }
+
+        public T next() {
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+            return nextElement();
+        }
+
+        public void remove() {
+            if (!iterator)
+                throw new UnsupportedOperationException();
+            if (lastReturned == null)
+                throw new IllegalStateException("Hashtable Enumerator");
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+
+            synchronized(Hashtable.this) {
+                Entry[] tab = Hashtable.this.table;
+                int index = (lastReturned.hash & 0x7FFFFFFF) % tab.length;
+
+                for (Entry<K,V> e = tab[index], prev = null; e != null;
+                     prev = e, e = e.next) {
+                    if (e == lastReturned) {
+                        modCount++;
+                        expectedModCount++;
+                        if (prev == null)
+                            tab[index] = e.next;
+                        else
+                            prev.next = e.next;
+                        count--;
+                        lastReturned = null;
+                        return;
+                    }
+                }
+                throw new ConcurrentModificationException();
+            }
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Iterator.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Iterator.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * An iterator over a collection.  {@code Iterator} takes the place of
+ * {@link Enumeration} in the Java Collections Framework.  Iterators
+ * differ from enumerations in two ways:
+ *
+ * <ul>
+ *      <li> Iterators allow the caller to remove elements from the
+ *           underlying collection during the iteration with well-defined
+ *           semantics.
+ *      <li> Method names have been improved.
+ * </ul>
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <E> the type of elements returned by this iterator
+ *
+ * @author  Josh Bloch
+ * @see Collection
+ * @see ListIterator
+ * @see Iterable
+ * @since 1.2
+ */
+public interface Iterator<E> {
+    /**
+     * Returns {@code true} if the iteration has more elements.
+     * (In other words, returns {@code true} if {@link #next} would
+     * return an element rather than throwing an exception.)
+     *
+     * @return {@code true} if the iteration has more elements
+     */
+    boolean hasNext();
+
+    /**
+     * Returns the next element in the iteration.
+     *
+     * @return the next element in the iteration
+     * @throws NoSuchElementException if the iteration has no more elements
+     */
+    E next();
+
+    /**
+     * Removes from the underlying collection the last element returned
+     * by this iterator (optional operation).  This method can be called
+     * only once per call to {@link #next}.  The behavior of an iterator
+     * is unspecified if the underlying collection is modified while the
+     * iteration is in progress in any way other than by calling this
+     * method.
+     *
+     * @throws UnsupportedOperationException if the {@code remove}
+     *         operation is not supported by this iterator
+     *
+     * @throws IllegalStateException if the {@code next} method has not
+     *         yet been called, or the {@code remove} method has already
+     *         been called after the last call to the {@code next}
+     *         method
+     */
+    void remove();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/LinkedHashMap.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/LinkedHashMap.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,491 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+import java.io.*;
+
+/**
+ * <p>Hash table and linked list implementation of the <tt>Map</tt> interface,
+ * with predictable iteration order.  This implementation differs from
+ * <tt>HashMap</tt> in that it maintains a doubly-linked list running through
+ * all of its entries.  This linked list defines the iteration ordering,
+ * which is normally the order in which keys were inserted into the map
+ * (<i>insertion-order</i>).  Note that insertion order is not affected
+ * if a key is <i>re-inserted</i> into the map.  (A key <tt>k</tt> is
+ * reinserted into a map <tt>m</tt> if <tt>m.put(k, v)</tt> is invoked when
+ * <tt>m.containsKey(k)</tt> would return <tt>true</tt> immediately prior to
+ * the invocation.)
+ *
+ * <p>This implementation spares its clients from the unspecified, generally
+ * chaotic ordering provided by {@link HashMap} (and {@link Hashtable}),
+ * without incurring the increased cost associated with {@link TreeMap}.  It
+ * can be used to produce a copy of a map that has the same order as the
+ * original, regardless of the original map's implementation:
+ * <pre>
+ *     void foo(Map m) {
+ *         Map copy = new LinkedHashMap(m);
+ *         ...
+ *     }
+ * </pre>
+ * This technique is particularly useful if a module takes a map on input,
+ * copies it, and later returns results whose order is determined by that of
+ * the copy.  (Clients generally appreciate having things returned in the same
+ * order they were presented.)
+ *
+ * <p>A special {@link #LinkedHashMap(int,float,boolean) constructor} is
+ * provided to create a linked hash map whose order of iteration is the order
+ * in which its entries were last accessed, from least-recently accessed to
+ * most-recently (<i>access-order</i>).  This kind of map is well-suited to
+ * building LRU caches.  Invoking the <tt>put</tt> or <tt>get</tt> method
+ * results in an access to the corresponding entry (assuming it exists after
+ * the invocation completes).  The <tt>putAll</tt> method generates one entry
+ * access for each mapping in the specified map, in the order that key-value
+ * mappings are provided by the specified map's entry set iterator.  <i>No
+ * other methods generate entry accesses.</i> In particular, operations on
+ * collection-views do <i>not</i> affect the order of iteration of the backing
+ * map.
+ *
+ * <p>The {@link #removeEldestEntry(Map.Entry)} method may be overridden to
+ * impose a policy for removing stale mappings automatically when new mappings
+ * are added to the map.
+ *
+ * <p>This class provides all of the optional <tt>Map</tt> operations, and
+ * permits null elements.  Like <tt>HashMap</tt>, it provides constant-time
+ * performance for the basic operations (<tt>add</tt>, <tt>contains</tt> and
+ * <tt>remove</tt>), assuming the hash function disperses elements
+ * properly among the buckets.  Performance is likely to be just slightly
+ * below that of <tt>HashMap</tt>, due to the added expense of maintaining the
+ * linked list, with one exception: Iteration over the collection-views
+ * of a <tt>LinkedHashMap</tt> requires time proportional to the <i>size</i>
+ * of the map, regardless of its capacity.  Iteration over a <tt>HashMap</tt>
+ * is likely to be more expensive, requiring time proportional to its
+ * <i>capacity</i>.
+ *
+ * <p>A linked hash map has two parameters that affect its performance:
+ * <i>initial capacity</i> and <i>load factor</i>.  They are defined precisely
+ * as for <tt>HashMap</tt>.  Note, however, that the penalty for choosing an
+ * excessively high value for initial capacity is less severe for this class
+ * than for <tt>HashMap</tt>, as iteration times for this class are unaffected
+ * by capacity.
+ *
+ * <p><strong>Note that this implementation is not synchronized.</strong>
+ * If multiple threads access a linked hash map concurrently, and at least
+ * one of the threads modifies the map structurally, it <em>must</em> be
+ * synchronized externally.  This is typically accomplished by
+ * synchronizing on some object that naturally encapsulates the map.
+ *
+ * If no such object exists, the map should be "wrapped" using the
+ * {@link Collections#synchronizedMap Collections.synchronizedMap}
+ * method.  This is best done at creation time, to prevent accidental
+ * unsynchronized access to the map:<pre>
+ *   Map m = Collections.synchronizedMap(new LinkedHashMap(...));</pre>
+ *
+ * A structural modification is any operation that adds or deletes one or more
+ * mappings or, in the case of access-ordered linked hash maps, affects
+ * iteration order.  In insertion-ordered linked hash maps, merely changing
+ * the value associated with a key that is already contained in the map is not
+ * a structural modification.  <strong>In access-ordered linked hash maps,
+ * merely querying the map with <tt>get</tt> is a structural
+ * modification.</strong>)
+ *
+ * <p>The iterators returned by the <tt>iterator</tt> method of the collections
+ * returned by all of this class's collection view methods are
+ * <em>fail-fast</em>: if the map is structurally modified at any time after
+ * the iterator is created, in any way except through the iterator's own
+ * <tt>remove</tt> method, the iterator will throw a {@link
+ * ConcurrentModificationException}.  Thus, in the face of concurrent
+ * modification, the iterator fails quickly and cleanly, rather than risking
+ * arbitrary, non-deterministic behavior at an undetermined time in the future.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness:   <i>the fail-fast behavior of iterators
+ * should be used only to detect bugs.</i>
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <K> the type of keys maintained by this map
+ * @param <V> the type of mapped values
+ *
+ * @author  Josh Bloch
+ * @see     Object#hashCode()
+ * @see     Collection
+ * @see     Map
+ * @see     HashMap
+ * @see     TreeMap
+ * @see     Hashtable
+ * @since   1.4
+ */
+
+public class LinkedHashMap<K,V>
+    extends HashMap<K,V>
+    implements Map<K,V>
+{
+
+    private static final long serialVersionUID = 3801124242820219131L;
+
+    /**
+     * The head of the doubly linked list.
+     */
+    private transient Entry<K,V> header;
+
+    /**
+     * The iteration ordering method for this linked hash map: <tt>true</tt>
+     * for access-order, <tt>false</tt> for insertion-order.
+     *
+     * @serial
+     */
+    private final boolean accessOrder;
+
+    /**
+     * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
+     * with the specified initial capacity and load factor.
+     *
+     * @param  initialCapacity the initial capacity
+     * @param  loadFactor      the load factor
+     * @throws IllegalArgumentException if the initial capacity is negative
+     *         or the load factor is nonpositive
+     */
+    public LinkedHashMap(int initialCapacity, float loadFactor) {
+        super(initialCapacity, loadFactor);
+        accessOrder = false;
+    }
+
+    /**
+     * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
+     * with the specified initial capacity and a default load factor (0.75).
+     *
+     * @param  initialCapacity the initial capacity
+     * @throws IllegalArgumentException if the initial capacity is negative
+     */
+    public LinkedHashMap(int initialCapacity) {
+        super(initialCapacity);
+        accessOrder = false;
+    }
+
+    /**
+     * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
+     * with the default initial capacity (16) and load factor (0.75).
+     */
+    public LinkedHashMap() {
+        super();
+        accessOrder = false;
+    }
+
+    /**
+     * Constructs an insertion-ordered <tt>LinkedHashMap</tt> instance with
+     * the same mappings as the specified map.  The <tt>LinkedHashMap</tt>
+     * instance is created with a default load factor (0.75) and an initial
+     * capacity sufficient to hold the mappings in the specified map.
+     *
+     * @param  m the map whose mappings are to be placed in this map
+     * @throws NullPointerException if the specified map is null
+     */
+    public LinkedHashMap(Map<? extends K, ? extends V> m) {
+        super(m);
+        accessOrder = false;
+    }
+
+    /**
+     * Constructs an empty <tt>LinkedHashMap</tt> instance with the
+     * specified initial capacity, load factor and ordering mode.
+     *
+     * @param  initialCapacity the initial capacity
+     * @param  loadFactor      the load factor
+     * @param  accessOrder     the ordering mode - <tt>true</tt> for
+     *         access-order, <tt>false</tt> for insertion-order
+     * @throws IllegalArgumentException if the initial capacity is negative
+     *         or the load factor is nonpositive
+     */
+    public LinkedHashMap(int initialCapacity,
+                         float loadFactor,
+                         boolean accessOrder) {
+        super(initialCapacity, loadFactor);
+        this.accessOrder = accessOrder;
+    }
+
+    /**
+     * Called by superclass constructors and pseudoconstructors (clone,
+     * readObject) before any entries are inserted into the map.  Initializes
+     * the chain.
+     */
+    void init() {
+        header = new Entry<>(-1, null, null, null);
+        header.before = header.after = header;
+    }
+
+    /**
+     * Transfers all entries to new table array.  This method is called
+     * by superclass resize.  It is overridden for performance, as it is
+     * faster to iterate using our linked list.
+     */
+    void transfer(HashMap.Entry[] newTable) {
+        int newCapacity = newTable.length;
+        for (Entry<K,V> e = header.after; e != header; e = e.after) {
+            int index = indexFor(e.hash, newCapacity);
+            e.next = newTable[index];
+            newTable[index] = e;
+        }
+    }
+
+
+    /**
+     * Returns <tt>true</tt> if this map maps one or more keys to the
+     * specified value.
+     *
+     * @param value value whose presence in this map is to be tested
+     * @return <tt>true</tt> if this map maps one or more keys to the
+     *         specified value
+     */
+    public boolean containsValue(Object value) {
+        // Overridden to take advantage of faster iterator
+        if (value==null) {
+            for (Entry e = header.after; e != header; e = e.after)
+                if (e.value==null)
+                    return true;
+        } else {
+            for (Entry e = header.after; e != header; e = e.after)
+                if (value.equals(e.value))
+                    return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns the value to which the specified key is mapped,
+     * or {@code null} if this map contains no mapping for the key.
+     *
+     * <p>More formally, if this map contains a mapping from a key
+     * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
+     * key.equals(k))}, then this method returns {@code v}; otherwise
+     * it returns {@code null}.  (There can be at most one such mapping.)
+     *
+     * <p>A return value of {@code null} does not <i>necessarily</i>
+     * indicate that the map contains no mapping for the key; it's also
+     * possible that the map explicitly maps the key to {@code null}.
+     * The {@link #containsKey containsKey} operation may be used to
+     * distinguish these two cases.
+     */
+    public V get(Object key) {
+        Entry<K,V> e = (Entry<K,V>)getEntry(key);
+        if (e == null)
+            return null;
+        e.recordAccess(this);
+        return e.value;
+    }
+
+    /**
+     * Removes all of the mappings from this map.
+     * The map will be empty after this call returns.
+     */
+    public void clear() {
+        super.clear();
+        header.before = header.after = header;
+    }
+
+    /**
+     * LinkedHashMap entry.
+     */
+    private static class Entry<K,V> extends HashMap.Entry<K,V> {
+        // These fields comprise the doubly linked list used for iteration.
+        Entry<K,V> before, after;
+
+        Entry(int hash, K key, V value, HashMap.Entry<K,V> next) {
+            super(hash, key, value, next);
+        }
+
+        /**
+         * Removes this entry from the linked list.
+         */
+        private void remove() {
+            before.after = after;
+            after.before = before;
+        }
+
+        /**
+         * Inserts this entry before the specified existing entry in the list.
+         */
+        private void addBefore(Entry<K,V> existingEntry) {
+            after  = existingEntry;
+            before = existingEntry.before;
+            before.after = this;
+            after.before = this;
+        }
+
+        /**
+         * This method is invoked by the superclass whenever the value
+         * of a pre-existing entry is read by Map.get or modified by Map.set.
+         * If the enclosing Map is access-ordered, it moves the entry
+         * to the end of the list; otherwise, it does nothing.
+         */
+        void recordAccess(HashMap<K,V> m) {
+            LinkedHashMap<K,V> lm = (LinkedHashMap<K,V>)m;
+            if (lm.accessOrder) {
+                lm.modCount++;
+                remove();
+                addBefore(lm.header);
+            }
+        }
+
+        void recordRemoval(HashMap<K,V> m) {
+            remove();
+        }
+    }
+
+    private abstract class LinkedHashIterator<T> implements Iterator<T> {
+        Entry<K,V> nextEntry    = header.after;
+        Entry<K,V> lastReturned = null;
+
+        /**
+         * The modCount value that the iterator believes that the backing
+         * List should have.  If this expectation is violated, the iterator
+         * has detected concurrent modification.
+         */
+        int expectedModCount = modCount;
+
+        public boolean hasNext() {
+            return nextEntry != header;
+        }
+
+        public void remove() {
+            if (lastReturned == null)
+                throw new IllegalStateException();
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+
+            LinkedHashMap.this.remove(lastReturned.key);
+            lastReturned = null;
+            expectedModCount = modCount;
+        }
+
+        Entry<K,V> nextEntry() {
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+            if (nextEntry == header)
+                throw new NoSuchElementException();
+
+            Entry<K,V> e = lastReturned = nextEntry;
+            nextEntry = e.after;
+            return e;
+        }
+    }
+
+    private class KeyIterator extends LinkedHashIterator<K> {
+        public K next() { return nextEntry().getKey(); }
+    }
+
+    private class ValueIterator extends LinkedHashIterator<V> {
+        public V next() { return nextEntry().value; }
+    }
+
+    private class EntryIterator extends LinkedHashIterator<Map.Entry<K,V>> {
+        public Map.Entry<K,V> next() { return nextEntry(); }
+    }
+
+    // These Overrides alter the behavior of superclass view iterator() methods
+    Iterator<K> newKeyIterator()   { return new KeyIterator();   }
+    Iterator<V> newValueIterator() { return new ValueIterator(); }
+    Iterator<Map.Entry<K,V>> newEntryIterator() { return new EntryIterator(); }
+
+    /**
+     * This override alters behavior of superclass put method. It causes newly
+     * allocated entry to get inserted at the end of the linked list and
+     * removes the eldest entry if appropriate.
+     */
+    void addEntry(int hash, K key, V value, int bucketIndex) {
+        createEntry(hash, key, value, bucketIndex);
+
+        // Remove eldest entry if instructed, else grow capacity if appropriate
+        Entry<K,V> eldest = header.after;
+        if (removeEldestEntry(eldest)) {
+            removeEntryForKey(eldest.key);
+        } else {
+            if (size >= threshold)
+                resize(2 * table.length);
+        }
+    }
+
+    /**
+     * This override differs from addEntry in that it doesn't resize the
+     * table or remove the eldest entry.
+     */
+    void createEntry(int hash, K key, V value, int bucketIndex) {
+        HashMap.Entry<K,V> old = table[bucketIndex];
+        Entry<K,V> e = new Entry<>(hash, key, value, old);
+        table[bucketIndex] = e;
+        e.addBefore(header);
+        size++;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this map should remove its eldest entry.
+     * This method is invoked by <tt>put</tt> and <tt>putAll</tt> after
+     * inserting a new entry into the map.  It provides the implementor
+     * with the opportunity to remove the eldest entry each time a new one
+     * is added.  This is useful if the map represents a cache: it allows
+     * the map to reduce memory consumption by deleting stale entries.
+     *
+     * <p>Sample use: this override will allow the map to grow up to 100
+     * entries and then delete the eldest entry each time a new entry is
+     * added, maintaining a steady state of 100 entries.
+     * <pre>
+     *     private static final int MAX_ENTRIES = 100;
+     *
+     *     protected boolean removeEldestEntry(Map.Entry eldest) {
+     *        return size() > MAX_ENTRIES;
+     *     }
+     * </pre>
+     *
+     * <p>This method typically does not modify the map in any way,
+     * instead allowing the map to modify itself as directed by its
+     * return value.  It <i>is</i> permitted for this method to modify
+     * the map directly, but if it does so, it <i>must</i> return
+     * <tt>false</tt> (indicating that the map should not attempt any
+     * further modification).  The effects of returning <tt>true</tt>
+     * after modifying the map from within this method are unspecified.
+     *
+     * <p>This implementation merely returns <tt>false</tt> (so that this
+     * map acts like a normal map - the eldest element is never removed).
+     *
+     * @param    eldest The least recently inserted entry in the map, or if
+     *           this is an access-ordered map, the least recently accessed
+     *           entry.  This is the entry that will be removed it this
+     *           method returns <tt>true</tt>.  If the map was empty prior
+     *           to the <tt>put</tt> or <tt>putAll</tt> invocation resulting
+     *           in this invocation, this will be the entry that was just
+     *           inserted; in other words, if the map contains a single
+     *           entry, the eldest entry is also the newest.
+     * @return   <tt>true</tt> if the eldest entry should be removed
+     *           from the map; <tt>false</tt> if it should be retained.
+     */
+    protected boolean removeEldestEntry(Map.Entry<K,V> eldest) {
+        return false;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/LinkedList.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/LinkedList.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1100 @@
+/*
+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * Doubly-linked list implementation of the {@code List} and {@code Deque}
+ * interfaces.  Implements all optional list operations, and permits all
+ * elements (including {@code null}).
+ *
+ * <p>All of the operations perform as could be expected for a doubly-linked
+ * list.  Operations that index into the list will traverse the list from
+ * the beginning or the end, whichever is closer to the specified index.
+ *
+ * <p><strong>Note that this implementation is not synchronized.</strong>
+ * If multiple threads access a linked list concurrently, and at least
+ * one of the threads modifies the list structurally, it <i>must</i> be
+ * synchronized externally.  (A structural modification is any operation
+ * that adds or deletes one or more elements; merely setting the value of
+ * an element is not a structural modification.)  This is typically
+ * accomplished by synchronizing on some object that naturally
+ * encapsulates the list.
+ *
+ * If no such object exists, the list should be "wrapped" using the
+ * {@link Collections#synchronizedList Collections.synchronizedList}
+ * method.  This is best done at creation time, to prevent accidental
+ * unsynchronized access to the list:<pre>
+ *   List list = Collections.synchronizedList(new LinkedList(...));</pre>
+ *
+ * <p>The iterators returned by this class's {@code iterator} and
+ * {@code listIterator} methods are <i>fail-fast</i>: if the list is
+ * structurally modified at any time after the iterator is created, in
+ * any way except through the Iterator's own {@code remove} or
+ * {@code add} methods, the iterator will throw a {@link
+ * ConcurrentModificationException}.  Thus, in the face of concurrent
+ * modification, the iterator fails quickly and cleanly, rather than
+ * risking arbitrary, non-deterministic behavior at an undetermined
+ * time in the future.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness:   <i>the fail-fast behavior of iterators
+ * should be used only to detect bugs.</i>
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch
+ * @see     List
+ * @see     ArrayList
+ * @since 1.2
+ * @param <E> the type of elements held in this collection
+ */
+
+public class LinkedList<E>
+    extends AbstractSequentialList<E>
+    implements List<E>, Deque<E>, Cloneable, java.io.Serializable
+{
+    transient int size = 0;
+
+    /**
+     * Pointer to first node.
+     * Invariant: (first == null && last == null) ||
+     *            (first.prev == null && first.item != null)
+     */
+    transient Node<E> first;
+
+    /**
+     * Pointer to last node.
+     * Invariant: (first == null && last == null) ||
+     *            (last.next == null && last.item != null)
+     */
+    transient Node<E> last;
+
+    /**
+     * Constructs an empty list.
+     */
+    public LinkedList() {
+    }
+
+    /**
+     * Constructs a list containing the elements of the specified
+     * collection, in the order they are returned by the collection's
+     * iterator.
+     *
+     * @param  c the collection whose elements are to be placed into this list
+     * @throws NullPointerException if the specified collection is null
+     */
+    public LinkedList(Collection<? extends E> c) {
+        this();
+        addAll(c);
+    }
+
+    /**
+     * Links e as first element.
+     */
+    private void linkFirst(E e) {
+        final Node<E> f = first;
+        final Node<E> newNode = new Node<>(null, e, f);
+        first = newNode;
+        if (f == null)
+            last = newNode;
+        else
+            f.prev = newNode;
+        size++;
+        modCount++;
+    }
+
+    /**
+     * Links e as last element.
+     */
+    void linkLast(E e) {
+        final Node<E> l = last;
+        final Node<E> newNode = new Node<>(l, e, null);
+        last = newNode;
+        if (l == null)
+            first = newNode;
+        else
+            l.next = newNode;
+        size++;
+        modCount++;
+    }
+
+    /**
+     * Inserts element e before non-null Node succ.
+     */
+    void linkBefore(E e, Node<E> succ) {
+        // assert succ != null;
+        final Node<E> pred = succ.prev;
+        final Node<E> newNode = new Node<>(pred, e, succ);
+        succ.prev = newNode;
+        if (pred == null)
+            first = newNode;
+        else
+            pred.next = newNode;
+        size++;
+        modCount++;
+    }
+
+    /**
+     * Unlinks non-null first node f.
+     */
+    private E unlinkFirst(Node<E> f) {
+        // assert f == first && f != null;
+        final E element = f.item;
+        final Node<E> next = f.next;
+        f.item = null;
+        f.next = null; // help GC
+        first = next;
+        if (next == null)
+            last = null;
+        else
+            next.prev = null;
+        size--;
+        modCount++;
+        return element;
+    }
+
+    /**
+     * Unlinks non-null last node l.
+     */
+    private E unlinkLast(Node<E> l) {
+        // assert l == last && l != null;
+        final E element = l.item;
+        final Node<E> prev = l.prev;
+        l.item = null;
+        l.prev = null; // help GC
+        last = prev;
+        if (prev == null)
+            first = null;
+        else
+            prev.next = null;
+        size--;
+        modCount++;
+        return element;
+    }
+
+    /**
+     * Unlinks non-null node x.
+     */
+    E unlink(Node<E> x) {
+        // assert x != null;
+        final E element = x.item;
+        final Node<E> next = x.next;
+        final Node<E> prev = x.prev;
+
+        if (prev == null) {
+            first = next;
+        } else {
+            prev.next = next;
+            x.prev = null;
+        }
+
+        if (next == null) {
+            last = prev;
+        } else {
+            next.prev = prev;
+            x.next = null;
+        }
+
+        x.item = null;
+        size--;
+        modCount++;
+        return element;
+    }
+
+    /**
+     * Returns the first element in this list.
+     *
+     * @return the first element in this list
+     * @throws NoSuchElementException if this list is empty
+     */
+    public E getFirst() {
+        final Node<E> f = first;
+        if (f == null)
+            throw new NoSuchElementException();
+        return f.item;
+    }
+
+    /**
+     * Returns the last element in this list.
+     *
+     * @return the last element in this list
+     * @throws NoSuchElementException if this list is empty
+     */
+    public E getLast() {
+        final Node<E> l = last;
+        if (l == null)
+            throw new NoSuchElementException();
+        return l.item;
+    }
+
+    /**
+     * Removes and returns the first element from this list.
+     *
+     * @return the first element from this list
+     * @throws NoSuchElementException if this list is empty
+     */
+    public E removeFirst() {
+        final Node<E> f = first;
+        if (f == null)
+            throw new NoSuchElementException();
+        return unlinkFirst(f);
+    }
+
+    /**
+     * Removes and returns the last element from this list.
+     *
+     * @return the last element from this list
+     * @throws NoSuchElementException if this list is empty
+     */
+    public E removeLast() {
+        final Node<E> l = last;
+        if (l == null)
+            throw new NoSuchElementException();
+        return unlinkLast(l);
+    }
+
+    /**
+     * Inserts the specified element at the beginning of this list.
+     *
+     * @param e the element to add
+     */
+    public void addFirst(E e) {
+        linkFirst(e);
+    }
+
+    /**
+     * Appends the specified element to the end of this list.
+     *
+     * <p>This method is equivalent to {@link #add}.
+     *
+     * @param e the element to add
+     */
+    public void addLast(E e) {
+        linkLast(e);
+    }
+
+    /**
+     * Returns {@code true} if this list contains the specified element.
+     * More formally, returns {@code true} if and only if this list contains
+     * at least one element {@code e} such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     *
+     * @param o element whose presence in this list is to be tested
+     * @return {@code true} if this list contains the specified element
+     */
+    public boolean contains(Object o) {
+        return indexOf(o) != -1;
+    }
+
+    /**
+     * Returns the number of elements in this list.
+     *
+     * @return the number of elements in this list
+     */
+    public int size() {
+        return size;
+    }
+
+    /**
+     * Appends the specified element to the end of this list.
+     *
+     * <p>This method is equivalent to {@link #addLast}.
+     *
+     * @param e element to be appended to this list
+     * @return {@code true} (as specified by {@link Collection#add})
+     */
+    public boolean add(E e) {
+        linkLast(e);
+        return true;
+    }
+
+    /**
+     * Removes the first occurrence of the specified element from this list,
+     * if it is present.  If this list does not contain the element, it is
+     * unchanged.  More formally, removes the element with the lowest index
+     * {@code i} such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>
+     * (if such an element exists).  Returns {@code true} if this list
+     * contained the specified element (or equivalently, if this list
+     * changed as a result of the call).
+     *
+     * @param o element to be removed from this list, if present
+     * @return {@code true} if this list contained the specified element
+     */
+    public boolean remove(Object o) {
+        if (o == null) {
+            for (Node<E> x = first; x != null; x = x.next) {
+                if (x.item == null) {
+                    unlink(x);
+                    return true;
+                }
+            }
+        } else {
+            for (Node<E> x = first; x != null; x = x.next) {
+                if (o.equals(x.item)) {
+                    unlink(x);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Appends all of the elements in the specified collection to the end of
+     * this list, in the order that they are returned by the specified
+     * collection's iterator.  The behavior of this operation is undefined if
+     * the specified collection is modified while the operation is in
+     * progress.  (Note that this will occur if the specified collection is
+     * this list, and it's nonempty.)
+     *
+     * @param c collection containing elements to be added to this list
+     * @return {@code true} if this list changed as a result of the call
+     * @throws NullPointerException if the specified collection is null
+     */
+    public boolean addAll(Collection<? extends E> c) {
+        return addAll(size, c);
+    }
+
+    /**
+     * Inserts all of the elements in the specified collection into this
+     * list, starting at the specified position.  Shifts the element
+     * currently at that position (if any) and any subsequent elements to
+     * the right (increases their indices).  The new elements will appear
+     * in the list in the order that they are returned by the
+     * specified collection's iterator.
+     *
+     * @param index index at which to insert the first element
+     *              from the specified collection
+     * @param c collection containing elements to be added to this list
+     * @return {@code true} if this list changed as a result of the call
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @throws NullPointerException if the specified collection is null
+     */
+    public boolean addAll(int index, Collection<? extends E> c) {
+        checkPositionIndex(index);
+
+        Object[] a = c.toArray();
+        int numNew = a.length;
+        if (numNew == 0)
+            return false;
+
+        Node<E> pred, succ;
+        if (index == size) {
+            succ = null;
+            pred = last;
+        } else {
+            succ = node(index);
+            pred = succ.prev;
+        }
+
+        for (Object o : a) {
+            @SuppressWarnings("unchecked") E e = (E) o;
+            Node<E> newNode = new Node<>(pred, e, null);
+            if (pred == null)
+                first = newNode;
+            else
+                pred.next = newNode;
+            pred = newNode;
+        }
+
+        if (succ == null) {
+            last = pred;
+        } else {
+            pred.next = succ;
+            succ.prev = pred;
+        }
+
+        size += numNew;
+        modCount++;
+        return true;
+    }
+
+    /**
+     * Removes all of the elements from this list.
+     * The list will be empty after this call returns.
+     */
+    public void clear() {
+        // Clearing all of the links between nodes is "unnecessary", but:
+        // - helps a generational GC if the discarded nodes inhabit
+        //   more than one generation
+        // - is sure to free memory even if there is a reachable Iterator
+        for (Node<E> x = first; x != null; ) {
+            Node<E> next = x.next;
+            x.item = null;
+            x.next = null;
+            x.prev = null;
+            x = next;
+        }
+        first = last = null;
+        size = 0;
+        modCount++;
+    }
+
+
+    // Positional Access Operations
+
+    /**
+     * Returns the element at the specified position in this list.
+     *
+     * @param index index of the element to return
+     * @return the element at the specified position in this list
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public E get(int index) {
+        checkElementIndex(index);
+        return node(index).item;
+    }
+
+    /**
+     * Replaces the element at the specified position in this list with the
+     * specified element.
+     *
+     * @param index index of the element to replace
+     * @param element element to be stored at the specified position
+     * @return the element previously at the specified position
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public E set(int index, E element) {
+        checkElementIndex(index);
+        Node<E> x = node(index);
+        E oldVal = x.item;
+        x.item = element;
+        return oldVal;
+    }
+
+    /**
+     * Inserts the specified element at the specified position in this list.
+     * Shifts the element currently at that position (if any) and any
+     * subsequent elements to the right (adds one to their indices).
+     *
+     * @param index index at which the specified element is to be inserted
+     * @param element element to be inserted
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public void add(int index, E element) {
+        checkPositionIndex(index);
+
+        if (index == size)
+            linkLast(element);
+        else
+            linkBefore(element, node(index));
+    }
+
+    /**
+     * Removes the element at the specified position in this list.  Shifts any
+     * subsequent elements to the left (subtracts one from their indices).
+     * Returns the element that was removed from the list.
+     *
+     * @param index the index of the element to be removed
+     * @return the element previously at the specified position
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public E remove(int index) {
+        checkElementIndex(index);
+        return unlink(node(index));
+    }
+
+    /**
+     * Tells if the argument is the index of an existing element.
+     */
+    private boolean isElementIndex(int index) {
+        return index >= 0 && index < size;
+    }
+
+    /**
+     * Tells if the argument is the index of a valid position for an
+     * iterator or an add operation.
+     */
+    private boolean isPositionIndex(int index) {
+        return index >= 0 && index <= size;
+    }
+
+    /**
+     * Constructs an IndexOutOfBoundsException detail message.
+     * Of the many possible refactorings of the error handling code,
+     * this "outlining" performs best with both server and client VMs.
+     */
+    private String outOfBoundsMsg(int index) {
+        return "Index: "+index+", Size: "+size;
+    }
+
+    private void checkElementIndex(int index) {
+        if (!isElementIndex(index))
+            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+    }
+
+    private void checkPositionIndex(int index) {
+        if (!isPositionIndex(index))
+            throw new IndexOutOfBoundsException(outOfBoundsMsg(index));
+    }
+
+    /**
+     * Returns the (non-null) Node at the specified element index.
+     */
+    Node<E> node(int index) {
+        // assert isElementIndex(index);
+
+        if (index < (size >> 1)) {
+            Node<E> x = first;
+            for (int i = 0; i < index; i++)
+                x = x.next;
+            return x;
+        } else {
+            Node<E> x = last;
+            for (int i = size - 1; i > index; i--)
+                x = x.prev;
+            return x;
+        }
+    }
+
+    // Search Operations
+
+    /**
+     * Returns the index of the first occurrence of the specified element
+     * in this list, or -1 if this list does not contain the element.
+     * More formally, returns the lowest index {@code i} such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
+     * or -1 if there is no such index.
+     *
+     * @param o element to search for
+     * @return the index of the first occurrence of the specified element in
+     *         this list, or -1 if this list does not contain the element
+     */
+    public int indexOf(Object o) {
+        int index = 0;
+        if (o == null) {
+            for (Node<E> x = first; x != null; x = x.next) {
+                if (x.item == null)
+                    return index;
+                index++;
+            }
+        } else {
+            for (Node<E> x = first; x != null; x = x.next) {
+                if (o.equals(x.item))
+                    return index;
+                index++;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Returns the index of the last occurrence of the specified element
+     * in this list, or -1 if this list does not contain the element.
+     * More formally, returns the highest index {@code i} such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
+     * or -1 if there is no such index.
+     *
+     * @param o element to search for
+     * @return the index of the last occurrence of the specified element in
+     *         this list, or -1 if this list does not contain the element
+     */
+    public int lastIndexOf(Object o) {
+        int index = size;
+        if (o == null) {
+            for (Node<E> x = last; x != null; x = x.prev) {
+                index--;
+                if (x.item == null)
+                    return index;
+            }
+        } else {
+            for (Node<E> x = last; x != null; x = x.prev) {
+                index--;
+                if (o.equals(x.item))
+                    return index;
+            }
+        }
+        return -1;
+    }
+
+    // Queue operations.
+
+    /**
+     * Retrieves, but does not remove, the head (first element) of this list.
+     *
+     * @return the head of this list, or {@code null} if this list is empty
+     * @since 1.5
+     */
+    public E peek() {
+        final Node<E> f = first;
+        return (f == null) ? null : f.item;
+    }
+
+    /**
+     * Retrieves, but does not remove, the head (first element) of this list.
+     *
+     * @return the head of this list
+     * @throws NoSuchElementException if this list is empty
+     * @since 1.5
+     */
+    public E element() {
+        return getFirst();
+    }
+
+    /**
+     * Retrieves and removes the head (first element) of this list.
+     *
+     * @return the head of this list, or {@code null} if this list is empty
+     * @since 1.5
+     */
+    public E poll() {
+        final Node<E> f = first;
+        return (f == null) ? null : unlinkFirst(f);
+    }
+
+    /**
+     * Retrieves and removes the head (first element) of this list.
+     *
+     * @return the head of this list
+     * @throws NoSuchElementException if this list is empty
+     * @since 1.5
+     */
+    public E remove() {
+        return removeFirst();
+    }
+
+    /**
+     * Adds the specified element as the tail (last element) of this list.
+     *
+     * @param e the element to add
+     * @return {@code true} (as specified by {@link Queue#offer})
+     * @since 1.5
+     */
+    public boolean offer(E e) {
+        return add(e);
+    }
+
+    // Deque operations
+    /**
+     * Inserts the specified element at the front of this list.
+     *
+     * @param e the element to insert
+     * @return {@code true} (as specified by {@link Deque#offerFirst})
+     * @since 1.6
+     */
+    public boolean offerFirst(E e) {
+        addFirst(e);
+        return true;
+    }
+
+    /**
+     * Inserts the specified element at the end of this list.
+     *
+     * @param e the element to insert
+     * @return {@code true} (as specified by {@link Deque#offerLast})
+     * @since 1.6
+     */
+    public boolean offerLast(E e) {
+        addLast(e);
+        return true;
+    }
+
+    /**
+     * Retrieves, but does not remove, the first element of this list,
+     * or returns {@code null} if this list is empty.
+     *
+     * @return the first element of this list, or {@code null}
+     *         if this list is empty
+     * @since 1.6
+     */
+    public E peekFirst() {
+        final Node<E> f = first;
+        return (f == null) ? null : f.item;
+     }
+
+    /**
+     * Retrieves, but does not remove, the last element of this list,
+     * or returns {@code null} if this list is empty.
+     *
+     * @return the last element of this list, or {@code null}
+     *         if this list is empty
+     * @since 1.6
+     */
+    public E peekLast() {
+        final Node<E> l = last;
+        return (l == null) ? null : l.item;
+    }
+
+    /**
+     * Retrieves and removes the first element of this list,
+     * or returns {@code null} if this list is empty.
+     *
+     * @return the first element of this list, or {@code null} if
+     *     this list is empty
+     * @since 1.6
+     */
+    public E pollFirst() {
+        final Node<E> f = first;
+        return (f == null) ? null : unlinkFirst(f);
+    }
+
+    /**
+     * Retrieves and removes the last element of this list,
+     * or returns {@code null} if this list is empty.
+     *
+     * @return the last element of this list, or {@code null} if
+     *     this list is empty
+     * @since 1.6
+     */
+    public E pollLast() {
+        final Node<E> l = last;
+        return (l == null) ? null : unlinkLast(l);
+    }
+
+    /**
+     * Pushes an element onto the stack represented by this list.  In other
+     * words, inserts the element at the front of this list.
+     *
+     * <p>This method is equivalent to {@link #addFirst}.
+     *
+     * @param e the element to push
+     * @since 1.6
+     */
+    public void push(E e) {
+        addFirst(e);
+    }
+
+    /**
+     * Pops an element from the stack represented by this list.  In other
+     * words, removes and returns the first element of this list.
+     *
+     * <p>This method is equivalent to {@link #removeFirst()}.
+     *
+     * @return the element at the front of this list (which is the top
+     *         of the stack represented by this list)
+     * @throws NoSuchElementException if this list is empty
+     * @since 1.6
+     */
+    public E pop() {
+        return removeFirst();
+    }
+
+    /**
+     * Removes the first occurrence of the specified element in this
+     * list (when traversing the list from head to tail).  If the list
+     * does not contain the element, it is unchanged.
+     *
+     * @param o element to be removed from this list, if present
+     * @return {@code true} if the list contained the specified element
+     * @since 1.6
+     */
+    public boolean removeFirstOccurrence(Object o) {
+        return remove(o);
+    }
+
+    /**
+     * Removes the last occurrence of the specified element in this
+     * list (when traversing the list from head to tail).  If the list
+     * does not contain the element, it is unchanged.
+     *
+     * @param o element to be removed from this list, if present
+     * @return {@code true} if the list contained the specified element
+     * @since 1.6
+     */
+    public boolean removeLastOccurrence(Object o) {
+        if (o == null) {
+            for (Node<E> x = last; x != null; x = x.prev) {
+                if (x.item == null) {
+                    unlink(x);
+                    return true;
+                }
+            }
+        } else {
+            for (Node<E> x = last; x != null; x = x.prev) {
+                if (o.equals(x.item)) {
+                    unlink(x);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns a list-iterator of the elements in this list (in proper
+     * sequence), starting at the specified position in the list.
+     * Obeys the general contract of {@code List.listIterator(int)}.<p>
+     *
+     * The list-iterator is <i>fail-fast</i>: if the list is structurally
+     * modified at any time after the Iterator is created, in any way except
+     * through the list-iterator's own {@code remove} or {@code add}
+     * methods, the list-iterator will throw a
+     * {@code ConcurrentModificationException}.  Thus, in the face of
+     * concurrent modification, the iterator fails quickly and cleanly, rather
+     * than risking arbitrary, non-deterministic behavior at an undetermined
+     * time in the future.
+     *
+     * @param index index of the first element to be returned from the
+     *              list-iterator (by a call to {@code next})
+     * @return a ListIterator of the elements in this list (in proper
+     *         sequence), starting at the specified position in the list
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @see List#listIterator(int)
+     */
+    public ListIterator<E> listIterator(int index) {
+        checkPositionIndex(index);
+        return new ListItr(index);
+    }
+
+    private class ListItr implements ListIterator<E> {
+        private Node<E> lastReturned = null;
+        private Node<E> next;
+        private int nextIndex;
+        private int expectedModCount = modCount;
+
+        ListItr(int index) {
+            // assert isPositionIndex(index);
+            next = (index == size) ? null : node(index);
+            nextIndex = index;
+        }
+
+        public boolean hasNext() {
+            return nextIndex < size;
+        }
+
+        public E next() {
+            checkForComodification();
+            if (!hasNext())
+                throw new NoSuchElementException();
+
+            lastReturned = next;
+            next = next.next;
+            nextIndex++;
+            return lastReturned.item;
+        }
+
+        public boolean hasPrevious() {
+            return nextIndex > 0;
+        }
+
+        public E previous() {
+            checkForComodification();
+            if (!hasPrevious())
+                throw new NoSuchElementException();
+
+            lastReturned = next = (next == null) ? last : next.prev;
+            nextIndex--;
+            return lastReturned.item;
+        }
+
+        public int nextIndex() {
+            return nextIndex;
+        }
+
+        public int previousIndex() {
+            return nextIndex - 1;
+        }
+
+        public void remove() {
+            checkForComodification();
+            if (lastReturned == null)
+                throw new IllegalStateException();
+
+            Node<E> lastNext = lastReturned.next;
+            unlink(lastReturned);
+            if (next == lastReturned)
+                next = lastNext;
+            else
+                nextIndex--;
+            lastReturned = null;
+            expectedModCount++;
+        }
+
+        public void set(E e) {
+            if (lastReturned == null)
+                throw new IllegalStateException();
+            checkForComodification();
+            lastReturned.item = e;
+        }
+
+        public void add(E e) {
+            checkForComodification();
+            lastReturned = null;
+            if (next == null)
+                linkLast(e);
+            else
+                linkBefore(e, next);
+            nextIndex++;
+            expectedModCount++;
+        }
+
+        final void checkForComodification() {
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+        }
+    }
+
+    private static class Node<E> {
+        E item;
+        Node<E> next;
+        Node<E> prev;
+
+        Node(Node<E> prev, E element, Node<E> next) {
+            this.item = element;
+            this.next = next;
+            this.prev = prev;
+        }
+    }
+
+    /**
+     * @since 1.6
+     */
+    public Iterator<E> descendingIterator() {
+        return new DescendingIterator();
+    }
+
+    /**
+     * Adapter to provide descending iterators via ListItr.previous
+     */
+    private class DescendingIterator implements Iterator<E> {
+        private final ListItr itr = new ListItr(size());
+        public boolean hasNext() {
+            return itr.hasPrevious();
+        }
+        public E next() {
+            return itr.previous();
+        }
+        public void remove() {
+            itr.remove();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private LinkedList<E> superClone() {
+        try {
+            return (LinkedList<E>) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new InternalError();
+        }
+    }
+
+    /**
+     * Returns a shallow copy of this {@code LinkedList}. (The elements
+     * themselves are not cloned.)
+     *
+     * @return a shallow copy of this {@code LinkedList} instance
+     */
+    public Object clone() {
+        LinkedList<E> clone = superClone();
+
+        // Put clone into "virgin" state
+        clone.first = clone.last = null;
+        clone.size = 0;
+        clone.modCount = 0;
+
+        // Initialize clone with our elements
+        for (Node<E> x = first; x != null; x = x.next)
+            clone.add(x.item);
+
+        return clone;
+    }
+
+    /**
+     * Returns an array containing all of the elements in this list
+     * in proper sequence (from first to last element).
+     *
+     * <p>The returned array will be "safe" in that no references to it are
+     * maintained by this list.  (In other words, this method must allocate
+     * a new array).  The caller is thus free to modify the returned array.
+     *
+     * <p>This method acts as bridge between array-based and collection-based
+     * APIs.
+     *
+     * @return an array containing all of the elements in this list
+     *         in proper sequence
+     */
+    public Object[] toArray() {
+        Object[] result = new Object[size];
+        int i = 0;
+        for (Node<E> x = first; x != null; x = x.next)
+            result[i++] = x.item;
+        return result;
+    }
+
+    /**
+     * Returns an array containing all of the elements in this list in
+     * proper sequence (from first to last element); the runtime type of
+     * the returned array is that of the specified array.  If the list fits
+     * in the specified array, it is returned therein.  Otherwise, a new
+     * array is allocated with the runtime type of the specified array and
+     * the size of this list.
+     *
+     * <p>If the list fits in the specified array with room to spare (i.e.,
+     * the array has more elements than the list), the element in the array
+     * immediately following the end of the list is set to {@code null}.
+     * (This is useful in determining the length of the list <i>only</i> if
+     * the caller knows that the list does not contain any null elements.)
+     *
+     * <p>Like the {@link #toArray()} method, this method acts as bridge between
+     * array-based and collection-based APIs.  Further, this method allows
+     * precise control over the runtime type of the output array, and may,
+     * under certain circumstances, be used to save allocation costs.
+     *
+     * <p>Suppose {@code x} is a list known to contain only strings.
+     * The following code can be used to dump the list into a newly
+     * allocated array of {@code String}:
+     *
+     * <pre>
+     *     String[] y = x.toArray(new String[0]);</pre>
+     *
+     * Note that {@code toArray(new Object[0])} is identical in function to
+     * {@code toArray()}.
+     *
+     * @param a the array into which the elements of the list are to
+     *          be stored, if it is big enough; otherwise, a new array of the
+     *          same runtime type is allocated for this purpose.
+     * @return an array containing the elements of the list
+     * @throws ArrayStoreException if the runtime type of the specified array
+     *         is not a supertype of the runtime type of every element in
+     *         this list
+     * @throws NullPointerException if the specified array is null
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T[] toArray(T[] a) {
+        if (a.length < size)
+            a = (T[])java.lang.reflect.Array.newInstance(
+                                a.getClass().getComponentType(), size);
+        int i = 0;
+        Object[] result = a;
+        for (Node<E> x = first; x != null; x = x.next)
+            result[i++] = x.item;
+
+        if (a.length > size)
+            a[size] = null;
+
+        return a;
+    }
+
+    private static final long serialVersionUID = 876323262645176354L;
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/List.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/List.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,600 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * An ordered collection (also known as a <i>sequence</i>).  The user of this
+ * interface has precise control over where in the list each element is
+ * inserted.  The user can access elements by their integer index (position in
+ * the list), and search for elements in the list.<p>
+ *
+ * Unlike sets, lists typically allow duplicate elements.  More formally,
+ * lists typically allow pairs of elements <tt>e1</tt> and <tt>e2</tt>
+ * such that <tt>e1.equals(e2)</tt>, and they typically allow multiple
+ * null elements if they allow null elements at all.  It is not inconceivable
+ * that someone might wish to implement a list that prohibits duplicates, by
+ * throwing runtime exceptions when the user attempts to insert them, but we
+ * expect this usage to be rare.<p>
+ *
+ * The <tt>List</tt> interface places additional stipulations, beyond those
+ * specified in the <tt>Collection</tt> interface, on the contracts of the
+ * <tt>iterator</tt>, <tt>add</tt>, <tt>remove</tt>, <tt>equals</tt>, and
+ * <tt>hashCode</tt> methods.  Declarations for other inherited methods are
+ * also included here for convenience.<p>
+ *
+ * The <tt>List</tt> interface provides four methods for positional (indexed)
+ * access to list elements.  Lists (like Java arrays) are zero based.  Note
+ * that these operations may execute in time proportional to the index value
+ * for some implementations (the <tt>LinkedList</tt> class, for
+ * example). Thus, iterating over the elements in a list is typically
+ * preferable to indexing through it if the caller does not know the
+ * implementation.<p>
+ *
+ * The <tt>List</tt> interface provides a special iterator, called a
+ * <tt>ListIterator</tt>, that allows element insertion and replacement, and
+ * bidirectional access in addition to the normal operations that the
+ * <tt>Iterator</tt> interface provides.  A method is provided to obtain a
+ * list iterator that starts at a specified position in the list.<p>
+ *
+ * The <tt>List</tt> interface provides two methods to search for a specified
+ * object.  From a performance standpoint, these methods should be used with
+ * caution.  In many implementations they will perform costly linear
+ * searches.<p>
+ *
+ * The <tt>List</tt> interface provides two methods to efficiently insert and
+ * remove multiple elements at an arbitrary point in the list.<p>
+ *
+ * Note: While it is permissible for lists to contain themselves as elements,
+ * extreme caution is advised: the <tt>equals</tt> and <tt>hashCode</tt>
+ * methods are no longer well defined on such a list.
+ *
+ * <p>Some list implementations have restrictions on the elements that
+ * they may contain.  For example, some implementations prohibit null elements,
+ * and some have restrictions on the types of their elements.  Attempting to
+ * add an ineligible element throws an unchecked exception, typically
+ * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.  Attempting
+ * to query the presence of an ineligible element may throw an exception,
+ * or it may simply return false; some implementations will exhibit the former
+ * behavior and some will exhibit the latter.  More generally, attempting an
+ * operation on an ineligible element whose completion would not result in
+ * the insertion of an ineligible element into the list may throw an
+ * exception or it may succeed, at the option of the implementation.
+ * Such exceptions are marked as "optional" in the specification for this
+ * interface.
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <E> the type of elements in this list
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see Collection
+ * @see Set
+ * @see ArrayList
+ * @see LinkedList
+ * @see Vector
+ * @see Arrays#asList(Object[])
+ * @see Collections#nCopies(int, Object)
+ * @see Collections#EMPTY_LIST
+ * @see AbstractList
+ * @see AbstractSequentialList
+ * @since 1.2
+ */
+
+public interface List<E> extends Collection<E> {
+    // Query Operations
+
+    /**
+     * Returns the number of elements in this list.  If this list contains
+     * more than <tt>Integer.MAX_VALUE</tt> elements, returns
+     * <tt>Integer.MAX_VALUE</tt>.
+     *
+     * @return the number of elements in this list
+     */
+    int size();
+
+    /**
+     * Returns <tt>true</tt> if this list contains no elements.
+     *
+     * @return <tt>true</tt> if this list contains no elements
+     */
+    boolean isEmpty();
+
+    /**
+     * Returns <tt>true</tt> if this list contains the specified element.
+     * More formally, returns <tt>true</tt> if and only if this list contains
+     * at least one element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     *
+     * @param o element whose presence in this list is to be tested
+     * @return <tt>true</tt> if this list contains the specified element
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this list
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         list does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    boolean contains(Object o);
+
+    /**
+     * Returns an iterator over the elements in this list in proper sequence.
+     *
+     * @return an iterator over the elements in this list in proper sequence
+     */
+    Iterator<E> iterator();
+
+    /**
+     * Returns an array containing all of the elements in this list in proper
+     * sequence (from first to last element).
+     *
+     * <p>The returned array will be "safe" in that no references to it are
+     * maintained by this list.  (In other words, this method must
+     * allocate a new array even if this list is backed by an array).
+     * The caller is thus free to modify the returned array.
+     *
+     * <p>This method acts as bridge between array-based and collection-based
+     * APIs.
+     *
+     * @return an array containing all of the elements in this list in proper
+     *         sequence
+     * @see Arrays#asList(Object[])
+     */
+    Object[] toArray();
+
+    /**
+     * Returns an array containing all of the elements in this list in
+     * proper sequence (from first to last element); the runtime type of
+     * the returned array is that of the specified array.  If the list fits
+     * in the specified array, it is returned therein.  Otherwise, a new
+     * array is allocated with the runtime type of the specified array and
+     * the size of this list.
+     *
+     * <p>If the list fits in the specified array with room to spare (i.e.,
+     * the array has more elements than the list), the element in the array
+     * immediately following the end of the list is set to <tt>null</tt>.
+     * (This is useful in determining the length of the list <i>only</i> if
+     * the caller knows that the list does not contain any null elements.)
+     *
+     * <p>Like the {@link #toArray()} method, this method acts as bridge between
+     * array-based and collection-based APIs.  Further, this method allows
+     * precise control over the runtime type of the output array, and may,
+     * under certain circumstances, be used to save allocation costs.
+     *
+     * <p>Suppose <tt>x</tt> is a list known to contain only strings.
+     * The following code can be used to dump the list into a newly
+     * allocated array of <tt>String</tt>:
+     *
+     * <pre>
+     *     String[] y = x.toArray(new String[0]);</pre>
+     *
+     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
+     * <tt>toArray()</tt>.
+     *
+     * @param a the array into which the elements of this list are to
+     *          be stored, if it is big enough; otherwise, a new array of the
+     *          same runtime type is allocated for this purpose.
+     * @return an array containing the elements of this list
+     * @throws ArrayStoreException if the runtime type of the specified array
+     *         is not a supertype of the runtime type of every element in
+     *         this list
+     * @throws NullPointerException if the specified array is null
+     */
+    <T> T[] toArray(T[] a);
+
+
+    // Modification Operations
+
+    /**
+     * Appends the specified element to the end of this list (optional
+     * operation).
+     *
+     * <p>Lists that support this operation may place limitations on what
+     * elements may be added to this list.  In particular, some
+     * lists will refuse to add null elements, and others will impose
+     * restrictions on the type of elements that may be added.  List
+     * classes should clearly specify in their documentation any restrictions
+     * on what elements may be added.
+     *
+     * @param e element to be appended to this list
+     * @return <tt>true</tt> (as specified by {@link Collection#add})
+     * @throws UnsupportedOperationException if the <tt>add</tt> operation
+     *         is not supported by this list
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this list
+     * @throws NullPointerException if the specified element is null and this
+     *         list does not permit null elements
+     * @throws IllegalArgumentException if some property of this element
+     *         prevents it from being added to this list
+     */
+    boolean add(E e);
+
+    /**
+     * Removes the first occurrence of the specified element from this list,
+     * if it is present (optional operation).  If this list does not contain
+     * the element, it is unchanged.  More formally, removes the element with
+     * the lowest index <tt>i</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>
+     * (if such an element exists).  Returns <tt>true</tt> if this list
+     * contained the specified element (or equivalently, if this list changed
+     * as a result of the call).
+     *
+     * @param o element to be removed from this list, if present
+     * @return <tt>true</tt> if this list contained the specified element
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this list
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         list does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+     *         is not supported by this list
+     */
+    boolean remove(Object o);
+
+
+    // Bulk Modification Operations
+
+    /**
+     * Returns <tt>true</tt> if this list contains all of the elements of the
+     * specified collection.
+     *
+     * @param  c collection to be checked for containment in this list
+     * @return <tt>true</tt> if this list contains all of the elements of the
+     *         specified collection
+     * @throws ClassCastException if the types of one or more elements
+     *         in the specified collection are incompatible with this
+     *         list
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified collection contains one
+     *         or more null elements and this list does not permit null
+     *         elements
+     *         (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see #contains(Object)
+     */
+    boolean containsAll(Collection<?> c);
+
+    /**
+     * Appends all of the elements in the specified collection to the end of
+     * this list, in the order that they are returned by the specified
+     * collection's iterator (optional operation).  The behavior of this
+     * operation is undefined if the specified collection is modified while
+     * the operation is in progress.  (Note that this will occur if the
+     * specified collection is this list, and it's nonempty.)
+     *
+     * @param c collection containing elements to be added to this list
+     * @return <tt>true</tt> if this list changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
+     *         is not supported by this list
+     * @throws ClassCastException if the class of an element of the specified
+     *         collection prevents it from being added to this list
+     * @throws NullPointerException if the specified collection contains one
+     *         or more null elements and this list does not permit null
+     *         elements, or if the specified collection is null
+     * @throws IllegalArgumentException if some property of an element of the
+     *         specified collection prevents it from being added to this list
+     * @see #add(Object)
+     */
+    boolean addAll(Collection<? extends E> c);
+
+    /**
+     * Inserts all of the elements in the specified collection into this
+     * list at the specified position (optional operation).  Shifts the
+     * element currently at that position (if any) and any subsequent
+     * elements to the right (increases their indices).  The new elements
+     * will appear in this list in the order that they are returned by the
+     * specified collection's iterator.  The behavior of this operation is
+     * undefined if the specified collection is modified while the
+     * operation is in progress.  (Note that this will occur if the specified
+     * collection is this list, and it's nonempty.)
+     *
+     * @param index index at which to insert the first element from the
+     *              specified collection
+     * @param c collection containing elements to be added to this list
+     * @return <tt>true</tt> if this list changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
+     *         is not supported by this list
+     * @throws ClassCastException if the class of an element of the specified
+     *         collection prevents it from being added to this list
+     * @throws NullPointerException if the specified collection contains one
+     *         or more null elements and this list does not permit null
+     *         elements, or if the specified collection is null
+     * @throws IllegalArgumentException if some property of an element of the
+     *         specified collection prevents it from being added to this list
+     * @throws IndexOutOfBoundsException if the index is out of range
+     *         (<tt>index &lt; 0 || index &gt; size()</tt>)
+     */
+    boolean addAll(int index, Collection<? extends E> c);
+
+    /**
+     * Removes from this list all of its elements that are contained in the
+     * specified collection (optional operation).
+     *
+     * @param c collection containing elements to be removed from this list
+     * @return <tt>true</tt> if this list changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
+     *         is not supported by this list
+     * @throws ClassCastException if the class of an element of this list
+     *         is incompatible with the specified collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this list contains a null element and the
+     *         specified collection does not permit null elements
+     *         (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see #remove(Object)
+     * @see #contains(Object)
+     */
+    boolean removeAll(Collection<?> c);
+
+    /**
+     * Retains only the elements in this list that are contained in the
+     * specified collection (optional operation).  In other words, removes
+     * from this list all of its elements that are not contained in the
+     * specified collection.
+     *
+     * @param c collection containing elements to be retained in this list
+     * @return <tt>true</tt> if this list changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
+     *         is not supported by this list
+     * @throws ClassCastException if the class of an element of this list
+     *         is incompatible with the specified collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this list contains a null element and the
+     *         specified collection does not permit null elements
+     *         (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see #remove(Object)
+     * @see #contains(Object)
+     */
+    boolean retainAll(Collection<?> c);
+
+    /**
+     * Removes all of the elements from this list (optional operation).
+     * The list will be empty after this call returns.
+     *
+     * @throws UnsupportedOperationException if the <tt>clear</tt> operation
+     *         is not supported by this list
+     */
+    void clear();
+
+
+    // Comparison and hashing
+
+    /**
+     * Compares the specified object with this list for equality.  Returns
+     * <tt>true</tt> if and only if the specified object is also a list, both
+     * lists have the same size, and all corresponding pairs of elements in
+     * the two lists are <i>equal</i>.  (Two elements <tt>e1</tt> and
+     * <tt>e2</tt> are <i>equal</i> if <tt>(e1==null ? e2==null :
+     * e1.equals(e2))</tt>.)  In other words, two lists are defined to be
+     * equal if they contain the same elements in the same order.  This
+     * definition ensures that the equals method works properly across
+     * different implementations of the <tt>List</tt> interface.
+     *
+     * @param o the object to be compared for equality with this list
+     * @return <tt>true</tt> if the specified object is equal to this list
+     */
+    boolean equals(Object o);
+
+    /**
+     * Returns the hash code value for this list.  The hash code of a list
+     * is defined to be the result of the following calculation:
+     * <pre>
+     *  int hashCode = 1;
+     *  for (E e : list)
+     *      hashCode = 31*hashCode + (e==null ? 0 : e.hashCode());
+     * </pre>
+     * This ensures that <tt>list1.equals(list2)</tt> implies that
+     * <tt>list1.hashCode()==list2.hashCode()</tt> for any two lists,
+     * <tt>list1</tt> and <tt>list2</tt>, as required by the general
+     * contract of {@link Object#hashCode}.
+     *
+     * @return the hash code value for this list
+     * @see Object#equals(Object)
+     * @see #equals(Object)
+     */
+    int hashCode();
+
+
+    // Positional Access Operations
+
+    /**
+     * Returns the element at the specified position in this list.
+     *
+     * @param index index of the element to return
+     * @return the element at the specified position in this list
+     * @throws IndexOutOfBoundsException if the index is out of range
+     *         (<tt>index &lt; 0 || index &gt;= size()</tt>)
+     */
+    E get(int index);
+
+    /**
+     * Replaces the element at the specified position in this list with the
+     * specified element (optional operation).
+     *
+     * @param index index of the element to replace
+     * @param element element to be stored at the specified position
+     * @return the element previously at the specified position
+     * @throws UnsupportedOperationException if the <tt>set</tt> operation
+     *         is not supported by this list
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this list
+     * @throws NullPointerException if the specified element is null and
+     *         this list does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this list
+     * @throws IndexOutOfBoundsException if the index is out of range
+     *         (<tt>index &lt; 0 || index &gt;= size()</tt>)
+     */
+    E set(int index, E element);
+
+    /**
+     * Inserts the specified element at the specified position in this list
+     * (optional operation).  Shifts the element currently at that position
+     * (if any) and any subsequent elements to the right (adds one to their
+     * indices).
+     *
+     * @param index index at which the specified element is to be inserted
+     * @param element element to be inserted
+     * @throws UnsupportedOperationException if the <tt>add</tt> operation
+     *         is not supported by this list
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this list
+     * @throws NullPointerException if the specified element is null and
+     *         this list does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified
+     *         element prevents it from being added to this list
+     * @throws IndexOutOfBoundsException if the index is out of range
+     *         (<tt>index &lt; 0 || index &gt; size()</tt>)
+     */
+    void add(int index, E element);
+
+    /**
+     * Removes the element at the specified position in this list (optional
+     * operation).  Shifts any subsequent elements to the left (subtracts one
+     * from their indices).  Returns the element that was removed from the
+     * list.
+     *
+     * @param index the index of the element to be removed
+     * @return the element previously at the specified position
+     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+     *         is not supported by this list
+     * @throws IndexOutOfBoundsException if the index is out of range
+     *         (<tt>index &lt; 0 || index &gt;= size()</tt>)
+     */
+    E remove(int index);
+
+
+    // Search Operations
+
+    /**
+     * Returns the index of the first occurrence of the specified element
+     * in this list, or -1 if this list does not contain the element.
+     * More formally, returns the lowest index <tt>i</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
+     * or -1 if there is no such index.
+     *
+     * @param o element to search for
+     * @return the index of the first occurrence of the specified element in
+     *         this list, or -1 if this list does not contain the element
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this list
+     *         (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         list does not permit null elements
+     *         (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    int indexOf(Object o);
+
+    /**
+     * Returns the index of the last occurrence of the specified element
+     * in this list, or -1 if this list does not contain the element.
+     * More formally, returns the highest index <tt>i</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
+     * or -1 if there is no such index.
+     *
+     * @param o element to search for
+     * @return the index of the last occurrence of the specified element in
+     *         this list, or -1 if this list does not contain the element
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this list
+     *         (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         list does not permit null elements
+     *         (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    int lastIndexOf(Object o);
+
+
+    // List Iterators
+
+    /**
+     * Returns a list iterator over the elements in this list (in proper
+     * sequence).
+     *
+     * @return a list iterator over the elements in this list (in proper
+     *         sequence)
+     */
+    ListIterator<E> listIterator();
+
+    /**
+     * Returns a list iterator over the elements in this list (in proper
+     * sequence), starting at the specified position in the list.
+     * The specified index indicates the first element that would be
+     * returned by an initial call to {@link ListIterator#next next}.
+     * An initial call to {@link ListIterator#previous previous} would
+     * return the element with the specified index minus one.
+     *
+     * @param index index of the first element to be returned from the
+     *        list iterator (by a call to {@link ListIterator#next next})
+     * @return a list iterator over the elements in this list (in proper
+     *         sequence), starting at the specified position in the list
+     * @throws IndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index > size()})
+     */
+    ListIterator<E> listIterator(int index);
+
+    // View
+
+    /**
+     * Returns a view of the portion of this list between the specified
+     * <tt>fromIndex</tt>, inclusive, and <tt>toIndex</tt>, exclusive.  (If
+     * <tt>fromIndex</tt> and <tt>toIndex</tt> are equal, the returned list is
+     * empty.)  The returned list is backed by this list, so non-structural
+     * changes in the returned list are reflected in this list, and vice-versa.
+     * The returned list supports all of the optional list operations supported
+     * by this list.<p>
+     *
+     * This method eliminates the need for explicit range operations (of
+     * the sort that commonly exist for arrays).  Any operation that expects
+     * a list can be used as a range operation by passing a subList view
+     * instead of a whole list.  For example, the following idiom
+     * removes a range of elements from a list:
+     * <pre>
+     *      list.subList(from, to).clear();
+     * </pre>
+     * Similar idioms may be constructed for <tt>indexOf</tt> and
+     * <tt>lastIndexOf</tt>, and all of the algorithms in the
+     * <tt>Collections</tt> class can be applied to a subList.<p>
+     *
+     * The semantics of the list returned by this method become undefined if
+     * the backing list (i.e., this list) is <i>structurally modified</i> in
+     * any way other than via the returned list.  (Structural modifications are
+     * those that change the size of this list, or otherwise perturb it in such
+     * a fashion that iterations in progress may yield incorrect results.)
+     *
+     * @param fromIndex low endpoint (inclusive) of the subList
+     * @param toIndex high endpoint (exclusive) of the subList
+     * @return a view of the specified range within this list
+     * @throws IndexOutOfBoundsException for an illegal endpoint index value
+     *         (<tt>fromIndex &lt; 0 || toIndex &gt; size ||
+     *         fromIndex &gt; toIndex</tt>)
+     */
+    List<E> subList(int fromIndex, int toIndex);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/ListIterator.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/ListIterator.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * An iterator for lists that allows the programmer
+ * to traverse the list in either direction, modify
+ * the list during iteration, and obtain the iterator's
+ * current position in the list. A {@code ListIterator}
+ * has no current element; its <I>cursor position</I> always
+ * lies between the element that would be returned by a call
+ * to {@code previous()} and the element that would be
+ * returned by a call to {@code next()}.
+ * An iterator for a list of length {@code n} has {@code n+1} possible
+ * cursor positions, as illustrated by the carets ({@code ^}) below:
+ * <PRE>
+ *                      Element(0)   Element(1)   Element(2)   ... Element(n-1)
+ * cursor positions:  ^            ^            ^            ^                  ^
+ * </PRE>
+ * Note that the {@link #remove} and {@link #set(Object)} methods are
+ * <i>not</i> defined in terms of the cursor position;  they are defined to
+ * operate on the last element returned by a call to {@link #next} or
+ * {@link #previous()}.
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch
+ * @see Collection
+ * @see List
+ * @see Iterator
+ * @see Enumeration
+ * @see List#listIterator()
+ * @since   1.2
+ */
+public interface ListIterator<E> extends Iterator<E> {
+    // Query Operations
+
+    /**
+     * Returns {@code true} if this list iterator has more elements when
+     * traversing the list in the forward direction. (In other words,
+     * returns {@code true} if {@link #next} would return an element rather
+     * than throwing an exception.)
+     *
+     * @return {@code true} if the list iterator has more elements when
+     *         traversing the list in the forward direction
+     */
+    boolean hasNext();
+
+    /**
+     * Returns the next element in the list and advances the cursor position.
+     * This method may be called repeatedly to iterate through the list,
+     * or intermixed with calls to {@link #previous} to go back and forth.
+     * (Note that alternating calls to {@code next} and {@code previous}
+     * will return the same element repeatedly.)
+     *
+     * @return the next element in the list
+     * @throws NoSuchElementException if the iteration has no next element
+     */
+    E next();
+
+    /**
+     * Returns {@code true} if this list iterator has more elements when
+     * traversing the list in the reverse direction.  (In other words,
+     * returns {@code true} if {@link #previous} would return an element
+     * rather than throwing an exception.)
+     *
+     * @return {@code true} if the list iterator has more elements when
+     *         traversing the list in the reverse direction
+     */
+    boolean hasPrevious();
+
+    /**
+     * Returns the previous element in the list and moves the cursor
+     * position backwards.  This method may be called repeatedly to
+     * iterate through the list backwards, or intermixed with calls to
+     * {@link #next} to go back and forth.  (Note that alternating calls
+     * to {@code next} and {@code previous} will return the same
+     * element repeatedly.)
+     *
+     * @return the previous element in the list
+     * @throws NoSuchElementException if the iteration has no previous
+     *         element
+     */
+    E previous();
+
+    /**
+     * Returns the index of the element that would be returned by a
+     * subsequent call to {@link #next}. (Returns list size if the list
+     * iterator is at the end of the list.)
+     *
+     * @return the index of the element that would be returned by a
+     *         subsequent call to {@code next}, or list size if the list
+     *         iterator is at the end of the list
+     */
+    int nextIndex();
+
+    /**
+     * Returns the index of the element that would be returned by a
+     * subsequent call to {@link #previous}. (Returns -1 if the list
+     * iterator is at the beginning of the list.)
+     *
+     * @return the index of the element that would be returned by a
+     *         subsequent call to {@code previous}, or -1 if the list
+     *         iterator is at the beginning of the list
+     */
+    int previousIndex();
+
+
+    // Modification Operations
+
+    /**
+     * Removes from the list the last element that was returned by {@link
+     * #next} or {@link #previous} (optional operation).  This call can
+     * only be made once per call to {@code next} or {@code previous}.
+     * It can be made only if {@link #add} has not been
+     * called after the last call to {@code next} or {@code previous}.
+     *
+     * @throws UnsupportedOperationException if the {@code remove}
+     *         operation is not supported by this list iterator
+     * @throws IllegalStateException if neither {@code next} nor
+     *         {@code previous} have been called, or {@code remove} or
+     *         {@code add} have been called after the last call to
+     *         {@code next} or {@code previous}
+     */
+    void remove();
+
+    /**
+     * Replaces the last element returned by {@link #next} or
+     * {@link #previous} with the specified element (optional operation).
+     * This call can be made only if neither {@link #remove} nor {@link
+     * #add} have been called after the last call to {@code next} or
+     * {@code previous}.
+     *
+     * @param e the element with which to replace the last element returned by
+     *          {@code next} or {@code previous}
+     * @throws UnsupportedOperationException if the {@code set} operation
+     *         is not supported by this list iterator
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this list
+     * @throws IllegalArgumentException if some aspect of the specified
+     *         element prevents it from being added to this list
+     * @throws IllegalStateException if neither {@code next} nor
+     *         {@code previous} have been called, or {@code remove} or
+     *         {@code add} have been called after the last call to
+     *         {@code next} or {@code previous}
+     */
+    void set(E e);
+
+    /**
+     * Inserts the specified element into the list (optional operation).
+     * The element is inserted immediately before the element that
+     * would be returned by {@link #next}, if any, and after the element
+     * that would be returned by {@link #previous}, if any.  (If the
+     * list contains no elements, the new element becomes the sole element
+     * on the list.)  The new element is inserted before the implicit
+     * cursor: a subsequent call to {@code next} would be unaffected, and a
+     * subsequent call to {@code previous} would return the new element.
+     * (This call increases by one the value that would be returned by a
+     * call to {@code nextIndex} or {@code previousIndex}.)
+     *
+     * @param e the element to insert
+     * @throws UnsupportedOperationException if the {@code add} method is
+     *         not supported by this list iterator
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this list
+     * @throws IllegalArgumentException if some aspect of this element
+     *         prevents it from being added to this list
+     */
+    void add(E e);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Map.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Map.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,478 @@
+/*
+ * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * An object that maps keys to values.  A map cannot contain duplicate keys;
+ * each key can map to at most one value.
+ *
+ * <p>This interface takes the place of the <tt>Dictionary</tt> class, which
+ * was a totally abstract class rather than an interface.
+ *
+ * <p>The <tt>Map</tt> interface provides three <i>collection views</i>, which
+ * allow a map's contents to be viewed as a set of keys, collection of values,
+ * or set of key-value mappings.  The <i>order</i> of a map is defined as
+ * the order in which the iterators on the map's collection views return their
+ * elements.  Some map implementations, like the <tt>TreeMap</tt> class, make
+ * specific guarantees as to their order; others, like the <tt>HashMap</tt>
+ * class, do not.
+ *
+ * <p>Note: great care must be exercised if mutable objects are used as map
+ * keys.  The behavior of a map is not specified if the value of an object is
+ * changed in a manner that affects <tt>equals</tt> comparisons while the
+ * object is a key in the map.  A special case of this prohibition is that it
+ * is not permissible for a map to contain itself as a key.  While it is
+ * permissible for a map to contain itself as a value, extreme caution is
+ * advised: the <tt>equals</tt> and <tt>hashCode</tt> methods are no longer
+ * well defined on such a map.
+ *
+ * <p>All general-purpose map implementation classes should provide two
+ * "standard" constructors: a void (no arguments) constructor which creates an
+ * empty map, and a constructor with a single argument of type <tt>Map</tt>,
+ * which creates a new map with the same key-value mappings as its argument.
+ * In effect, the latter constructor allows the user to copy any map,
+ * producing an equivalent map of the desired class.  There is no way to
+ * enforce this recommendation (as interfaces cannot contain constructors) but
+ * all of the general-purpose map implementations in the JDK comply.
+ *
+ * <p>The "destructive" methods contained in this interface, that is, the
+ * methods that modify the map on which they operate, are specified to throw
+ * <tt>UnsupportedOperationException</tt> if this map does not support the
+ * operation.  If this is the case, these methods may, but are not required
+ * to, throw an <tt>UnsupportedOperationException</tt> if the invocation would
+ * have no effect on the map.  For example, invoking the {@link #putAll(Map)}
+ * method on an unmodifiable map may, but is not required to, throw the
+ * exception if the map whose mappings are to be "superimposed" is empty.
+ *
+ * <p>Some map implementations have restrictions on the keys and values they
+ * may contain.  For example, some implementations prohibit null keys and
+ * values, and some have restrictions on the types of their keys.  Attempting
+ * to insert an ineligible key or value throws an unchecked exception,
+ * typically <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.
+ * Attempting to query the presence of an ineligible key or value may throw an
+ * exception, or it may simply return false; some implementations will exhibit
+ * the former behavior and some will exhibit the latter.  More generally,
+ * attempting an operation on an ineligible key or value whose completion
+ * would not result in the insertion of an ineligible element into the map may
+ * throw an exception or it may succeed, at the option of the implementation.
+ * Such exceptions are marked as "optional" in the specification for this
+ * interface.
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * <p>Many methods in Collections Framework interfaces are defined
+ * in terms of the {@link Object#equals(Object) equals} method.  For
+ * example, the specification for the {@link #containsKey(Object)
+ * containsKey(Object key)} method says: "returns <tt>true</tt> if and
+ * only if this map contains a mapping for a key <tt>k</tt> such that
+ * <tt>(key==null ? k==null : key.equals(k))</tt>." This specification should
+ * <i>not</i> be construed to imply that invoking <tt>Map.containsKey</tt>
+ * with a non-null argument <tt>key</tt> will cause <tt>key.equals(k)</tt> to
+ * be invoked for any key <tt>k</tt>.  Implementations are free to
+ * implement optimizations whereby the <tt>equals</tt> invocation is avoided,
+ * for example, by first comparing the hash codes of the two keys.  (The
+ * {@link Object#hashCode()} specification guarantees that two objects with
+ * unequal hash codes cannot be equal.)  More generally, implementations of
+ * the various Collections Framework interfaces are free to take advantage of
+ * the specified behavior of underlying {@link Object} methods wherever the
+ * implementor deems it appropriate.
+ *
+ * @param <K> the type of keys maintained by this map
+ * @param <V> the type of mapped values
+ *
+ * @author  Josh Bloch
+ * @see HashMap
+ * @see TreeMap
+ * @see Hashtable
+ * @see SortedMap
+ * @see Collection
+ * @see Set
+ * @since 1.2
+ */
+public interface Map<K,V> {
+    // Query Operations
+
+    /**
+     * Returns the number of key-value mappings in this map.  If the
+     * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
+     * <tt>Integer.MAX_VALUE</tt>.
+     *
+     * @return the number of key-value mappings in this map
+     */
+    int size();
+
+    /**
+     * Returns <tt>true</tt> if this map contains no key-value mappings.
+     *
+     * @return <tt>true</tt> if this map contains no key-value mappings
+     */
+    boolean isEmpty();
+
+    /**
+     * Returns <tt>true</tt> if this map contains a mapping for the specified
+     * key.  More formally, returns <tt>true</tt> if and only if
+     * this map contains a mapping for a key <tt>k</tt> such that
+     * <tt>(key==null ? k==null : key.equals(k))</tt>.  (There can be
+     * at most one such mapping.)
+     *
+     * @param key key whose presence in this map is to be tested
+     * @return <tt>true</tt> if this map contains a mapping for the specified
+     *         key
+     * @throws ClassCastException if the key is of an inappropriate type for
+     *         this map
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified key is null and this map
+     *         does not permit null keys
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    boolean containsKey(Object key);
+
+    /**
+     * Returns <tt>true</tt> if this map maps one or more keys to the
+     * specified value.  More formally, returns <tt>true</tt> if and only if
+     * this map contains at least one mapping to a value <tt>v</tt> such that
+     * <tt>(value==null ? v==null : value.equals(v))</tt>.  This operation
+     * will probably require time linear in the map size for most
+     * implementations of the <tt>Map</tt> interface.
+     *
+     * @param value value whose presence in this map is to be tested
+     * @return <tt>true</tt> if this map maps one or more keys to the
+     *         specified value
+     * @throws ClassCastException if the value is of an inappropriate type for
+     *         this map
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified value is null and this
+     *         map does not permit null values
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    boolean containsValue(Object value);
+
+    /**
+     * Returns the value to which the specified key is mapped,
+     * or {@code null} if this map contains no mapping for the key.
+     *
+     * <p>More formally, if this map contains a mapping from a key
+     * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
+     * key.equals(k))}, then this method returns {@code v}; otherwise
+     * it returns {@code null}.  (There can be at most one such mapping.)
+     *
+     * <p>If this map permits null values, then a return value of
+     * {@code null} does not <i>necessarily</i> indicate that the map
+     * contains no mapping for the key; it's also possible that the map
+     * explicitly maps the key to {@code null}.  The {@link #containsKey
+     * containsKey} operation may be used to distinguish these two cases.
+     *
+     * @param key the key whose associated value is to be returned
+     * @return the value to which the specified key is mapped, or
+     *         {@code null} if this map contains no mapping for the key
+     * @throws ClassCastException if the key is of an inappropriate type for
+     *         this map
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified key is null and this map
+     *         does not permit null keys
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    V get(Object key);
+
+    // Modification Operations
+
+    /**
+     * Associates the specified value with the specified key in this map
+     * (optional operation).  If the map previously contained a mapping for
+     * the key, the old value is replaced by the specified value.  (A map
+     * <tt>m</tt> is said to contain a mapping for a key <tt>k</tt> if and only
+     * if {@link #containsKey(Object) m.containsKey(k)} would return
+     * <tt>true</tt>.)
+     *
+     * @param key key with which the specified value is to be associated
+     * @param value value to be associated with the specified key
+     * @return the previous value associated with <tt>key</tt>, or
+     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     *         (A <tt>null</tt> return can also indicate that the map
+     *         previously associated <tt>null</tt> with <tt>key</tt>,
+     *         if the implementation supports <tt>null</tt> values.)
+     * @throws UnsupportedOperationException if the <tt>put</tt> operation
+     *         is not supported by this map
+     * @throws ClassCastException if the class of the specified key or value
+     *         prevents it from being stored in this map
+     * @throws NullPointerException if the specified key or value is null
+     *         and this map does not permit null keys or values
+     * @throws IllegalArgumentException if some property of the specified key
+     *         or value prevents it from being stored in this map
+     */
+    V put(K key, V value);
+
+    /**
+     * Removes the mapping for a key from this map if it is present
+     * (optional operation).   More formally, if this map contains a mapping
+     * from key <tt>k</tt> to value <tt>v</tt> such that
+     * <code>(key==null ?  k==null : key.equals(k))</code>, that mapping
+     * is removed.  (The map can contain at most one such mapping.)
+     *
+     * <p>Returns the value to which this map previously associated the key,
+     * or <tt>null</tt> if the map contained no mapping for the key.
+     *
+     * <p>If this map permits null values, then a return value of
+     * <tt>null</tt> does not <i>necessarily</i> indicate that the map
+     * contained no mapping for the key; it's also possible that the map
+     * explicitly mapped the key to <tt>null</tt>.
+     *
+     * <p>The map will not contain a mapping for the specified key once the
+     * call returns.
+     *
+     * @param key key whose mapping is to be removed from the map
+     * @return the previous value associated with <tt>key</tt>, or
+     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+     *         is not supported by this map
+     * @throws ClassCastException if the key is of an inappropriate type for
+     *         this map
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified key is null and this
+     *         map does not permit null keys
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    V remove(Object key);
+
+
+    // Bulk Operations
+
+    /**
+     * Copies all of the mappings from the specified map to this map
+     * (optional operation).  The effect of this call is equivalent to that
+     * of calling {@link #put(Object,Object) put(k, v)} on this map once
+     * for each mapping from key <tt>k</tt> to value <tt>v</tt> in the
+     * specified map.  The behavior of this operation is undefined if the
+     * specified map is modified while the operation is in progress.
+     *
+     * @param m mappings to be stored in this map
+     * @throws UnsupportedOperationException if the <tt>putAll</tt> operation
+     *         is not supported by this map
+     * @throws ClassCastException if the class of a key or value in the
+     *         specified map prevents it from being stored in this map
+     * @throws NullPointerException if the specified map is null, or if
+     *         this map does not permit null keys or values, and the
+     *         specified map contains null keys or values
+     * @throws IllegalArgumentException if some property of a key or value in
+     *         the specified map prevents it from being stored in this map
+     */
+    void putAll(Map<? extends K, ? extends V> m);
+
+    /**
+     * Removes all of the mappings from this map (optional operation).
+     * The map will be empty after this call returns.
+     *
+     * @throws UnsupportedOperationException if the <tt>clear</tt> operation
+     *         is not supported by this map
+     */
+    void clear();
+
+
+    // Views
+
+    /**
+     * Returns a {@link Set} view of the keys contained in this map.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own <tt>remove</tt> operation), the results of
+     * the iteration are undefined.  The set supports element removal,
+     * which removes the corresponding mapping from the map, via the
+     * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+     * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+     * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
+     * operations.
+     *
+     * @return a set view of the keys contained in this map
+     */
+    Set<K> keySet();
+
+    /**
+     * Returns a {@link Collection} view of the values contained in this map.
+     * The collection is backed by the map, so changes to the map are
+     * reflected in the collection, and vice-versa.  If the map is
+     * modified while an iteration over the collection is in progress
+     * (except through the iterator's own <tt>remove</tt> operation),
+     * the results of the iteration are undefined.  The collection
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
+     * <tt>retainAll</tt> and <tt>clear</tt> operations.  It does not
+     * support the <tt>add</tt> or <tt>addAll</tt> operations.
+     *
+     * @return a collection view of the values contained in this map
+     */
+    Collection<V> values();
+
+    /**
+     * Returns a {@link Set} view of the mappings contained in this map.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own <tt>remove</tt> operation, or through the
+     * <tt>setValue</tt> operation on a map entry returned by the
+     * iterator) the results of the iteration are undefined.  The set
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
+     * <tt>clear</tt> operations.  It does not support the
+     * <tt>add</tt> or <tt>addAll</tt> operations.
+     *
+     * @return a set view of the mappings contained in this map
+     */
+    Set<Map.Entry<K, V>> entrySet();
+
+    /**
+     * A map entry (key-value pair).  The <tt>Map.entrySet</tt> method returns
+     * a collection-view of the map, whose elements are of this class.  The
+     * <i>only</i> way to obtain a reference to a map entry is from the
+     * iterator of this collection-view.  These <tt>Map.Entry</tt> objects are
+     * valid <i>only</i> for the duration of the iteration; more formally,
+     * the behavior of a map entry is undefined if the backing map has been
+     * modified after the entry was returned by the iterator, except through
+     * the <tt>setValue</tt> operation on the map entry.
+     *
+     * @see Map#entrySet()
+     * @since 1.2
+     */
+    interface Entry<K,V> {
+        /**
+         * Returns the key corresponding to this entry.
+         *
+         * @return the key corresponding to this entry
+         * @throws IllegalStateException implementations may, but are not
+         *         required to, throw this exception if the entry has been
+         *         removed from the backing map.
+         */
+        K getKey();
+
+        /**
+         * Returns the value corresponding to this entry.  If the mapping
+         * has been removed from the backing map (by the iterator's
+         * <tt>remove</tt> operation), the results of this call are undefined.
+         *
+         * @return the value corresponding to this entry
+         * @throws IllegalStateException implementations may, but are not
+         *         required to, throw this exception if the entry has been
+         *         removed from the backing map.
+         */
+        V getValue();
+
+        /**
+         * Replaces the value corresponding to this entry with the specified
+         * value (optional operation).  (Writes through to the map.)  The
+         * behavior of this call is undefined if the mapping has already been
+         * removed from the map (by the iterator's <tt>remove</tt> operation).
+         *
+         * @param value new value to be stored in this entry
+         * @return old value corresponding to the entry
+         * @throws UnsupportedOperationException if the <tt>put</tt> operation
+         *         is not supported by the backing map
+         * @throws ClassCastException if the class of the specified value
+         *         prevents it from being stored in the backing map
+         * @throws NullPointerException if the backing map does not permit
+         *         null values, and the specified value is null
+         * @throws IllegalArgumentException if some property of this value
+         *         prevents it from being stored in the backing map
+         * @throws IllegalStateException implementations may, but are not
+         *         required to, throw this exception if the entry has been
+         *         removed from the backing map.
+         */
+        V setValue(V value);
+
+        /**
+         * Compares the specified object with this entry for equality.
+         * Returns <tt>true</tt> if the given object is also a map entry and
+         * the two entries represent the same mapping.  More formally, two
+         * entries <tt>e1</tt> and <tt>e2</tt> represent the same mapping
+         * if<pre>
+         *     (e1.getKey()==null ?
+         *      e2.getKey()==null : e1.getKey().equals(e2.getKey()))  &amp;&amp;
+         *     (e1.getValue()==null ?
+         *      e2.getValue()==null : e1.getValue().equals(e2.getValue()))
+         * </pre>
+         * This ensures that the <tt>equals</tt> method works properly across
+         * different implementations of the <tt>Map.Entry</tt> interface.
+         *
+         * @param o object to be compared for equality with this map entry
+         * @return <tt>true</tt> if the specified object is equal to this map
+         *         entry
+         */
+        boolean equals(Object o);
+
+        /**
+         * Returns the hash code value for this map entry.  The hash code
+         * of a map entry <tt>e</tt> is defined to be: <pre>
+         *     (e.getKey()==null   ? 0 : e.getKey().hashCode()) ^
+         *     (e.getValue()==null ? 0 : e.getValue().hashCode())
+         * </pre>
+         * This ensures that <tt>e1.equals(e2)</tt> implies that
+         * <tt>e1.hashCode()==e2.hashCode()</tt> for any two Entries
+         * <tt>e1</tt> and <tt>e2</tt>, as required by the general
+         * contract of <tt>Object.hashCode</tt>.
+         *
+         * @return the hash code value for this map entry
+         * @see Object#hashCode()
+         * @see Object#equals(Object)
+         * @see #equals(Object)
+         */
+        int hashCode();
+    }
+
+    // Comparison and hashing
+
+    /**
+     * Compares the specified object with this map for equality.  Returns
+     * <tt>true</tt> if the given object is also a map and the two maps
+     * represent the same mappings.  More formally, two maps <tt>m1</tt> and
+     * <tt>m2</tt> represent the same mappings if
+     * <tt>m1.entrySet().equals(m2.entrySet())</tt>.  This ensures that the
+     * <tt>equals</tt> method works properly across different implementations
+     * of the <tt>Map</tt> interface.
+     *
+     * @param o object to be compared for equality with this map
+     * @return <tt>true</tt> if the specified object is equal to this map
+     */
+    boolean equals(Object o);
+
+    /**
+     * Returns the hash code value for this map.  The hash code of a map is
+     * defined to be the sum of the hash codes of each entry in the map's
+     * <tt>entrySet()</tt> view.  This ensures that <tt>m1.equals(m2)</tt>
+     * implies that <tt>m1.hashCode()==m2.hashCode()</tt> for any two maps
+     * <tt>m1</tt> and <tt>m2</tt>, as required by the general contract of
+     * {@link Object#hashCode}.
+     *
+     * @return the hash code value for this map
+     * @see Map.Entry#hashCode()
+     * @see Object#equals(Object)
+     * @see #equals(Object)
+     */
+    int hashCode();
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Objects.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Objects.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * This class consists of {@code static} utility methods for operating
+ * on objects.  These utilities include {@code null}-safe or {@code
+ * null}-tolerant methods for computing the hash code of an object,
+ * returning a string for an object, and comparing two objects.
+ *
+ * @since 1.7
+ */
+public final class Objects {
+    private Objects() {
+        throw new AssertionError("No java.util.Objects instances for you!");
+    }
+
+    /**
+     * Returns {@code true} if the arguments are equal to each other
+     * and {@code false} otherwise.
+     * Consequently, if both arguments are {@code null}, {@code true}
+     * is returned and if exactly one argument is {@code null}, {@code
+     * false} is returned.  Otherwise, equality is determined by using
+     * the {@link Object#equals equals} method of the first
+     * argument.
+     *
+     * @param a an object
+     * @param b an object to be compared with {@code a} for equality
+     * @return {@code true} if the arguments are equal to each other
+     * and {@code false} otherwise
+     * @see Object#equals(Object)
+     */
+    public static boolean equals(Object a, Object b) {
+        return (a == b) || (a != null && a.equals(b));
+    }
+
+   /**
+    * Returns {@code true} if the arguments are deeply equal to each other
+    * and {@code false} otherwise.
+    *
+    * Two {@code null} values are deeply equal.  If both arguments are
+    * arrays, the algorithm in {@link Arrays#deepEquals(Object[],
+    * Object[]) Arrays.deepEquals} is used to determine equality.
+    * Otherwise, equality is determined by using the {@link
+    * Object#equals equals} method of the first argument.
+    *
+    * @param a an object
+    * @param b an object to be compared with {@code a} for deep equality
+    * @return {@code true} if the arguments are deeply equal to each other
+    * and {@code false} otherwise
+    * @see Arrays#deepEquals(Object[], Object[])
+    * @see Objects#equals(Object, Object)
+    */
+    public static boolean deepEquals(Object a, Object b) {
+        if (a == b)
+            return true;
+        else if (a == null || b == null)
+            return false;
+        else
+            return Arrays.deepEquals0(a, b);
+    }
+
+    /**
+     * Returns the hash code of a non-{@code null} argument and 0 for
+     * a {@code null} argument.
+     *
+     * @param o an object
+     * @return the hash code of a non-{@code null} argument and 0 for
+     * a {@code null} argument
+     * @see Object#hashCode
+     */
+    public static int hashCode(Object o) {
+        return o != null ? o.hashCode() : 0;
+    }
+
+   /**
+    * Generates a hash code for a sequence of input values. The hash
+    * code is generated as if all the input values were placed into an
+    * array, and that array were hashed by calling {@link
+    * Arrays#hashCode(Object[])}.
+    *
+    * <p>This method is useful for implementing {@link
+    * Object#hashCode()} on objects containing multiple fields. For
+    * example, if an object that has three fields, {@code x}, {@code
+    * y}, and {@code z}, one could write:
+    *
+    * <blockquote><pre>
+    * &#064;Override public int hashCode() {
+    *     return Objects.hash(x, y, z);
+    * }
+    * </pre></blockquote>
+    *
+    * <b>Warning: When a single object reference is supplied, the returned
+    * value does not equal the hash code of that object reference.</b> This
+    * value can be computed by calling {@link #hashCode(Object)}.
+    *
+    * @param values the values to be hashed
+    * @return a hash value of the sequence of input values
+    * @see Arrays#hashCode(Object[])
+    * @see List#hashCode
+    */
+    public static int hash(Object... values) {
+        return Arrays.hashCode(values);
+    }
+
+    /**
+     * Returns the result of calling {@code toString} for a non-{@code
+     * null} argument and {@code "null"} for a {@code null} argument.
+     *
+     * @param o an object
+     * @return the result of calling {@code toString} for a non-{@code
+     * null} argument and {@code "null"} for a {@code null} argument
+     * @see Object#toString
+     * @see String#valueOf(Object)
+     */
+    public static String toString(Object o) {
+        return String.valueOf(o);
+    }
+
+    /**
+     * Returns the result of calling {@code toString} on the first
+     * argument if the first argument is not {@code null} and returns
+     * the second argument otherwise.
+     *
+     * @param o an object
+     * @param nullDefault string to return if the first argument is
+     *        {@code null}
+     * @return the result of calling {@code toString} on the first
+     * argument if it is not {@code null} and the second argument
+     * otherwise.
+     * @see Objects#toString(Object)
+     */
+    public static String toString(Object o, String nullDefault) {
+        return (o != null) ? o.toString() : nullDefault;
+    }
+
+    /**
+     * Returns 0 if the arguments are identical and {@code
+     * c.compare(a, b)} otherwise.
+     * Consequently, if both arguments are {@code null} 0
+     * is returned.
+     *
+     * <p>Note that if one of the arguments is {@code null}, a {@code
+     * NullPointerException} may or may not be thrown depending on
+     * what ordering policy, if any, the {@link Comparator Comparator}
+     * chooses to have for {@code null} values.
+     *
+     * @param <T> the type of the objects being compared
+     * @param a an object
+     * @param b an object to be compared with {@code a}
+     * @param c the {@code Comparator} to compare the first two arguments
+     * @return 0 if the arguments are identical and {@code
+     * c.compare(a, b)} otherwise.
+     * @see Comparable
+     * @see Comparator
+     */
+    public static <T> int compare(T a, T b, Comparator<? super T> c) {
+        return (a == b) ? 0 :  c.compare(a, b);
+    }
+
+    /**
+     * Checks that the specified object reference is not {@code null}. This
+     * method is designed primarily for doing parameter validation in methods
+     * and constructors, as demonstrated below:
+     * <blockquote><pre>
+     * public Foo(Bar bar) {
+     *     this.bar = Objects.requireNonNull(bar);
+     * }
+     * </pre></blockquote>
+     *
+     * @param obj the object reference to check for nullity
+     * @param <T> the type of the reference
+     * @return {@code obj} if not {@code null}
+     * @throws NullPointerException if {@code obj} is {@code null}
+     */
+    public static <T> T requireNonNull(T obj) {
+        if (obj == null)
+            throw new NullPointerException();
+        return obj;
+    }
+
+    /**
+     * Checks that the specified object reference is not {@code null} and
+     * throws a customized {@link NullPointerException} if it is. This method
+     * is designed primarily for doing parameter validation in methods and
+     * constructors with multiple parameters, as demonstrated below:
+     * <blockquote><pre>
+     * public Foo(Bar bar, Baz baz) {
+     *     this.bar = Objects.requireNonNull(bar, "bar must not be null");
+     *     this.baz = Objects.requireNonNull(baz, "baz must not be null");
+     * }
+     * </pre></blockquote>
+     *
+     * @param obj     the object reference to check for nullity
+     * @param message detail message to be used in the event that a {@code
+     *                NullPointerException} is thrown
+     * @param <T> the type of the reference
+     * @return {@code obj} if not {@code null}
+     * @throws NullPointerException if {@code obj} is {@code null}
+     */
+    public static <T> T requireNonNull(T obj, String message) {
+        if (obj == null)
+            throw new NullPointerException(message);
+        return obj;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/PriorityQueue.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/PriorityQueue.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,731 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+
+/**
+ * An unbounded priority {@linkplain Queue queue} based on a priority heap.
+ * The elements of the priority queue are ordered according to their
+ * {@linkplain Comparable natural ordering}, or by a {@link Comparator}
+ * provided at queue construction time, depending on which constructor is
+ * used.  A priority queue does not permit {@code null} elements.
+ * A priority queue relying on natural ordering also does not permit
+ * insertion of non-comparable objects (doing so may result in
+ * {@code ClassCastException}).
+ *
+ * <p>The <em>head</em> of this queue is the <em>least</em> element
+ * with respect to the specified ordering.  If multiple elements are
+ * tied for least value, the head is one of those elements -- ties are
+ * broken arbitrarily.  The queue retrieval operations {@code poll},
+ * {@code remove}, {@code peek}, and {@code element} access the
+ * element at the head of the queue.
+ *
+ * <p>A priority queue is unbounded, but has an internal
+ * <i>capacity</i> governing the size of an array used to store the
+ * elements on the queue.  It is always at least as large as the queue
+ * size.  As elements are added to a priority queue, its capacity
+ * grows automatically.  The details of the growth policy are not
+ * specified.
+ *
+ * <p>This class and its iterator implement all of the
+ * <em>optional</em> methods of the {@link Collection} and {@link
+ * Iterator} interfaces.  The Iterator provided in method {@link
+ * #iterator()} is <em>not</em> guaranteed to traverse the elements of
+ * the priority queue in any particular order. If you need ordered
+ * traversal, consider using {@code Arrays.sort(pq.toArray())}.
+ *
+ * <p> <strong>Note that this implementation is not synchronized.</strong>
+ * Multiple threads should not access a {@code PriorityQueue}
+ * instance concurrently if any of the threads modifies the queue.
+ * Instead, use the thread-safe {@link
+ * java.util.concurrent.PriorityBlockingQueue} class.
+ *
+ * <p>Implementation note: this implementation provides
+ * O(log(n)) time for the enqueing and dequeing methods
+ * ({@code offer}, {@code poll}, {@code remove()} and {@code add});
+ * linear time for the {@code remove(Object)} and {@code contains(Object)}
+ * methods; and constant time for the retrieval methods
+ * ({@code peek}, {@code element}, and {@code size}).
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @since 1.5
+ * @author Josh Bloch, Doug Lea
+ * @param <E> the type of elements held in this collection
+ */
+public class PriorityQueue<E> extends AbstractQueue<E>
+    implements java.io.Serializable {
+
+    private static final long serialVersionUID = -7720805057305804111L;
+
+    private static final int DEFAULT_INITIAL_CAPACITY = 11;
+
+    /**
+     * Priority queue represented as a balanced binary heap: the two
+     * children of queue[n] are queue[2*n+1] and queue[2*(n+1)].  The
+     * priority queue is ordered by comparator, or by the elements'
+     * natural ordering, if comparator is null: For each node n in the
+     * heap and each descendant d of n, n <= d.  The element with the
+     * lowest value is in queue[0], assuming the queue is nonempty.
+     */
+    private transient Object[] queue;
+
+    /**
+     * The number of elements in the priority queue.
+     */
+    private int size = 0;
+
+    /**
+     * The comparator, or null if priority queue uses elements'
+     * natural ordering.
+     */
+    private final Comparator<? super E> comparator;
+
+    /**
+     * The number of times this priority queue has been
+     * <i>structurally modified</i>.  See AbstractList for gory details.
+     */
+    private transient int modCount = 0;
+
+    /**
+     * Creates a {@code PriorityQueue} with the default initial
+     * capacity (11) that orders its elements according to their
+     * {@linkplain Comparable natural ordering}.
+     */
+    public PriorityQueue() {
+        this(DEFAULT_INITIAL_CAPACITY, null);
+    }
+
+    /**
+     * Creates a {@code PriorityQueue} with the specified initial
+     * capacity that orders its elements according to their
+     * {@linkplain Comparable natural ordering}.
+     *
+     * @param initialCapacity the initial capacity for this priority queue
+     * @throws IllegalArgumentException if {@code initialCapacity} is less
+     *         than 1
+     */
+    public PriorityQueue(int initialCapacity) {
+        this(initialCapacity, null);
+    }
+
+    /**
+     * Creates a {@code PriorityQueue} with the specified initial capacity
+     * that orders its elements according to the specified comparator.
+     *
+     * @param  initialCapacity the initial capacity for this priority queue
+     * @param  comparator the comparator that will be used to order this
+     *         priority queue.  If {@code null}, the {@linkplain Comparable
+     *         natural ordering} of the elements will be used.
+     * @throws IllegalArgumentException if {@code initialCapacity} is
+     *         less than 1
+     */
+    public PriorityQueue(int initialCapacity,
+                         Comparator<? super E> comparator) {
+        // Note: This restriction of at least one is not actually needed,
+        // but continues for 1.5 compatibility
+        if (initialCapacity < 1)
+            throw new IllegalArgumentException();
+        this.queue = new Object[initialCapacity];
+        this.comparator = comparator;
+    }
+
+    /**
+     * Creates a {@code PriorityQueue} containing the elements in the
+     * specified collection.  If the specified collection is an instance of
+     * a {@link SortedSet} or is another {@code PriorityQueue}, this
+     * priority queue will be ordered according to the same ordering.
+     * Otherwise, this priority queue will be ordered according to the
+     * {@linkplain Comparable natural ordering} of its elements.
+     *
+     * @param  c the collection whose elements are to be placed
+     *         into this priority queue
+     * @throws ClassCastException if elements of the specified collection
+     *         cannot be compared to one another according to the priority
+     *         queue's ordering
+     * @throws NullPointerException if the specified collection or any
+     *         of its elements are null
+     */
+    @SuppressWarnings("unchecked")
+    public PriorityQueue(Collection<? extends E> c) {
+        if (c instanceof SortedSet<?>) {
+            SortedSet<? extends E> ss = (SortedSet<? extends E>) c;
+            this.comparator = (Comparator<? super E>) ss.comparator();
+            initElementsFromCollection(ss);
+        }
+        else if (c instanceof PriorityQueue<?>) {
+            PriorityQueue<? extends E> pq = (PriorityQueue<? extends E>) c;
+            this.comparator = (Comparator<? super E>) pq.comparator();
+            initFromPriorityQueue(pq);
+        }
+        else {
+            this.comparator = null;
+            initFromCollection(c);
+        }
+    }
+
+    /**
+     * Creates a {@code PriorityQueue} containing the elements in the
+     * specified priority queue.  This priority queue will be
+     * ordered according to the same ordering as the given priority
+     * queue.
+     *
+     * @param  c the priority queue whose elements are to be placed
+     *         into this priority queue
+     * @throws ClassCastException if elements of {@code c} cannot be
+     *         compared to one another according to {@code c}'s
+     *         ordering
+     * @throws NullPointerException if the specified priority queue or any
+     *         of its elements are null
+     */
+    @SuppressWarnings("unchecked")
+    public PriorityQueue(PriorityQueue<? extends E> c) {
+        this.comparator = (Comparator<? super E>) c.comparator();
+        initFromPriorityQueue(c);
+    }
+
+    /**
+     * Creates a {@code PriorityQueue} containing the elements in the
+     * specified sorted set.   This priority queue will be ordered
+     * according to the same ordering as the given sorted set.
+     *
+     * @param  c the sorted set whose elements are to be placed
+     *         into this priority queue
+     * @throws ClassCastException if elements of the specified sorted
+     *         set cannot be compared to one another according to the
+     *         sorted set's ordering
+     * @throws NullPointerException if the specified sorted set or any
+     *         of its elements are null
+     */
+    @SuppressWarnings("unchecked")
+    public PriorityQueue(SortedSet<? extends E> c) {
+        this.comparator = (Comparator<? super E>) c.comparator();
+        initElementsFromCollection(c);
+    }
+
+    private void initFromPriorityQueue(PriorityQueue<? extends E> c) {
+        if (c.getClass() == PriorityQueue.class) {
+            this.queue = c.toArray();
+            this.size = c.size();
+        } else {
+            initFromCollection(c);
+        }
+    }
+
+    private void initElementsFromCollection(Collection<? extends E> c) {
+        Object[] a = c.toArray();
+        // If c.toArray incorrectly doesn't return Object[], copy it.
+        if (a.getClass() != Object[].class)
+            a = Arrays.copyOf(a, a.length, Object[].class);
+        int len = a.length;
+        if (len == 1 || this.comparator != null)
+            for (int i = 0; i < len; i++)
+                if (a[i] == null)
+                    throw new NullPointerException();
+        this.queue = a;
+        this.size = a.length;
+    }
+
+    /**
+     * Initializes queue array with elements from the given Collection.
+     *
+     * @param c the collection
+     */
+    private void initFromCollection(Collection<? extends E> c) {
+        initElementsFromCollection(c);
+        heapify();
+    }
+
+    /**
+     * The maximum size of array to allocate.
+     * Some VMs reserve some header words in an array.
+     * Attempts to allocate larger arrays may result in
+     * OutOfMemoryError: Requested array size exceeds VM limit
+     */
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    /**
+     * Increases the capacity of the array.
+     *
+     * @param minCapacity the desired minimum capacity
+     */
+    private void grow(int minCapacity) {
+        int oldCapacity = queue.length;
+        // Double size if small; else grow by 50%
+        int newCapacity = oldCapacity + ((oldCapacity < 64) ?
+                                         (oldCapacity + 2) :
+                                         (oldCapacity >> 1));
+        // overflow-conscious code
+        if (newCapacity - MAX_ARRAY_SIZE > 0)
+            newCapacity = hugeCapacity(minCapacity);
+        queue = Arrays.copyOf(queue, newCapacity);
+    }
+
+    private static int hugeCapacity(int minCapacity) {
+        if (minCapacity < 0) // overflow
+            throw new OutOfMemoryError();
+        return (minCapacity > MAX_ARRAY_SIZE) ?
+            Integer.MAX_VALUE :
+            MAX_ARRAY_SIZE;
+    }
+
+    /**
+     * Inserts the specified element into this priority queue.
+     *
+     * @return {@code true} (as specified by {@link Collection#add})
+     * @throws ClassCastException if the specified element cannot be
+     *         compared with elements currently in this priority queue
+     *         according to the priority queue's ordering
+     * @throws NullPointerException if the specified element is null
+     */
+    public boolean add(E e) {
+        return offer(e);
+    }
+
+    /**
+     * Inserts the specified element into this priority queue.
+     *
+     * @return {@code true} (as specified by {@link Queue#offer})
+     * @throws ClassCastException if the specified element cannot be
+     *         compared with elements currently in this priority queue
+     *         according to the priority queue's ordering
+     * @throws NullPointerException if the specified element is null
+     */
+    public boolean offer(E e) {
+        if (e == null)
+            throw new NullPointerException();
+        modCount++;
+        int i = size;
+        if (i >= queue.length)
+            grow(i + 1);
+        size = i + 1;
+        if (i == 0)
+            queue[0] = e;
+        else
+            siftUp(i, e);
+        return true;
+    }
+
+    public E peek() {
+        if (size == 0)
+            return null;
+        return (E) queue[0];
+    }
+
+    private int indexOf(Object o) {
+        if (o != null) {
+            for (int i = 0; i < size; i++)
+                if (o.equals(queue[i]))
+                    return i;
+        }
+        return -1;
+    }
+
+    /**
+     * Removes a single instance of the specified element from this queue,
+     * if it is present.  More formally, removes an element {@code e} such
+     * that {@code o.equals(e)}, if this queue contains one or more such
+     * elements.  Returns {@code true} if and only if this queue contained
+     * the specified element (or equivalently, if this queue changed as a
+     * result of the call).
+     *
+     * @param o element to be removed from this queue, if present
+     * @return {@code true} if this queue changed as a result of the call
+     */
+    public boolean remove(Object o) {
+        int i = indexOf(o);
+        if (i == -1)
+            return false;
+        else {
+            removeAt(i);
+            return true;
+        }
+    }
+
+    /**
+     * Version of remove using reference equality, not equals.
+     * Needed by iterator.remove.
+     *
+     * @param o element to be removed from this queue, if present
+     * @return {@code true} if removed
+     */
+    boolean removeEq(Object o) {
+        for (int i = 0; i < size; i++) {
+            if (o == queue[i]) {
+                removeAt(i);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns {@code true} if this queue contains the specified element.
+     * More formally, returns {@code true} if and only if this queue contains
+     * at least one element {@code e} such that {@code o.equals(e)}.
+     *
+     * @param o object to be checked for containment in this queue
+     * @return {@code true} if this queue contains the specified element
+     */
+    public boolean contains(Object o) {
+        return indexOf(o) != -1;
+    }
+
+    /**
+     * Returns an array containing all of the elements in this queue.
+     * The elements are in no particular order.
+     *
+     * <p>The returned array will be "safe" in that no references to it are
+     * maintained by this queue.  (In other words, this method must allocate
+     * a new array).  The caller is thus free to modify the returned array.
+     *
+     * <p>This method acts as bridge between array-based and collection-based
+     * APIs.
+     *
+     * @return an array containing all of the elements in this queue
+     */
+    public Object[] toArray() {
+        return Arrays.copyOf(queue, size);
+    }
+
+    /**
+     * Returns an array containing all of the elements in this queue; the
+     * runtime type of the returned array is that of the specified array.
+     * The returned array elements are in no particular order.
+     * If the queue fits in the specified array, it is returned therein.
+     * Otherwise, a new array is allocated with the runtime type of the
+     * specified array and the size of this queue.
+     *
+     * <p>If the queue fits in the specified array with room to spare
+     * (i.e., the array has more elements than the queue), the element in
+     * the array immediately following the end of the collection is set to
+     * {@code null}.
+     *
+     * <p>Like the {@link #toArray()} method, this method acts as bridge between
+     * array-based and collection-based APIs.  Further, this method allows
+     * precise control over the runtime type of the output array, and may,
+     * under certain circumstances, be used to save allocation costs.
+     *
+     * <p>Suppose <tt>x</tt> is a queue known to contain only strings.
+     * The following code can be used to dump the queue into a newly
+     * allocated array of <tt>String</tt>:
+     *
+     * <pre>
+     *     String[] y = x.toArray(new String[0]);</pre>
+     *
+     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
+     * <tt>toArray()</tt>.
+     *
+     * @param a the array into which the elements of the queue are to
+     *          be stored, if it is big enough; otherwise, a new array of the
+     *          same runtime type is allocated for this purpose.
+     * @return an array containing all of the elements in this queue
+     * @throws ArrayStoreException if the runtime type of the specified array
+     *         is not a supertype of the runtime type of every element in
+     *         this queue
+     * @throws NullPointerException if the specified array is null
+     */
+    public <T> T[] toArray(T[] a) {
+        if (a.length < size)
+            // Make a new array of a's runtime type, but my contents:
+            return (T[]) Arrays.copyOf(queue, size, a.getClass());
+        System.arraycopy(queue, 0, a, 0, size);
+        if (a.length > size)
+            a[size] = null;
+        return a;
+    }
+
+    /**
+     * Returns an iterator over the elements in this queue. The iterator
+     * does not return the elements in any particular order.
+     *
+     * @return an iterator over the elements in this queue
+     */
+    public Iterator<E> iterator() {
+        return new Itr();
+    }
+
+    private final class Itr implements Iterator<E> {
+        /**
+         * Index (into queue array) of element to be returned by
+         * subsequent call to next.
+         */
+        private int cursor = 0;
+
+        /**
+         * Index of element returned by most recent call to next,
+         * unless that element came from the forgetMeNot list.
+         * Set to -1 if element is deleted by a call to remove.
+         */
+        private int lastRet = -1;
+
+        /**
+         * A queue of elements that were moved from the unvisited portion of
+         * the heap into the visited portion as a result of "unlucky" element
+         * removals during the iteration.  (Unlucky element removals are those
+         * that require a siftup instead of a siftdown.)  We must visit all of
+         * the elements in this list to complete the iteration.  We do this
+         * after we've completed the "normal" iteration.
+         *
+         * We expect that most iterations, even those involving removals,
+         * will not need to store elements in this field.
+         */
+        private ArrayDeque<E> forgetMeNot = null;
+
+        /**
+         * Element returned by the most recent call to next iff that
+         * element was drawn from the forgetMeNot list.
+         */
+        private E lastRetElt = null;
+
+        /**
+         * The modCount value that the iterator believes that the backing
+         * Queue should have.  If this expectation is violated, the iterator
+         * has detected concurrent modification.
+         */
+        private int expectedModCount = modCount;
+
+        public boolean hasNext() {
+            return cursor < size ||
+                (forgetMeNot != null && !forgetMeNot.isEmpty());
+        }
+
+        public E next() {
+            if (expectedModCount != modCount)
+                throw new ConcurrentModificationException();
+            if (cursor < size)
+                return (E) queue[lastRet = cursor++];
+            if (forgetMeNot != null) {
+                lastRet = -1;
+                lastRetElt = forgetMeNot.poll();
+                if (lastRetElt != null)
+                    return lastRetElt;
+            }
+            throw new NoSuchElementException();
+        }
+
+        public void remove() {
+            if (expectedModCount != modCount)
+                throw new ConcurrentModificationException();
+            if (lastRet != -1) {
+                E moved = PriorityQueue.this.removeAt(lastRet);
+                lastRet = -1;
+                if (moved == null)
+                    cursor--;
+                else {
+                    if (forgetMeNot == null)
+                        forgetMeNot = new ArrayDeque<>();
+                    forgetMeNot.add(moved);
+                }
+            } else if (lastRetElt != null) {
+                PriorityQueue.this.removeEq(lastRetElt);
+                lastRetElt = null;
+            } else {
+                throw new IllegalStateException();
+            }
+            expectedModCount = modCount;
+        }
+    }
+
+    public int size() {
+        return size;
+    }
+
+    /**
+     * Removes all of the elements from this priority queue.
+     * The queue will be empty after this call returns.
+     */
+    public void clear() {
+        modCount++;
+        for (int i = 0; i < size; i++)
+            queue[i] = null;
+        size = 0;
+    }
+
+    public E poll() {
+        if (size == 0)
+            return null;
+        int s = --size;
+        modCount++;
+        E result = (E) queue[0];
+        E x = (E) queue[s];
+        queue[s] = null;
+        if (s != 0)
+            siftDown(0, x);
+        return result;
+    }
+
+    /**
+     * Removes the ith element from queue.
+     *
+     * Normally this method leaves the elements at up to i-1,
+     * inclusive, untouched.  Under these circumstances, it returns
+     * null.  Occasionally, in order to maintain the heap invariant,
+     * it must swap a later element of the list with one earlier than
+     * i.  Under these circumstances, this method returns the element
+     * that was previously at the end of the list and is now at some
+     * position before i. This fact is used by iterator.remove so as to
+     * avoid missing traversing elements.
+     */
+    private E removeAt(int i) {
+        assert i >= 0 && i < size;
+        modCount++;
+        int s = --size;
+        if (s == i) // removed last element
+            queue[i] = null;
+        else {
+            E moved = (E) queue[s];
+            queue[s] = null;
+            siftDown(i, moved);
+            if (queue[i] == moved) {
+                siftUp(i, moved);
+                if (queue[i] != moved)
+                    return moved;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Inserts item x at position k, maintaining heap invariant by
+     * promoting x up the tree until it is greater than or equal to
+     * its parent, or is the root.
+     *
+     * To simplify and speed up coercions and comparisons. the
+     * Comparable and Comparator versions are separated into different
+     * methods that are otherwise identical. (Similarly for siftDown.)
+     *
+     * @param k the position to fill
+     * @param x the item to insert
+     */
+    private void siftUp(int k, E x) {
+        if (comparator != null)
+            siftUpUsingComparator(k, x);
+        else
+            siftUpComparable(k, x);
+    }
+
+    private void siftUpComparable(int k, E x) {
+        Comparable<? super E> key = (Comparable<? super E>) x;
+        while (k > 0) {
+            int parent = (k - 1) >>> 1;
+            Object e = queue[parent];
+            if (key.compareTo((E) e) >= 0)
+                break;
+            queue[k] = e;
+            k = parent;
+        }
+        queue[k] = key;
+    }
+
+    private void siftUpUsingComparator(int k, E x) {
+        while (k > 0) {
+            int parent = (k - 1) >>> 1;
+            Object e = queue[parent];
+            if (comparator.compare(x, (E) e) >= 0)
+                break;
+            queue[k] = e;
+            k = parent;
+        }
+        queue[k] = x;
+    }
+
+    /**
+     * Inserts item x at position k, maintaining heap invariant by
+     * demoting x down the tree repeatedly until it is less than or
+     * equal to its children or is a leaf.
+     *
+     * @param k the position to fill
+     * @param x the item to insert
+     */
+    private void siftDown(int k, E x) {
+        if (comparator != null)
+            siftDownUsingComparator(k, x);
+        else
+            siftDownComparable(k, x);
+    }
+
+    private void siftDownComparable(int k, E x) {
+        Comparable<? super E> key = (Comparable<? super E>)x;
+        int half = size >>> 1;        // loop while a non-leaf
+        while (k < half) {
+            int child = (k << 1) + 1; // assume left child is least
+            Object c = queue[child];
+            int right = child + 1;
+            if (right < size &&
+                ((Comparable<? super E>) c).compareTo((E) queue[right]) > 0)
+                c = queue[child = right];
+            if (key.compareTo((E) c) <= 0)
+                break;
+            queue[k] = c;
+            k = child;
+        }
+        queue[k] = key;
+    }
+
+    private void siftDownUsingComparator(int k, E x) {
+        int half = size >>> 1;
+        while (k < half) {
+            int child = (k << 1) + 1;
+            Object c = queue[child];
+            int right = child + 1;
+            if (right < size &&
+                comparator.compare((E) c, (E) queue[right]) > 0)
+                c = queue[child = right];
+            if (comparator.compare(x, (E) c) <= 0)
+                break;
+            queue[k] = c;
+            k = child;
+        }
+        queue[k] = x;
+    }
+
+    /**
+     * Establishes the heap invariant (described above) in the entire tree,
+     * assuming nothing about the order of the elements prior to the call.
+     */
+    private void heapify() {
+        for (int i = (size >>> 1) - 1; i >= 0; i--)
+            siftDown(i, (E) queue[i]);
+    }
+
+    /**
+     * Returns the comparator used to order the elements in this
+     * queue, or {@code null} if this queue is sorted according to
+     * the {@linkplain Comparable natural ordering} of its elements.
+     *
+     * @return the comparator used to order this queue, or
+     *         {@code null} if this queue is sorted according to the
+     *         natural ordering of its elements
+     */
+    public Comparator<? super E> comparator() {
+        return comparator;
+    }
+
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Queue.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Queue.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,218 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util;
+
+/**
+ * A collection designed for holding elements prior to processing.
+ * Besides basic {@link java.util.Collection Collection} operations,
+ * queues provide additional insertion, extraction, and inspection
+ * operations.  Each of these methods exists in two forms: one throws
+ * an exception if the operation fails, the other returns a special
+ * value (either <tt>null</tt> or <tt>false</tt>, depending on the
+ * operation).  The latter form of the insert operation is designed
+ * specifically for use with capacity-restricted <tt>Queue</tt>
+ * implementations; in most implementations, insert operations cannot
+ * fail.
+ *
+ * <p>
+ * <table BORDER CELLPADDING=3 CELLSPACING=1>
+ *  <tr>
+ *    <td></td>
+ *    <td ALIGN=CENTER><em>Throws exception</em></td>
+ *    <td ALIGN=CENTER><em>Returns special value</em></td>
+ *  </tr>
+ *  <tr>
+ *    <td><b>Insert</b></td>
+ *    <td>{@link #add add(e)}</td>
+ *    <td>{@link #offer offer(e)}</td>
+ *  </tr>
+ *  <tr>
+ *    <td><b>Remove</b></td>
+ *    <td>{@link #remove remove()}</td>
+ *    <td>{@link #poll poll()}</td>
+ *  </tr>
+ *  <tr>
+ *    <td><b>Examine</b></td>
+ *    <td>{@link #element element()}</td>
+ *    <td>{@link #peek peek()}</td>
+ *  </tr>
+ * </table>
+ *
+ * <p>Queues typically, but do not necessarily, order elements in a
+ * FIFO (first-in-first-out) manner.  Among the exceptions are
+ * priority queues, which order elements according to a supplied
+ * comparator, or the elements' natural ordering, and LIFO queues (or
+ * stacks) which order the elements LIFO (last-in-first-out).
+ * Whatever the ordering used, the <em>head</em> of the queue is that
+ * element which would be removed by a call to {@link #remove() } or
+ * {@link #poll()}.  In a FIFO queue, all new elements are inserted at
+ * the <em> tail</em> of the queue. Other kinds of queues may use
+ * different placement rules.  Every <tt>Queue</tt> implementation
+ * must specify its ordering properties.
+ *
+ * <p>The {@link #offer offer} method inserts an element if possible,
+ * otherwise returning <tt>false</tt>.  This differs from the {@link
+ * java.util.Collection#add Collection.add} method, which can fail to
+ * add an element only by throwing an unchecked exception.  The
+ * <tt>offer</tt> method is designed for use when failure is a normal,
+ * rather than exceptional occurrence, for example, in fixed-capacity
+ * (or &quot;bounded&quot;) queues.
+ *
+ * <p>The {@link #remove()} and {@link #poll()} methods remove and
+ * return the head of the queue.
+ * Exactly which element is removed from the queue is a
+ * function of the queue's ordering policy, which differs from
+ * implementation to implementation. The <tt>remove()</tt> and
+ * <tt>poll()</tt> methods differ only in their behavior when the
+ * queue is empty: the <tt>remove()</tt> method throws an exception,
+ * while the <tt>poll()</tt> method returns <tt>null</tt>.
+ *
+ * <p>The {@link #element()} and {@link #peek()} methods return, but do
+ * not remove, the head of the queue.
+ *
+ * <p>The <tt>Queue</tt> interface does not define the <i>blocking queue
+ * methods</i>, which are common in concurrent programming.  These methods,
+ * which wait for elements to appear or for space to become available, are
+ * defined in the {@link java.util.concurrent.BlockingQueue} interface, which
+ * extends this interface.
+ *
+ * <p><tt>Queue</tt> implementations generally do not allow insertion
+ * of <tt>null</tt> elements, although some implementations, such as
+ * {@link LinkedList}, do not prohibit insertion of <tt>null</tt>.
+ * Even in the implementations that permit it, <tt>null</tt> should
+ * not be inserted into a <tt>Queue</tt>, as <tt>null</tt> is also
+ * used as a special return value by the <tt>poll</tt> method to
+ * indicate that the queue contains no elements.
+ *
+ * <p><tt>Queue</tt> implementations generally do not define
+ * element-based versions of methods <tt>equals</tt> and
+ * <tt>hashCode</tt> but instead inherit the identity based versions
+ * from class <tt>Object</tt>, because element-based equality is not
+ * always well-defined for queues with the same elements but different
+ * ordering properties.
+ *
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @see java.util.Collection
+ * @see LinkedList
+ * @see PriorityQueue
+ * @see java.util.concurrent.LinkedBlockingQueue
+ * @see java.util.concurrent.BlockingQueue
+ * @see java.util.concurrent.ArrayBlockingQueue
+ * @see java.util.concurrent.LinkedBlockingQueue
+ * @see java.util.concurrent.PriorityBlockingQueue
+ * @since 1.5
+ * @author Doug Lea
+ * @param <E> the type of elements held in this collection
+ */
+public interface Queue<E> extends Collection<E> {
+    /**
+     * Inserts the specified element into this queue if it is possible to do so
+     * immediately without violating capacity restrictions, returning
+     * <tt>true</tt> upon success and throwing an <tt>IllegalStateException</tt>
+     * if no space is currently available.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> (as specified by {@link Collection#add})
+     * @throws IllegalStateException if the element cannot be added at this
+     *         time due to capacity restrictions
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this queue
+     * @throws NullPointerException if the specified element is null and
+     *         this queue does not permit null elements
+     * @throws IllegalArgumentException if some property of this element
+     *         prevents it from being added to this queue
+     */
+    boolean add(E e);
+
+    /**
+     * Inserts the specified element into this queue if it is possible to do
+     * so immediately without violating capacity restrictions.
+     * When using a capacity-restricted queue, this method is generally
+     * preferable to {@link #add}, which can fail to insert an element only
+     * by throwing an exception.
+     *
+     * @param e the element to add
+     * @return <tt>true</tt> if the element was added to this queue, else
+     *         <tt>false</tt>
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this queue
+     * @throws NullPointerException if the specified element is null and
+     *         this queue does not permit null elements
+     * @throws IllegalArgumentException if some property of this element
+     *         prevents it from being added to this queue
+     */
+    boolean offer(E e);
+
+    /**
+     * Retrieves and removes the head of this queue.  This method differs
+     * from {@link #poll poll} only in that it throws an exception if this
+     * queue is empty.
+     *
+     * @return the head of this queue
+     * @throws NoSuchElementException if this queue is empty
+     */
+    E remove();
+
+    /**
+     * Retrieves and removes the head of this queue,
+     * or returns <tt>null</tt> if this queue is empty.
+     *
+     * @return the head of this queue, or <tt>null</tt> if this queue is empty
+     */
+    E poll();
+
+    /**
+     * Retrieves, but does not remove, the head of this queue.  This method
+     * differs from {@link #peek peek} only in that it throws an exception
+     * if this queue is empty.
+     *
+     * @return the head of this queue
+     * @throws NoSuchElementException if this queue is empty
+     */
+    E element();
+
+    /**
+     * Retrieves, but does not remove, the head of this queue,
+     * or returns <tt>null</tt> if this queue is empty.
+     *
+     * @return the head of this queue, or <tt>null</tt> if this queue is empty
+     */
+    E peek();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Random.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Random.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,503 @@
+/*
+ * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * An instance of this class is used to generate a stream of
+ * pseudorandom numbers. The class uses a 48-bit seed, which is
+ * modified using a linear congruential formula. (See Donald Knuth,
+ * <i>The Art of Computer Programming, Volume 2</i>, Section 3.2.1.)
+ * <p>
+ * If two instances of {@code Random} are created with the same
+ * seed, and the same sequence of method calls is made for each, they
+ * will generate and return identical sequences of numbers. In order to
+ * guarantee this property, particular algorithms are specified for the
+ * class {@code Random}. Java implementations must use all the algorithms
+ * shown here for the class {@code Random}, for the sake of absolute
+ * portability of Java code. However, subclasses of class {@code Random}
+ * are permitted to use other algorithms, so long as they adhere to the
+ * general contracts for all the methods.
+ * <p>
+ * The algorithms implemented by class {@code Random} use a
+ * {@code protected} utility method that on each invocation can supply
+ * up to 32 pseudorandomly generated bits.
+ * <p>
+ * Many applications will find the method {@link Math#random} simpler to use.
+ *
+ * <p>Instances of {@code java.util.Random} are threadsafe.
+ * However, the concurrent use of the same {@code java.util.Random}
+ * instance across threads may encounter contention and consequent
+ * poor performance. Consider instead using
+ * {@link java.util.concurrent.ThreadLocalRandom} in multithreaded
+ * designs.
+ *
+ * <p>Instances of {@code java.util.Random} are not cryptographically
+ * secure.  Consider instead using {@link java.security.SecureRandom} to
+ * get a cryptographically secure pseudo-random number generator for use
+ * by security-sensitive applications.
+ *
+ * @author  Frank Yellin
+ * @since   1.0
+ */
+public
+class Random implements java.io.Serializable {
+    /** use serialVersionUID from JDK 1.1 for interoperability */
+    static final long serialVersionUID = 3905348978240129619L;
+
+    /**
+     * The internal state associated with this pseudorandom number generator.
+     * (The specs for the methods in this class describe the ongoing
+     * computation of this value.)
+     */
+    private long seed;
+
+    private static final long multiplier = 0x5DEECE66DL;
+    private static final long addend = 0xBL;
+    private static final long mask = (1L << 48) - 1;
+
+    /**
+     * Creates a new random number generator. This constructor sets
+     * the seed of the random number generator to a value very likely
+     * to be distinct from any other invocation of this constructor.
+     */
+    public Random() {
+        this(seedUniquifier() ^ System.nanoTime());
+    }
+    
+    private static synchronized long seedUniquifier() {
+        // L'Ecuyer, "Tables of Linear Congruential Generators of
+        // Different Sizes and Good Lattice Structure", 1999
+        long current = seedUniquifier;
+        long next = current * 181783497276652981L;
+        seedUniquifier = next;
+        return next;
+    }
+
+    private static long seedUniquifier = 8682522807148012L;
+
+    /**
+     * Creates a new random number generator using a single {@code long} seed.
+     * The seed is the initial value of the internal state of the pseudorandom
+     * number generator which is maintained by method {@link #next}.
+     *
+     * <p>The invocation {@code new Random(seed)} is equivalent to:
+     *  <pre> {@code
+     * Random rnd = new Random();
+     * rnd.setSeed(seed);}</pre>
+     *
+     * @param seed the initial seed
+     * @see   #setSeed(long)
+     */
+    public Random(long seed) {
+        this.seed = initialScramble(seed);
+    }
+
+    private static long initialScramble(long seed) {
+        return (seed ^ multiplier) & mask;
+    }
+
+    /**
+     * Sets the seed of this random number generator using a single
+     * {@code long} seed. The general contract of {@code setSeed} is
+     * that it alters the state of this random number generator object
+     * so as to be in exactly the same state as if it had just been
+     * created with the argument {@code seed} as a seed. The method
+     * {@code setSeed} is implemented by class {@code Random} by
+     * atomically updating the seed to
+     *  <pre>{@code (seed ^ 0x5DEECE66DL) & ((1L << 48) - 1)}</pre>
+     * and clearing the {@code haveNextNextGaussian} flag used by {@link
+     * #nextGaussian}.
+     *
+     * <p>The implementation of {@code setSeed} by class {@code Random}
+     * happens to use only 48 bits of the given seed. In general, however,
+     * an overriding method may use all 64 bits of the {@code long}
+     * argument as a seed value.
+     *
+     * @param seed the initial seed
+     */
+    synchronized public void setSeed(long seed) {
+        this.seed = initialScramble(seed);
+        haveNextNextGaussian = false;
+    }
+
+    /**
+     * Generates the next pseudorandom number. Subclasses should
+     * override this, as this is used by all other methods.
+     *
+     * <p>The general contract of {@code next} is that it returns an
+     * {@code int} value and if the argument {@code bits} is between
+     * {@code 1} and {@code 32} (inclusive), then that many low-order
+     * bits of the returned value will be (approximately) independently
+     * chosen bit values, each of which is (approximately) equally
+     * likely to be {@code 0} or {@code 1}. The method {@code next} is
+     * implemented by class {@code Random} by atomically updating the seed to
+     *  <pre>{@code (seed * 0x5DEECE66DL + 0xBL) & ((1L << 48) - 1)}</pre>
+     * and returning
+     *  <pre>{@code (int)(seed >>> (48 - bits))}.</pre>
+     *
+     * This is a linear congruential pseudorandom number generator, as
+     * defined by D. H. Lehmer and described by Donald E. Knuth in
+     * <i>The Art of Computer Programming,</i> Volume 3:
+     * <i>Seminumerical Algorithms</i>, section 3.2.1.
+     *
+     * @param  bits random bits
+     * @return the next pseudorandom value from this random number
+     *         generator's sequence
+     * @since  1.1
+     */
+    protected synchronized int next(int bits) {
+        long oldseed, nextseed;
+        long seed = this.seed;
+        oldseed = seed;
+        nextseed = (oldseed * multiplier + addend) & mask;
+        this.seed = nextseed;
+        return (int)(nextseed >>> (48 - bits));
+    }
+
+    /**
+     * Generates random bytes and places them into a user-supplied
+     * byte array.  The number of random bytes produced is equal to
+     * the length of the byte array.
+     *
+     * <p>The method {@code nextBytes} is implemented by class {@code Random}
+     * as if by:
+     *  <pre> {@code
+     * public void nextBytes(byte[] bytes) {
+     *   for (int i = 0; i < bytes.length; )
+     *     for (int rnd = nextInt(), n = Math.min(bytes.length - i, 4);
+     *          n-- > 0; rnd >>= 8)
+     *       bytes[i++] = (byte)rnd;
+     * }}</pre>
+     *
+     * @param  bytes the byte array to fill with random bytes
+     * @throws NullPointerException if the byte array is null
+     * @since  1.1
+     */
+    public void nextBytes(byte[] bytes) {
+        for (int i = 0, len = bytes.length; i < len; )
+            for (int rnd = nextInt(),
+                     n = Math.min(len - i, Integer.SIZE/Byte.SIZE);
+                 n-- > 0; rnd >>= Byte.SIZE)
+                bytes[i++] = (byte)rnd;
+    }
+
+    /**
+     * Returns the next pseudorandom, uniformly distributed {@code int}
+     * value from this random number generator's sequence. The general
+     * contract of {@code nextInt} is that one {@code int} value is
+     * pseudorandomly generated and returned. All 2<font size="-1"><sup>32
+     * </sup></font> possible {@code int} values are produced with
+     * (approximately) equal probability.
+     *
+     * <p>The method {@code nextInt} is implemented by class {@code Random}
+     * as if by:
+     *  <pre> {@code
+     * public int nextInt() {
+     *   return next(32);
+     * }}</pre>
+     *
+     * @return the next pseudorandom, uniformly distributed {@code int}
+     *         value from this random number generator's sequence
+     */
+    public int nextInt() {
+        return next(32);
+    }
+
+    /**
+     * Returns a pseudorandom, uniformly distributed {@code int} value
+     * between 0 (inclusive) and the specified value (exclusive), drawn from
+     * this random number generator's sequence.  The general contract of
+     * {@code nextInt} is that one {@code int} value in the specified range
+     * is pseudorandomly generated and returned.  All {@code n} possible
+     * {@code int} values are produced with (approximately) equal
+     * probability.  The method {@code nextInt(int n)} is implemented by
+     * class {@code Random} as if by:
+     *  <pre> {@code
+     * public int nextInt(int n) {
+     *   if (n <= 0)
+     *     throw new IllegalArgumentException("n must be positive");
+     *
+     *   if ((n & -n) == n)  // i.e., n is a power of 2
+     *     return (int)((n * (long)next(31)) >> 31);
+     *
+     *   int bits, val;
+     *   do {
+     *       bits = next(31);
+     *       val = bits % n;
+     *   } while (bits - val + (n-1) < 0);
+     *   return val;
+     * }}</pre>
+     *
+     * <p>The hedge "approximately" is used in the foregoing description only
+     * because the next method is only approximately an unbiased source of
+     * independently chosen bits.  If it were a perfect source of randomly
+     * chosen bits, then the algorithm shown would choose {@code int}
+     * values from the stated range with perfect uniformity.
+     * <p>
+     * The algorithm is slightly tricky.  It rejects values that would result
+     * in an uneven distribution (due to the fact that 2^31 is not divisible
+     * by n). The probability of a value being rejected depends on n.  The
+     * worst case is n=2^30+1, for which the probability of a reject is 1/2,
+     * and the expected number of iterations before the loop terminates is 2.
+     * <p>
+     * The algorithm treats the case where n is a power of two specially: it
+     * returns the correct number of high-order bits from the underlying
+     * pseudo-random number generator.  In the absence of special treatment,
+     * the correct number of <i>low-order</i> bits would be returned.  Linear
+     * congruential pseudo-random number generators such as the one
+     * implemented by this class are known to have short periods in the
+     * sequence of values of their low-order bits.  Thus, this special case
+     * greatly increases the length of the sequence of values returned by
+     * successive calls to this method if n is a small power of two.
+     *
+     * @param n the bound on the random number to be returned.  Must be
+     *        positive.
+     * @return the next pseudorandom, uniformly distributed {@code int}
+     *         value between {@code 0} (inclusive) and {@code n} (exclusive)
+     *         from this random number generator's sequence
+     * @throws IllegalArgumentException if n is not positive
+     * @since 1.2
+     */
+
+    public int nextInt(int n) {
+        if (n <= 0)
+            throw new IllegalArgumentException("n must be positive");
+
+        if ((n & -n) == n)  // i.e., n is a power of 2
+            return (int)((n * (long)next(31)) >> 31);
+
+        int bits, val;
+        do {
+            bits = next(31);
+            val = bits % n;
+        } while (bits - val + (n-1) < 0);
+        return val;
+    }
+
+    /**
+     * Returns the next pseudorandom, uniformly distributed {@code long}
+     * value from this random number generator's sequence. The general
+     * contract of {@code nextLong} is that one {@code long} value is
+     * pseudorandomly generated and returned.
+     *
+     * <p>The method {@code nextLong} is implemented by class {@code Random}
+     * as if by:
+     *  <pre> {@code
+     * public long nextLong() {
+     *   return ((long)next(32) << 32) + next(32);
+     * }}</pre>
+     *
+     * Because class {@code Random} uses a seed with only 48 bits,
+     * this algorithm will not return all possible {@code long} values.
+     *
+     * @return the next pseudorandom, uniformly distributed {@code long}
+     *         value from this random number generator's sequence
+     */
+    public long nextLong() {
+        // it's okay that the bottom word remains signed.
+        return ((long)(next(32)) << 32) + next(32);
+    }
+
+    /**
+     * Returns the next pseudorandom, uniformly distributed
+     * {@code boolean} value from this random number generator's
+     * sequence. The general contract of {@code nextBoolean} is that one
+     * {@code boolean} value is pseudorandomly generated and returned.  The
+     * values {@code true} and {@code false} are produced with
+     * (approximately) equal probability.
+     *
+     * <p>The method {@code nextBoolean} is implemented by class {@code Random}
+     * as if by:
+     *  <pre> {@code
+     * public boolean nextBoolean() {
+     *   return next(1) != 0;
+     * }}</pre>
+     *
+     * @return the next pseudorandom, uniformly distributed
+     *         {@code boolean} value from this random number generator's
+     *         sequence
+     * @since 1.2
+     */
+    public boolean nextBoolean() {
+        return next(1) != 0;
+    }
+
+    /**
+     * Returns the next pseudorandom, uniformly distributed {@code float}
+     * value between {@code 0.0} and {@code 1.0} from this random
+     * number generator's sequence.
+     *
+     * <p>The general contract of {@code nextFloat} is that one
+     * {@code float} value, chosen (approximately) uniformly from the
+     * range {@code 0.0f} (inclusive) to {@code 1.0f} (exclusive), is
+     * pseudorandomly generated and returned. All 2<font
+     * size="-1"><sup>24</sup></font> possible {@code float} values
+     * of the form <i>m&nbsp;x&nbsp</i>2<font
+     * size="-1"><sup>-24</sup></font>, where <i>m</i> is a positive
+     * integer less than 2<font size="-1"><sup>24</sup> </font>, are
+     * produced with (approximately) equal probability.
+     *
+     * <p>The method {@code nextFloat} is implemented by class {@code Random}
+     * as if by:
+     *  <pre> {@code
+     * public float nextFloat() {
+     *   return next(24) / ((float)(1 << 24));
+     * }}</pre>
+     *
+     * <p>The hedge "approximately" is used in the foregoing description only
+     * because the next method is only approximately an unbiased source of
+     * independently chosen bits. If it were a perfect source of randomly
+     * chosen bits, then the algorithm shown would choose {@code float}
+     * values from the stated range with perfect uniformity.<p>
+     * [In early versions of Java, the result was incorrectly calculated as:
+     *  <pre> {@code
+     *   return next(30) / ((float)(1 << 30));}</pre>
+     * This might seem to be equivalent, if not better, but in fact it
+     * introduced a slight nonuniformity because of the bias in the rounding
+     * of floating-point numbers: it was slightly more likely that the
+     * low-order bit of the significand would be 0 than that it would be 1.]
+     *
+     * @return the next pseudorandom, uniformly distributed {@code float}
+     *         value between {@code 0.0} and {@code 1.0} from this
+     *         random number generator's sequence
+     */
+    public float nextFloat() {
+        return next(24) / ((float)(1 << 24));
+    }
+
+    /**
+     * Returns the next pseudorandom, uniformly distributed
+     * {@code double} value between {@code 0.0} and
+     * {@code 1.0} from this random number generator's sequence.
+     *
+     * <p>The general contract of {@code nextDouble} is that one
+     * {@code double} value, chosen (approximately) uniformly from the
+     * range {@code 0.0d} (inclusive) to {@code 1.0d} (exclusive), is
+     * pseudorandomly generated and returned.
+     *
+     * <p>The method {@code nextDouble} is implemented by class {@code Random}
+     * as if by:
+     *  <pre> {@code
+     * public double nextDouble() {
+     *   return (((long)next(26) << 27) + next(27))
+     *     / (double)(1L << 53);
+     * }}</pre>
+     *
+     * <p>The hedge "approximately" is used in the foregoing description only
+     * because the {@code next} method is only approximately an unbiased
+     * source of independently chosen bits. If it were a perfect source of
+     * randomly chosen bits, then the algorithm shown would choose
+     * {@code double} values from the stated range with perfect uniformity.
+     * <p>[In early versions of Java, the result was incorrectly calculated as:
+     *  <pre> {@code
+     *   return (((long)next(27) << 27) + next(27))
+     *     / (double)(1L << 54);}</pre>
+     * This might seem to be equivalent, if not better, but in fact it
+     * introduced a large nonuniformity because of the bias in the rounding
+     * of floating-point numbers: it was three times as likely that the
+     * low-order bit of the significand would be 0 than that it would be 1!
+     * This nonuniformity probably doesn't matter much in practice, but we
+     * strive for perfection.]
+     *
+     * @return the next pseudorandom, uniformly distributed {@code double}
+     *         value between {@code 0.0} and {@code 1.0} from this
+     *         random number generator's sequence
+     * @see Math#random
+     */
+    public double nextDouble() {
+        return (((long)(next(26)) << 27) + next(27))
+            / (double)(1L << 53);
+    }
+
+    private double nextNextGaussian;
+    private boolean haveNextNextGaussian = false;
+
+    /**
+     * Returns the next pseudorandom, Gaussian ("normally") distributed
+     * {@code double} value with mean {@code 0.0} and standard
+     * deviation {@code 1.0} from this random number generator's sequence.
+     * <p>
+     * The general contract of {@code nextGaussian} is that one
+     * {@code double} value, chosen from (approximately) the usual
+     * normal distribution with mean {@code 0.0} and standard deviation
+     * {@code 1.0}, is pseudorandomly generated and returned.
+     *
+     * <p>The method {@code nextGaussian} is implemented by class
+     * {@code Random} as if by a threadsafe version of the following:
+     *  <pre> {@code
+     * private double nextNextGaussian;
+     * private boolean haveNextNextGaussian = false;
+     *
+     * public double nextGaussian() {
+     *   if (haveNextNextGaussian) {
+     *     haveNextNextGaussian = false;
+     *     return nextNextGaussian;
+     *   } else {
+     *     double v1, v2, s;
+     *     do {
+     *       v1 = 2 * nextDouble() - 1;   // between -1.0 and 1.0
+     *       v2 = 2 * nextDouble() - 1;   // between -1.0 and 1.0
+     *       s = v1 * v1 + v2 * v2;
+     *     } while (s >= 1 || s == 0);
+     *     double multiplier = StrictMath.sqrt(-2 * StrictMath.log(s)/s);
+     *     nextNextGaussian = v2 * multiplier;
+     *     haveNextNextGaussian = true;
+     *     return v1 * multiplier;
+     *   }
+     * }}</pre>
+     * This uses the <i>polar method</i> of G. E. P. Box, M. E. Muller, and
+     * G. Marsaglia, as described by Donald E. Knuth in <i>The Art of
+     * Computer Programming</i>, Volume 3: <i>Seminumerical Algorithms</i>,
+     * section 3.4.1, subsection C, algorithm P. Note that it generates two
+     * independent values at the cost of only one call to {@code StrictMath.log}
+     * and one call to {@code StrictMath.sqrt}.
+     *
+     * @return the next pseudorandom, Gaussian ("normally") distributed
+     *         {@code double} value with mean {@code 0.0} and
+     *         standard deviation {@code 1.0} from this random number
+     *         generator's sequence
+     */
+    synchronized public double nextGaussian() {
+        // See Knuth, ACP, Section 3.4.1 Algorithm C.
+        if (haveNextNextGaussian) {
+            haveNextNextGaussian = false;
+            return nextNextGaussian;
+        } else {
+            double v1, v2, s;
+            do {
+                v1 = 2 * nextDouble() - 1; // between -1 and 1
+                v2 = 2 * nextDouble() - 1; // between -1 and 1
+                s = v1 * v1 + v2 * v2;
+            } while (s >= 1 || s == 0);
+            double multiplier = Math.sqrt(-2 * Math.log(s)/s);
+            nextNextGaussian = v2 * multiplier;
+            haveNextNextGaussian = true;
+            return v1 * multiplier;
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/RandomAccess.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/RandomAccess.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * Marker interface used by <tt>List</tt> implementations to indicate that
+ * they support fast (generally constant time) random access.  The primary
+ * purpose of this interface is to allow generic algorithms to alter their
+ * behavior to provide good performance when applied to either random or
+ * sequential access lists.
+ *
+ * <p>The best algorithms for manipulating random access lists (such as
+ * <tt>ArrayList</tt>) can produce quadratic behavior when applied to
+ * sequential access lists (such as <tt>LinkedList</tt>).  Generic list
+ * algorithms are encouraged to check whether the given list is an
+ * <tt>instanceof</tt> this interface before applying an algorithm that would
+ * provide poor performance if it were applied to a sequential access list,
+ * and to alter their behavior if necessary to guarantee acceptable
+ * performance.
+ *
+ * <p>It is recognized that the distinction between random and sequential
+ * access is often fuzzy.  For example, some <tt>List</tt> implementations
+ * provide asymptotically linear access times if they get huge, but constant
+ * access times in practice.  Such a <tt>List</tt> implementation
+ * should generally implement this interface.  As a rule of thumb, a
+ * <tt>List</tt> implementation should implement this interface if,
+ * for typical instances of the class, this loop:
+ * <pre>
+ *     for (int i=0, n=list.size(); i &lt; n; i++)
+ *         list.get(i);
+ * </pre>
+ * runs faster than this loop:
+ * <pre>
+ *     for (Iterator i=list.iterator(); i.hasNext(); )
+ *         i.next();
+ * </pre>
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @since 1.4
+ */
+public interface RandomAccess {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/ServiceConfigurationError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/ServiceConfigurationError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+
+/**
+ * Error thrown when something goes wrong while loading a service provider.
+ *
+ * <p> This error will be thrown in the following situations:
+ *
+ * <ul>
+ *
+ *   <li> The format of a provider-configuration file violates the <a
+ *   href="ServiceLoader.html#format">specification</a>; </li>
+ *
+ *   <li> An {@link java.io.IOException IOException} occurs while reading a
+ *   provider-configuration file; </li>
+ *
+ *   <li> A concrete provider class named in a provider-configuration file
+ *   cannot be found; </li>
+ *
+ *   <li> A concrete provider class is not a subclass of the service class;
+ *   </li>
+ *
+ *   <li> A concrete provider class cannot be instantiated; or
+ *
+ *   <li> Some other kind of error occurs. </li>
+ *
+ * </ul>
+ *
+ *
+ * @author Mark Reinhold
+ * @since 1.6
+ */
+
+public class ServiceConfigurationError
+    extends Error
+{
+
+    private static final long serialVersionUID = 74132770414881L;
+
+    /**
+     * Constructs a new instance with the specified message.
+     *
+     * @param  msg  The message, or <tt>null</tt> if there is no message
+     *
+     */
+    public ServiceConfigurationError(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Constructs a new instance with the specified message and cause.
+     *
+     * @param  msg  The message, or <tt>null</tt> if there is no message
+     *
+     * @param  cause  The cause, or <tt>null</tt> if the cause is nonexistent
+     *                or unknown
+     */
+    public ServiceConfigurationError(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/ServiceLoader.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/ServiceLoader.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,538 @@
+/*
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+
+/**
+ * A simple service-provider loading facility.
+ *
+ * <p> A <i>service</i> is a well-known set of interfaces and (usually
+ * abstract) classes.  A <i>service provider</i> is a specific implementation
+ * of a service.  The classes in a provider typically implement the interfaces
+ * and subclass the classes defined in the service itself.  Service providers
+ * can be installed in an implementation of the Java platform in the form of
+ * extensions, that is, jar files placed into any of the usual extension
+ * directories.  Providers can also be made available by adding them to the
+ * application's class path or by some other platform-specific means.
+ *
+ * <p> For the purpose of loading, a service is represented by a single type,
+ * that is, a single interface or abstract class.  (A concrete class can be
+ * used, but this is not recommended.)  A provider of a given service contains
+ * one or more concrete classes that extend this <i>service type</i> with data
+ * and code specific to the provider.  The <i>provider class</i> is typically
+ * not the entire provider itself but rather a proxy which contains enough
+ * information to decide whether the provider is able to satisfy a particular
+ * request together with code that can create the actual provider on demand.
+ * The details of provider classes tend to be highly service-specific; no
+ * single class or interface could possibly unify them, so no such type is
+ * defined here.  The only requirement enforced by this facility is that
+ * provider classes must have a zero-argument constructor so that they can be
+ * instantiated during loading.
+ *
+ * <p><a name="format"> A service provider is identified by placing a
+ * <i>provider-configuration file</i> in the resource directory
+ * <tt>META-INF/services</tt>.  The file's name is the fully-qualified <a
+ * href="../lang/ClassLoader.html#name">binary name</a> of the service's type.
+ * The file contains a list of fully-qualified binary names of concrete
+ * provider classes, one per line.  Space and tab characters surrounding each
+ * name, as well as blank lines, are ignored.  The comment character is
+ * <tt>'#'</tt> (<tt>'&#92;u0023'</tt>, <font size="-1">NUMBER SIGN</font>); on
+ * each line all characters following the first comment character are ignored.
+ * The file must be encoded in UTF-8.
+ *
+ * <p> If a particular concrete provider class is named in more than one
+ * configuration file, or is named in the same configuration file more than
+ * once, then the duplicates are ignored.  The configuration file naming a
+ * particular provider need not be in the same jar file or other distribution
+ * unit as the provider itself.  The provider must be accessible from the same
+ * class loader that was initially queried to locate the configuration file;
+ * note that this is not necessarily the class loader from which the file was
+ * actually loaded.
+ *
+ * <p> Providers are located and instantiated lazily, that is, on demand.  A
+ * service loader maintains a cache of the providers that have been loaded so
+ * far.  Each invocation of the {@link #iterator iterator} method returns an
+ * iterator that first yields all of the elements of the cache, in
+ * instantiation order, and then lazily locates and instantiates any remaining
+ * providers, adding each one to the cache in turn.  The cache can be cleared
+ * via the {@link #reload reload} method.
+ *
+ * <p> Service loaders always execute in the security context of the caller.
+ * Trusted system code should typically invoke the methods in this class, and
+ * the methods of the iterators which they return, from within a privileged
+ * security context.
+ *
+ * <p> Instances of this class are not safe for use by multiple concurrent
+ * threads.
+ *
+ * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * method in this class will cause a {@link NullPointerException} to be thrown.
+ *
+ *
+ * <p><span style="font-weight: bold; padding-right: 1em">Example</span>
+ * Suppose we have a service type <tt>com.example.CodecSet</tt> which is
+ * intended to represent sets of encoder/decoder pairs for some protocol.  In
+ * this case it is an abstract class with two abstract methods:
+ *
+ * <blockquote><pre>
+ * public abstract Encoder getEncoder(String encodingName);
+ * public abstract Decoder getDecoder(String encodingName);</pre></blockquote>
+ *
+ * Each method returns an appropriate object or <tt>null</tt> if the provider
+ * does not support the given encoding.  Typical providers support more than
+ * one encoding.
+ *
+ * <p> If <tt>com.example.impl.StandardCodecs</tt> is an implementation of the
+ * <tt>CodecSet</tt> service then its jar file also contains a file named
+ *
+ * <blockquote><pre>
+ * META-INF/services/com.example.CodecSet</pre></blockquote>
+ *
+ * <p> This file contains the single line:
+ *
+ * <blockquote><pre>
+ * com.example.impl.StandardCodecs    # Standard codecs</pre></blockquote>
+ *
+ * <p> The <tt>CodecSet</tt> class creates and saves a single service instance
+ * at initialization:
+ *
+ * <blockquote><pre>
+ * private static ServiceLoader&lt;CodecSet&gt; codecSetLoader
+ *     = ServiceLoader.load(CodecSet.class);</pre></blockquote>
+ *
+ * <p> To locate an encoder for a given encoding name it defines a static
+ * factory method which iterates through the known and available providers,
+ * returning only when it has located a suitable encoder or has run out of
+ * providers.
+ *
+ * <blockquote><pre>
+ * public static Encoder getEncoder(String encodingName) {
+ *     for (CodecSet cp : codecSetLoader) {
+ *         Encoder enc = cp.getEncoder(encodingName);
+ *         if (enc != null)
+ *             return enc;
+ *     }
+ *     return null;
+ * }</pre></blockquote>
+ *
+ * <p> A <tt>getDecoder</tt> method is defined similarly.
+ *
+ *
+ * <p><span style="font-weight: bold; padding-right: 1em">Usage Note</span> If
+ * the class path of a class loader that is used for provider loading includes
+ * remote network URLs then those URLs will be dereferenced in the process of
+ * searching for provider-configuration files.
+ *
+ * <p> This activity is normal, although it may cause puzzling entries to be
+ * created in web-server logs.  If a web server is not configured correctly,
+ * however, then this activity may cause the provider-loading algorithm to fail
+ * spuriously.
+ *
+ * <p> A web server should return an HTTP 404 (Not Found) response when a
+ * requested resource does not exist.  Sometimes, however, web servers are
+ * erroneously configured to return an HTTP 200 (OK) response along with a
+ * helpful HTML error page in such cases.  This will cause a {@link
+ * ServiceConfigurationError} to be thrown when this class attempts to parse
+ * the HTML page as a provider-configuration file.  The best solution to this
+ * problem is to fix the misconfigured web server to return the correct
+ * response code (HTTP 404) along with the HTML error page.
+ *
+ * @param  <S>
+ *         The type of the service to be loaded by this loader
+ *
+ * @author Mark Reinhold
+ * @since 1.6
+ */
+
+public final class ServiceLoader<S>
+    implements Iterable<S>
+{
+
+    private static final String PREFIX = "META-INF/services/";
+
+    // The class or interface representing the service being loaded
+    private Class<S> service;
+
+    // The class loader used to locate, load, and instantiate providers
+    private ClassLoader loader;
+
+    // Cached providers, in instantiation order
+    private LinkedHashMap<String,S> providers = new LinkedHashMap<>();
+
+    // The current lazy-lookup iterator
+    private LazyIterator lookupIterator;
+
+    /**
+     * Clear this loader's provider cache so that all providers will be
+     * reloaded.
+     *
+     * <p> After invoking this method, subsequent invocations of the {@link
+     * #iterator() iterator} method will lazily look up and instantiate
+     * providers from scratch, just as is done by a newly-created loader.
+     *
+     * <p> This method is intended for use in situations in which new providers
+     * can be installed into a running Java virtual machine.
+     */
+    public void reload() {
+        providers.clear();
+        lookupIterator = new LazyIterator(service, loader);
+    }
+
+    private ServiceLoader(Class<S> svc, ClassLoader cl) {
+        service = svc;
+        loader = cl;
+        reload();
+    }
+
+    private static void fail(Class service, String msg, Throwable cause)
+        throws ServiceConfigurationError
+    {
+        throw new ServiceConfigurationError(service.getName() + ": " + msg,
+                                            cause);
+    }
+
+    private static void fail(Class service, String msg)
+        throws ServiceConfigurationError
+    {
+        throw new ServiceConfigurationError(service.getName() + ": " + msg);
+    }
+
+    private static void fail(Class service, URL u, int line, String msg)
+        throws ServiceConfigurationError
+    {
+        fail(service, u + ":" + line + ": " + msg);
+    }
+
+    // Parse a single line from the given configuration file, adding the name
+    // on the line to the names list.
+    //
+    private int parseLine(Class service, URL u, BufferedReader r, int lc,
+                          List<String> names)
+        throws IOException, ServiceConfigurationError
+    {
+        String ln = r.readLine();
+        if (ln == null) {
+            return -1;
+        }
+        int ci = ln.indexOf('#');
+        if (ci >= 0) ln = ln.substring(0, ci);
+        ln = ln.trim();
+        int n = ln.length();
+        if (n != 0) {
+            if ((ln.indexOf(' ') >= 0) || (ln.indexOf('\t') >= 0))
+                fail(service, u, lc, "Illegal configuration-file syntax");
+            int cp = ln.codePointAt(0);
+            if (!Character.isJavaIdentifierStart(cp))
+                fail(service, u, lc, "Illegal provider-class name: " + ln);
+            for (int i = Character.charCount(cp); i < n; i += Character.charCount(cp)) {
+                cp = ln.codePointAt(i);
+                if (!Character.isJavaIdentifierPart(cp) && (cp != '.'))
+                    fail(service, u, lc, "Illegal provider-class name: " + ln);
+            }
+            if (!providers.containsKey(ln) && !names.contains(ln))
+                names.add(ln);
+        }
+        return lc + 1;
+    }
+
+    // Parse the content of the given URL as a provider-configuration file.
+    //
+    // @param  service
+    //         The service type for which providers are being sought;
+    //         used to construct error detail strings
+    //
+    // @param  u
+    //         The URL naming the configuration file to be parsed
+    //
+    // @return A (possibly empty) iterator that will yield the provider-class
+    //         names in the given configuration file that are not yet members
+    //         of the returned set
+    //
+    // @throws ServiceConfigurationError
+    //         If an I/O error occurs while reading from the given URL, or
+    //         if a configuration-file format error is detected
+    //
+    private Iterator<String> parse(Class service, URL u)
+        throws ServiceConfigurationError
+    {
+        InputStream in = null;
+        BufferedReader r = null;
+        ArrayList<String> names = new ArrayList<>();
+        try {
+            in = u.openStream();
+            r = new BufferedReader(new InputStreamReader(in, "utf-8"));
+            int lc = 1;
+            while ((lc = parseLine(service, u, r, lc, names)) >= 0);
+        } catch (IOException x) {
+            fail(service, "Error reading configuration file", x);
+        } finally {
+            try {
+                if (r != null) r.close();
+                if (in != null) in.close();
+            } catch (IOException y) {
+                fail(service, "Error closing configuration file", y);
+            }
+        }
+        return names.iterator();
+    }
+
+    // Private inner class implementing fully-lazy provider lookup
+    //
+    private class LazyIterator
+        implements Iterator<S>
+    {
+
+        Class<S> service;
+        ClassLoader loader;
+        Enumeration<URL> configs = null;
+        Iterator<String> pending = null;
+        String nextName = null;
+
+        private LazyIterator(Class<S> service, ClassLoader loader) {
+            this.service = service;
+            this.loader = loader;
+        }
+
+        public boolean hasNext() {
+            if (nextName != null) {
+                return true;
+            }
+            if (configs == null) {
+                try {
+                    String fullName = PREFIX + service.getName();
+                    if (loader == null)
+                        configs = ClassLoader.getSystemResources(fullName);
+                    else
+                        configs = loader.getResources(fullName);
+                } catch (IOException x) {
+                    fail(service, "Error locating configuration files", x);
+                }
+            }
+            while ((pending == null) || !pending.hasNext()) {
+                if (!configs.hasMoreElements()) {
+                    return false;
+                }
+                pending = parse(service, configs.nextElement());
+            }
+            nextName = pending.next();
+            return true;
+        }
+
+        public S next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+            String cn = nextName;
+            nextName = null;
+            try {
+                S p = service.cast(Class.forName(cn, true, loader)
+                                   .newInstance());
+                providers.put(cn, p);
+                return p;
+            } catch (ClassNotFoundException x) {
+                fail(service,
+                     "Provider " + cn + " not found");
+            } catch (Throwable x) {
+                fail(service,
+                     "Provider " + cn + " could not be instantiated: " + x,
+                     x);
+            }
+            throw new Error();          // This cannot happen
+        }
+
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+
+    }
+
+    /**
+     * Lazily loads the available providers of this loader's service.
+     *
+     * <p> The iterator returned by this method first yields all of the
+     * elements of the provider cache, in instantiation order.  It then lazily
+     * loads and instantiates any remaining providers, adding each one to the
+     * cache in turn.
+     *
+     * <p> To achieve laziness the actual work of parsing the available
+     * provider-configuration files and instantiating providers must be done by
+     * the iterator itself.  Its {@link java.util.Iterator#hasNext hasNext} and
+     * {@link java.util.Iterator#next next} methods can therefore throw a
+     * {@link ServiceConfigurationError} if a provider-configuration file
+     * violates the specified format, or if it names a provider class that
+     * cannot be found and instantiated, or if the result of instantiating the
+     * class is not assignable to the service type, or if any other kind of
+     * exception or error is thrown as the next provider is located and
+     * instantiated.  To write robust code it is only necessary to catch {@link
+     * ServiceConfigurationError} when using a service iterator.
+     *
+     * <p> If such an error is thrown then subsequent invocations of the
+     * iterator will make a best effort to locate and instantiate the next
+     * available provider, but in general such recovery cannot be guaranteed.
+     *
+     * <blockquote style="font-size: smaller; line-height: 1.2"><span
+     * style="padding-right: 1em; font-weight: bold">Design Note</span>
+     * Throwing an error in these cases may seem extreme.  The rationale for
+     * this behavior is that a malformed provider-configuration file, like a
+     * malformed class file, indicates a serious problem with the way the Java
+     * virtual machine is configured or is being used.  As such it is
+     * preferable to throw an error rather than try to recover or, even worse,
+     * fail silently.</blockquote>
+     *
+     * <p> The iterator returned by this method does not support removal.
+     * Invoking its {@link java.util.Iterator#remove() remove} method will
+     * cause an {@link UnsupportedOperationException} to be thrown.
+     *
+     * @return  An iterator that lazily loads providers for this loader's
+     *          service
+     */
+    public Iterator<S> iterator() {
+        return new Iterator<S>() {
+
+            Iterator<Map.Entry<String,S>> knownProviders
+                = providers.entrySet().iterator();
+
+            public boolean hasNext() {
+                if (knownProviders.hasNext())
+                    return true;
+                return lookupIterator.hasNext();
+            }
+
+            public S next() {
+                if (knownProviders.hasNext())
+                    return knownProviders.next().getValue();
+                return lookupIterator.next();
+            }
+
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+
+        };
+    }
+
+    /**
+     * Creates a new service loader for the given service type and class
+     * loader.
+     *
+     * @param  service
+     *         The interface or abstract class representing the service
+     *
+     * @param  loader
+     *         The class loader to be used to load provider-configuration files
+     *         and provider classes, or <tt>null</tt> if the system class
+     *         loader (or, failing that, the bootstrap class loader) is to be
+     *         used
+     *
+     * @return A new service loader
+     */
+    public static <S> ServiceLoader<S> load(Class<S> service,
+                                            ClassLoader loader)
+    {
+        return new ServiceLoader<>(service, loader);
+    }
+
+    /**
+     * Creates a new service loader for the given service type, using the
+     * current thread's {@linkplain java.lang.Thread#getContextClassLoader
+     * context class loader}.
+     *
+     * <p> An invocation of this convenience method of the form
+     *
+     * <blockquote><pre>
+     * ServiceLoader.load(<i>service</i>)</pre></blockquote>
+     *
+     * is equivalent to
+     *
+     * <blockquote><pre>
+     * ServiceLoader.load(<i>service</i>,
+     *                    Thread.currentThread().getContextClassLoader())</pre></blockquote>
+     *
+     * @param  service
+     *         The interface or abstract class representing the service
+     *
+     * @return A new service loader
+     */
+    public static <S> ServiceLoader<S> load(Class<S> service) {
+        ClassLoader cl = null; // XXX: Thread.currentThread().getContextClassLoader();
+        return ServiceLoader.load(service, cl);
+    }
+
+    /**
+     * Creates a new service loader for the given service type, using the
+     * extension class loader.
+     *
+     * <p> This convenience method simply locates the extension class loader,
+     * call it <tt><i>extClassLoader</i></tt>, and then returns
+     *
+     * <blockquote><pre>
+     * ServiceLoader.load(<i>service</i>, <i>extClassLoader</i>)</pre></blockquote>
+     *
+     * <p> If the extension class loader cannot be found then the system class
+     * loader is used; if there is no system class loader then the bootstrap
+     * class loader is used.
+     *
+     * <p> This method is intended for use when only installed providers are
+     * desired.  The resulting service will only find and load providers that
+     * have been installed into the current Java virtual machine; providers on
+     * the application's class path will be ignored.
+     *
+     * @param  service
+     *         The interface or abstract class representing the service
+     *
+     * @return A new service loader
+     */
+    public static <S> ServiceLoader<S> loadInstalled(Class<S> service) {
+        ClassLoader cl = ClassLoader.getSystemClassLoader();
+        ClassLoader prev = null;
+        while (cl != null) {
+            prev = cl;
+            cl = cl.getParent();
+        }
+        return ServiceLoader.load(service, prev);
+    }
+
+    /**
+     * Returns a string describing this service.
+     *
+     * @return  A descriptive string
+     */
+    public String toString() {
+        return "java.util.ServiceLoader[" + service.getName() + "]";
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Set.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Set.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,385 @@
+/*
+ * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * A collection that contains no duplicate elements.  More formally, sets
+ * contain no pair of elements <code>e1</code> and <code>e2</code> such that
+ * <code>e1.equals(e2)</code>, and at most one null element.  As implied by
+ * its name, this interface models the mathematical <i>set</i> abstraction.
+ *
+ * <p>The <tt>Set</tt> interface places additional stipulations, beyond those
+ * inherited from the <tt>Collection</tt> interface, on the contracts of all
+ * constructors and on the contracts of the <tt>add</tt>, <tt>equals</tt> and
+ * <tt>hashCode</tt> methods.  Declarations for other inherited methods are
+ * also included here for convenience.  (The specifications accompanying these
+ * declarations have been tailored to the <tt>Set</tt> interface, but they do
+ * not contain any additional stipulations.)
+ *
+ * <p>The additional stipulation on constructors is, not surprisingly,
+ * that all constructors must create a set that contains no duplicate elements
+ * (as defined above).
+ *
+ * <p>Note: Great care must be exercised if mutable objects are used as set
+ * elements.  The behavior of a set is not specified if the value of an object
+ * is changed in a manner that affects <tt>equals</tt> comparisons while the
+ * object is an element in the set.  A special case of this prohibition is
+ * that it is not permissible for a set to contain itself as an element.
+ *
+ * <p>Some set implementations have restrictions on the elements that
+ * they may contain.  For example, some implementations prohibit null elements,
+ * and some have restrictions on the types of their elements.  Attempting to
+ * add an ineligible element throws an unchecked exception, typically
+ * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.  Attempting
+ * to query the presence of an ineligible element may throw an exception,
+ * or it may simply return false; some implementations will exhibit the former
+ * behavior and some will exhibit the latter.  More generally, attempting an
+ * operation on an ineligible element whose completion would not result in
+ * the insertion of an ineligible element into the set may throw an
+ * exception or it may succeed, at the option of the implementation.
+ * Such exceptions are marked as "optional" in the specification for this
+ * interface.
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <E> the type of elements maintained by this set
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see Collection
+ * @see List
+ * @see SortedSet
+ * @see HashSet
+ * @see TreeSet
+ * @see AbstractSet
+ * @see Collections#singleton(java.lang.Object)
+ * @see Collections#EMPTY_SET
+ * @since 1.2
+ */
+
+public interface Set<E> extends Collection<E> {
+    // Query Operations
+
+    /**
+     * Returns the number of elements in this set (its cardinality).  If this
+     * set contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
+     * <tt>Integer.MAX_VALUE</tt>.
+     *
+     * @return the number of elements in this set (its cardinality)
+     */
+    int size();
+
+    /**
+     * Returns <tt>true</tt> if this set contains no elements.
+     *
+     * @return <tt>true</tt> if this set contains no elements
+     */
+    boolean isEmpty();
+
+    /**
+     * Returns <tt>true</tt> if this set contains the specified element.
+     * More formally, returns <tt>true</tt> if and only if this set
+     * contains an element <tt>e</tt> such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     *
+     * @param o element whose presence in this set is to be tested
+     * @return <tt>true</tt> if this set contains the specified element
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this set
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         set does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     */
+    boolean contains(Object o);
+
+    /**
+     * Returns an iterator over the elements in this set.  The elements are
+     * returned in no particular order (unless this set is an instance of some
+     * class that provides a guarantee).
+     *
+     * @return an iterator over the elements in this set
+     */
+    Iterator<E> iterator();
+
+    /**
+     * Returns an array containing all of the elements in this set.
+     * If this set makes any guarantees as to what order its elements
+     * are returned by its iterator, this method must return the
+     * elements in the same order.
+     *
+     * <p>The returned array will be "safe" in that no references to it
+     * are maintained by this set.  (In other words, this method must
+     * allocate a new array even if this set is backed by an array).
+     * The caller is thus free to modify the returned array.
+     *
+     * <p>This method acts as bridge between array-based and collection-based
+     * APIs.
+     *
+     * @return an array containing all the elements in this set
+     */
+    Object[] toArray();
+
+    /**
+     * Returns an array containing all of the elements in this set; the
+     * runtime type of the returned array is that of the specified array.
+     * If the set fits in the specified array, it is returned therein.
+     * Otherwise, a new array is allocated with the runtime type of the
+     * specified array and the size of this set.
+     *
+     * <p>If this set fits in the specified array with room to spare
+     * (i.e., the array has more elements than this set), the element in
+     * the array immediately following the end of the set is set to
+     * <tt>null</tt>.  (This is useful in determining the length of this
+     * set <i>only</i> if the caller knows that this set does not contain
+     * any null elements.)
+     *
+     * <p>If this set makes any guarantees as to what order its elements
+     * are returned by its iterator, this method must return the elements
+     * in the same order.
+     *
+     * <p>Like the {@link #toArray()} method, this method acts as bridge between
+     * array-based and collection-based APIs.  Further, this method allows
+     * precise control over the runtime type of the output array, and may,
+     * under certain circumstances, be used to save allocation costs.
+     *
+     * <p>Suppose <tt>x</tt> is a set known to contain only strings.
+     * The following code can be used to dump the set into a newly allocated
+     * array of <tt>String</tt>:
+     *
+     * <pre>
+     *     String[] y = x.toArray(new String[0]);</pre>
+     *
+     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
+     * <tt>toArray()</tt>.
+     *
+     * @param a the array into which the elements of this set are to be
+     *        stored, if it is big enough; otherwise, a new array of the same
+     *        runtime type is allocated for this purpose.
+     * @return an array containing all the elements in this set
+     * @throws ArrayStoreException if the runtime type of the specified array
+     *         is not a supertype of the runtime type of every element in this
+     *         set
+     * @throws NullPointerException if the specified array is null
+     */
+    <T> T[] toArray(T[] a);
+
+
+    // Modification Operations
+
+    /**
+     * Adds the specified element to this set if it is not already present
+     * (optional operation).  More formally, adds the specified element
+     * <tt>e</tt> to this set if the set contains no element <tt>e2</tt>
+     * such that
+     * <tt>(e==null&nbsp;?&nbsp;e2==null&nbsp;:&nbsp;e.equals(e2))</tt>.
+     * If this set already contains the element, the call leaves the set
+     * unchanged and returns <tt>false</tt>.  In combination with the
+     * restriction on constructors, this ensures that sets never contain
+     * duplicate elements.
+     *
+     * <p>The stipulation above does not imply that sets must accept all
+     * elements; sets may refuse to add any particular element, including
+     * <tt>null</tt>, and throw an exception, as described in the
+     * specification for {@link Collection#add Collection.add}.
+     * Individual set implementations should clearly document any
+     * restrictions on the elements that they may contain.
+     *
+     * @param e element to be added to this set
+     * @return <tt>true</tt> if this set did not already contain the specified
+     *         element
+     * @throws UnsupportedOperationException if the <tt>add</tt> operation
+     *         is not supported by this set
+     * @throws ClassCastException if the class of the specified element
+     *         prevents it from being added to this set
+     * @throws NullPointerException if the specified element is null and this
+     *         set does not permit null elements
+     * @throws IllegalArgumentException if some property of the specified element
+     *         prevents it from being added to this set
+     */
+    boolean add(E e);
+
+
+    /**
+     * Removes the specified element from this set if it is present
+     * (optional operation).  More formally, removes an element <tt>e</tt>
+     * such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>, if
+     * this set contains such an element.  Returns <tt>true</tt> if this set
+     * contained the element (or equivalently, if this set changed as a
+     * result of the call).  (This set will not contain the element once the
+     * call returns.)
+     *
+     * @param o object to be removed from this set, if present
+     * @return <tt>true</tt> if this set contained the specified element
+     * @throws ClassCastException if the type of the specified element
+     *         is incompatible with this set
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified element is null and this
+     *         set does not permit null elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+     *         is not supported by this set
+     */
+    boolean remove(Object o);
+
+
+    // Bulk Operations
+
+    /**
+     * Returns <tt>true</tt> if this set contains all of the elements of the
+     * specified collection.  If the specified collection is also a set, this
+     * method returns <tt>true</tt> if it is a <i>subset</i> of this set.
+     *
+     * @param  c collection to be checked for containment in this set
+     * @return <tt>true</tt> if this set contains all of the elements of the
+     *         specified collection
+     * @throws ClassCastException if the types of one or more elements
+     *         in the specified collection are incompatible with this
+     *         set
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if the specified collection contains one
+     *         or more null elements and this set does not permit null
+     *         elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see    #contains(Object)
+     */
+    boolean containsAll(Collection<?> c);
+
+    /**
+     * Adds all of the elements in the specified collection to this set if
+     * they're not already present (optional operation).  If the specified
+     * collection is also a set, the <tt>addAll</tt> operation effectively
+     * modifies this set so that its value is the <i>union</i> of the two
+     * sets.  The behavior of this operation is undefined if the specified
+     * collection is modified while the operation is in progress.
+     *
+     * @param  c collection containing elements to be added to this set
+     * @return <tt>true</tt> if this set changed as a result of the call
+     *
+     * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
+     *         is not supported by this set
+     * @throws ClassCastException if the class of an element of the
+     *         specified collection prevents it from being added to this set
+     * @throws NullPointerException if the specified collection contains one
+     *         or more null elements and this set does not permit null
+     *         elements, or if the specified collection is null
+     * @throws IllegalArgumentException if some property of an element of the
+     *         specified collection prevents it from being added to this set
+     * @see #add(Object)
+     */
+    boolean addAll(Collection<? extends E> c);
+
+    /**
+     * Retains only the elements in this set that are contained in the
+     * specified collection (optional operation).  In other words, removes
+     * from this set all of its elements that are not contained in the
+     * specified collection.  If the specified collection is also a set, this
+     * operation effectively modifies this set so that its value is the
+     * <i>intersection</i> of the two sets.
+     *
+     * @param  c collection containing elements to be retained in this set
+     * @return <tt>true</tt> if this set changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
+     *         is not supported by this set
+     * @throws ClassCastException if the class of an element of this set
+     *         is incompatible with the specified collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this set contains a null element and the
+     *         specified collection does not permit null elements
+     *         (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see #remove(Object)
+     */
+    boolean retainAll(Collection<?> c);
+
+    /**
+     * Removes from this set all of its elements that are contained in the
+     * specified collection (optional operation).  If the specified
+     * collection is also a set, this operation effectively modifies this
+     * set so that its value is the <i>asymmetric set difference</i> of
+     * the two sets.
+     *
+     * @param  c collection containing elements to be removed from this set
+     * @return <tt>true</tt> if this set changed as a result of the call
+     * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
+     *         is not supported by this set
+     * @throws ClassCastException if the class of an element of this set
+     *         is incompatible with the specified collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this set contains a null element and the
+     *         specified collection does not permit null elements
+     *         (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @see #remove(Object)
+     * @see #contains(Object)
+     */
+    boolean removeAll(Collection<?> c);
+
+    /**
+     * Removes all of the elements from this set (optional operation).
+     * The set will be empty after this call returns.
+     *
+     * @throws UnsupportedOperationException if the <tt>clear</tt> method
+     *         is not supported by this set
+     */
+    void clear();
+
+
+    // Comparison and hashing
+
+    /**
+     * Compares the specified object with this set for equality.  Returns
+     * <tt>true</tt> if the specified object is also a set, the two sets
+     * have the same size, and every member of the specified set is
+     * contained in this set (or equivalently, every member of this set is
+     * contained in the specified set).  This definition ensures that the
+     * equals method works properly across different implementations of the
+     * set interface.
+     *
+     * @param o object to be compared for equality with this set
+     * @return <tt>true</tt> if the specified object is equal to this set
+     */
+    boolean equals(Object o);
+
+    /**
+     * Returns the hash code value for this set.  The hash code of a set is
+     * defined to be the sum of the hash codes of the elements in the set,
+     * where the hash code of a <tt>null</tt> element is defined to be zero.
+     * This ensures that <tt>s1.equals(s2)</tt> implies that
+     * <tt>s1.hashCode()==s2.hashCode()</tt> for any two sets <tt>s1</tt>
+     * and <tt>s2</tt>, as required by the general contract of
+     * {@link Object#hashCode}.
+     *
+     * @return the hash code value for this set
+     * @see Object#equals(Object)
+     * @see Set#equals(Object)
+     */
+    int hashCode();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/SortedMap.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/SortedMap.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * A {@link Map} that further provides a <em>total ordering</em> on its keys.
+ * The map is ordered according to the {@linkplain Comparable natural
+ * ordering} of its keys, or by a {@link Comparator} typically
+ * provided at sorted map creation time.  This order is reflected when
+ * iterating over the sorted map's collection views (returned by the
+ * {@code entrySet}, {@code keySet} and {@code values} methods).
+ * Several additional operations are provided to take advantage of the
+ * ordering.  (This interface is the map analogue of {@link SortedSet}.)
+ *
+ * <p>All keys inserted into a sorted map must implement the {@code Comparable}
+ * interface (or be accepted by the specified comparator).  Furthermore, all
+ * such keys must be <em>mutually comparable</em>: {@code k1.compareTo(k2)} (or
+ * {@code comparator.compare(k1, k2)}) must not throw a
+ * {@code ClassCastException} for any keys {@code k1} and {@code k2} in
+ * the sorted map.  Attempts to violate this restriction will cause the
+ * offending method or constructor invocation to throw a
+ * {@code ClassCastException}.
+ *
+ * <p>Note that the ordering maintained by a sorted map (whether or not an
+ * explicit comparator is provided) must be <em>consistent with equals</em> if
+ * the sorted map is to correctly implement the {@code Map} interface.  (See
+ * the {@code Comparable} interface or {@code Comparator} interface for a
+ * precise definition of <em>consistent with equals</em>.)  This is so because
+ * the {@code Map} interface is defined in terms of the {@code equals}
+ * operation, but a sorted map performs all key comparisons using its
+ * {@code compareTo} (or {@code compare}) method, so two keys that are
+ * deemed equal by this method are, from the standpoint of the sorted map,
+ * equal.  The behavior of a tree map <em>is</em> well-defined even if its
+ * ordering is inconsistent with equals; it just fails to obey the general
+ * contract of the {@code Map} interface.
+ *
+ * <p>All general-purpose sorted map implementation classes should provide four
+ * "standard" constructors. It is not possible to enforce this recommendation
+ * though as required constructors cannot be specified by interfaces. The
+ * expected "standard" constructors for all sorted map implementations are:
+ * <ol>
+ *   <li>A void (no arguments) constructor, which creates an empty sorted map
+ *   sorted according to the natural ordering of its keys.</li>
+ *   <li>A constructor with a single argument of type {@code Comparator}, which
+ *   creates an empty sorted map sorted according to the specified comparator.</li>
+ *   <li>A constructor with a single argument of type {@code Map}, which creates
+ *   a new map with the same key-value mappings as its argument, sorted
+ *   according to the keys' natural ordering.</li>
+ *   <li>A constructor with a single argument of type {@code SortedMap}, which
+ *   creates a new sorted map with the same key-value mappings and the same
+ *   ordering as the input sorted map.</li>
+ * </ol>
+ *
+ * <p><strong>Note</strong>: several methods return submaps with restricted key
+ * ranges. Such ranges are <em>half-open</em>, that is, they include their low
+ * endpoint but not their high endpoint (where applicable).  If you need a
+ * <em>closed range</em> (which includes both endpoints), and the key type
+ * allows for calculation of the successor of a given key, merely request
+ * the subrange from {@code lowEndpoint} to
+ * {@code successor(highEndpoint)}.  For example, suppose that {@code m}
+ * is a map whose keys are strings.  The following idiom obtains a view
+ * containing all of the key-value mappings in {@code m} whose keys are
+ * between {@code low} and {@code high}, inclusive:<pre>
+ *   SortedMap&lt;String, V&gt; sub = m.subMap(low, high+"\0");</pre>
+ *
+ * A similar technique can be used to generate an <em>open range</em>
+ * (which contains neither endpoint).  The following idiom obtains a
+ * view containing all of the key-value mappings in {@code m} whose keys
+ * are between {@code low} and {@code high}, exclusive:<pre>
+ *   SortedMap&lt;String, V&gt; sub = m.subMap(low+"\0", high);</pre>
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <K> the type of keys maintained by this map
+ * @param <V> the type of mapped values
+ *
+ * @author  Josh Bloch
+ * @see Map
+ * @see TreeMap
+ * @see SortedSet
+ * @see Comparator
+ * @see Comparable
+ * @see Collection
+ * @see ClassCastException
+ * @since 1.2
+ */
+
+public interface SortedMap<K,V> extends Map<K,V> {
+    /**
+     * Returns the comparator used to order the keys in this map, or
+     * {@code null} if this map uses the {@linkplain Comparable
+     * natural ordering} of its keys.
+     *
+     * @return the comparator used to order the keys in this map,
+     *         or {@code null} if this map uses the natural ordering
+     *         of its keys
+     */
+    Comparator<? super K> comparator();
+
+    /**
+     * Returns a view of the portion of this map whose keys range from
+     * {@code fromKey}, inclusive, to {@code toKey}, exclusive.  (If
+     * {@code fromKey} and {@code toKey} are equal, the returned map
+     * is empty.)  The returned map is backed by this map, so changes
+     * in the returned map are reflected in this map, and vice-versa.
+     * The returned map supports all optional map operations that this
+     * map supports.
+     *
+     * <p>The returned map will throw an {@code IllegalArgumentException}
+     * on an attempt to insert a key outside its range.
+     *
+     * @param fromKey low endpoint (inclusive) of the keys in the returned map
+     * @param toKey high endpoint (exclusive) of the keys in the returned map
+     * @return a view of the portion of this map whose keys range from
+     *         {@code fromKey}, inclusive, to {@code toKey}, exclusive
+     * @throws ClassCastException if {@code fromKey} and {@code toKey}
+     *         cannot be compared to one another using this map's comparator
+     *         (or, if the map has no comparator, using natural ordering).
+     *         Implementations may, but are not required to, throw this
+     *         exception if {@code fromKey} or {@code toKey}
+     *         cannot be compared to keys currently in the map.
+     * @throws NullPointerException if {@code fromKey} or {@code toKey}
+     *         is null and this map does not permit null keys
+     * @throws IllegalArgumentException if {@code fromKey} is greater than
+     *         {@code toKey}; or if this map itself has a restricted
+     *         range, and {@code fromKey} or {@code toKey} lies
+     *         outside the bounds of the range
+     */
+    SortedMap<K,V> subMap(K fromKey, K toKey);
+
+    /**
+     * Returns a view of the portion of this map whose keys are
+     * strictly less than {@code toKey}.  The returned map is backed
+     * by this map, so changes in the returned map are reflected in
+     * this map, and vice-versa.  The returned map supports all
+     * optional map operations that this map supports.
+     *
+     * <p>The returned map will throw an {@code IllegalArgumentException}
+     * on an attempt to insert a key outside its range.
+     *
+     * @param toKey high endpoint (exclusive) of the keys in the returned map
+     * @return a view of the portion of this map whose keys are strictly
+     *         less than {@code toKey}
+     * @throws ClassCastException if {@code toKey} is not compatible
+     *         with this map's comparator (or, if the map has no comparator,
+     *         if {@code toKey} does not implement {@link Comparable}).
+     *         Implementations may, but are not required to, throw this
+     *         exception if {@code toKey} cannot be compared to keys
+     *         currently in the map.
+     * @throws NullPointerException if {@code toKey} is null and
+     *         this map does not permit null keys
+     * @throws IllegalArgumentException if this map itself has a
+     *         restricted range, and {@code toKey} lies outside the
+     *         bounds of the range
+     */
+    SortedMap<K,V> headMap(K toKey);
+
+    /**
+     * Returns a view of the portion of this map whose keys are
+     * greater than or equal to {@code fromKey}.  The returned map is
+     * backed by this map, so changes in the returned map are
+     * reflected in this map, and vice-versa.  The returned map
+     * supports all optional map operations that this map supports.
+     *
+     * <p>The returned map will throw an {@code IllegalArgumentException}
+     * on an attempt to insert a key outside its range.
+     *
+     * @param fromKey low endpoint (inclusive) of the keys in the returned map
+     * @return a view of the portion of this map whose keys are greater
+     *         than or equal to {@code fromKey}
+     * @throws ClassCastException if {@code fromKey} is not compatible
+     *         with this map's comparator (or, if the map has no comparator,
+     *         if {@code fromKey} does not implement {@link Comparable}).
+     *         Implementations may, but are not required to, throw this
+     *         exception if {@code fromKey} cannot be compared to keys
+     *         currently in the map.
+     * @throws NullPointerException if {@code fromKey} is null and
+     *         this map does not permit null keys
+     * @throws IllegalArgumentException if this map itself has a
+     *         restricted range, and {@code fromKey} lies outside the
+     *         bounds of the range
+     */
+    SortedMap<K,V> tailMap(K fromKey);
+
+    /**
+     * Returns the first (lowest) key currently in this map.
+     *
+     * @return the first (lowest) key currently in this map
+     * @throws NoSuchElementException if this map is empty
+     */
+    K firstKey();
+
+    /**
+     * Returns the last (highest) key currently in this map.
+     *
+     * @return the last (highest) key currently in this map
+     * @throws NoSuchElementException if this map is empty
+     */
+    K lastKey();
+
+    /**
+     * Returns a {@link Set} view of the keys contained in this map.
+     * The set's iterator returns the keys in ascending order.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own {@code remove} operation), the results of
+     * the iteration are undefined.  The set supports element removal,
+     * which removes the corresponding mapping from the map, via the
+     * {@code Iterator.remove}, {@code Set.remove},
+     * {@code removeAll}, {@code retainAll}, and {@code clear}
+     * operations.  It does not support the {@code add} or {@code addAll}
+     * operations.
+     *
+     * @return a set view of the keys contained in this map, sorted in
+     *         ascending order
+     */
+    Set<K> keySet();
+
+    /**
+     * Returns a {@link Collection} view of the values contained in this map.
+     * The collection's iterator returns the values in ascending order
+     * of the corresponding keys.
+     * The collection is backed by the map, so changes to the map are
+     * reflected in the collection, and vice-versa.  If the map is
+     * modified while an iteration over the collection is in progress
+     * (except through the iterator's own {@code remove} operation),
+     * the results of the iteration are undefined.  The collection
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the {@code Iterator.remove},
+     * {@code Collection.remove}, {@code removeAll},
+     * {@code retainAll} and {@code clear} operations.  It does not
+     * support the {@code add} or {@code addAll} operations.
+     *
+     * @return a collection view of the values contained in this map,
+     *         sorted in ascending key order
+     */
+    Collection<V> values();
+
+    /**
+     * Returns a {@link Set} view of the mappings contained in this map.
+     * The set's iterator returns the entries in ascending key order.
+     * The set is backed by the map, so changes to the map are
+     * reflected in the set, and vice-versa.  If the map is modified
+     * while an iteration over the set is in progress (except through
+     * the iterator's own {@code remove} operation, or through the
+     * {@code setValue} operation on a map entry returned by the
+     * iterator) the results of the iteration are undefined.  The set
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the {@code Iterator.remove},
+     * {@code Set.remove}, {@code removeAll}, {@code retainAll} and
+     * {@code clear} operations.  It does not support the
+     * {@code add} or {@code addAll} operations.
+     *
+     * @return a set view of the mappings contained in this map,
+     *         sorted in ascending key order
+     */
+    Set<Map.Entry<K, V>> entrySet();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/SortedSet.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/SortedSet.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * A {@link Set} that further provides a <i>total ordering</i> on its elements.
+ * The elements are ordered using their {@linkplain Comparable natural
+ * ordering}, or by a {@link Comparator} typically provided at sorted
+ * set creation time.  The set's iterator will traverse the set in
+ * ascending element order. Several additional operations are provided
+ * to take advantage of the ordering.  (This interface is the set
+ * analogue of {@link SortedMap}.)
+ *
+ * <p>All elements inserted into a sorted set must implement the <tt>Comparable</tt>
+ * interface (or be accepted by the specified comparator).  Furthermore, all
+ * such elements must be <i>mutually comparable</i>: <tt>e1.compareTo(e2)</tt>
+ * (or <tt>comparator.compare(e1, e2)</tt>) must not throw a
+ * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and <tt>e2</tt> in
+ * the sorted set.  Attempts to violate this restriction will cause the
+ * offending method or constructor invocation to throw a
+ * <tt>ClassCastException</tt>.
+ *
+ * <p>Note that the ordering maintained by a sorted set (whether or not an
+ * explicit comparator is provided) must be <i>consistent with equals</i> if
+ * the sorted set is to correctly implement the <tt>Set</tt> interface.  (See
+ * the <tt>Comparable</tt> interface or <tt>Comparator</tt> interface for a
+ * precise definition of <i>consistent with equals</i>.)  This is so because
+ * the <tt>Set</tt> interface is defined in terms of the <tt>equals</tt>
+ * operation, but a sorted set performs all element comparisons using its
+ * <tt>compareTo</tt> (or <tt>compare</tt>) method, so two elements that are
+ * deemed equal by this method are, from the standpoint of the sorted set,
+ * equal.  The behavior of a sorted set <i>is</i> well-defined even if its
+ * ordering is inconsistent with equals; it just fails to obey the general
+ * contract of the <tt>Set</tt> interface.
+ *
+ * <p>All general-purpose sorted set implementation classes should
+ * provide four "standard" constructors: 1) A void (no arguments)
+ * constructor, which creates an empty sorted set sorted according to
+ * the natural ordering of its elements.  2) A constructor with a
+ * single argument of type <tt>Comparator</tt>, which creates an empty
+ * sorted set sorted according to the specified comparator.  3) A
+ * constructor with a single argument of type <tt>Collection</tt>,
+ * which creates a new sorted set with the same elements as its
+ * argument, sorted according to the natural ordering of the elements.
+ * 4) A constructor with a single argument of type <tt>SortedSet</tt>,
+ * which creates a new sorted set with the same elements and the same
+ * ordering as the input sorted set.  There is no way to enforce this
+ * recommendation, as interfaces cannot contain constructors.
+ *
+ * <p>Note: several methods return subsets with restricted ranges.
+ * Such ranges are <i>half-open</i>, that is, they include their low
+ * endpoint but not their high endpoint (where applicable).
+ * If you need a <i>closed range</i> (which includes both endpoints), and
+ * the element type allows for calculation of the successor of a given
+ * value, merely request the subrange from <tt>lowEndpoint</tt> to
+ * <tt>successor(highEndpoint)</tt>.  For example, suppose that <tt>s</tt>
+ * is a sorted set of strings.  The following idiom obtains a view
+ * containing all of the strings in <tt>s</tt> from <tt>low</tt> to
+ * <tt>high</tt>, inclusive:<pre>
+ *   SortedSet&lt;String&gt; sub = s.subSet(low, high+"\0");</pre>
+ *
+ * A similar technique can be used to generate an <i>open range</i> (which
+ * contains neither endpoint).  The following idiom obtains a view
+ * containing all of the Strings in <tt>s</tt> from <tt>low</tt> to
+ * <tt>high</tt>, exclusive:<pre>
+ *   SortedSet&lt;String&gt; sub = s.subSet(low+"\0", high);</pre>
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <E> the type of elements maintained by this set
+ *
+ * @author  Josh Bloch
+ * @see Set
+ * @see TreeSet
+ * @see SortedMap
+ * @see Collection
+ * @see Comparable
+ * @see Comparator
+ * @see ClassCastException
+ * @since 1.2
+ */
+
+public interface SortedSet<E> extends Set<E> {
+    /**
+     * Returns the comparator used to order the elements in this set,
+     * or <tt>null</tt> if this set uses the {@linkplain Comparable
+     * natural ordering} of its elements.
+     *
+     * @return the comparator used to order the elements in this set,
+     *         or <tt>null</tt> if this set uses the natural ordering
+     *         of its elements
+     */
+    Comparator<? super E> comparator();
+
+    /**
+     * Returns a view of the portion of this set whose elements range
+     * from <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>,
+     * exclusive.  (If <tt>fromElement</tt> and <tt>toElement</tt> are
+     * equal, the returned set is empty.)  The returned set is backed
+     * by this set, so changes in the returned set are reflected in
+     * this set, and vice-versa.  The returned set supports all
+     * optional set operations that this set supports.
+     *
+     * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
+     * on an attempt to insert an element outside its range.
+     *
+     * @param fromElement low endpoint (inclusive) of the returned set
+     * @param toElement high endpoint (exclusive) of the returned set
+     * @return a view of the portion of this set whose elements range from
+     *         <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>, exclusive
+     * @throws ClassCastException if <tt>fromElement</tt> and
+     *         <tt>toElement</tt> cannot be compared to one another using this
+     *         set's comparator (or, if the set has no comparator, using
+     *         natural ordering).  Implementations may, but are not required
+     *         to, throw this exception if <tt>fromElement</tt> or
+     *         <tt>toElement</tt> cannot be compared to elements currently in
+     *         the set.
+     * @throws NullPointerException if <tt>fromElement</tt> or
+     *         <tt>toElement</tt> is null and this set does not permit null
+     *         elements
+     * @throws IllegalArgumentException if <tt>fromElement</tt> is
+     *         greater than <tt>toElement</tt>; or if this set itself
+     *         has a restricted range, and <tt>fromElement</tt> or
+     *         <tt>toElement</tt> lies outside the bounds of the range
+     */
+    SortedSet<E> subSet(E fromElement, E toElement);
+
+    /**
+     * Returns a view of the portion of this set whose elements are
+     * strictly less than <tt>toElement</tt>.  The returned set is
+     * backed by this set, so changes in the returned set are
+     * reflected in this set, and vice-versa.  The returned set
+     * supports all optional set operations that this set supports.
+     *
+     * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
+     * on an attempt to insert an element outside its range.
+     *
+     * @param toElement high endpoint (exclusive) of the returned set
+     * @return a view of the portion of this set whose elements are strictly
+     *         less than <tt>toElement</tt>
+     * @throws ClassCastException if <tt>toElement</tt> is not compatible
+     *         with this set's comparator (or, if the set has no comparator,
+     *         if <tt>toElement</tt> does not implement {@link Comparable}).
+     *         Implementations may, but are not required to, throw this
+     *         exception if <tt>toElement</tt> cannot be compared to elements
+     *         currently in the set.
+     * @throws NullPointerException if <tt>toElement</tt> is null and
+     *         this set does not permit null elements
+     * @throws IllegalArgumentException if this set itself has a
+     *         restricted range, and <tt>toElement</tt> lies outside the
+     *         bounds of the range
+     */
+    SortedSet<E> headSet(E toElement);
+
+    /**
+     * Returns a view of the portion of this set whose elements are
+     * greater than or equal to <tt>fromElement</tt>.  The returned
+     * set is backed by this set, so changes in the returned set are
+     * reflected in this set, and vice-versa.  The returned set
+     * supports all optional set operations that this set supports.
+     *
+     * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
+     * on an attempt to insert an element outside its range.
+     *
+     * @param fromElement low endpoint (inclusive) of the returned set
+     * @return a view of the portion of this set whose elements are greater
+     *         than or equal to <tt>fromElement</tt>
+     * @throws ClassCastException if <tt>fromElement</tt> is not compatible
+     *         with this set's comparator (or, if the set has no comparator,
+     *         if <tt>fromElement</tt> does not implement {@link Comparable}).
+     *         Implementations may, but are not required to, throw this
+     *         exception if <tt>fromElement</tt> cannot be compared to elements
+     *         currently in the set.
+     * @throws NullPointerException if <tt>fromElement</tt> is null
+     *         and this set does not permit null elements
+     * @throws IllegalArgumentException if this set itself has a
+     *         restricted range, and <tt>fromElement</tt> lies outside the
+     *         bounds of the range
+     */
+    SortedSet<E> tailSet(E fromElement);
+
+    /**
+     * Returns the first (lowest) element currently in this set.
+     *
+     * @return the first (lowest) element currently in this set
+     * @throws NoSuchElementException if this set is empty
+     */
+    E first();
+
+    /**
+     * Returns the last (highest) element currently in this set.
+     *
+     * @return the last (highest) element currently in this set
+     * @throws NoSuchElementException if this set is empty
+     */
+    E last();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Stack.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Stack.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * The <code>Stack</code> class represents a last-in-first-out
+ * (LIFO) stack of objects. It extends class <tt>Vector</tt> with five
+ * operations that allow a vector to be treated as a stack. The usual
+ * <tt>push</tt> and <tt>pop</tt> operations are provided, as well as a
+ * method to <tt>peek</tt> at the top item on the stack, a method to test
+ * for whether the stack is <tt>empty</tt>, and a method to <tt>search</tt>
+ * the stack for an item and discover how far it is from the top.
+ * <p>
+ * When a stack is first created, it contains no items.
+ *
+ * <p>A more complete and consistent set of LIFO stack operations is
+ * provided by the {@link Deque} interface and its implementations, which
+ * should be used in preference to this class.  For example:
+ * <pre>   {@code
+ *   Deque<Integer> stack = new ArrayDeque<Integer>();}</pre>
+ *
+ * @author  Jonathan Payne
+ * @since   JDK1.0
+ */
+public
+class Stack<E> extends Vector<E> {
+    /**
+     * Creates an empty Stack.
+     */
+    public Stack() {
+    }
+
+    /**
+     * Pushes an item onto the top of this stack. This has exactly
+     * the same effect as:
+     * <blockquote><pre>
+     * addElement(item)</pre></blockquote>
+     *
+     * @param   item   the item to be pushed onto this stack.
+     * @return  the <code>item</code> argument.
+     * @see     java.util.Vector#addElement
+     */
+    public E push(E item) {
+        addElement(item);
+
+        return item;
+    }
+
+    /**
+     * Removes the object at the top of this stack and returns that
+     * object as the value of this function.
+     *
+     * @return  The object at the top of this stack (the last item
+     *          of the <tt>Vector</tt> object).
+     * @throws  EmptyStackException  if this stack is empty.
+     */
+    public synchronized E pop() {
+        E       obj;
+        int     len = size();
+
+        obj = peek();
+        removeElementAt(len - 1);
+
+        return obj;
+    }
+
+    /**
+     * Looks at the object at the top of this stack without removing it
+     * from the stack.
+     *
+     * @return  the object at the top of this stack (the last item
+     *          of the <tt>Vector</tt> object).
+     * @throws  EmptyStackException  if this stack is empty.
+     */
+    public synchronized E peek() {
+        int     len = size();
+
+        if (len == 0)
+            throw new EmptyStackException();
+        return elementAt(len - 1);
+    }
+
+    /**
+     * Tests if this stack is empty.
+     *
+     * @return  <code>true</code> if and only if this stack contains
+     *          no items; <code>false</code> otherwise.
+     */
+    public boolean empty() {
+        return size() == 0;
+    }
+
+    /**
+     * Returns the 1-based position where an object is on this stack.
+     * If the object <tt>o</tt> occurs as an item in this stack, this
+     * method returns the distance from the top of the stack of the
+     * occurrence nearest the top of the stack; the topmost item on the
+     * stack is considered to be at distance <tt>1</tt>. The <tt>equals</tt>
+     * method is used to compare <tt>o</tt> to the
+     * items in this stack.
+     *
+     * @param   o   the desired object.
+     * @return  the 1-based position from the top of the stack where
+     *          the object is located; the return value <code>-1</code>
+     *          indicates that the object is not on the stack.
+     */
+    public synchronized int search(Object o) {
+        int i = lastIndexOf(o);
+
+        if (i >= 0) {
+            return size() - i;
+        }
+        return -1;
+    }
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = 1224463164541339165L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/StringTokenizer.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/StringTokenizer.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,431 @@
+/*
+ * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+import java.lang.*;
+
+/**
+ * The string tokenizer class allows an application to break a
+ * string into tokens. The tokenization method is much simpler than
+ * the one used by the <code>StreamTokenizer</code> class. The
+ * <code>StringTokenizer</code> methods do not distinguish among
+ * identifiers, numbers, and quoted strings, nor do they recognize
+ * and skip comments.
+ * <p>
+ * The set of delimiters (the characters that separate tokens) may
+ * be specified either at creation time or on a per-token basis.
+ * <p>
+ * An instance of <code>StringTokenizer</code> behaves in one of two
+ * ways, depending on whether it was created with the
+ * <code>returnDelims</code> flag having the value <code>true</code>
+ * or <code>false</code>:
+ * <ul>
+ * <li>If the flag is <code>false</code>, delimiter characters serve to
+ *     separate tokens. A token is a maximal sequence of consecutive
+ *     characters that are not delimiters.
+ * <li>If the flag is <code>true</code>, delimiter characters are themselves
+ *     considered to be tokens. A token is thus either one delimiter
+ *     character, or a maximal sequence of consecutive characters that are
+ *     not delimiters.
+ * </ul><p>
+ * A <tt>StringTokenizer</tt> object internally maintains a current
+ * position within the string to be tokenized. Some operations advance this
+ * current position past the characters processed.<p>
+ * A token is returned by taking a substring of the string that was used to
+ * create the <tt>StringTokenizer</tt> object.
+ * <p>
+ * The following is one example of the use of the tokenizer. The code:
+ * <blockquote><pre>
+ *     StringTokenizer st = new StringTokenizer("this is a test");
+ *     while (st.hasMoreTokens()) {
+ *         System.out.println(st.nextToken());
+ *     }
+ * </pre></blockquote>
+ * <p>
+ * prints the following output:
+ * <blockquote><pre>
+ *     this
+ *     is
+ *     a
+ *     test
+ * </pre></blockquote>
+ *
+ * <p>
+ * <tt>StringTokenizer</tt> is a legacy class that is retained for
+ * compatibility reasons although its use is discouraged in new code. It is
+ * recommended that anyone seeking this functionality use the <tt>split</tt>
+ * method of <tt>String</tt> or the java.util.regex package instead.
+ * <p>
+ * The following example illustrates how the <tt>String.split</tt>
+ * method can be used to break up a string into its basic tokens:
+ * <blockquote><pre>
+ *     String[] result = "this is a test".split("\\s");
+ *     for (int x=0; x&lt;result.length; x++)
+ *         System.out.println(result[x]);
+ * </pre></blockquote>
+ * <p>
+ * prints the following output:
+ * <blockquote><pre>
+ *     this
+ *     is
+ *     a
+ *     test
+ * </pre></blockquote>
+ *
+ * @author  unascribed
+ * @see     java.io.StreamTokenizer
+ * @since   JDK1.0
+ */
+public
+class StringTokenizer implements Enumeration<Object> {
+    private int currentPosition;
+    private int newPosition;
+    private int maxPosition;
+    private String str;
+    private String delimiters;
+    private boolean retDelims;
+    private boolean delimsChanged;
+
+    /**
+     * maxDelimCodePoint stores the value of the delimiter character with the
+     * highest value. It is used to optimize the detection of delimiter
+     * characters.
+     *
+     * It is unlikely to provide any optimization benefit in the
+     * hasSurrogates case because most string characters will be
+     * smaller than the limit, but we keep it so that the two code
+     * paths remain similar.
+     */
+    private int maxDelimCodePoint;
+
+    /**
+     * If delimiters include any surrogates (including surrogate
+     * pairs), hasSurrogates is true and the tokenizer uses the
+     * different code path. This is because String.indexOf(int)
+     * doesn't handle unpaired surrogates as a single character.
+     */
+    private boolean hasSurrogates = false;
+
+    /**
+     * When hasSurrogates is true, delimiters are converted to code
+     * points and isDelimiter(int) is used to determine if the given
+     * codepoint is a delimiter.
+     */
+    private int[] delimiterCodePoints;
+
+    /**
+     * Set maxDelimCodePoint to the highest char in the delimiter set.
+     */
+    private void setMaxDelimCodePoint() {
+        if (delimiters == null) {
+            maxDelimCodePoint = 0;
+            return;
+        }
+
+        int m = 0;
+        int c;
+        int count = 0;
+        for (int i = 0; i < delimiters.length(); i += Character.charCount(c)) {
+            c = delimiters.charAt(i);
+            if (c >= Character.MIN_HIGH_SURROGATE && c <= Character.MAX_LOW_SURROGATE) {
+                c = delimiters.codePointAt(i);
+                hasSurrogates = true;
+            }
+            if (m < c)
+                m = c;
+            count++;
+        }
+        maxDelimCodePoint = m;
+
+        if (hasSurrogates) {
+            delimiterCodePoints = new int[count];
+            for (int i = 0, j = 0; i < count; i++, j += Character.charCount(c)) {
+                c = delimiters.codePointAt(j);
+                delimiterCodePoints[i] = c;
+            }
+        }
+    }
+
+    /**
+     * Constructs a string tokenizer for the specified string. All
+     * characters in the <code>delim</code> argument are the delimiters
+     * for separating tokens.
+     * <p>
+     * If the <code>returnDelims</code> flag is <code>true</code>, then
+     * the delimiter characters are also returned as tokens. Each
+     * delimiter is returned as a string of length one. If the flag is
+     * <code>false</code>, the delimiter characters are skipped and only
+     * serve as separators between tokens.
+     * <p>
+     * Note that if <tt>delim</tt> is <tt>null</tt>, this constructor does
+     * not throw an exception. However, trying to invoke other methods on the
+     * resulting <tt>StringTokenizer</tt> may result in a
+     * <tt>NullPointerException</tt>.
+     *
+     * @param   str            a string to be parsed.
+     * @param   delim          the delimiters.
+     * @param   returnDelims   flag indicating whether to return the delimiters
+     *                         as tokens.
+     * @exception NullPointerException if str is <CODE>null</CODE>
+     */
+    public StringTokenizer(String str, String delim, boolean returnDelims) {
+        currentPosition = 0;
+        newPosition = -1;
+        delimsChanged = false;
+        this.str = str;
+        maxPosition = str.length();
+        delimiters = delim;
+        retDelims = returnDelims;
+        setMaxDelimCodePoint();
+    }
+
+    /**
+     * Constructs a string tokenizer for the specified string. The
+     * characters in the <code>delim</code> argument are the delimiters
+     * for separating tokens. Delimiter characters themselves will not
+     * be treated as tokens.
+     * <p>
+     * Note that if <tt>delim</tt> is <tt>null</tt>, this constructor does
+     * not throw an exception. However, trying to invoke other methods on the
+     * resulting <tt>StringTokenizer</tt> may result in a
+     * <tt>NullPointerException</tt>.
+     *
+     * @param   str     a string to be parsed.
+     * @param   delim   the delimiters.
+     * @exception NullPointerException if str is <CODE>null</CODE>
+     */
+    public StringTokenizer(String str, String delim) {
+        this(str, delim, false);
+    }
+
+    /**
+     * Constructs a string tokenizer for the specified string. The
+     * tokenizer uses the default delimiter set, which is
+     * <code>"&nbsp;&#92;t&#92;n&#92;r&#92;f"</code>: the space character,
+     * the tab character, the newline character, the carriage-return character,
+     * and the form-feed character. Delimiter characters themselves will
+     * not be treated as tokens.
+     *
+     * @param   str   a string to be parsed.
+     * @exception NullPointerException if str is <CODE>null</CODE>
+     */
+    public StringTokenizer(String str) {
+        this(str, " \t\n\r\f", false);
+    }
+
+    /**
+     * Skips delimiters starting from the specified position. If retDelims
+     * is false, returns the index of the first non-delimiter character at or
+     * after startPos. If retDelims is true, startPos is returned.
+     */
+    private int skipDelimiters(int startPos) {
+        if (delimiters == null)
+            throw new NullPointerException();
+
+        int position = startPos;
+        while (!retDelims && position < maxPosition) {
+            if (!hasSurrogates) {
+                char c = str.charAt(position);
+                if ((c > maxDelimCodePoint) || (delimiters.indexOf(c) < 0))
+                    break;
+                position++;
+            } else {
+                int c = str.codePointAt(position);
+                if ((c > maxDelimCodePoint) || !isDelimiter(c)) {
+                    break;
+                }
+                position += Character.charCount(c);
+            }
+        }
+        return position;
+    }
+
+    /**
+     * Skips ahead from startPos and returns the index of the next delimiter
+     * character encountered, or maxPosition if no such delimiter is found.
+     */
+    private int scanToken(int startPos) {
+        int position = startPos;
+        while (position < maxPosition) {
+            if (!hasSurrogates) {
+                char c = str.charAt(position);
+                if ((c <= maxDelimCodePoint) && (delimiters.indexOf(c) >= 0))
+                    break;
+                position++;
+            } else {
+                int c = str.codePointAt(position);
+                if ((c <= maxDelimCodePoint) && isDelimiter(c))
+                    break;
+                position += Character.charCount(c);
+            }
+        }
+        if (retDelims && (startPos == position)) {
+            if (!hasSurrogates) {
+                char c = str.charAt(position);
+                if ((c <= maxDelimCodePoint) && (delimiters.indexOf(c) >= 0))
+                    position++;
+            } else {
+                int c = str.codePointAt(position);
+                if ((c <= maxDelimCodePoint) && isDelimiter(c))
+                    position += Character.charCount(c);
+            }
+        }
+        return position;
+    }
+
+    private boolean isDelimiter(int codePoint) {
+        for (int i = 0; i < delimiterCodePoints.length; i++) {
+            if (delimiterCodePoints[i] == codePoint) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Tests if there are more tokens available from this tokenizer's string.
+     * If this method returns <tt>true</tt>, then a subsequent call to
+     * <tt>nextToken</tt> with no argument will successfully return a token.
+     *
+     * @return  <code>true</code> if and only if there is at least one token
+     *          in the string after the current position; <code>false</code>
+     *          otherwise.
+     */
+    public boolean hasMoreTokens() {
+        /*
+         * Temporarily store this position and use it in the following
+         * nextToken() method only if the delimiters haven't been changed in
+         * that nextToken() invocation.
+         */
+        newPosition = skipDelimiters(currentPosition);
+        return (newPosition < maxPosition);
+    }
+
+    /**
+     * Returns the next token from this string tokenizer.
+     *
+     * @return     the next token from this string tokenizer.
+     * @exception  NoSuchElementException  if there are no more tokens in this
+     *               tokenizer's string.
+     */
+    public String nextToken() {
+        /*
+         * If next position already computed in hasMoreElements() and
+         * delimiters have changed between the computation and this invocation,
+         * then use the computed value.
+         */
+
+        currentPosition = (newPosition >= 0 && !delimsChanged) ?
+            newPosition : skipDelimiters(currentPosition);
+
+        /* Reset these anyway */
+        delimsChanged = false;
+        newPosition = -1;
+
+        if (currentPosition >= maxPosition)
+            throw new NoSuchElementException();
+        int start = currentPosition;
+        currentPosition = scanToken(currentPosition);
+        return str.substring(start, currentPosition);
+    }
+
+    /**
+     * Returns the next token in this string tokenizer's string. First,
+     * the set of characters considered to be delimiters by this
+     * <tt>StringTokenizer</tt> object is changed to be the characters in
+     * the string <tt>delim</tt>. Then the next token in the string
+     * after the current position is returned. The current position is
+     * advanced beyond the recognized token.  The new delimiter set
+     * remains the default after this call.
+     *
+     * @param      delim   the new delimiters.
+     * @return     the next token, after switching to the new delimiter set.
+     * @exception  NoSuchElementException  if there are no more tokens in this
+     *               tokenizer's string.
+     * @exception NullPointerException if delim is <CODE>null</CODE>
+     */
+    public String nextToken(String delim) {
+        delimiters = delim;
+
+        /* delimiter string specified, so set the appropriate flag. */
+        delimsChanged = true;
+
+        setMaxDelimCodePoint();
+        return nextToken();
+    }
+
+    /**
+     * Returns the same value as the <code>hasMoreTokens</code>
+     * method. It exists so that this class can implement the
+     * <code>Enumeration</code> interface.
+     *
+     * @return  <code>true</code> if there are more tokens;
+     *          <code>false</code> otherwise.
+     * @see     java.util.Enumeration
+     * @see     java.util.StringTokenizer#hasMoreTokens()
+     */
+    public boolean hasMoreElements() {
+        return hasMoreTokens();
+    }
+
+    /**
+     * Returns the same value as the <code>nextToken</code> method,
+     * except that its declared return value is <code>Object</code> rather than
+     * <code>String</code>. It exists so that this class can implement the
+     * <code>Enumeration</code> interface.
+     *
+     * @return     the next token in the string.
+     * @exception  NoSuchElementException  if there are no more tokens in this
+     *               tokenizer's string.
+     * @see        java.util.Enumeration
+     * @see        java.util.StringTokenizer#nextToken()
+     */
+    public Object nextElement() {
+        return nextToken();
+    }
+
+    /**
+     * Calculates the number of times that this tokenizer's
+     * <code>nextToken</code> method can be called before it generates an
+     * exception. The current position is not advanced.
+     *
+     * @return  the number of tokens remaining in the string using the current
+     *          delimiter set.
+     * @see     java.util.StringTokenizer#nextToken()
+     */
+    public int countTokens() {
+        int count = 0;
+        int currpos = currentPosition;
+        while (currpos < maxPosition) {
+            currpos = skipDelimiters(currpos);
+            if (currpos >= maxPosition)
+                break;
+            currpos = scanToken(currpos);
+            count++;
+        }
+        return count;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/TimSort.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/TimSort.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,929 @@
+/*
+ * Copyright 2009 Google Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+
+/**
+ * A stable, adaptive, iterative mergesort that requires far fewer than
+ * n lg(n) comparisons when running on partially sorted arrays, while
+ * offering performance comparable to a traditional mergesort when run
+ * on random arrays.  Like all proper mergesorts, this sort is stable and
+ * runs O(n log n) time (worst case).  In the worst case, this sort requires
+ * temporary storage space for n/2 object references; in the best case,
+ * it requires only a small constant amount of space.
+ *
+ * This implementation was adapted from Tim Peters's list sort for
+ * Python, which is described in detail here:
+ *
+ *   http://svn.python.org/projects/python/trunk/Objects/listsort.txt
+ *
+ * Tim's C code may be found here:
+ *
+ *   http://svn.python.org/projects/python/trunk/Objects/listobject.c
+ *
+ * The underlying techniques are described in this paper (and may have
+ * even earlier origins):
+ *
+ *  "Optimistic Sorting and Information Theoretic Complexity"
+ *  Peter McIlroy
+ *  SODA (Fourth Annual ACM-SIAM Symposium on Discrete Algorithms),
+ *  pp 467-474, Austin, Texas, 25-27 January 1993.
+ *
+ * While the API to this class consists solely of static methods, it is
+ * (privately) instantiable; a TimSort instance holds the state of an ongoing
+ * sort, assuming the input array is large enough to warrant the full-blown
+ * TimSort. Small arrays are sorted in place, using a binary insertion sort.
+ *
+ * @author Josh Bloch
+ */
+class TimSort<T> {
+    /**
+     * This is the minimum sized sequence that will be merged.  Shorter
+     * sequences will be lengthened by calling binarySort.  If the entire
+     * array is less than this length, no merges will be performed.
+     *
+     * This constant should be a power of two.  It was 64 in Tim Peter's C
+     * implementation, but 32 was empirically determined to work better in
+     * this implementation.  In the unlikely event that you set this constant
+     * to be a number that's not a power of two, you'll need to change the
+     * {@link #minRunLength} computation.
+     *
+     * If you decrease this constant, you must change the stackLen
+     * computation in the TimSort constructor, or you risk an
+     * ArrayOutOfBounds exception.  See listsort.txt for a discussion
+     * of the minimum stack length required as a function of the length
+     * of the array being sorted and the minimum merge sequence length.
+     */
+    private static final int MIN_MERGE = 32;
+
+    /**
+     * The array being sorted.
+     */
+    private final T[] a;
+
+    /**
+     * The comparator for this sort.
+     */
+    private final Comparator<? super T> c;
+
+    /**
+     * When we get into galloping mode, we stay there until both runs win less
+     * often than MIN_GALLOP consecutive times.
+     */
+    private static final int  MIN_GALLOP = 7;
+
+    /**
+     * This controls when we get *into* galloping mode.  It is initialized
+     * to MIN_GALLOP.  The mergeLo and mergeHi methods nudge it higher for
+     * random data, and lower for highly structured data.
+     */
+    private int minGallop = MIN_GALLOP;
+
+    /**
+     * Maximum initial size of tmp array, which is used for merging.  The array
+     * can grow to accommodate demand.
+     *
+     * Unlike Tim's original C version, we do not allocate this much storage
+     * when sorting smaller arrays.  This change was required for performance.
+     */
+    private static final int INITIAL_TMP_STORAGE_LENGTH = 256;
+
+    /**
+     * Temp storage for merges.
+     */
+    private T[] tmp; // Actual runtime type will be Object[], regardless of T
+
+    /**
+     * A stack of pending runs yet to be merged.  Run i starts at
+     * address base[i] and extends for len[i] elements.  It's always
+     * true (so long as the indices are in bounds) that:
+     *
+     *     runBase[i] + runLen[i] == runBase[i + 1]
+     *
+     * so we could cut the storage for this, but it's a minor amount,
+     * and keeping all the info explicit simplifies the code.
+     */
+    private int stackSize = 0;  // Number of pending runs on stack
+    private final int[] runBase;
+    private final int[] runLen;
+
+    /**
+     * Creates a TimSort instance to maintain the state of an ongoing sort.
+     *
+     * @param a the array to be sorted
+     * @param c the comparator to determine the order of the sort
+     */
+    private TimSort(T[] a, Comparator<? super T> c) {
+        this.a = a;
+        this.c = c;
+
+        // Allocate temp storage (which may be increased later if necessary)
+        int len = a.length;
+        @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+        T[] newArray = (T[]) new Object[len < 2 * INITIAL_TMP_STORAGE_LENGTH ?
+                                        len >>> 1 : INITIAL_TMP_STORAGE_LENGTH];
+        tmp = newArray;
+
+        /*
+         * Allocate runs-to-be-merged stack (which cannot be expanded).  The
+         * stack length requirements are described in listsort.txt.  The C
+         * version always uses the same stack length (85), but this was
+         * measured to be too expensive when sorting "mid-sized" arrays (e.g.,
+         * 100 elements) in Java.  Therefore, we use smaller (but sufficiently
+         * large) stack lengths for smaller arrays.  The "magic numbers" in the
+         * computation below must be changed if MIN_MERGE is decreased.  See
+         * the MIN_MERGE declaration above for more information.
+         */
+        int stackLen = (len <    120  ?  5 :
+                        len <   1542  ? 10 :
+                        len < 119151  ? 19 : 40);
+        runBase = new int[stackLen];
+        runLen = new int[stackLen];
+    }
+
+    /*
+     * The next two methods (which are package private and static) constitute
+     * the entire API of this class.  Each of these methods obeys the contract
+     * of the public method with the same signature in java.util.Arrays.
+     */
+
+    static <T> void sort(T[] a, Comparator<? super T> c) {
+        sort(a, 0, a.length, c);
+    }
+
+    static <T> void sort(T[] a, int lo, int hi, Comparator<? super T> c) {
+        if (c == null) {
+            Arrays.sort(a, lo, hi);
+            return;
+        }
+
+        rangeCheck(a.length, lo, hi);
+        int nRemaining  = hi - lo;
+        if (nRemaining < 2)
+            return;  // Arrays of size 0 and 1 are always sorted
+
+        // If array is small, do a "mini-TimSort" with no merges
+        if (nRemaining < MIN_MERGE) {
+            int initRunLen = countRunAndMakeAscending(a, lo, hi, c);
+            binarySort(a, lo, hi, lo + initRunLen, c);
+            return;
+        }
+
+        /**
+         * March over the array once, left to right, finding natural runs,
+         * extending short natural runs to minRun elements, and merging runs
+         * to maintain stack invariant.
+         */
+        TimSort<T> ts = new TimSort<>(a, c);
+        int minRun = minRunLength(nRemaining);
+        do {
+            // Identify next run
+            int runLen = countRunAndMakeAscending(a, lo, hi, c);
+
+            // If run is short, extend to min(minRun, nRemaining)
+            if (runLen < minRun) {
+                int force = nRemaining <= minRun ? nRemaining : minRun;
+                binarySort(a, lo, lo + force, lo + runLen, c);
+                runLen = force;
+            }
+
+            // Push run onto pending-run stack, and maybe merge
+            ts.pushRun(lo, runLen);
+            ts.mergeCollapse();
+
+            // Advance to find next run
+            lo += runLen;
+            nRemaining -= runLen;
+        } while (nRemaining != 0);
+
+        // Merge all remaining runs to complete sort
+        assert lo == hi;
+        ts.mergeForceCollapse();
+        assert ts.stackSize == 1;
+    }
+
+    /**
+     * Sorts the specified portion of the specified array using a binary
+     * insertion sort.  This is the best method for sorting small numbers
+     * of elements.  It requires O(n log n) compares, but O(n^2) data
+     * movement (worst case).
+     *
+     * If the initial part of the specified range is already sorted,
+     * this method can take advantage of it: the method assumes that the
+     * elements from index {@code lo}, inclusive, to {@code start},
+     * exclusive are already sorted.
+     *
+     * @param a the array in which a range is to be sorted
+     * @param lo the index of the first element in the range to be sorted
+     * @param hi the index after the last element in the range to be sorted
+     * @param start the index of the first element in the range that is
+     *        not already known to be sorted ({@code lo <= start <= hi})
+     * @param c comparator to used for the sort
+     */
+    @SuppressWarnings("fallthrough")
+    private static <T> void binarySort(T[] a, int lo, int hi, int start,
+                                       Comparator<? super T> c) {
+        assert lo <= start && start <= hi;
+        if (start == lo)
+            start++;
+        for ( ; start < hi; start++) {
+            T pivot = a[start];
+
+            // Set left (and right) to the index where a[start] (pivot) belongs
+            int left = lo;
+            int right = start;
+            assert left <= right;
+            /*
+             * Invariants:
+             *   pivot >= all in [lo, left).
+             *   pivot <  all in [right, start).
+             */
+            while (left < right) {
+                int mid = (left + right) >>> 1;
+                if (c.compare(pivot, a[mid]) < 0)
+                    right = mid;
+                else
+                    left = mid + 1;
+            }
+            assert left == right;
+
+            /*
+             * The invariants still hold: pivot >= all in [lo, left) and
+             * pivot < all in [left, start), so pivot belongs at left.  Note
+             * that if there are elements equal to pivot, left points to the
+             * first slot after them -- that's why this sort is stable.
+             * Slide elements over to make room for pivot.
+             */
+            int n = start - left;  // The number of elements to move
+            // Switch is just an optimization for arraycopy in default case
+            switch (n) {
+                case 2:  a[left + 2] = a[left + 1];
+                case 1:  a[left + 1] = a[left];
+                         break;
+                default: System.arraycopy(a, left, a, left + 1, n);
+            }
+            a[left] = pivot;
+        }
+    }
+
+    /**
+     * Returns the length of the run beginning at the specified position in
+     * the specified array and reverses the run if it is descending (ensuring
+     * that the run will always be ascending when the method returns).
+     *
+     * A run is the longest ascending sequence with:
+     *
+     *    a[lo] <= a[lo + 1] <= a[lo + 2] <= ...
+     *
+     * or the longest descending sequence with:
+     *
+     *    a[lo] >  a[lo + 1] >  a[lo + 2] >  ...
+     *
+     * For its intended use in a stable mergesort, the strictness of the
+     * definition of "descending" is needed so that the call can safely
+     * reverse a descending sequence without violating stability.
+     *
+     * @param a the array in which a run is to be counted and possibly reversed
+     * @param lo index of the first element in the run
+     * @param hi index after the last element that may be contained in the run.
+              It is required that {@code lo < hi}.
+     * @param c the comparator to used for the sort
+     * @return  the length of the run beginning at the specified position in
+     *          the specified array
+     */
+    private static <T> int countRunAndMakeAscending(T[] a, int lo, int hi,
+                                                    Comparator<? super T> c) {
+        assert lo < hi;
+        int runHi = lo + 1;
+        if (runHi == hi)
+            return 1;
+
+        // Find end of run, and reverse range if descending
+        if (c.compare(a[runHi++], a[lo]) < 0) { // Descending
+            while (runHi < hi && c.compare(a[runHi], a[runHi - 1]) < 0)
+                runHi++;
+            reverseRange(a, lo, runHi);
+        } else {                              // Ascending
+            while (runHi < hi && c.compare(a[runHi], a[runHi - 1]) >= 0)
+                runHi++;
+        }
+
+        return runHi - lo;
+    }
+
+    /**
+     * Reverse the specified range of the specified array.
+     *
+     * @param a the array in which a range is to be reversed
+     * @param lo the index of the first element in the range to be reversed
+     * @param hi the index after the last element in the range to be reversed
+     */
+    private static void reverseRange(Object[] a, int lo, int hi) {
+        hi--;
+        while (lo < hi) {
+            Object t = a[lo];
+            a[lo++] = a[hi];
+            a[hi--] = t;
+        }
+    }
+
+    /**
+     * Returns the minimum acceptable run length for an array of the specified
+     * length. Natural runs shorter than this will be extended with
+     * {@link #binarySort}.
+     *
+     * Roughly speaking, the computation is:
+     *
+     *  If n < MIN_MERGE, return n (it's too small to bother with fancy stuff).
+     *  Else if n is an exact power of 2, return MIN_MERGE/2.
+     *  Else return an int k, MIN_MERGE/2 <= k <= MIN_MERGE, such that n/k
+     *   is close to, but strictly less than, an exact power of 2.
+     *
+     * For the rationale, see listsort.txt.
+     *
+     * @param n the length of the array to be sorted
+     * @return the length of the minimum run to be merged
+     */
+    private static int minRunLength(int n) {
+        assert n >= 0;
+        int r = 0;      // Becomes 1 if any 1 bits are shifted off
+        while (n >= MIN_MERGE) {
+            r |= (n & 1);
+            n >>= 1;
+        }
+        return n + r;
+    }
+
+    /**
+     * Pushes the specified run onto the pending-run stack.
+     *
+     * @param runBase index of the first element in the run
+     * @param runLen  the number of elements in the run
+     */
+    private void pushRun(int runBase, int runLen) {
+        this.runBase[stackSize] = runBase;
+        this.runLen[stackSize] = runLen;
+        stackSize++;
+    }
+
+    /**
+     * Examines the stack of runs waiting to be merged and merges adjacent runs
+     * until the stack invariants are reestablished:
+     *
+     *     1. runLen[i - 3] > runLen[i - 2] + runLen[i - 1]
+     *     2. runLen[i - 2] > runLen[i - 1]
+     *
+     * This method is called each time a new run is pushed onto the stack,
+     * so the invariants are guaranteed to hold for i < stackSize upon
+     * entry to the method.
+     */
+    private void mergeCollapse() {
+        while (stackSize > 1) {
+            int n = stackSize - 2;
+            if (n > 0 && runLen[n-1] <= runLen[n] + runLen[n+1]) {
+                if (runLen[n - 1] < runLen[n + 1])
+                    n--;
+                mergeAt(n);
+            } else if (runLen[n] <= runLen[n + 1]) {
+                mergeAt(n);
+            } else {
+                break; // Invariant is established
+            }
+        }
+    }
+
+    /**
+     * Merges all runs on the stack until only one remains.  This method is
+     * called once, to complete the sort.
+     */
+    private void mergeForceCollapse() {
+        while (stackSize > 1) {
+            int n = stackSize - 2;
+            if (n > 0 && runLen[n - 1] < runLen[n + 1])
+                n--;
+            mergeAt(n);
+        }
+    }
+
+    /**
+     * Merges the two runs at stack indices i and i+1.  Run i must be
+     * the penultimate or antepenultimate run on the stack.  In other words,
+     * i must be equal to stackSize-2 or stackSize-3.
+     *
+     * @param i stack index of the first of the two runs to merge
+     */
+    private void mergeAt(int i) {
+        assert stackSize >= 2;
+        assert i >= 0;
+        assert i == stackSize - 2 || i == stackSize - 3;
+
+        int base1 = runBase[i];
+        int len1 = runLen[i];
+        int base2 = runBase[i + 1];
+        int len2 = runLen[i + 1];
+        assert len1 > 0 && len2 > 0;
+        assert base1 + len1 == base2;
+
+        /*
+         * Record the length of the combined runs; if i is the 3rd-last
+         * run now, also slide over the last run (which isn't involved
+         * in this merge).  The current run (i+1) goes away in any case.
+         */
+        runLen[i] = len1 + len2;
+        if (i == stackSize - 3) {
+            runBase[i + 1] = runBase[i + 2];
+            runLen[i + 1] = runLen[i + 2];
+        }
+        stackSize--;
+
+        /*
+         * Find where the first element of run2 goes in run1. Prior elements
+         * in run1 can be ignored (because they're already in place).
+         */
+        int k = gallopRight(a[base2], a, base1, len1, 0, c);
+        assert k >= 0;
+        base1 += k;
+        len1 -= k;
+        if (len1 == 0)
+            return;
+
+        /*
+         * Find where the last element of run1 goes in run2. Subsequent elements
+         * in run2 can be ignored (because they're already in place).
+         */
+        len2 = gallopLeft(a[base1 + len1 - 1], a, base2, len2, len2 - 1, c);
+        assert len2 >= 0;
+        if (len2 == 0)
+            return;
+
+        // Merge remaining runs, using tmp array with min(len1, len2) elements
+        if (len1 <= len2)
+            mergeLo(base1, len1, base2, len2);
+        else
+            mergeHi(base1, len1, base2, len2);
+    }
+
+    /**
+     * Locates the position at which to insert the specified key into the
+     * specified sorted range; if the range contains an element equal to key,
+     * returns the index of the leftmost equal element.
+     *
+     * @param key the key whose insertion point to search for
+     * @param a the array in which to search
+     * @param base the index of the first element in the range
+     * @param len the length of the range; must be > 0
+     * @param hint the index at which to begin the search, 0 <= hint < n.
+     *     The closer hint is to the result, the faster this method will run.
+     * @param c the comparator used to order the range, and to search
+     * @return the int k,  0 <= k <= n such that a[b + k - 1] < key <= a[b + k],
+     *    pretending that a[b - 1] is minus infinity and a[b + n] is infinity.
+     *    In other words, key belongs at index b + k; or in other words,
+     *    the first k elements of a should precede key, and the last n - k
+     *    should follow it.
+     */
+    private static <T> int gallopLeft(T key, T[] a, int base, int len, int hint,
+                                      Comparator<? super T> c) {
+        assert len > 0 && hint >= 0 && hint < len;
+        int lastOfs = 0;
+        int ofs = 1;
+        if (c.compare(key, a[base + hint]) > 0) {
+            // Gallop right until a[base+hint+lastOfs] < key <= a[base+hint+ofs]
+            int maxOfs = len - hint;
+            while (ofs < maxOfs && c.compare(key, a[base + hint + ofs]) > 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to base
+            lastOfs += hint;
+            ofs += hint;
+        } else { // key <= a[base + hint]
+            // Gallop left until a[base+hint-ofs] < key <= a[base+hint-lastOfs]
+            final int maxOfs = hint + 1;
+            while (ofs < maxOfs && c.compare(key, a[base + hint - ofs]) <= 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to base
+            int tmp = lastOfs;
+            lastOfs = hint - ofs;
+            ofs = hint - tmp;
+        }
+        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
+
+        /*
+         * Now a[base+lastOfs] < key <= a[base+ofs], so key belongs somewhere
+         * to the right of lastOfs but no farther right than ofs.  Do a binary
+         * search, with invariant a[base + lastOfs - 1] < key <= a[base + ofs].
+         */
+        lastOfs++;
+        while (lastOfs < ofs) {
+            int m = lastOfs + ((ofs - lastOfs) >>> 1);
+
+            if (c.compare(key, a[base + m]) > 0)
+                lastOfs = m + 1;  // a[base + m] < key
+            else
+                ofs = m;          // key <= a[base + m]
+        }
+        assert lastOfs == ofs;    // so a[base + ofs - 1] < key <= a[base + ofs]
+        return ofs;
+    }
+
+    /**
+     * Like gallopLeft, except that if the range contains an element equal to
+     * key, gallopRight returns the index after the rightmost equal element.
+     *
+     * @param key the key whose insertion point to search for
+     * @param a the array in which to search
+     * @param base the index of the first element in the range
+     * @param len the length of the range; must be > 0
+     * @param hint the index at which to begin the search, 0 <= hint < n.
+     *     The closer hint is to the result, the faster this method will run.
+     * @param c the comparator used to order the range, and to search
+     * @return the int k,  0 <= k <= n such that a[b + k - 1] <= key < a[b + k]
+     */
+    private static <T> int gallopRight(T key, T[] a, int base, int len,
+                                       int hint, Comparator<? super T> c) {
+        assert len > 0 && hint >= 0 && hint < len;
+
+        int ofs = 1;
+        int lastOfs = 0;
+        if (c.compare(key, a[base + hint]) < 0) {
+            // Gallop left until a[b+hint - ofs] <= key < a[b+hint - lastOfs]
+            int maxOfs = hint + 1;
+            while (ofs < maxOfs && c.compare(key, a[base + hint - ofs]) < 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to b
+            int tmp = lastOfs;
+            lastOfs = hint - ofs;
+            ofs = hint - tmp;
+        } else { // a[b + hint] <= key
+            // Gallop right until a[b+hint + lastOfs] <= key < a[b+hint + ofs]
+            int maxOfs = len - hint;
+            while (ofs < maxOfs && c.compare(key, a[base + hint + ofs]) >= 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to b
+            lastOfs += hint;
+            ofs += hint;
+        }
+        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
+
+        /*
+         * Now a[b + lastOfs] <= key < a[b + ofs], so key belongs somewhere to
+         * the right of lastOfs but no farther right than ofs.  Do a binary
+         * search, with invariant a[b + lastOfs - 1] <= key < a[b + ofs].
+         */
+        lastOfs++;
+        while (lastOfs < ofs) {
+            int m = lastOfs + ((ofs - lastOfs) >>> 1);
+
+            if (c.compare(key, a[base + m]) < 0)
+                ofs = m;          // key < a[b + m]
+            else
+                lastOfs = m + 1;  // a[b + m] <= key
+        }
+        assert lastOfs == ofs;    // so a[b + ofs - 1] <= key < a[b + ofs]
+        return ofs;
+    }
+
+    /**
+     * Merges two adjacent runs in place, in a stable fashion.  The first
+     * element of the first run must be greater than the first element of the
+     * second run (a[base1] > a[base2]), and the last element of the first run
+     * (a[base1 + len1-1]) must be greater than all elements of the second run.
+     *
+     * For performance, this method should be called only when len1 <= len2;
+     * its twin, mergeHi should be called if len1 >= len2.  (Either method
+     * may be called if len1 == len2.)
+     *
+     * @param base1 index of first element in first run to be merged
+     * @param len1  length of first run to be merged (must be > 0)
+     * @param base2 index of first element in second run to be merged
+     *        (must be aBase + aLen)
+     * @param len2  length of second run to be merged (must be > 0)
+     */
+    private void mergeLo(int base1, int len1, int base2, int len2) {
+        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
+
+        // Copy first run into temp array
+        T[] a = this.a; // For performance
+        T[] tmp = ensureCapacity(len1);
+        System.arraycopy(a, base1, tmp, 0, len1);
+
+        int cursor1 = 0;       // Indexes into tmp array
+        int cursor2 = base2;   // Indexes int a
+        int dest = base1;      // Indexes int a
+
+        // Move first element of second run and deal with degenerate cases
+        a[dest++] = a[cursor2++];
+        if (--len2 == 0) {
+            System.arraycopy(tmp, cursor1, a, dest, len1);
+            return;
+        }
+        if (len1 == 1) {
+            System.arraycopy(a, cursor2, a, dest, len2);
+            a[dest + len2] = tmp[cursor1]; // Last elt of run 1 to end of merge
+            return;
+        }
+
+        Comparator<? super T> c = this.c;  // Use local variable for performance
+        int minGallop = this.minGallop;    //  "    "       "     "      "
+    outer:
+        while (true) {
+            int count1 = 0; // Number of times in a row that first run won
+            int count2 = 0; // Number of times in a row that second run won
+
+            /*
+             * Do the straightforward thing until (if ever) one run starts
+             * winning consistently.
+             */
+            do {
+                assert len1 > 1 && len2 > 0;
+                if (c.compare(a[cursor2], tmp[cursor1]) < 0) {
+                    a[dest++] = a[cursor2++];
+                    count2++;
+                    count1 = 0;
+                    if (--len2 == 0)
+                        break outer;
+                } else {
+                    a[dest++] = tmp[cursor1++];
+                    count1++;
+                    count2 = 0;
+                    if (--len1 == 1)
+                        break outer;
+                }
+            } while ((count1 | count2) < minGallop);
+
+            /*
+             * One run is winning so consistently that galloping may be a
+             * huge win. So try that, and continue galloping until (if ever)
+             * neither run appears to be winning consistently anymore.
+             */
+            do {
+                assert len1 > 1 && len2 > 0;
+                count1 = gallopRight(a[cursor2], tmp, cursor1, len1, 0, c);
+                if (count1 != 0) {
+                    System.arraycopy(tmp, cursor1, a, dest, count1);
+                    dest += count1;
+                    cursor1 += count1;
+                    len1 -= count1;
+                    if (len1 <= 1) // len1 == 1 || len1 == 0
+                        break outer;
+                }
+                a[dest++] = a[cursor2++];
+                if (--len2 == 0)
+                    break outer;
+
+                count2 = gallopLeft(tmp[cursor1], a, cursor2, len2, 0, c);
+                if (count2 != 0) {
+                    System.arraycopy(a, cursor2, a, dest, count2);
+                    dest += count2;
+                    cursor2 += count2;
+                    len2 -= count2;
+                    if (len2 == 0)
+                        break outer;
+                }
+                a[dest++] = tmp[cursor1++];
+                if (--len1 == 1)
+                    break outer;
+                minGallop--;
+            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
+            if (minGallop < 0)
+                minGallop = 0;
+            minGallop += 2;  // Penalize for leaving gallop mode
+        }  // End of "outer" loop
+        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
+
+        if (len1 == 1) {
+            assert len2 > 0;
+            System.arraycopy(a, cursor2, a, dest, len2);
+            a[dest + len2] = tmp[cursor1]; //  Last elt of run 1 to end of merge
+        } else if (len1 == 0) {
+            throw new IllegalArgumentException(
+                "Comparison method violates its general contract!");
+        } else {
+            assert len2 == 0;
+            assert len1 > 1;
+            System.arraycopy(tmp, cursor1, a, dest, len1);
+        }
+    }
+
+    /**
+     * Like mergeLo, except that this method should be called only if
+     * len1 >= len2; mergeLo should be called if len1 <= len2.  (Either method
+     * may be called if len1 == len2.)
+     *
+     * @param base1 index of first element in first run to be merged
+     * @param len1  length of first run to be merged (must be > 0)
+     * @param base2 index of first element in second run to be merged
+     *        (must be aBase + aLen)
+     * @param len2  length of second run to be merged (must be > 0)
+     */
+    private void mergeHi(int base1, int len1, int base2, int len2) {
+        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
+
+        // Copy second run into temp array
+        T[] a = this.a; // For performance
+        T[] tmp = ensureCapacity(len2);
+        System.arraycopy(a, base2, tmp, 0, len2);
+
+        int cursor1 = base1 + len1 - 1;  // Indexes into a
+        int cursor2 = len2 - 1;          // Indexes into tmp array
+        int dest = base2 + len2 - 1;     // Indexes into a
+
+        // Move last element of first run and deal with degenerate cases
+        a[dest--] = a[cursor1--];
+        if (--len1 == 0) {
+            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
+            return;
+        }
+        if (len2 == 1) {
+            dest -= len1;
+            cursor1 -= len1;
+            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
+            a[dest] = tmp[cursor2];
+            return;
+        }
+
+        Comparator<? super T> c = this.c;  // Use local variable for performance
+        int minGallop = this.minGallop;    //  "    "       "     "      "
+    outer:
+        while (true) {
+            int count1 = 0; // Number of times in a row that first run won
+            int count2 = 0; // Number of times in a row that second run won
+
+            /*
+             * Do the straightforward thing until (if ever) one run
+             * appears to win consistently.
+             */
+            do {
+                assert len1 > 0 && len2 > 1;
+                if (c.compare(tmp[cursor2], a[cursor1]) < 0) {
+                    a[dest--] = a[cursor1--];
+                    count1++;
+                    count2 = 0;
+                    if (--len1 == 0)
+                        break outer;
+                } else {
+                    a[dest--] = tmp[cursor2--];
+                    count2++;
+                    count1 = 0;
+                    if (--len2 == 1)
+                        break outer;
+                }
+            } while ((count1 | count2) < minGallop);
+
+            /*
+             * One run is winning so consistently that galloping may be a
+             * huge win. So try that, and continue galloping until (if ever)
+             * neither run appears to be winning consistently anymore.
+             */
+            do {
+                assert len1 > 0 && len2 > 1;
+                count1 = len1 - gallopRight(tmp[cursor2], a, base1, len1, len1 - 1, c);
+                if (count1 != 0) {
+                    dest -= count1;
+                    cursor1 -= count1;
+                    len1 -= count1;
+                    System.arraycopy(a, cursor1 + 1, a, dest + 1, count1);
+                    if (len1 == 0)
+                        break outer;
+                }
+                a[dest--] = tmp[cursor2--];
+                if (--len2 == 1)
+                    break outer;
+
+                count2 = len2 - gallopLeft(a[cursor1], tmp, 0, len2, len2 - 1, c);
+                if (count2 != 0) {
+                    dest -= count2;
+                    cursor2 -= count2;
+                    len2 -= count2;
+                    System.arraycopy(tmp, cursor2 + 1, a, dest + 1, count2);
+                    if (len2 <= 1)  // len2 == 1 || len2 == 0
+                        break outer;
+                }
+                a[dest--] = a[cursor1--];
+                if (--len1 == 0)
+                    break outer;
+                minGallop--;
+            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
+            if (minGallop < 0)
+                minGallop = 0;
+            minGallop += 2;  // Penalize for leaving gallop mode
+        }  // End of "outer" loop
+        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
+
+        if (len2 == 1) {
+            assert len1 > 0;
+            dest -= len1;
+            cursor1 -= len1;
+            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
+            a[dest] = tmp[cursor2];  // Move first elt of run2 to front of merge
+        } else if (len2 == 0) {
+            throw new IllegalArgumentException(
+                "Comparison method violates its general contract!");
+        } else {
+            assert len1 == 0;
+            assert len2 > 0;
+            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
+        }
+    }
+
+    /**
+     * Ensures that the external array tmp has at least the specified
+     * number of elements, increasing its size if necessary.  The size
+     * increases exponentially to ensure amortized linear time complexity.
+     *
+     * @param minCapacity the minimum required capacity of the tmp array
+     * @return tmp, whether or not it grew
+     */
+    private T[] ensureCapacity(int minCapacity) {
+        if (tmp.length < minCapacity) {
+            // Compute smallest power of 2 > minCapacity
+            int newSize = minCapacity;
+            newSize |= newSize >> 1;
+            newSize |= newSize >> 2;
+            newSize |= newSize >> 4;
+            newSize |= newSize >> 8;
+            newSize |= newSize >> 16;
+            newSize++;
+
+            if (newSize < 0) // Not bloody likely!
+                newSize = minCapacity;
+            else
+                newSize = Math.min(newSize, a.length >>> 1);
+
+            @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+            T[] newArray = (T[]) new Object[newSize];
+            tmp = newArray;
+        }
+        return tmp;
+    }
+
+    /**
+     * Checks that fromIndex and toIndex are in range, and throws an
+     * appropriate exception if they aren't.
+     *
+     * @param arrayLen the length of the array
+     * @param fromIndex the index of the first element of the range
+     * @param toIndex the index after the last element of the range
+     * @throws IllegalArgumentException if fromIndex > toIndex
+     * @throws ArrayIndexOutOfBoundsException if fromIndex < 0
+     *         or toIndex > arrayLen
+     */
+    private static void rangeCheck(int arrayLen, int fromIndex, int toIndex) {
+        if (fromIndex > toIndex)
+            throw new IllegalArgumentException("fromIndex(" + fromIndex +
+                       ") > toIndex(" + toIndex+")");
+        if (fromIndex < 0)
+            throw new ArrayIndexOutOfBoundsException(fromIndex);
+        if (toIndex > arrayLen)
+            throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/Vector.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/Vector.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1194 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+
+/**
+ * The {@code Vector} class implements a growable array of
+ * objects. Like an array, it contains components that can be
+ * accessed using an integer index. However, the size of a
+ * {@code Vector} can grow or shrink as needed to accommodate
+ * adding and removing items after the {@code Vector} has been created.
+ *
+ * <p>Each vector tries to optimize storage management by maintaining a
+ * {@code capacity} and a {@code capacityIncrement}. The
+ * {@code capacity} is always at least as large as the vector
+ * size; it is usually larger because as components are added to the
+ * vector, the vector's storage increases in chunks the size of
+ * {@code capacityIncrement}. An application can increase the
+ * capacity of a vector before inserting a large number of
+ * components; this reduces the amount of incremental reallocation.
+ *
+ * <p><a name="fail-fast"/>
+ * The iterators returned by this class's {@link #iterator() iterator} and
+ * {@link #listIterator(int) listIterator} methods are <em>fail-fast</em>:
+ * if the vector is structurally modified at any time after the iterator is
+ * created, in any way except through the iterator's own
+ * {@link ListIterator#remove() remove} or
+ * {@link ListIterator#add(Object) add} methods, the iterator will throw a
+ * {@link ConcurrentModificationException}.  Thus, in the face of
+ * concurrent modification, the iterator fails quickly and cleanly, rather
+ * than risking arbitrary, non-deterministic behavior at an undetermined
+ * time in the future.  The {@link Enumeration Enumerations} returned by
+ * the {@link #elements() elements} method are <em>not</em> fail-fast.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness:  <i>the fail-fast behavior of iterators
+ * should be used only to detect bugs.</i>
+ *
+ * <p>As of the Java 2 platform v1.2, this class was retrofitted to
+ * implement the {@link List} interface, making it a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.  Unlike the new collection
+ * implementations, {@code Vector} is synchronized.  If a thread-safe
+ * implementation is not needed, it is recommended to use {@link
+ * ArrayList} in place of {@code Vector}.
+ *
+ * @author  Lee Boynton
+ * @author  Jonathan Payne
+ * @see Collection
+ * @see LinkedList
+ * @since   JDK1.0
+ */
+public class Vector<E>
+    extends AbstractList<E>
+    implements List<E>, RandomAccess, Cloneable, java.io.Serializable
+{
+    /**
+     * The array buffer into which the components of the vector are
+     * stored. The capacity of the vector is the length of this array buffer,
+     * and is at least large enough to contain all the vector's elements.
+     *
+     * <p>Any array elements following the last element in the Vector are null.
+     *
+     * @serial
+     */
+    protected Object[] elementData;
+
+    /**
+     * The number of valid components in this {@code Vector} object.
+     * Components {@code elementData[0]} through
+     * {@code elementData[elementCount-1]} are the actual items.
+     *
+     * @serial
+     */
+    protected int elementCount;
+
+    /**
+     * The amount by which the capacity of the vector is automatically
+     * incremented when its size becomes greater than its capacity.  If
+     * the capacity increment is less than or equal to zero, the capacity
+     * of the vector is doubled each time it needs to grow.
+     *
+     * @serial
+     */
+    protected int capacityIncrement;
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = -2767605614048989439L;
+
+    /**
+     * Constructs an empty vector with the specified initial capacity and
+     * capacity increment.
+     *
+     * @param   initialCapacity     the initial capacity of the vector
+     * @param   capacityIncrement   the amount by which the capacity is
+     *                              increased when the vector overflows
+     * @throws IllegalArgumentException if the specified initial capacity
+     *         is negative
+     */
+    public Vector(int initialCapacity, int capacityIncrement) {
+        super();
+        if (initialCapacity < 0)
+            throw new IllegalArgumentException("Illegal Capacity: "+
+                                               initialCapacity);
+        this.elementData = new Object[initialCapacity];
+        this.capacityIncrement = capacityIncrement;
+    }
+
+    /**
+     * Constructs an empty vector with the specified initial capacity and
+     * with its capacity increment equal to zero.
+     *
+     * @param   initialCapacity   the initial capacity of the vector
+     * @throws IllegalArgumentException if the specified initial capacity
+     *         is negative
+     */
+    public Vector(int initialCapacity) {
+        this(initialCapacity, 0);
+    }
+
+    /**
+     * Constructs an empty vector so that its internal data array
+     * has size {@code 10} and its standard capacity increment is
+     * zero.
+     */
+    public Vector() {
+        this(10);
+    }
+
+    /**
+     * Constructs a vector containing the elements of the specified
+     * collection, in the order they are returned by the collection's
+     * iterator.
+     *
+     * @param c the collection whose elements are to be placed into this
+     *       vector
+     * @throws NullPointerException if the specified collection is null
+     * @since   1.2
+     */
+    public Vector(Collection<? extends E> c) {
+        elementData = c.toArray();
+        elementCount = elementData.length;
+        // c.toArray might (incorrectly) not return Object[] (see 6260652)
+        if (elementData.getClass() != Object[].class)
+            elementData = Arrays.copyOf(elementData, elementCount, Object[].class);
+    }
+
+    /**
+     * Copies the components of this vector into the specified array.
+     * The item at index {@code k} in this vector is copied into
+     * component {@code k} of {@code anArray}.
+     *
+     * @param  anArray the array into which the components get copied
+     * @throws NullPointerException if the given array is null
+     * @throws IndexOutOfBoundsException if the specified array is not
+     *         large enough to hold all the components of this vector
+     * @throws ArrayStoreException if a component of this vector is not of
+     *         a runtime type that can be stored in the specified array
+     * @see #toArray(Object[])
+     */
+    public synchronized void copyInto(Object[] anArray) {
+        System.arraycopy(elementData, 0, anArray, 0, elementCount);
+    }
+
+    /**
+     * Trims the capacity of this vector to be the vector's current
+     * size. If the capacity of this vector is larger than its current
+     * size, then the capacity is changed to equal the size by replacing
+     * its internal data array, kept in the field {@code elementData},
+     * with a smaller one. An application can use this operation to
+     * minimize the storage of a vector.
+     */
+    public synchronized void trimToSize() {
+        modCount++;
+        int oldCapacity = elementData.length;
+        if (elementCount < oldCapacity) {
+            elementData = Arrays.copyOf(elementData, elementCount);
+        }
+    }
+
+    /**
+     * Increases the capacity of this vector, if necessary, to ensure
+     * that it can hold at least the number of components specified by
+     * the minimum capacity argument.
+     *
+     * <p>If the current capacity of this vector is less than
+     * {@code minCapacity}, then its capacity is increased by replacing its
+     * internal data array, kept in the field {@code elementData}, with a
+     * larger one.  The size of the new data array will be the old size plus
+     * {@code capacityIncrement}, unless the value of
+     * {@code capacityIncrement} is less than or equal to zero, in which case
+     * the new capacity will be twice the old capacity; but if this new size
+     * is still smaller than {@code minCapacity}, then the new capacity will
+     * be {@code minCapacity}.
+     *
+     * @param minCapacity the desired minimum capacity
+     */
+    public synchronized void ensureCapacity(int minCapacity) {
+        if (minCapacity > 0) {
+            modCount++;
+            ensureCapacityHelper(minCapacity);
+        }
+    }
+
+    /**
+     * This implements the unsynchronized semantics of ensureCapacity.
+     * Synchronized methods in this class can internally call this
+     * method for ensuring capacity without incurring the cost of an
+     * extra synchronization.
+     *
+     * @see #ensureCapacity(int)
+     */
+    private void ensureCapacityHelper(int minCapacity) {
+        // overflow-conscious code
+        if (minCapacity - elementData.length > 0)
+            grow(minCapacity);
+    }
+
+    /**
+     * The maximum size of array to allocate.
+     * Some VMs reserve some header words in an array.
+     * Attempts to allocate larger arrays may result in
+     * OutOfMemoryError: Requested array size exceeds VM limit
+     */
+    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    private void grow(int minCapacity) {
+        // overflow-conscious code
+        int oldCapacity = elementData.length;
+        int newCapacity = oldCapacity + ((capacityIncrement > 0) ?
+                                         capacityIncrement : oldCapacity);
+        if (newCapacity - minCapacity < 0)
+            newCapacity = minCapacity;
+        if (newCapacity - MAX_ARRAY_SIZE > 0)
+            newCapacity = hugeCapacity(minCapacity);
+        elementData = Arrays.copyOf(elementData, newCapacity);
+    }
+
+    private static int hugeCapacity(int minCapacity) {
+        if (minCapacity < 0) // overflow
+            throw new OutOfMemoryError();
+        return (minCapacity > MAX_ARRAY_SIZE) ?
+            Integer.MAX_VALUE :
+            MAX_ARRAY_SIZE;
+    }
+
+    /**
+     * Sets the size of this vector. If the new size is greater than the
+     * current size, new {@code null} items are added to the end of
+     * the vector. If the new size is less than the current size, all
+     * components at index {@code newSize} and greater are discarded.
+     *
+     * @param  newSize   the new size of this vector
+     * @throws ArrayIndexOutOfBoundsException if the new size is negative
+     */
+    public synchronized void setSize(int newSize) {
+        modCount++;
+        if (newSize > elementCount) {
+            ensureCapacityHelper(newSize);
+        } else {
+            for (int i = newSize ; i < elementCount ; i++) {
+                elementData[i] = null;
+            }
+        }
+        elementCount = newSize;
+    }
+
+    /**
+     * Returns the current capacity of this vector.
+     *
+     * @return  the current capacity (the length of its internal
+     *          data array, kept in the field {@code elementData}
+     *          of this vector)
+     */
+    public synchronized int capacity() {
+        return elementData.length;
+    }
+
+    /**
+     * Returns the number of components in this vector.
+     *
+     * @return  the number of components in this vector
+     */
+    public synchronized int size() {
+        return elementCount;
+    }
+
+    /**
+     * Tests if this vector has no components.
+     *
+     * @return  {@code true} if and only if this vector has
+     *          no components, that is, its size is zero;
+     *          {@code false} otherwise.
+     */
+    public synchronized boolean isEmpty() {
+        return elementCount == 0;
+    }
+
+    /**
+     * Returns an enumeration of the components of this vector. The
+     * returned {@code Enumeration} object will generate all items in
+     * this vector. The first item generated is the item at index {@code 0},
+     * then the item at index {@code 1}, and so on.
+     *
+     * @return  an enumeration of the components of this vector
+     * @see     Iterator
+     */
+    public Enumeration<E> elements() {
+        return new Enumeration<E>() {
+            int count = 0;
+
+            public boolean hasMoreElements() {
+                return count < elementCount;
+            }
+
+            public E nextElement() {
+                synchronized (Vector.this) {
+                    if (count < elementCount) {
+                        return elementData(count++);
+                    }
+                }
+                throw new NoSuchElementException("Vector Enumeration");
+            }
+        };
+    }
+
+    /**
+     * Returns {@code true} if this vector contains the specified element.
+     * More formally, returns {@code true} if and only if this vector
+     * contains at least one element {@code e} such that
+     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     *
+     * @param o element whose presence in this vector is to be tested
+     * @return {@code true} if this vector contains the specified element
+     */
+    public boolean contains(Object o) {
+        return indexOf(o, 0) >= 0;
+    }
+
+    /**
+     * Returns the index of the first occurrence of the specified element
+     * in this vector, or -1 if this vector does not contain the element.
+     * More formally, returns the lowest index {@code i} such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
+     * or -1 if there is no such index.
+     *
+     * @param o element to search for
+     * @return the index of the first occurrence of the specified element in
+     *         this vector, or -1 if this vector does not contain the element
+     */
+    public int indexOf(Object o) {
+        return indexOf(o, 0);
+    }
+
+    /**
+     * Returns the index of the first occurrence of the specified element in
+     * this vector, searching forwards from {@code index}, or returns -1 if
+     * the element is not found.
+     * More formally, returns the lowest index {@code i} such that
+     * <tt>(i&nbsp;&gt;=&nbsp;index&nbsp;&amp;&amp;&nbsp;(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i))))</tt>,
+     * or -1 if there is no such index.
+     *
+     * @param o element to search for
+     * @param index index to start searching from
+     * @return the index of the first occurrence of the element in
+     *         this vector at position {@code index} or later in the vector;
+     *         {@code -1} if the element is not found.
+     * @throws IndexOutOfBoundsException if the specified index is negative
+     * @see     Object#equals(Object)
+     */
+    public synchronized int indexOf(Object o, int index) {
+        if (o == null) {
+            for (int i = index ; i < elementCount ; i++)
+                if (elementData[i]==null)
+                    return i;
+        } else {
+            for (int i = index ; i < elementCount ; i++)
+                if (o.equals(elementData[i]))
+                    return i;
+        }
+        return -1;
+    }
+
+    /**
+     * Returns the index of the last occurrence of the specified element
+     * in this vector, or -1 if this vector does not contain the element.
+     * More formally, returns the highest index {@code i} such that
+     * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
+     * or -1 if there is no such index.
+     *
+     * @param o element to search for
+     * @return the index of the last occurrence of the specified element in
+     *         this vector, or -1 if this vector does not contain the element
+     */
+    public synchronized int lastIndexOf(Object o) {
+        return lastIndexOf(o, elementCount-1);
+    }
+
+    /**
+     * Returns the index of the last occurrence of the specified element in
+     * this vector, searching backwards from {@code index}, or returns -1 if
+     * the element is not found.
+     * More formally, returns the highest index {@code i} such that
+     * <tt>(i&nbsp;&lt;=&nbsp;index&nbsp;&amp;&amp;&nbsp;(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i))))</tt>,
+     * or -1 if there is no such index.
+     *
+     * @param o element to search for
+     * @param index index to start searching backwards from
+     * @return the index of the last occurrence of the element at position
+     *         less than or equal to {@code index} in this vector;
+     *         -1 if the element is not found.
+     * @throws IndexOutOfBoundsException if the specified index is greater
+     *         than or equal to the current size of this vector
+     */
+    public synchronized int lastIndexOf(Object o, int index) {
+        if (index >= elementCount)
+            throw new IndexOutOfBoundsException(index + " >= "+ elementCount);
+
+        if (o == null) {
+            for (int i = index; i >= 0; i--)
+                if (elementData[i]==null)
+                    return i;
+        } else {
+            for (int i = index; i >= 0; i--)
+                if (o.equals(elementData[i]))
+                    return i;
+        }
+        return -1;
+    }
+
+    /**
+     * Returns the component at the specified index.
+     *
+     * <p>This method is identical in functionality to the {@link #get(int)}
+     * method (which is part of the {@link List} interface).
+     *
+     * @param      index   an index into this vector
+     * @return     the component at the specified index
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index >= size()})
+     */
+    public synchronized E elementAt(int index) {
+        if (index >= elementCount) {
+            throw new ArrayIndexOutOfBoundsException(index + " >= " + elementCount);
+        }
+
+        return elementData(index);
+    }
+
+    /**
+     * Returns the first component (the item at index {@code 0}) of
+     * this vector.
+     *
+     * @return     the first component of this vector
+     * @throws NoSuchElementException if this vector has no components
+     */
+    public synchronized E firstElement() {
+        if (elementCount == 0) {
+            throw new NoSuchElementException();
+        }
+        return elementData(0);
+    }
+
+    /**
+     * Returns the last component of the vector.
+     *
+     * @return  the last component of the vector, i.e., the component at index
+     *          <code>size()&nbsp;-&nbsp;1</code>.
+     * @throws NoSuchElementException if this vector is empty
+     */
+    public synchronized E lastElement() {
+        if (elementCount == 0) {
+            throw new NoSuchElementException();
+        }
+        return elementData(elementCount - 1);
+    }
+
+    /**
+     * Sets the component at the specified {@code index} of this
+     * vector to be the specified object. The previous component at that
+     * position is discarded.
+     *
+     * <p>The index must be a value greater than or equal to {@code 0}
+     * and less than the current size of the vector.
+     *
+     * <p>This method is identical in functionality to the
+     * {@link #set(int, Object) set(int, E)}
+     * method (which is part of the {@link List} interface). Note that the
+     * {@code set} method reverses the order of the parameters, to more closely
+     * match array usage.  Note also that the {@code set} method returns the
+     * old value that was stored at the specified position.
+     *
+     * @param      obj     what the component is to be set to
+     * @param      index   the specified index
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index >= size()})
+     */
+    public synchronized void setElementAt(E obj, int index) {
+        if (index >= elementCount) {
+            throw new ArrayIndexOutOfBoundsException(index + " >= " +
+                                                     elementCount);
+        }
+        elementData[index] = obj;
+    }
+
+    /**
+     * Deletes the component at the specified index. Each component in
+     * this vector with an index greater or equal to the specified
+     * {@code index} is shifted downward to have an index one
+     * smaller than the value it had previously. The size of this vector
+     * is decreased by {@code 1}.
+     *
+     * <p>The index must be a value greater than or equal to {@code 0}
+     * and less than the current size of the vector.
+     *
+     * <p>This method is identical in functionality to the {@link #remove(int)}
+     * method (which is part of the {@link List} interface).  Note that the
+     * {@code remove} method returns the old value that was stored at the
+     * specified position.
+     *
+     * @param      index   the index of the object to remove
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index >= size()})
+     */
+    public synchronized void removeElementAt(int index) {
+        modCount++;
+        if (index >= elementCount) {
+            throw new ArrayIndexOutOfBoundsException(index + " >= " +
+                                                     elementCount);
+        }
+        else if (index < 0) {
+            throw new ArrayIndexOutOfBoundsException(index);
+        }
+        int j = elementCount - index - 1;
+        if (j > 0) {
+            System.arraycopy(elementData, index + 1, elementData, index, j);
+        }
+        elementCount--;
+        elementData[elementCount] = null; /* to let gc do its work */
+    }
+
+    /**
+     * Inserts the specified object as a component in this vector at the
+     * specified {@code index}. Each component in this vector with
+     * an index greater or equal to the specified {@code index} is
+     * shifted upward to have an index one greater than the value it had
+     * previously.
+     *
+     * <p>The index must be a value greater than or equal to {@code 0}
+     * and less than or equal to the current size of the vector. (If the
+     * index is equal to the current size of the vector, the new element
+     * is appended to the Vector.)
+     *
+     * <p>This method is identical in functionality to the
+     * {@link #add(int, Object) add(int, E)}
+     * method (which is part of the {@link List} interface).  Note that the
+     * {@code add} method reverses the order of the parameters, to more closely
+     * match array usage.
+     *
+     * @param      obj     the component to insert
+     * @param      index   where to insert the new component
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index > size()})
+     */
+    public synchronized void insertElementAt(E obj, int index) {
+        modCount++;
+        if (index > elementCount) {
+            throw new ArrayIndexOutOfBoundsException(index
+                                                     + " > " + elementCount);
+        }
+        ensureCapacityHelper(elementCount + 1);
+        System.arraycopy(elementData, index, elementData, index + 1, elementCount - index);
+        elementData[index] = obj;
+        elementCount++;
+    }
+
+    /**
+     * Adds the specified component to the end of this vector,
+     * increasing its size by one. The capacity of this vector is
+     * increased if its size becomes greater than its capacity.
+     *
+     * <p>This method is identical in functionality to the
+     * {@link #add(Object) add(E)}
+     * method (which is part of the {@link List} interface).
+     *
+     * @param   obj   the component to be added
+     */
+    public synchronized void addElement(E obj) {
+        modCount++;
+        ensureCapacityHelper(elementCount + 1);
+        elementData[elementCount++] = obj;
+    }
+
+    /**
+     * Removes the first (lowest-indexed) occurrence of the argument
+     * from this vector. If the object is found in this vector, each
+     * component in the vector with an index greater or equal to the
+     * object's index is shifted downward to have an index one smaller
+     * than the value it had previously.
+     *
+     * <p>This method is identical in functionality to the
+     * {@link #remove(Object)} method (which is part of the
+     * {@link List} interface).
+     *
+     * @param   obj   the component to be removed
+     * @return  {@code true} if the argument was a component of this
+     *          vector; {@code false} otherwise.
+     */
+    public synchronized boolean removeElement(Object obj) {
+        modCount++;
+        int i = indexOf(obj);
+        if (i >= 0) {
+            removeElementAt(i);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Removes all components from this vector and sets its size to zero.
+     *
+     * <p>This method is identical in functionality to the {@link #clear}
+     * method (which is part of the {@link List} interface).
+     */
+    public synchronized void removeAllElements() {
+        modCount++;
+        // Let gc do its work
+        for (int i = 0; i < elementCount; i++)
+            elementData[i] = null;
+
+        elementCount = 0;
+    }
+
+    /**
+     * Returns a clone of this vector. The copy will contain a
+     * reference to a clone of the internal data array, not a reference
+     * to the original internal data array of this {@code Vector} object.
+     *
+     * @return  a clone of this vector
+     */
+    public synchronized Object clone() {
+        try {
+            @SuppressWarnings("unchecked")
+                Vector<E> v = (Vector<E>) super.clone();
+            v.elementData = Arrays.copyOf(elementData, elementCount);
+            v.modCount = 0;
+            return v;
+        } catch (CloneNotSupportedException e) {
+            // this shouldn't happen, since we are Cloneable
+            throw new InternalError();
+        }
+    }
+
+    /**
+     * Returns an array containing all of the elements in this Vector
+     * in the correct order.
+     *
+     * @since 1.2
+     */
+    public synchronized Object[] toArray() {
+        return Arrays.copyOf(elementData, elementCount);
+    }
+
+    /**
+     * Returns an array containing all of the elements in this Vector in the
+     * correct order; the runtime type of the returned array is that of the
+     * specified array.  If the Vector fits in the specified array, it is
+     * returned therein.  Otherwise, a new array is allocated with the runtime
+     * type of the specified array and the size of this Vector.
+     *
+     * <p>If the Vector fits in the specified array with room to spare
+     * (i.e., the array has more elements than the Vector),
+     * the element in the array immediately following the end of the
+     * Vector is set to null.  (This is useful in determining the length
+     * of the Vector <em>only</em> if the caller knows that the Vector
+     * does not contain any null elements.)
+     *
+     * @param a the array into which the elements of the Vector are to
+     *          be stored, if it is big enough; otherwise, a new array of the
+     *          same runtime type is allocated for this purpose.
+     * @return an array containing the elements of the Vector
+     * @throws ArrayStoreException if the runtime type of a is not a supertype
+     * of the runtime type of every element in this Vector
+     * @throws NullPointerException if the given array is null
+     * @since 1.2
+     */
+    @SuppressWarnings("unchecked")
+    public synchronized <T> T[] toArray(T[] a) {
+        if (a.length < elementCount)
+            return (T[]) Arrays.copyOf(elementData, elementCount, a.getClass());
+
+        System.arraycopy(elementData, 0, a, 0, elementCount);
+
+        if (a.length > elementCount)
+            a[elementCount] = null;
+
+        return a;
+    }
+
+    // Positional Access Operations
+
+    @SuppressWarnings("unchecked")
+    E elementData(int index) {
+        return (E) elementData[index];
+    }
+
+    /**
+     * Returns the element at the specified position in this Vector.
+     *
+     * @param index index of the element to return
+     * @return object at the specified index
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *            ({@code index < 0 || index >= size()})
+     * @since 1.2
+     */
+    public synchronized E get(int index) {
+        if (index >= elementCount)
+            throw new ArrayIndexOutOfBoundsException(index);
+
+        return elementData(index);
+    }
+
+    /**
+     * Replaces the element at the specified position in this Vector with the
+     * specified element.
+     *
+     * @param index index of the element to replace
+     * @param element element to be stored at the specified position
+     * @return the element previously at the specified position
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index >= size()})
+     * @since 1.2
+     */
+    public synchronized E set(int index, E element) {
+        if (index >= elementCount)
+            throw new ArrayIndexOutOfBoundsException(index);
+
+        E oldValue = elementData(index);
+        elementData[index] = element;
+        return oldValue;
+    }
+
+    /**
+     * Appends the specified element to the end of this Vector.
+     *
+     * @param e element to be appended to this Vector
+     * @return {@code true} (as specified by {@link Collection#add})
+     * @since 1.2
+     */
+    public synchronized boolean add(E e) {
+        modCount++;
+        ensureCapacityHelper(elementCount + 1);
+        elementData[elementCount++] = e;
+        return true;
+    }
+
+    /**
+     * Removes the first occurrence of the specified element in this Vector
+     * If the Vector does not contain the element, it is unchanged.  More
+     * formally, removes the element with the lowest index i such that
+     * {@code (o==null ? get(i)==null : o.equals(get(i)))} (if such
+     * an element exists).
+     *
+     * @param o element to be removed from this Vector, if present
+     * @return true if the Vector contained the specified element
+     * @since 1.2
+     */
+    public boolean remove(Object o) {
+        return removeElement(o);
+    }
+
+    /**
+     * Inserts the specified element at the specified position in this Vector.
+     * Shifts the element currently at that position (if any) and any
+     * subsequent elements to the right (adds one to their indices).
+     *
+     * @param index index at which the specified element is to be inserted
+     * @param element element to be inserted
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index > size()})
+     * @since 1.2
+     */
+    public void add(int index, E element) {
+        insertElementAt(element, index);
+    }
+
+    /**
+     * Removes the element at the specified position in this Vector.
+     * Shifts any subsequent elements to the left (subtracts one from their
+     * indices).  Returns the element that was removed from the Vector.
+     *
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index >= size()})
+     * @param index the index of the element to be removed
+     * @return element that was removed
+     * @since 1.2
+     */
+    public synchronized E remove(int index) {
+        modCount++;
+        if (index >= elementCount)
+            throw new ArrayIndexOutOfBoundsException(index);
+        E oldValue = elementData(index);
+
+        int numMoved = elementCount - index - 1;
+        if (numMoved > 0)
+            System.arraycopy(elementData, index+1, elementData, index,
+                             numMoved);
+        elementData[--elementCount] = null; // Let gc do its work
+
+        return oldValue;
+    }
+
+    /**
+     * Removes all of the elements from this Vector.  The Vector will
+     * be empty after this call returns (unless it throws an exception).
+     *
+     * @since 1.2
+     */
+    public void clear() {
+        removeAllElements();
+    }
+
+    // Bulk Operations
+
+    /**
+     * Returns true if this Vector contains all of the elements in the
+     * specified Collection.
+     *
+     * @param   c a collection whose elements will be tested for containment
+     *          in this Vector
+     * @return true if this Vector contains all of the elements in the
+     *         specified collection
+     * @throws NullPointerException if the specified collection is null
+     */
+    public synchronized boolean containsAll(Collection<?> c) {
+        return super.containsAll(c);
+    }
+
+    /**
+     * Appends all of the elements in the specified Collection to the end of
+     * this Vector, in the order that they are returned by the specified
+     * Collection's Iterator.  The behavior of this operation is undefined if
+     * the specified Collection is modified while the operation is in progress.
+     * (This implies that the behavior of this call is undefined if the
+     * specified Collection is this Vector, and this Vector is nonempty.)
+     *
+     * @param c elements to be inserted into this Vector
+     * @return {@code true} if this Vector changed as a result of the call
+     * @throws NullPointerException if the specified collection is null
+     * @since 1.2
+     */
+    public synchronized boolean addAll(Collection<? extends E> c) {
+        modCount++;
+        Object[] a = c.toArray();
+        int numNew = a.length;
+        ensureCapacityHelper(elementCount + numNew);
+        System.arraycopy(a, 0, elementData, elementCount, numNew);
+        elementCount += numNew;
+        return numNew != 0;
+    }
+
+    /**
+     * Removes from this Vector all of its elements that are contained in the
+     * specified Collection.
+     *
+     * @param c a collection of elements to be removed from the Vector
+     * @return true if this Vector changed as a result of the call
+     * @throws ClassCastException if the types of one or more elements
+     *         in this vector are incompatible with the specified
+     *         collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this vector contains one or more null
+     *         elements and the specified collection does not support null
+     *         elements
+     * (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @since 1.2
+     */
+    public synchronized boolean removeAll(Collection<?> c) {
+        return super.removeAll(c);
+    }
+
+    /**
+     * Retains only the elements in this Vector that are contained in the
+     * specified Collection.  In other words, removes from this Vector all
+     * of its elements that are not contained in the specified Collection.
+     *
+     * @param c a collection of elements to be retained in this Vector
+     *          (all other elements are removed)
+     * @return true if this Vector changed as a result of the call
+     * @throws ClassCastException if the types of one or more elements
+     *         in this vector are incompatible with the specified
+     *         collection
+     * (<a href="Collection.html#optional-restrictions">optional</a>)
+     * @throws NullPointerException if this vector contains one or more null
+     *         elements and the specified collection does not support null
+     *         elements
+     *         (<a href="Collection.html#optional-restrictions">optional</a>),
+     *         or if the specified collection is null
+     * @since 1.2
+     */
+    public synchronized boolean retainAll(Collection<?> c) {
+        return super.retainAll(c);
+    }
+
+    /**
+     * Inserts all of the elements in the specified Collection into this
+     * Vector at the specified position.  Shifts the element currently at
+     * that position (if any) and any subsequent elements to the right
+     * (increases their indices).  The new elements will appear in the Vector
+     * in the order that they are returned by the specified Collection's
+     * iterator.
+     *
+     * @param index index at which to insert the first element from the
+     *              specified collection
+     * @param c elements to be inserted into this Vector
+     * @return {@code true} if this Vector changed as a result of the call
+     * @throws ArrayIndexOutOfBoundsException if the index is out of range
+     *         ({@code index < 0 || index > size()})
+     * @throws NullPointerException if the specified collection is null
+     * @since 1.2
+     */
+    public synchronized boolean addAll(int index, Collection<? extends E> c) {
+        modCount++;
+        if (index < 0 || index > elementCount)
+            throw new ArrayIndexOutOfBoundsException(index);
+
+        Object[] a = c.toArray();
+        int numNew = a.length;
+        ensureCapacityHelper(elementCount + numNew);
+
+        int numMoved = elementCount - index;
+        if (numMoved > 0)
+            System.arraycopy(elementData, index, elementData, index + numNew,
+                             numMoved);
+
+        System.arraycopy(a, 0, elementData, index, numNew);
+        elementCount += numNew;
+        return numNew != 0;
+    }
+
+    /**
+     * Compares the specified Object with this Vector for equality.  Returns
+     * true if and only if the specified Object is also a List, both Lists
+     * have the same size, and all corresponding pairs of elements in the two
+     * Lists are <em>equal</em>.  (Two elements {@code e1} and
+     * {@code e2} are <em>equal</em> if {@code (e1==null ? e2==null :
+     * e1.equals(e2))}.)  In other words, two Lists are defined to be
+     * equal if they contain the same elements in the same order.
+     *
+     * @param o the Object to be compared for equality with this Vector
+     * @return true if the specified Object is equal to this Vector
+     */
+    public synchronized boolean equals(Object o) {
+        return super.equals(o);
+    }
+
+    /**
+     * Returns the hash code value for this Vector.
+     */
+    public synchronized int hashCode() {
+        return super.hashCode();
+    }
+
+    /**
+     * Returns a string representation of this Vector, containing
+     * the String representation of each element.
+     */
+    public synchronized String toString() {
+        return super.toString();
+    }
+
+    /**
+     * Returns a view of the portion of this List between fromIndex,
+     * inclusive, and toIndex, exclusive.  (If fromIndex and toIndex are
+     * equal, the returned List is empty.)  The returned List is backed by this
+     * List, so changes in the returned List are reflected in this List, and
+     * vice-versa.  The returned List supports all of the optional List
+     * operations supported by this List.
+     *
+     * <p>This method eliminates the need for explicit range operations (of
+     * the sort that commonly exist for arrays).  Any operation that expects
+     * a List can be used as a range operation by operating on a subList view
+     * instead of a whole List.  For example, the following idiom
+     * removes a range of elements from a List:
+     * <pre>
+     *      list.subList(from, to).clear();
+     * </pre>
+     * Similar idioms may be constructed for indexOf and lastIndexOf,
+     * and all of the algorithms in the Collections class can be applied to
+     * a subList.
+     *
+     * <p>The semantics of the List returned by this method become undefined if
+     * the backing list (i.e., this List) is <i>structurally modified</i> in
+     * any way other than via the returned List.  (Structural modifications are
+     * those that change the size of the List, or otherwise perturb it in such
+     * a fashion that iterations in progress may yield incorrect results.)
+     *
+     * @param fromIndex low endpoint (inclusive) of the subList
+     * @param toIndex high endpoint (exclusive) of the subList
+     * @return a view of the specified range within this List
+     * @throws IndexOutOfBoundsException if an endpoint index value is out of range
+     *         {@code (fromIndex < 0 || toIndex > size)}
+     * @throws IllegalArgumentException if the endpoint indices are out of order
+     *         {@code (fromIndex > toIndex)}
+     */
+    public synchronized List<E> subList(int fromIndex, int toIndex) {
+        return Collections.synchronizedList(super.subList(fromIndex, toIndex),
+                                            this);
+    }
+
+    /**
+     * Removes from this list all of the elements whose index is between
+     * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive.
+     * Shifts any succeeding elements to the left (reduces their index).
+     * This call shortens the list by {@code (toIndex - fromIndex)} elements.
+     * (If {@code toIndex==fromIndex}, this operation has no effect.)
+     */
+    protected synchronized void removeRange(int fromIndex, int toIndex) {
+        modCount++;
+        int numMoved = elementCount - toIndex;
+        System.arraycopy(elementData, toIndex, elementData, fromIndex,
+                         numMoved);
+
+        // Let gc do its work
+        int newElementCount = elementCount - (toIndex-fromIndex);
+        while (elementCount != newElementCount)
+            elementData[--elementCount] = null;
+    }
+
+    /**
+     * Returns a list iterator over the elements in this list (in proper
+     * sequence), starting at the specified position in the list.
+     * The specified index indicates the first element that would be
+     * returned by an initial call to {@link ListIterator#next next}.
+     * An initial call to {@link ListIterator#previous previous} would
+     * return the element with the specified index minus one.
+     *
+     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
+     *
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public synchronized ListIterator<E> listIterator(int index) {
+        if (index < 0 || index > elementCount)
+            throw new IndexOutOfBoundsException("Index: "+index);
+        return new ListItr(index);
+    }
+
+    /**
+     * Returns a list iterator over the elements in this list (in proper
+     * sequence).
+     *
+     * <p>The returned list iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
+     *
+     * @see #listIterator(int)
+     */
+    public synchronized ListIterator<E> listIterator() {
+        return new ListItr(0);
+    }
+
+    /**
+     * Returns an iterator over the elements in this list in proper sequence.
+     *
+     * <p>The returned iterator is <a href="#fail-fast"><i>fail-fast</i></a>.
+     *
+     * @return an iterator over the elements in this list in proper sequence
+     */
+    public synchronized Iterator<E> iterator() {
+        return new Itr();
+    }
+
+    /**
+     * An optimized version of AbstractList.Itr
+     */
+    private class Itr implements Iterator<E> {
+        int cursor;       // index of next element to return
+        int lastRet = -1; // index of last element returned; -1 if no such
+        int expectedModCount = modCount;
+
+        public boolean hasNext() {
+            // Racy but within spec, since modifications are checked
+            // within or after synchronization in next/previous
+            return cursor != elementCount;
+        }
+
+        public E next() {
+            synchronized (Vector.this) {
+                checkForComodification();
+                int i = cursor;
+                if (i >= elementCount)
+                    throw new NoSuchElementException();
+                cursor = i + 1;
+                return elementData(lastRet = i);
+            }
+        }
+
+        public void remove() {
+            if (lastRet == -1)
+                throw new IllegalStateException();
+            synchronized (Vector.this) {
+                checkForComodification();
+                Vector.this.remove(lastRet);
+                expectedModCount = modCount;
+            }
+            cursor = lastRet;
+            lastRet = -1;
+        }
+
+        final void checkForComodification() {
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+        }
+    }
+
+    /**
+     * An optimized version of AbstractList.ListItr
+     */
+    final class ListItr extends Itr implements ListIterator<E> {
+        ListItr(int index) {
+            super();
+            cursor = index;
+        }
+
+        public boolean hasPrevious() {
+            return cursor != 0;
+        }
+
+        public int nextIndex() {
+            return cursor;
+        }
+
+        public int previousIndex() {
+            return cursor - 1;
+        }
+
+        public E previous() {
+            synchronized (Vector.this) {
+                checkForComodification();
+                int i = cursor - 1;
+                if (i < 0)
+                    throw new NoSuchElementException();
+                cursor = i;
+                return elementData(lastRet = i);
+            }
+        }
+
+        public void set(E e) {
+            if (lastRet == -1)
+                throw new IllegalStateException();
+            synchronized (Vector.this) {
+                checkForComodification();
+                Vector.this.set(lastRet, e);
+            }
+        }
+
+        public void add(E e) {
+            int i = cursor;
+            synchronized (Vector.this) {
+                checkForComodification();
+                Vector.this.add(i, e);
+                expectedModCount = modCount;
+            }
+            cursor = i + 1;
+            lastRet = -1;
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/concurrent/Callable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/concurrent/Callable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,65 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util.concurrent;
+
+/**
+ * A task that returns a result and may throw an exception.
+ * Implementors define a single method with no arguments called
+ * <tt>call</tt>.
+ *
+ * <p>The <tt>Callable</tt> interface is similar to {@link
+ * java.lang.Runnable}, in that both are designed for classes whose
+ * instances are potentially executed by another thread.  A
+ * <tt>Runnable</tt>, however, does not return a result and cannot
+ * throw a checked exception.
+ *
+ * <p> The {@link Executors} class contains utility methods to
+ * convert from other common forms to <tt>Callable</tt> classes.
+ *
+ * @see Executor
+ * @since 1.5
+ * @author Doug Lea
+ * @param <V> the result type of method <tt>call</tt>
+ */
+public interface Callable<V> {
+    /**
+     * Computes a result, or throws an exception if unable to do so.
+     *
+     * @return computed result
+     * @throws Exception if unable to compute a result
+     */
+    V call() throws Exception;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/main/java/java/util/concurrent/TimeUnit.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/main/java/java/util/concurrent/TimeUnit.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,367 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util.concurrent;
+
+/**
+ * A <tt>TimeUnit</tt> represents time durations at a given unit of
+ * granularity and provides utility methods to convert across units,
+ * and to perform timing and delay operations in these units.  A
+ * <tt>TimeUnit</tt> does not maintain time information, but only
+ * helps organize and use time representations that may be maintained
+ * separately across various contexts.  A nanosecond is defined as one
+ * thousandth of a microsecond, a microsecond as one thousandth of a
+ * millisecond, a millisecond as one thousandth of a second, a minute
+ * as sixty seconds, an hour as sixty minutes, and a day as twenty four
+ * hours.
+ *
+ * <p>A <tt>TimeUnit</tt> is mainly used to inform time-based methods
+ * how a given timing parameter should be interpreted. For example,
+ * the following code will timeout in 50 milliseconds if the {@link
+ * java.util.concurrent.locks.Lock lock} is not available:
+ *
+ * <pre>  Lock lock = ...;
+ *  if (lock.tryLock(50L, TimeUnit.MILLISECONDS)) ...
+ * </pre>
+ * while this code will timeout in 50 seconds:
+ * <pre>
+ *  Lock lock = ...;
+ *  if (lock.tryLock(50L, TimeUnit.SECONDS)) ...
+ * </pre>
+ *
+ * Note however, that there is no guarantee that a particular timeout
+ * implementation will be able to notice the passage of time at the
+ * same granularity as the given <tt>TimeUnit</tt>.
+ *
+ * @since 1.5
+ * @author Doug Lea
+ */
+public enum TimeUnit {
+    NANOSECONDS {
+        public long toNanos(long d)   { return d; }
+        public long toMicros(long d)  { return d/(C1/C0); }
+        public long toMillis(long d)  { return d/(C2/C0); }
+        public long toSeconds(long d) { return d/(C3/C0); }
+        public long toMinutes(long d) { return d/(C4/C0); }
+        public long toHours(long d)   { return d/(C5/C0); }
+        public long toDays(long d)    { return d/(C6/C0); }
+        public long convert(long d, TimeUnit u) { return u.toNanos(d); }
+        int excessNanos(long d, long m) { return (int)(d - (m*C2)); }
+    },
+    MICROSECONDS {
+        public long toNanos(long d)   { return x(d, C1/C0, MAX/(C1/C0)); }
+        public long toMicros(long d)  { return d; }
+        public long toMillis(long d)  { return d/(C2/C1); }
+        public long toSeconds(long d) { return d/(C3/C1); }
+        public long toMinutes(long d) { return d/(C4/C1); }
+        public long toHours(long d)   { return d/(C5/C1); }
+        public long toDays(long d)    { return d/(C6/C1); }
+        public long convert(long d, TimeUnit u) { return u.toMicros(d); }
+        int excessNanos(long d, long m) { return (int)((d*C1) - (m*C2)); }
+    },
+    MILLISECONDS {
+        public long toNanos(long d)   { return x(d, C2/C0, MAX/(C2/C0)); }
+        public long toMicros(long d)  { return x(d, C2/C1, MAX/(C2/C1)); }
+        public long toMillis(long d)  { return d; }
+        public long toSeconds(long d) { return d/(C3/C2); }
+        public long toMinutes(long d) { return d/(C4/C2); }
+        public long toHours(long d)   { return d/(C5/C2); }
+        public long toDays(long d)    { return d/(C6/C2); }
+        public long convert(long d, TimeUnit u) { return u.toMillis(d); }
+        int excessNanos(long d, long m) { return 0; }
+    },
+    SECONDS {
+        public long toNanos(long d)   { return x(d, C3/C0, MAX/(C3/C0)); }
+        public long toMicros(long d)  { return x(d, C3/C1, MAX/(C3/C1)); }
+        public long toMillis(long d)  { return x(d, C3/C2, MAX/(C3/C2)); }
+        public long toSeconds(long d) { return d; }
+        public long toMinutes(long d) { return d/(C4/C3); }
+        public long toHours(long d)   { return d/(C5/C3); }
+        public long toDays(long d)    { return d/(C6/C3); }
+        public long convert(long d, TimeUnit u) { return u.toSeconds(d); }
+        int excessNanos(long d, long m) { return 0; }
+    },
+    MINUTES {
+        public long toNanos(long d)   { return x(d, C4/C0, MAX/(C4/C0)); }
+        public long toMicros(long d)  { return x(d, C4/C1, MAX/(C4/C1)); }
+        public long toMillis(long d)  { return x(d, C4/C2, MAX/(C4/C2)); }
+        public long toSeconds(long d) { return x(d, C4/C3, MAX/(C4/C3)); }
+        public long toMinutes(long d) { return d; }
+        public long toHours(long d)   { return d/(C5/C4); }
+        public long toDays(long d)    { return d/(C6/C4); }
+        public long convert(long d, TimeUnit u) { return u.toMinutes(d); }
+        int excessNanos(long d, long m) { return 0; }
+    },
+    HOURS {
+        public long toNanos(long d)   { return x(d, C5/C0, MAX/(C5/C0)); }
+        public long toMicros(long d)  { return x(d, C5/C1, MAX/(C5/C1)); }
+        public long toMillis(long d)  { return x(d, C5/C2, MAX/(C5/C2)); }
+        public long toSeconds(long d) { return x(d, C5/C3, MAX/(C5/C3)); }
+        public long toMinutes(long d) { return x(d, C5/C4, MAX/(C5/C4)); }
+        public long toHours(long d)   { return d; }
+        public long toDays(long d)    { return d/(C6/C5); }
+        public long convert(long d, TimeUnit u) { return u.toHours(d); }
+        int excessNanos(long d, long m) { return 0; }
+    },
+    DAYS {
+        public long toNanos(long d)   { return x(d, C6/C0, MAX/(C6/C0)); }
+        public long toMicros(long d)  { return x(d, C6/C1, MAX/(C6/C1)); }
+        public long toMillis(long d)  { return x(d, C6/C2, MAX/(C6/C2)); }
+        public long toSeconds(long d) { return x(d, C6/C3, MAX/(C6/C3)); }
+        public long toMinutes(long d) { return x(d, C6/C4, MAX/(C6/C4)); }
+        public long toHours(long d)   { return x(d, C6/C5, MAX/(C6/C5)); }
+        public long toDays(long d)    { return d; }
+        public long convert(long d, TimeUnit u) { return u.toDays(d); }
+        int excessNanos(long d, long m) { return 0; }
+    };
+
+    // Handy constants for conversion methods
+    static final long C0 = 1L;
+    static final long C1 = C0 * 1000L;
+    static final long C2 = C1 * 1000L;
+    static final long C3 = C2 * 1000L;
+    static final long C4 = C3 * 60L;
+    static final long C5 = C4 * 60L;
+    static final long C6 = C5 * 24L;
+
+    static final long MAX = Long.MAX_VALUE;
+
+    /**
+     * Scale d by m, checking for overflow.
+     * This has a short name to make above code more readable.
+     */
+    static long x(long d, long m, long over) {
+        if (d >  over) return Long.MAX_VALUE;
+        if (d < -over) return Long.MIN_VALUE;
+        return d * m;
+    }
+
+    // To maintain full signature compatibility with 1.5, and to improve the
+    // clarity of the generated javadoc (see 6287639: Abstract methods in
+    // enum classes should not be listed as abstract), method convert
+    // etc. are not declared abstract but otherwise act as abstract methods.
+
+    /**
+     * Convert the given time duration in the given unit to this
+     * unit.  Conversions from finer to coarser granularities
+     * truncate, so lose precision. For example converting
+     * <tt>999</tt> milliseconds to seconds results in
+     * <tt>0</tt>. Conversions from coarser to finer granularities
+     * with arguments that would numerically overflow saturate to
+     * <tt>Long.MIN_VALUE</tt> if negative or <tt>Long.MAX_VALUE</tt>
+     * if positive.
+     *
+     * <p>For example, to convert 10 minutes to milliseconds, use:
+     * <tt>TimeUnit.MILLISECONDS.convert(10L, TimeUnit.MINUTES)</tt>
+     *
+     * @param sourceDuration the time duration in the given <tt>sourceUnit</tt>
+     * @param sourceUnit the unit of the <tt>sourceDuration</tt> argument
+     * @return the converted duration in this unit,
+     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+     */
+    public long convert(long sourceDuration, TimeUnit sourceUnit) {
+        throw new AbstractMethodError();
+    }
+
+    /**
+     * Equivalent to <tt>NANOSECONDS.convert(duration, this)</tt>.
+     * @param duration the duration
+     * @return the converted duration,
+     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+     * @see #convert
+     */
+    public long toNanos(long duration) {
+        throw new AbstractMethodError();
+    }
+
+    /**
+     * Equivalent to <tt>MICROSECONDS.convert(duration, this)</tt>.
+     * @param duration the duration
+     * @return the converted duration,
+     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+     * @see #convert
+     */
+    public long toMicros(long duration) {
+        throw new AbstractMethodError();
+    }
+
+    /**
+     * Equivalent to <tt>MILLISECONDS.convert(duration, this)</tt>.
+     * @param duration the duration
+     * @return the converted duration,
+     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+     * @see #convert
+     */
+    public long toMillis(long duration) {
+        throw new AbstractMethodError();
+    }
+
+    /**
+     * Equivalent to <tt>SECONDS.convert(duration, this)</tt>.
+     * @param duration the duration
+     * @return the converted duration,
+     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+     * @see #convert
+     */
+    public long toSeconds(long duration) {
+        throw new AbstractMethodError();
+    }
+
+    /**
+     * Equivalent to <tt>MINUTES.convert(duration, this)</tt>.
+     * @param duration the duration
+     * @return the converted duration,
+     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+     * @see #convert
+     * @since 1.6
+     */
+    public long toMinutes(long duration) {
+        throw new AbstractMethodError();
+    }
+
+    /**
+     * Equivalent to <tt>HOURS.convert(duration, this)</tt>.
+     * @param duration the duration
+     * @return the converted duration,
+     * or <tt>Long.MIN_VALUE</tt> if conversion would negatively
+     * overflow, or <tt>Long.MAX_VALUE</tt> if it would positively overflow.
+     * @see #convert
+     * @since 1.6
+     */
+    public long toHours(long duration) {
+        throw new AbstractMethodError();
+    }
+
+    /**
+     * Equivalent to <tt>DAYS.convert(duration, this)</tt>.
+     * @param duration the duration
+     * @return the converted duration
+     * @see #convert
+     * @since 1.6
+     */
+    public long toDays(long duration) {
+        throw new AbstractMethodError();
+    }
+
+    /**
+     * Utility to compute the excess-nanosecond argument to wait,
+     * sleep, join.
+     * @param d the duration
+     * @param m the number of milliseconds
+     * @return the number of nanoseconds
+     */
+    abstract int excessNanos(long d, long m);
+
+    /**
+     * Performs a timed {@link Object#wait(long, int) Object.wait}
+     * using this time unit.
+     * This is a convenience method that converts timeout arguments
+     * into the form required by the <tt>Object.wait</tt> method.
+     *
+     * <p>For example, you could implement a blocking <tt>poll</tt>
+     * method (see {@link BlockingQueue#poll BlockingQueue.poll})
+     * using:
+     *
+     *  <pre> {@code
+     * public synchronized Object poll(long timeout, TimeUnit unit)
+     *     throws InterruptedException {
+     *   while (empty) {
+     *     unit.timedWait(this, timeout);
+     *     ...
+     *   }
+     * }}</pre>
+     *
+     * @param obj the object to wait on
+     * @param timeout the maximum time to wait. If less than
+     * or equal to zero, do not wait at all.
+     * @throws InterruptedException if interrupted while waiting
+     */
+    public void timedWait(Object obj, long timeout)
+            throws InterruptedException {
+        if (timeout > 0) {
+            long ms = toMillis(timeout);
+            int ns = excessNanos(timeout, ms);
+            obj.wait(ms, ns);
+        }
+    }
+
+    /**
+     * Performs a timed {@link Thread#join(long, int) Thread.join}
+     * using this time unit.
+     * This is a convenience method that converts time arguments into the
+     * form required by the <tt>Thread.join</tt> method.
+     *
+     * @param thread the thread to wait for
+     * @param timeout the maximum time to wait. If less than
+     * or equal to zero, do not wait at all.
+     * @throws InterruptedException if interrupted while waiting
+     */
+//    public void timedJoin(Thread thread, long timeout)
+//            throws InterruptedException {
+//        if (timeout > 0) {
+//            long ms = toMillis(timeout);
+//            int ns = excessNanos(timeout, ms);
+//            thread.join(ms, ns);
+//        }
+//    }
+
+    /**
+     * Performs a {@link Thread#sleep(long, int) Thread.sleep} using
+     * this time unit.
+     * This is a convenience method that converts time arguments into the
+     * form required by the <tt>Thread.sleep</tt> method.
+     *
+     * @param timeout the minimum time to sleep. If less than
+     * or equal to zero, do not sleep at all.
+     * @throws InterruptedException if interrupted while sleeping
+     */
+    public void sleep(long timeout) throws InterruptedException {
+        if (timeout > 0) {
+            long ms = toMillis(timeout);
+            int ns = excessNanos(timeout, ms);
+            Object o = new Object();
+            synchronized (o) {
+                o.wait(ms, ns);
+            }
+        }
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/CollectionsTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/CollectionsTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,107 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.compact.tck;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Vector;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class CollectionsTest {
+    @Compare public String sortStringsInArray() {
+        List<String> list = new ArrayList<>();
+        list.add("one");
+        list.add("two");
+        list.add("three");
+        list.add("four");
+        list.add("five");
+        list.add("six");
+        list.add("seven");
+        list.add("eight");
+        list.add("nine");
+        list.add("ten");
+        
+        String[] arr = list.toArray(new String[list.size()]);
+        Arrays.sort(arr);
+        
+        return Arrays.asList(arr).toString();
+    }
+    
+    @Compare public String sortStringsInHashSet() {
+        Collection<String> list = new HashSet<>();
+        list.add("one");
+        list.add("two");
+        list.add("three");
+        list.add("four");
+        list.add("five");
+        list.add("six");
+        list.add("seven");
+        list.add("eight");
+        list.add("nine");
+        list.add("ten");
+        
+        String[] arr = list.toArray(new String[0]);
+        Arrays.sort(arr);
+        
+        return Arrays.asList(arr).toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Compare public String sortStringsInHashMapWithComparator() {
+        class C implements Comparator<Map.Entry<String,Integer>> {
+            public int compare(Map.Entry<String, Integer> o1, Map.Entry<String, Integer> o2) {
+                return o1.getKey().compareTo(o2.getKey());
+            }
+        }
+        
+        Map<String,Integer> map = new HashMap<>();
+        map.put("one", 1);
+        map.put("two", 2);
+        map.put("three", 3);
+        map.put("four", 4);
+        map.put("five", 5);
+        map.put("six", 6);
+        map.put("seven", 7);
+        map.put("eight", 8);
+        map.put("nine", 9);
+        map.put("ten", 10);
+        
+        List<Entry<String,Integer>> arr = new Vector<>();
+        arr.addAll(map.entrySet());
+        return arr.toString();
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(CollectionsTest.class);
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,84 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.compact.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+
+public class JFXIssuesTest {
+    private abstract class Application {
+        public abstract int getID();
+    }
+    
+    private class MyApplication extends Application {
+
+        @Override
+        public int getID() {
+            return 1;
+        }
+        
+    } 
+    
+    @Compare public boolean isClassAssignable() {
+        return Application.class.isAssignableFrom(MyApplication.class);
+    }
+
+    @Compare public boolean isNaN() {
+        return Double.isNaN(Double.NaN);
+    }
+
+    @Compare public boolean isInfinite() {
+        return Float.isInfinite(Float.NEGATIVE_INFINITY);
+    }
+
+    @Compare public boolean areTimesEqual() {
+        long l1 = System.currentTimeMillis();
+        long l2 = l1 + 0;
+
+        return l1 == l2;
+    }
+    
+    @Compare public boolean roundOnDouble() {
+        long l1 = Math.round(System.currentTimeMillis() / 1.1);
+        long l2 = l1 + 0;
+        
+        return l1 == l2;
+    }
+
+    private static long val = 1238078409318L;
+    
+    @Compare public int valueConvertedToString() {
+        return (int) val++;
+    }
+    
+    @Compare public boolean roundOnFloat() {
+        final float f = System.currentTimeMillis() / 1.1f;
+        int l1 = Math.round(f);
+        int l2 = l1 + 0;
+        
+        assert l1 == l2 : "Round " + l1 + " == " + l2;
+        
+        return l1 == l2;
+    }
+    
+    @Factory public static Object[] create() {
+        return VMTest.create(JFXIssuesTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/RandomTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/RandomTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,40 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.compact.tck;
+
+import java.util.Random;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class RandomTest {
+    @Compare public boolean canInstantiateRandom() {
+        Random r = new Random();
+        r.nextInt();
+        return r != null;
+    }
+
+    
+    @Factory public static Object[] create() {
+        return VMTest.create(RandomTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ReaderTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ReaderTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,61 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.compact.tck;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ReaderTest {
+    @Compare public String readUTFString() throws IOException {
+        byte[] arr = { 
+            (byte)-59, (byte)-67, (byte)108, (byte)117, (byte)-59, (byte)-91, 
+            (byte)111, (byte)117, (byte)-60, (byte)-115, (byte)107, (byte)-61, 
+            (byte)-67, (byte)32, (byte)107, (byte)-59, (byte)-81, (byte)-59, 
+            (byte)-120 
+        };
+        ByteArrayInputStream is = new ByteArrayInputStream(arr);
+        InputStreamReader r = new InputStreamReader(is, "UTF-8");
+        
+        StringBuilder sb = new StringBuilder();
+        for (;;) {
+            int ch = r.read();
+            if (ch == -1) {
+                break;
+            }
+            sb.append((char)ch);
+        }
+        return sb.toString().toString();
+    }
+    @Compare public String stringToBytes() throws UnsupportedEncodingException {
+        return Arrays.toString("\u017dlu\u0165ou\u010dk\u00fd k\u016f\u0148".getBytes("UTF-8"));
+    }
+    
+    @Factory public static Object[] create() {
+        return VMTest.create(ReaderTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ServiceLoaderTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ServiceLoaderTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,61 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.compact.tck;
+
+import java.io.IOException;
+import java.util.ServiceLoader;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.openide.util.lookup.ServiceProvider;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ServiceLoaderTest {
+    @Compare//(scripting = false) 
+    public Object findsIOException() {
+//      delayStart();
+        for (IOException e : ServiceLoader.load(IOException.class)) {
+            return "Found service: " + e.getClass().getName();
+        }
+        return null;
+    }
+/*    
+    @org.apidesign.bck2brwsr.core.JavaScriptBody(args = { "a" }, body = "alert(a);")
+    private static void alert(String a) {
+    }
+    private void delayStart() {
+        for (int i = 0; i < 10; i++) {
+            alert("State: " + i);
+            for (int j = 0; j < 493208409; j++) ;
+        }
+    }
+*/
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(ServiceLoaderTest.class);
+    }
+
+    
+    @ServiceProvider(service = IOException.class)
+    public static class MyException extends IOException {
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipArchive.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipArchive.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,154 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.compact.tck;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.zip.ZipEntry;
+import org.apidesign.bck2brwsr.emul.zip.ZipInputStream;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class ZipArchive {
+    private final Map<String, byte[]> entries = new LinkedHashMap<>();
+
+    public static ZipArchive createZip(InputStream is) throws IOException {
+        ZipArchive a = new ZipArchive();
+        readZip(is, a);
+        return a;
+    }
+
+    public static ZipArchive createReal(InputStream is) throws IOException {
+        ZipArchive a = new ZipArchive();
+        realZip(is, a);
+        return a;
+    }
+
+    /**
+     * Registers entry name and data
+     */
+    final void register(String entry, InputStream is) throws IOException {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        for (;;) {
+            int ch = is.read();
+            if (ch == -1) {
+                break;
+            }
+            os.write(ch);
+        }
+        os.close();
+        entries.put(entry, os.toByteArray());
+    }
+
+    @Override
+    public int hashCode() {
+        return entries.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final ZipArchive other = (ZipArchive) obj;
+        if (!Objects.deepEquals(this.entries, other.entries)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, byte[]> en : entries.entrySet()) {
+            String string = en.getKey();
+            byte[] bs = en.getValue();
+            sb.append(string).append(" = ").append(Arrays.toString(bs)).append("\n");
+        }
+        return sb.toString();
+    }
+
+    public void assertEquals(ZipArchive zip, String msg) {
+        boolean ok = true;
+        StringBuilder sb = new StringBuilder();
+        sb.append(msg);
+        for (Map.Entry<String, byte[]> en : entries.entrySet()) {
+            String string = en.getKey();
+            byte[] bs = en.getValue();
+            byte[] other = zip.entries.get(string);
+            sb.append("\n");
+            if (other == null) {
+                sb.append("EXTRA ").append(string).append(" = ").append(Arrays.toString(bs));
+                ok = false;
+                continue;
+            }
+            if (Arrays.equals(bs, other)) {
+                sb.append("OK    ").append(string);
+                continue;
+            } else {
+                sb.append("DIFF  ").append(string).append(" = ").append(Arrays.toString(bs)).append("\n");
+                sb.append("    TO").append(string).append(" = ").append(Arrays.toString(other)).append("\n");
+                ok = false;
+                continue;
+            }
+        }
+        for (Map.Entry<String, byte[]> entry : zip.entries.entrySet()) {
+            String string = entry.getKey();
+            if (entries.get(string) == null) {
+                sb.append("MISS  ").append(string).append(" = ").append(Arrays.toString(entry.getValue()));
+                ok = false;
+            }
+        }
+        if (!ok) {
+            assert false : sb.toString();
+        }
+    }
+
+    public static void readZip(InputStream is, ZipArchive data) throws IOException {
+        ZipInputStream zip = new org.apidesign.bck2brwsr.emul.zip.ZipInputStream(is);
+        for (;;) {
+            ZipEntry en = zip.getNextEntry();
+            if (en == null) {
+                return;
+            }
+            data.register(en.getName(), zip);
+        }
+    }
+
+    public static void realZip(InputStream is, ZipArchive data) throws IOException {
+        java.util.zip.ZipInputStream zip = new java.util.zip.ZipInputStream(is);
+        for (;;) {
+            ZipEntry en = zip.getNextEntry();
+            if (en == null) {
+                return;
+            }
+            data.register(en.getName(), zip);
+        }
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipCompatibilityTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipCompatibilityTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,43 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.compact.tck;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ZipCompatibilityTest {
+    @Compare
+    public String testDemoStaticCalculator() throws IOException {
+        InputStream is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
+        ZipArchive zip = ZipArchive.createZip(is);
+        final String ts = zip.toString();
+        return ts.substring(0, 4096) + ts.hashCode();
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(ZipCompatibilityTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipVsJzLibTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/ZipVsJzLibTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,39 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.compact.tck;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ZipVsJzLibTest {
+    @Test public void r() throws IOException {
+        InputStream is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
+        ZipArchive zip = ZipArchive.createZip(is);
+        
+        is = getClass().getResourceAsStream("demo.static.calculator-0.3-SNAPSHOT.jar");
+        ZipArchive real = ZipArchive.createReal(is);
+        
+        real.assertEquals(zip, "Are they the same?");
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/compact/src/test/resources/org/apidesign/bck2brwsr/compact/tck/demo.static.calculator-0.3-SNAPSHOT.jar
Binary file rt/emul/compact/src/test/resources/org/apidesign/bck2brwsr/compact/tck/demo.static.calculator-0.3-SNAPSHOT.jar has changed
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>emul.pom</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>emul.mini</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <name>Minimal API Profile</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apidesign.bck2brwsr</groupId>
+      <artifactId>core</artifactId>
+      <version>0.5-SNAPSHOT</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>6.5.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>2.5.1</version>
+              <configuration>
+                  <compilerArguments>
+                      <bootclasspath>netbeans.ignore.jdk.bootsclasspath</bootclasspath>
+                  </compilerArguments>
+                 <source>1.7</source>
+                 <target>1.7</target>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <configuration>
+                  <excludePackageNames>org.apidesign.bck2brwsr.emul.*</excludePackageNames>
+                  <skip>false</skip>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-source-plugin</artifactId>
+              <version>2.2.1</version>
+              <executions>
+                  <execution>
+                      <id>prepare-sources</id>
+                      <goals>
+                          <goal>jar</goal>
+                      </goals>
+                      <phase>package</phase>
+                  </execution>
+              </executions>
+          </plugin>
+      </plugins>
+  </build>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/ByteArrayInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/ByteArrayInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * A <code>ByteArrayInputStream</code> contains
+ * an internal buffer that contains bytes that
+ * may be read from the stream. An internal
+ * counter keeps track of the next byte to
+ * be supplied by the <code>read</code> method.
+ * <p>
+ * Closing a <tt>ByteArrayInputStream</tt> has no effect. The methods in
+ * this class can be called after the stream has been closed without
+ * generating an <tt>IOException</tt>.
+ *
+ * @author  Arthur van Hoff
+ * @see     java.io.StringBufferInputStream
+ * @since   JDK1.0
+ */
+public
+class ByteArrayInputStream extends InputStream {
+
+    /**
+     * An array of bytes that was provided
+     * by the creator of the stream. Elements <code>buf[0]</code>
+     * through <code>buf[count-1]</code> are the
+     * only bytes that can ever be read from the
+     * stream;  element <code>buf[pos]</code> is
+     * the next byte to be read.
+     */
+    protected byte buf[];
+
+    /**
+     * The index of the next character to read from the input stream buffer.
+     * This value should always be nonnegative
+     * and not larger than the value of <code>count</code>.
+     * The next byte to be read from the input stream buffer
+     * will be <code>buf[pos]</code>.
+     */
+    protected int pos;
+
+    /**
+     * The currently marked position in the stream.
+     * ByteArrayInputStream objects are marked at position zero by
+     * default when constructed.  They may be marked at another
+     * position within the buffer by the <code>mark()</code> method.
+     * The current buffer position is set to this point by the
+     * <code>reset()</code> method.
+     * <p>
+     * If no mark has been set, then the value of mark is the offset
+     * passed to the constructor (or 0 if the offset was not supplied).
+     *
+     * @since   JDK1.1
+     */
+    protected int mark = 0;
+
+    /**
+     * The index one greater than the last valid character in the input
+     * stream buffer.
+     * This value should always be nonnegative
+     * and not larger than the length of <code>buf</code>.
+     * It  is one greater than the position of
+     * the last byte within <code>buf</code> that
+     * can ever be read  from the input stream buffer.
+     */
+    protected int count;
+
+    /**
+     * Creates a <code>ByteArrayInputStream</code>
+     * so that it  uses <code>buf</code> as its
+     * buffer array.
+     * The buffer array is not copied.
+     * The initial value of <code>pos</code>
+     * is <code>0</code> and the initial value
+     * of  <code>count</code> is the length of
+     * <code>buf</code>.
+     *
+     * @param   buf   the input buffer.
+     */
+    public ByteArrayInputStream(byte buf[]) {
+        this.buf = buf;
+        this.pos = 0;
+        this.count = buf.length;
+    }
+
+    /**
+     * Creates <code>ByteArrayInputStream</code>
+     * that uses <code>buf</code> as its
+     * buffer array. The initial value of <code>pos</code>
+     * is <code>offset</code> and the initial value
+     * of <code>count</code> is the minimum of <code>offset+length</code>
+     * and <code>buf.length</code>.
+     * The buffer array is not copied. The buffer's mark is
+     * set to the specified offset.
+     *
+     * @param   buf      the input buffer.
+     * @param   offset   the offset in the buffer of the first byte to read.
+     * @param   length   the maximum number of bytes to read from the buffer.
+     */
+    public ByteArrayInputStream(byte buf[], int offset, int length) {
+        this.buf = buf;
+        this.pos = offset;
+        this.count = Math.min(offset + length, buf.length);
+        this.mark = offset;
+    }
+
+    /**
+     * Reads the next byte of data from this input stream. The value
+     * byte is returned as an <code>int</code> in the range
+     * <code>0</code> to <code>255</code>. If no byte is available
+     * because the end of the stream has been reached, the value
+     * <code>-1</code> is returned.
+     * <p>
+     * This <code>read</code> method
+     * cannot block.
+     *
+     * @return  the next byte of data, or <code>-1</code> if the end of the
+     *          stream has been reached.
+     */
+    public synchronized int read() {
+        return (pos < count) ? (buf[pos++] & 0xff) : -1;
+    }
+
+    /**
+     * Reads up to <code>len</code> bytes of data into an array of bytes
+     * from this input stream.
+     * If <code>pos</code> equals <code>count</code>,
+     * then <code>-1</code> is returned to indicate
+     * end of file. Otherwise, the  number <code>k</code>
+     * of bytes read is equal to the smaller of
+     * <code>len</code> and <code>count-pos</code>.
+     * If <code>k</code> is positive, then bytes
+     * <code>buf[pos]</code> through <code>buf[pos+k-1]</code>
+     * are copied into <code>b[off]</code>  through
+     * <code>b[off+k-1]</code> in the manner performed
+     * by <code>System.arraycopy</code>. The
+     * value <code>k</code> is added into <code>pos</code>
+     * and <code>k</code> is returned.
+     * <p>
+     * This <code>read</code> method cannot block.
+     *
+     * @param   b     the buffer into which the data is read.
+     * @param   off   the start offset in the destination array <code>b</code>
+     * @param   len   the maximum number of bytes read.
+     * @return  the total number of bytes read into the buffer, or
+     *          <code>-1</code> if there is no more data because the end of
+     *          the stream has been reached.
+     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
+     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
+     * <code>len</code> is negative, or <code>len</code> is greater than
+     * <code>b.length - off</code>
+     */
+    public synchronized int read(byte b[], int off, int len) {
+        if (b == null) {
+            throw new NullPointerException();
+        } else if (off < 0 || len < 0 || len > b.length - off) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        if (pos >= count) {
+            return -1;
+        }
+
+        int avail = count - pos;
+        if (len > avail) {
+            len = avail;
+        }
+        if (len <= 0) {
+            return 0;
+        }
+        System.arraycopy(buf, pos, b, off, len);
+        pos += len;
+        return len;
+    }
+
+    /**
+     * Skips <code>n</code> bytes of input from this input stream. Fewer
+     * bytes might be skipped if the end of the input stream is reached.
+     * The actual number <code>k</code>
+     * of bytes to be skipped is equal to the smaller
+     * of <code>n</code> and  <code>count-pos</code>.
+     * The value <code>k</code> is added into <code>pos</code>
+     * and <code>k</code> is returned.
+     *
+     * @param   n   the number of bytes to be skipped.
+     * @return  the actual number of bytes skipped.
+     */
+    public synchronized long skip(long n) {
+        long k = count - pos;
+        if (n < k) {
+            k = n < 0 ? 0 : n;
+        }
+
+        pos += k;
+        return k;
+    }
+
+    /**
+     * Returns the number of remaining bytes that can be read (or skipped over)
+     * from this input stream.
+     * <p>
+     * The value returned is <code>count&nbsp;- pos</code>,
+     * which is the number of bytes remaining to be read from the input buffer.
+     *
+     * @return  the number of remaining bytes that can be read (or skipped
+     *          over) from this input stream without blocking.
+     */
+    public synchronized int available() {
+        return count - pos;
+    }
+
+    /**
+     * Tests if this <code>InputStream</code> supports mark/reset. The
+     * <code>markSupported</code> method of <code>ByteArrayInputStream</code>
+     * always returns <code>true</code>.
+     *
+     * @since   JDK1.1
+     */
+    public boolean markSupported() {
+        return true;
+    }
+
+    /**
+     * Set the current marked position in the stream.
+     * ByteArrayInputStream objects are marked at position zero by
+     * default when constructed.  They may be marked at another
+     * position within the buffer by this method.
+     * <p>
+     * If no mark has been set, then the value of the mark is the
+     * offset passed to the constructor (or 0 if the offset was not
+     * supplied).
+     *
+     * <p> Note: The <code>readAheadLimit</code> for this class
+     *  has no meaning.
+     *
+     * @since   JDK1.1
+     */
+    public void mark(int readAheadLimit) {
+        mark = pos;
+    }
+
+    /**
+     * Resets the buffer to the marked position.  The marked position
+     * is 0 unless another position was marked or an offset was specified
+     * in the constructor.
+     */
+    public synchronized void reset() {
+        pos = mark;
+    }
+
+    /**
+     * Closing a <tt>ByteArrayInputStream</tt> has no effect. The methods in
+     * this class can be called after the stream has been closed without
+     * generating an <tt>IOException</tt>.
+     * <p>
+     */
+    public void close() throws IOException {
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/Closeable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/Closeable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import java.io.IOException;
+
+/**
+ * A {@code Closeable} is a source or destination of data that can be closed.
+ * The close method is invoked to release resources that the object is
+ * holding (such as open files).
+ *
+ * @since 1.5
+ */
+
+public interface Closeable extends AutoCloseable {
+
+    /**
+     * Closes this stream and releases any system resources associated
+     * with it. If the stream is already closed then invoking this
+     * method has no effect.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    public void close() throws IOException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/DataInput.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/DataInput.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,635 @@
+/*
+ * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * The <code>DataInput</code> interface provides
+ * for reading bytes from a binary stream and
+ * reconstructing from them data in any of
+ * the Java primitive types. There is also
+ * a
+ * facility for reconstructing a <code>String</code>
+ * from data in
+ * <a href="#modified-utf-8">modified UTF-8</a>
+ * format.
+ * <p>
+ * It is generally true of all the reading
+ * routines in this interface that if end of
+ * file is reached before the desired number
+ * of bytes has been read, an <code>EOFException</code>
+ * (which is a kind of <code>IOException</code>)
+ * is thrown. If any byte cannot be read for
+ * any reason other than end of file, an <code>IOException</code>
+ * other than <code>EOFException</code> is
+ * thrown. In particular, an <code>IOException</code>
+ * may be thrown if the input stream has been
+ * closed.
+ *
+ * <h4><a name="modified-utf-8">Modified UTF-8</a></h4>
+ * <p>
+ * Implementations of the DataInput and DataOutput interfaces represent
+ * Unicode strings in a format that is a slight modification of UTF-8.
+ * (For information regarding the standard UTF-8 format, see section
+ * <i>3.9 Unicode Encoding Forms</i> of <i>The Unicode Standard, Version
+ * 4.0</i>).
+ * Note that in the following tables, the most significant bit appears in the
+ * far left-hand column.
+ * <p>
+ * All characters in the range <code>'&#92;u0001'</code> to
+ * <code>'&#92;u007F'</code> are represented by a single byte:
+ *
+ * <blockquote>
+ *   <table border="1" cellspacing="0" cellpadding="8" width="50%"
+ *          summary="Bit values and bytes">
+ *     <tr>
+ *       <td></td>
+ *       <th id="bit">Bit Values</th>
+ *     </tr>
+ *     <tr>
+ *       <th id="byte1">Byte 1</th>
+ *       <td>
+ *         <table border="1" cellspacing="0" width="100%">
+ *           <tr>
+ *             <td width="12%"><center>0</center>
+ *             <td colspan="7"><center>bits 6-0</center>
+ *           </tr>
+ *         </table>
+ *       </td>
+ *     </tr>
+ *   </table>
+ * </blockquote>
+ *
+ * <p>
+ * The null character <code>'&#92;u0000'</code> and characters in the
+ * range <code>'&#92;u0080'</code> to <code>'&#92;u07FF'</code> are
+ * represented by a pair of bytes:
+ *
+ * <blockquote>
+ *   <table border="1" cellspacing="0" cellpadding="8" width="50%"
+ *          summary="Bit values and bytes">
+ *     <tr>
+ *       <td></td>
+ *       <th id="bit">Bit Values</th>
+ *     </tr>
+ *     <tr>
+ *       <th id="byte1">Byte 1</th>
+ *       <td>
+ *         <table border="1" cellspacing="0" width="100%">
+ *           <tr>
+ *             <td width="12%"><center>1</center>
+ *             <td width="13%"><center>1</center>
+ *             <td width="12%"><center>0</center>
+ *             <td colspan="5"><center>bits 10-6</center>
+ *           </tr>
+ *         </table>
+ *       </td>
+ *     </tr>
+ *     <tr>
+ *       <th id="byte2">Byte 2</th>
+ *       <td>
+ *         <table border="1" cellspacing="0" width="100%">
+ *           <tr>
+ *             <td width="12%"><center>1</center>
+ *             <td width="13%"><center>0</center>
+ *             <td colspan="6"><center>bits 5-0</center>
+ *           </tr>
+ *         </table>
+ *       </td>
+ *     </tr>
+ *   </table>
+ *  </blockquote>
+ *
+ * <br>
+ * <code>char</code> values in the range <code>'&#92;u0800'</code> to
+ * <code>'&#92;uFFFF'</code> are represented by three bytes:
+ *
+ * <blockquote>
+ *   <table border="1" cellspacing="0" cellpadding="8" width="50%"
+ *          summary="Bit values and bytes">
+ *     <tr>
+ *       <td></td>
+ *       <th id="bit">Bit Values</th>
+ *     </tr>
+ *     <tr>
+ *       <th id="byte1">Byte 1</th>
+ *       <td>
+ *         <table border="1" cellspacing="0" width="100%">
+ *           <tr>
+ *             <td width="12%"><center>1</center>
+ *             <td width="13%"><center>1</center>
+ *             <td width="12%"><center>1</center>
+ *             <td width="13%"><center>0</center>
+ *             <td colspan="4"><center>bits 15-12</center>
+ *           </tr>
+ *         </table>
+ *       </td>
+ *     </tr>
+ *     <tr>
+ *       <th id="byte2">Byte 2</th>
+ *       <td>
+ *         <table border="1" cellspacing="0" width="100%">
+ *           <tr>
+ *             <td width="12%"><center>1</center>
+ *             <td width="13%"><center>0</center>
+ *             <td colspan="6"><center>bits 11-6</center>
+ *           </tr>
+ *         </table>
+ *       </td>
+ *     </tr>
+ *     <tr>
+ *       <th id="byte3">Byte 3</th>
+ *       <td>
+ *         <table border="1" cellspacing="0" width="100%">
+ *           <tr>
+ *             <td width="12%"><center>1</center>
+ *             <td width="13%"><center>0</center>
+ *             <td colspan="6"><center>bits 5-0</center>
+ *           </tr>
+ *         </table>
+ *       </td>
+ *     </tr>
+ *   </table>
+ *  </blockquote>
+ *
+ * <p>
+ * The differences between this format and the
+ * standard UTF-8 format are the following:
+ * <ul>
+ * <li>The null byte <code>'&#92;u0000'</code> is encoded in 2-byte format
+ *     rather than 1-byte, so that the encoded strings never have
+ *     embedded nulls.
+ * <li>Only the 1-byte, 2-byte, and 3-byte formats are used.
+ * <li><a href="../lang/Character.html#unicode">Supplementary characters</a>
+ *     are represented in the form of surrogate pairs.
+ * </ul>
+ * @author  Frank Yellin
+ * @see     java.io.DataInputStream
+ * @see     java.io.DataOutput
+ * @since   JDK1.0
+ */
+public
+interface DataInput {
+    /**
+     * Reads some bytes from an input
+     * stream and stores them into the buffer
+     * array <code>b</code>. The number of bytes
+     * read is equal
+     * to the length of <code>b</code>.
+     * <p>
+     * This method blocks until one of the
+     * following conditions occurs:<p>
+     * <ul>
+     * <li><code>b.length</code>
+     * bytes of input data are available, in which
+     * case a normal return is made.
+     *
+     * <li>End of
+     * file is detected, in which case an <code>EOFException</code>
+     * is thrown.
+     *
+     * <li>An I/O error occurs, in
+     * which case an <code>IOException</code> other
+     * than <code>EOFException</code> is thrown.
+     * </ul>
+     * <p>
+     * If <code>b</code> is <code>null</code>,
+     * a <code>NullPointerException</code> is thrown.
+     * If <code>b.length</code> is zero, then
+     * no bytes are read. Otherwise, the first
+     * byte read is stored into element <code>b[0]</code>,
+     * the next one into <code>b[1]</code>, and
+     * so on.
+     * If an exception is thrown from
+     * this method, then it may be that some but
+     * not all bytes of <code>b</code> have been
+     * updated with data from the input stream.
+     *
+     * @param     b   the buffer into which the data is read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    void readFully(byte b[]) throws IOException;
+
+    /**
+     *
+     * Reads <code>len</code>
+     * bytes from
+     * an input stream.
+     * <p>
+     * This method
+     * blocks until one of the following conditions
+     * occurs:<p>
+     * <ul>
+     * <li><code>len</code> bytes
+     * of input data are available, in which case
+     * a normal return is made.
+     *
+     * <li>End of file
+     * is detected, in which case an <code>EOFException</code>
+     * is thrown.
+     *
+     * <li>An I/O error occurs, in
+     * which case an <code>IOException</code> other
+     * than <code>EOFException</code> is thrown.
+     * </ul>
+     * <p>
+     * If <code>b</code> is <code>null</code>,
+     * a <code>NullPointerException</code> is thrown.
+     * If <code>off</code> is negative, or <code>len</code>
+     * is negative, or <code>off+len</code> is
+     * greater than the length of the array <code>b</code>,
+     * then an <code>IndexOutOfBoundsException</code>
+     * is thrown.
+     * If <code>len</code> is zero,
+     * then no bytes are read. Otherwise, the first
+     * byte read is stored into element <code>b[off]</code>,
+     * the next one into <code>b[off+1]</code>,
+     * and so on. The number of bytes read is,
+     * at most, equal to <code>len</code>.
+     *
+     * @param     b   the buffer into which the data is read.
+     * @param off  an int specifying the offset into the data.
+     * @param len  an int specifying the number of bytes to read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    void readFully(byte b[], int off, int len) throws IOException;
+
+    /**
+     * Makes an attempt to skip over
+     * <code>n</code> bytes
+     * of data from the input
+     * stream, discarding the skipped bytes. However,
+     * it may skip
+     * over some smaller number of
+     * bytes, possibly zero. This may result from
+     * any of a
+     * number of conditions; reaching
+     * end of file before <code>n</code> bytes
+     * have been skipped is
+     * only one possibility.
+     * This method never throws an <code>EOFException</code>.
+     * The actual
+     * number of bytes skipped is returned.
+     *
+     * @param      n   the number of bytes to be skipped.
+     * @return     the number of bytes actually skipped.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    int skipBytes(int n) throws IOException;
+
+    /**
+     * Reads one input byte and returns
+     * <code>true</code> if that byte is nonzero,
+     * <code>false</code> if that byte is zero.
+     * This method is suitable for reading
+     * the byte written by the <code>writeBoolean</code>
+     * method of interface <code>DataOutput</code>.
+     *
+     * @return     the <code>boolean</code> value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    boolean readBoolean() throws IOException;
+
+    /**
+     * Reads and returns one input byte.
+     * The byte is treated as a signed value in
+     * the range <code>-128</code> through <code>127</code>,
+     * inclusive.
+     * This method is suitable for
+     * reading the byte written by the <code>writeByte</code>
+     * method of interface <code>DataOutput</code>.
+     *
+     * @return     the 8-bit value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    byte readByte() throws IOException;
+
+    /**
+     * Reads one input byte, zero-extends
+     * it to type <code>int</code>, and returns
+     * the result, which is therefore in the range
+     * <code>0</code>
+     * through <code>255</code>.
+     * This method is suitable for reading
+     * the byte written by the <code>writeByte</code>
+     * method of interface <code>DataOutput</code>
+     * if the argument to <code>writeByte</code>
+     * was intended to be a value in the range
+     * <code>0</code> through <code>255</code>.
+     *
+     * @return     the unsigned 8-bit value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    int readUnsignedByte() throws IOException;
+
+    /**
+     * Reads two input bytes and returns
+     * a <code>short</code> value. Let <code>a</code>
+     * be the first byte read and <code>b</code>
+     * be the second byte. The value
+     * returned
+     * is:
+     * <p><pre><code>(short)((a &lt;&lt; 8) | (b &amp; 0xff))
+     * </code></pre>
+     * This method
+     * is suitable for reading the bytes written
+     * by the <code>writeShort</code> method of
+     * interface <code>DataOutput</code>.
+     *
+     * @return     the 16-bit value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    short readShort() throws IOException;
+
+    /**
+     * Reads two input bytes and returns
+     * an <code>int</code> value in the range <code>0</code>
+     * through <code>65535</code>. Let <code>a</code>
+     * be the first byte read and
+     * <code>b</code>
+     * be the second byte. The value returned is:
+     * <p><pre><code>(((a &amp; 0xff) &lt;&lt; 8) | (b &amp; 0xff))
+     * </code></pre>
+     * This method is suitable for reading the bytes
+     * written by the <code>writeShort</code> method
+     * of interface <code>DataOutput</code>  if
+     * the argument to <code>writeShort</code>
+     * was intended to be a value in the range
+     * <code>0</code> through <code>65535</code>.
+     *
+     * @return     the unsigned 16-bit value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    int readUnsignedShort() throws IOException;
+
+    /**
+     * Reads two input bytes and returns a <code>char</code> value.
+     * Let <code>a</code>
+     * be the first byte read and <code>b</code>
+     * be the second byte. The value
+     * returned is:
+     * <p><pre><code>(char)((a &lt;&lt; 8) | (b &amp; 0xff))
+     * </code></pre>
+     * This method
+     * is suitable for reading bytes written by
+     * the <code>writeChar</code> method of interface
+     * <code>DataOutput</code>.
+     *
+     * @return     the <code>char</code> value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    char readChar() throws IOException;
+
+    /**
+     * Reads four input bytes and returns an
+     * <code>int</code> value. Let <code>a-d</code>
+     * be the first through fourth bytes read. The value returned is:
+     * <p><pre>
+     * <code>
+     * (((a &amp; 0xff) &lt;&lt; 24) | ((b &amp; 0xff) &lt;&lt; 16) |
+     * &#32;((c &amp; 0xff) &lt;&lt; 8) | (d &amp; 0xff))
+     * </code></pre>
+     * This method is suitable
+     * for reading bytes written by the <code>writeInt</code>
+     * method of interface <code>DataOutput</code>.
+     *
+     * @return     the <code>int</code> value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    int readInt() throws IOException;
+
+    /**
+     * Reads eight input bytes and returns
+     * a <code>long</code> value. Let <code>a-h</code>
+     * be the first through eighth bytes read.
+     * The value returned is:
+     * <p><pre> <code>
+     * (((long)(a &amp; 0xff) &lt;&lt; 56) |
+     *  ((long)(b &amp; 0xff) &lt;&lt; 48) |
+     *  ((long)(c &amp; 0xff) &lt;&lt; 40) |
+     *  ((long)(d &amp; 0xff) &lt;&lt; 32) |
+     *  ((long)(e &amp; 0xff) &lt;&lt; 24) |
+     *  ((long)(f &amp; 0xff) &lt;&lt; 16) |
+     *  ((long)(g &amp; 0xff) &lt;&lt;  8) |
+     *  ((long)(h &amp; 0xff)))
+     * </code></pre>
+     * <p>
+     * This method is suitable
+     * for reading bytes written by the <code>writeLong</code>
+     * method of interface <code>DataOutput</code>.
+     *
+     * @return     the <code>long</code> value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    long readLong() throws IOException;
+
+    /**
+     * Reads four input bytes and returns
+     * a <code>float</code> value. It does this
+     * by first constructing an <code>int</code>
+     * value in exactly the manner
+     * of the <code>readInt</code>
+     * method, then converting this <code>int</code>
+     * value to a <code>float</code> in
+     * exactly the manner of the method <code>Float.intBitsToFloat</code>.
+     * This method is suitable for reading
+     * bytes written by the <code>writeFloat</code>
+     * method of interface <code>DataOutput</code>.
+     *
+     * @return     the <code>float</code> value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    float readFloat() throws IOException;
+
+    /**
+     * Reads eight input bytes and returns
+     * a <code>double</code> value. It does this
+     * by first constructing a <code>long</code>
+     * value in exactly the manner
+     * of the <code>readlong</code>
+     * method, then converting this <code>long</code>
+     * value to a <code>double</code> in exactly
+     * the manner of the method <code>Double.longBitsToDouble</code>.
+     * This method is suitable for reading
+     * bytes written by the <code>writeDouble</code>
+     * method of interface <code>DataOutput</code>.
+     *
+     * @return     the <code>double</code> value read.
+     * @exception  EOFException  if this stream reaches the end before reading
+     *               all the bytes.
+     * @exception  IOException   if an I/O error occurs.
+     */
+    double readDouble() throws IOException;
+
+    /**
+     * Reads the next line of text from the input stream.
+     * It reads successive bytes, converting
+     * each byte separately into a character,
+     * until it encounters a line terminator or
+     * end of
+     * file; the characters read are then
+     * returned as a <code>String</code>. Note
+     * that because this
+     * method processes bytes,
+     * it does not support input of the full Unicode
+     * character set.
+     * <p>
+     * If end of file is encountered
+     * before even one byte can be read, then <code>null</code>
+     * is returned. Otherwise, each byte that is
+     * read is converted to type <code>char</code>
+     * by zero-extension. If the character <code>'\n'</code>
+     * is encountered, it is discarded and reading
+     * ceases. If the character <code>'\r'</code>
+     * is encountered, it is discarded and, if
+     * the following byte converts &#32;to the
+     * character <code>'\n'</code>, then that is
+     * discarded also; reading then ceases. If
+     * end of file is encountered before either
+     * of the characters <code>'\n'</code> and
+     * <code>'\r'</code> is encountered, reading
+     * ceases. Once reading has ceased, a <code>String</code>
+     * is returned that contains all the characters
+     * read and not discarded, taken in order.
+     * Note that every character in this string
+     * will have a value less than <code>&#92;u0100</code>,
+     * that is, <code>(char)256</code>.
+     *
+     * @return the next line of text from the input stream,
+     *         or <CODE>null</CODE> if the end of file is
+     *         encountered before a byte can be read.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    String readLine() throws IOException;
+
+    /**
+     * Reads in a string that has been encoded using a
+     * <a href="#modified-utf-8">modified UTF-8</a>
+     * format.
+     * The general contract of <code>readUTF</code>
+     * is that it reads a representation of a Unicode
+     * character string encoded in modified
+     * UTF-8 format; this string of characters
+     * is then returned as a <code>String</code>.
+     * <p>
+     * First, two bytes are read and used to
+     * construct an unsigned 16-bit integer in
+     * exactly the manner of the <code>readUnsignedShort</code>
+     * method . This integer value is called the
+     * <i>UTF length</i> and specifies the number
+     * of additional bytes to be read. These bytes
+     * are then converted to characters by considering
+     * them in groups. The length of each group
+     * is computed from the value of the first
+     * byte of the group. The byte following a
+     * group, if any, is the first byte of the
+     * next group.
+     * <p>
+     * If the first byte of a group
+     * matches the bit pattern <code>0xxxxxxx</code>
+     * (where <code>x</code> means "may be <code>0</code>
+     * or <code>1</code>"), then the group consists
+     * of just that byte. The byte is zero-extended
+     * to form a character.
+     * <p>
+     * If the first byte
+     * of a group matches the bit pattern <code>110xxxxx</code>,
+     * then the group consists of that byte <code>a</code>
+     * and a second byte <code>b</code>. If there
+     * is no byte <code>b</code> (because byte
+     * <code>a</code> was the last of the bytes
+     * to be read), or if byte <code>b</code> does
+     * not match the bit pattern <code>10xxxxxx</code>,
+     * then a <code>UTFDataFormatException</code>
+     * is thrown. Otherwise, the group is converted
+     * to the character:<p>
+     * <pre><code>(char)(((a&amp; 0x1F) &lt;&lt; 6) | (b &amp; 0x3F))
+     * </code></pre>
+     * If the first byte of a group
+     * matches the bit pattern <code>1110xxxx</code>,
+     * then the group consists of that byte <code>a</code>
+     * and two more bytes <code>b</code> and <code>c</code>.
+     * If there is no byte <code>c</code> (because
+     * byte <code>a</code> was one of the last
+     * two of the bytes to be read), or either
+     * byte <code>b</code> or byte <code>c</code>
+     * does not match the bit pattern <code>10xxxxxx</code>,
+     * then a <code>UTFDataFormatException</code>
+     * is thrown. Otherwise, the group is converted
+     * to the character:<p>
+     * <pre><code>
+     * (char)(((a &amp; 0x0F) &lt;&lt; 12) | ((b &amp; 0x3F) &lt;&lt; 6) | (c &amp; 0x3F))
+     * </code></pre>
+     * If the first byte of a group matches the
+     * pattern <code>1111xxxx</code> or the pattern
+     * <code>10xxxxxx</code>, then a <code>UTFDataFormatException</code>
+     * is thrown.
+     * <p>
+     * If end of file is encountered
+     * at any time during this entire process,
+     * then an <code>EOFException</code> is thrown.
+     * <p>
+     * After every group has been converted to
+     * a character by this process, the characters
+     * are gathered, in the same order in which
+     * their corresponding groups were read from
+     * the input stream, to form a <code>String</code>,
+     * which is returned.
+     * <p>
+     * The <code>writeUTF</code>
+     * method of interface <code>DataOutput</code>
+     * may be used to write data that is suitable
+     * for reading by this method.
+     * @return     a Unicode string.
+     * @exception  EOFException            if this stream reaches the end
+     *               before reading all the bytes.
+     * @exception  IOException             if an I/O error occurs.
+     * @exception  UTFDataFormatException  if the bytes do not represent a
+     *               valid modified UTF-8 encoding of a string.
+     */
+    String readUTF() throws IOException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/DataInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/DataInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,666 @@
+/*
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * A data input stream lets an application read primitive Java data
+ * types from an underlying input stream in a machine-independent
+ * way. An application uses a data output stream to write data that
+ * can later be read by a data input stream.
+ * <p>
+ * DataInputStream is not necessarily safe for multithreaded access.
+ * Thread safety is optional and is the responsibility of users of
+ * methods in this class.
+ *
+ * @author  Arthur van Hoff
+ * @see     java.io.DataOutputStream
+ * @since   JDK1.0
+ */
+public
+class DataInputStream extends FilterInputStream implements DataInput {
+
+    /**
+     * Creates a DataInputStream that uses the specified
+     * underlying InputStream.
+     *
+     * @param  in   the specified input stream
+     */
+    public DataInputStream(InputStream in) {
+        super(in);
+    }
+
+    /**
+     * working arrays initialized on demand by readUTF
+     */
+    private byte bytearr[] = new byte[80];
+    private char chararr[] = new char[80];
+
+    /**
+     * Reads some number of bytes from the contained input stream and
+     * stores them into the buffer array <code>b</code>. The number of
+     * bytes actually read is returned as an integer. This method blocks
+     * until input data is available, end of file is detected, or an
+     * exception is thrown.
+     *
+     * <p>If <code>b</code> is null, a <code>NullPointerException</code> is
+     * thrown. If the length of <code>b</code> is zero, then no bytes are
+     * read and <code>0</code> is returned; otherwise, there is an attempt
+     * to read at least one byte. If no byte is available because the
+     * stream is at end of file, the value <code>-1</code> is returned;
+     * otherwise, at least one byte is read and stored into <code>b</code>.
+     *
+     * <p>The first byte read is stored into element <code>b[0]</code>, the
+     * next one into <code>b[1]</code>, and so on. The number of bytes read
+     * is, at most, equal to the length of <code>b</code>. Let <code>k</code>
+     * be the number of bytes actually read; these bytes will be stored in
+     * elements <code>b[0]</code> through <code>b[k-1]</code>, leaving
+     * elements <code>b[k]</code> through <code>b[b.length-1]</code>
+     * unaffected.
+     *
+     * <p>The <code>read(b)</code> method has the same effect as:
+     * <blockquote><pre>
+     * read(b, 0, b.length)
+     * </pre></blockquote>
+     *
+     * @param      b   the buffer into which the data is read.
+     * @return     the total number of bytes read into the buffer, or
+     *             <code>-1</code> if there is no more data because the end
+     *             of the stream has been reached.
+     * @exception  IOException if the first byte cannot be read for any reason
+     * other than end of file, the stream has been closed and the underlying
+     * input stream does not support reading after close, or another I/O
+     * error occurs.
+     * @see        java.io.FilterInputStream#in
+     * @see        java.io.InputStream#read(byte[], int, int)
+     */
+    public final int read(byte b[]) throws IOException {
+        return in.read(b, 0, b.length);
+    }
+
+    /**
+     * Reads up to <code>len</code> bytes of data from the contained
+     * input stream into an array of bytes.  An attempt is made to read
+     * as many as <code>len</code> bytes, but a smaller number may be read,
+     * possibly zero. The number of bytes actually read is returned as an
+     * integer.
+     *
+     * <p> This method blocks until input data is available, end of file is
+     * detected, or an exception is thrown.
+     *
+     * <p> If <code>len</code> is zero, then no bytes are read and
+     * <code>0</code> is returned; otherwise, there is an attempt to read at
+     * least one byte. If no byte is available because the stream is at end of
+     * file, the value <code>-1</code> is returned; otherwise, at least one
+     * byte is read and stored into <code>b</code>.
+     *
+     * <p> The first byte read is stored into element <code>b[off]</code>, the
+     * next one into <code>b[off+1]</code>, and so on. The number of bytes read
+     * is, at most, equal to <code>len</code>. Let <i>k</i> be the number of
+     * bytes actually read; these bytes will be stored in elements
+     * <code>b[off]</code> through <code>b[off+</code><i>k</i><code>-1]</code>,
+     * leaving elements <code>b[off+</code><i>k</i><code>]</code> through
+     * <code>b[off+len-1]</code> unaffected.
+     *
+     * <p> In every case, elements <code>b[0]</code> through
+     * <code>b[off]</code> and elements <code>b[off+len]</code> through
+     * <code>b[b.length-1]</code> are unaffected.
+     *
+     * @param      b     the buffer into which the data is read.
+     * @param off the start offset in the destination array <code>b</code>
+     * @param      len   the maximum number of bytes read.
+     * @return     the total number of bytes read into the buffer, or
+     *             <code>-1</code> if there is no more data because the end
+     *             of the stream has been reached.
+     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
+     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
+     * <code>len</code> is negative, or <code>len</code> is greater than
+     * <code>b.length - off</code>
+     * @exception  IOException if the first byte cannot be read for any reason
+     * other than end of file, the stream has been closed and the underlying
+     * input stream does not support reading after close, or another I/O
+     * error occurs.
+     * @see        java.io.FilterInputStream#in
+     * @see        java.io.InputStream#read(byte[], int, int)
+     */
+    public final int read(byte b[], int off, int len) throws IOException {
+        return in.read(b, off, len);
+    }
+
+    /**
+     * See the general contract of the <code>readFully</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @param      b   the buffer into which the data is read.
+     * @exception  EOFException  if this input stream reaches the end before
+     *             reading all the bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final void readFully(byte b[]) throws IOException {
+        readFully(b, 0, b.length);
+    }
+
+    /**
+     * See the general contract of the <code>readFully</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @param      b     the buffer into which the data is read.
+     * @param      off   the start offset of the data.
+     * @param      len   the number of bytes to read.
+     * @exception  EOFException  if this input stream reaches the end before
+     *               reading all the bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final void readFully(byte b[], int off, int len) throws IOException {
+        if (len < 0)
+            throw new IndexOutOfBoundsException();
+        int n = 0;
+        while (n < len) {
+            int count = in.read(b, off + n, len - n);
+            if (count < 0)
+                throw new EOFException();
+            n += count;
+        }
+    }
+
+    /**
+     * See the general contract of the <code>skipBytes</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes for this operation are read from the contained
+     * input stream.
+     *
+     * @param      n   the number of bytes to be skipped.
+     * @return     the actual number of bytes skipped.
+     * @exception  IOException  if the contained input stream does not support
+     *             seek, or the stream has been closed and
+     *             the contained input stream does not support
+     *             reading after close, or another I/O error occurs.
+     */
+    public final int skipBytes(int n) throws IOException {
+        int total = 0;
+        int cur = 0;
+
+        while ((total<n) && ((cur = (int) in.skip(n-total)) > 0)) {
+            total += cur;
+        }
+
+        return total;
+    }
+
+    /**
+     * See the general contract of the <code>readBoolean</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the <code>boolean</code> value read.
+     * @exception  EOFException  if this input stream has reached the end.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final boolean readBoolean() throws IOException {
+        int ch = in.read();
+        if (ch < 0)
+            throw new EOFException();
+        return (ch != 0);
+    }
+
+    /**
+     * See the general contract of the <code>readByte</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next byte of this input stream as a signed 8-bit
+     *             <code>byte</code>.
+     * @exception  EOFException  if this input stream has reached the end.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final byte readByte() throws IOException {
+        int ch = in.read();
+        if (ch < 0)
+            throw new EOFException();
+        return (byte)(ch);
+    }
+
+    /**
+     * See the general contract of the <code>readUnsignedByte</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next byte of this input stream, interpreted as an
+     *             unsigned 8-bit number.
+     * @exception  EOFException  if this input stream has reached the end.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see         java.io.FilterInputStream#in
+     */
+    public final int readUnsignedByte() throws IOException {
+        int ch = in.read();
+        if (ch < 0)
+            throw new EOFException();
+        return ch;
+    }
+
+    /**
+     * See the general contract of the <code>readShort</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next two bytes of this input stream, interpreted as a
+     *             signed 16-bit number.
+     * @exception  EOFException  if this input stream reaches the end before
+     *               reading two bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final short readShort() throws IOException {
+        int ch1 = in.read();
+        int ch2 = in.read();
+        if ((ch1 | ch2) < 0)
+            throw new EOFException();
+        return (short)((ch1 << 8) + (ch2 << 0));
+    }
+
+    /**
+     * See the general contract of the <code>readUnsignedShort</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next two bytes of this input stream, interpreted as an
+     *             unsigned 16-bit integer.
+     * @exception  EOFException  if this input stream reaches the end before
+     *             reading two bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final int readUnsignedShort() throws IOException {
+        int ch1 = in.read();
+        int ch2 = in.read();
+        if ((ch1 | ch2) < 0)
+            throw new EOFException();
+        return (ch1 << 8) + (ch2 << 0);
+    }
+
+    /**
+     * See the general contract of the <code>readChar</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next two bytes of this input stream, interpreted as a
+     *             <code>char</code>.
+     * @exception  EOFException  if this input stream reaches the end before
+     *               reading two bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final char readChar() throws IOException {
+        int ch1 = in.read();
+        int ch2 = in.read();
+        if ((ch1 | ch2) < 0)
+            throw new EOFException();
+        return (char)((ch1 << 8) + (ch2 << 0));
+    }
+
+    /**
+     * See the general contract of the <code>readInt</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next four bytes of this input stream, interpreted as an
+     *             <code>int</code>.
+     * @exception  EOFException  if this input stream reaches the end before
+     *               reading four bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final int readInt() throws IOException {
+        int ch1 = in.read();
+        int ch2 = in.read();
+        int ch3 = in.read();
+        int ch4 = in.read();
+        if ((ch1 | ch2 | ch3 | ch4) < 0)
+            throw new EOFException();
+        return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0));
+    }
+
+    private byte readBuffer[] = new byte[8];
+
+    /**
+     * See the general contract of the <code>readLong</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next eight bytes of this input stream, interpreted as a
+     *             <code>long</code>.
+     * @exception  EOFException  if this input stream reaches the end before
+     *               reading eight bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public final long readLong() throws IOException {
+        readFully(readBuffer, 0, 8);
+        return (((long)readBuffer[0] << 56) +
+                ((long)(readBuffer[1] & 255) << 48) +
+                ((long)(readBuffer[2] & 255) << 40) +
+                ((long)(readBuffer[3] & 255) << 32) +
+                ((long)(readBuffer[4] & 255) << 24) +
+                ((readBuffer[5] & 255) << 16) +
+                ((readBuffer[6] & 255) <<  8) +
+                ((readBuffer[7] & 255) <<  0));
+    }
+
+    /**
+     * See the general contract of the <code>readFloat</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next four bytes of this input stream, interpreted as a
+     *             <code>float</code>.
+     * @exception  EOFException  if this input stream reaches the end before
+     *               reading four bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.DataInputStream#readInt()
+     * @see        java.lang.Float#intBitsToFloat(int)
+     */
+    public final float readFloat() throws IOException {
+        return Float.intBitsToFloat(readInt());
+    }
+
+    /**
+     * See the general contract of the <code>readDouble</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     the next eight bytes of this input stream, interpreted as a
+     *             <code>double</code>.
+     * @exception  EOFException  if this input stream reaches the end before
+     *               reading eight bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @see        java.io.DataInputStream#readLong()
+     * @see        java.lang.Double#longBitsToDouble(long)
+     */
+    public final double readDouble() throws IOException {
+        return Double.longBitsToDouble(readLong());
+    }    
+
+    private char lineBuffer[];
+
+    /**
+     * See the general contract of the <code>readLine</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @deprecated This method does not properly convert bytes to characters.
+     * As of JDK&nbsp;1.1, the preferred way to read lines of text is via the
+     * <code>BufferedReader.readLine()</code> method.  Programs that use the
+     * <code>DataInputStream</code> class to read lines can be converted to use
+     * the <code>BufferedReader</code> class by replacing code of the form:
+     * <blockquote><pre>
+     *     DataInputStream d =&nbsp;new&nbsp;DataInputStream(in);
+     * </pre></blockquote>
+     * with:
+     * <blockquote><pre>
+     *     BufferedReader d
+     *          =&nbsp;new&nbsp;BufferedReader(new&nbsp;InputStreamReader(in));
+     * </pre></blockquote>
+     *
+     * @return     the next line of text from this input stream.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.BufferedReader#readLine()
+     * @see        java.io.FilterInputStream#in
+     */
+    @Deprecated
+    public final String readLine() throws IOException {
+        char buf[] = lineBuffer;
+
+        if (buf == null) {
+            buf = lineBuffer = new char[128];
+        }
+
+        int room = buf.length;
+        int offset = 0;
+        int c;
+
+loop:   while (true) {
+            switch (c = in.read()) {
+              case -1:
+              case '\n':
+                break loop;
+
+              case '\r':
+                int c2 = in.read();
+                if ((c2 != '\n') && (c2 != -1)) {
+                    if (!(in instanceof PushbackInputStream)) {
+                        this.in = new PushbackInputStream(in);
+                    }
+                    ((PushbackInputStream)in).unread(c2);
+                }
+                break loop;
+
+              default:
+                if (--room < 0) {
+                    buf = new char[offset + 128];
+                    room = buf.length - offset - 1;
+                    System.arraycopy(lineBuffer, 0, buf, 0, offset);
+                    lineBuffer = buf;
+                }
+                buf[offset++] = (char) c;
+                break;
+            }
+        }
+        if ((c == -1) && (offset == 0)) {
+            return null;
+        }
+        return String.copyValueOf(buf, 0, offset);
+    }
+
+    /**
+     * See the general contract of the <code>readUTF</code>
+     * method of <code>DataInput</code>.
+     * <p>
+     * Bytes
+     * for this operation are read from the contained
+     * input stream.
+     *
+     * @return     a Unicode string.
+     * @exception  EOFException  if this input stream reaches the end before
+     *               reading all the bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @exception  UTFDataFormatException if the bytes do not represent a valid
+     *             modified UTF-8 encoding of a string.
+     * @see        java.io.DataInputStream#readUTF(java.io.DataInput)
+     */
+    public final String readUTF() throws IOException {
+        return readUTF(this);
+    }
+
+    /**
+     * Reads from the
+     * stream <code>in</code> a representation
+     * of a Unicode  character string encoded in
+     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a> format;
+     * this string of characters is then returned as a <code>String</code>.
+     * The details of the modified UTF-8 representation
+     * are  exactly the same as for the <code>readUTF</code>
+     * method of <code>DataInput</code>.
+     *
+     * @param      in   a data input stream.
+     * @return     a Unicode string.
+     * @exception  EOFException            if the input stream reaches the end
+     *               before all the bytes.
+     * @exception  IOException   the stream has been closed and the contained
+     *             input stream does not support reading after close, or
+     *             another I/O error occurs.
+     * @exception  UTFDataFormatException  if the bytes do not represent a
+     *               valid modified UTF-8 encoding of a Unicode string.
+     * @see        java.io.DataInputStream#readUnsignedShort()
+     */
+    public final static String readUTF(DataInput in) throws IOException {
+        int utflen = in.readUnsignedShort();
+        byte[] bytearr = null;
+        char[] chararr = null;
+        if (in instanceof DataInputStream) {
+            DataInputStream dis = (DataInputStream)in;
+            if (dis.bytearr.length < utflen){
+                dis.bytearr = new byte[utflen*2];
+                dis.chararr = new char[utflen*2];
+            }
+            chararr = dis.chararr;
+            bytearr = dis.bytearr;
+        } else {
+            bytearr = new byte[utflen];
+            chararr = new char[utflen];
+        }
+
+        int c, char2, char3;
+        int count = 0;
+        int chararr_count=0;
+
+        in.readFully(bytearr, 0, utflen);
+
+        while (count < utflen) {
+            c = (int) bytearr[count] & 0xff;
+            if (c > 127) break;
+            count++;
+            chararr[chararr_count++]=(char)c;
+        }
+
+        while (count < utflen) {
+            c = (int) bytearr[count] & 0xff;
+            switch (c >> 4) {
+                case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
+                    /* 0xxxxxxx*/
+                    count++;
+                    chararr[chararr_count++]=(char)c;
+                    break;
+                case 12: case 13:
+                    /* 110x xxxx   10xx xxxx*/
+                    count += 2;
+                    if (count > utflen)
+                        throw new UTFDataFormatException(
+                            "malformed input: partial character at end");
+                    char2 = (int) bytearr[count-1];
+                    if ((char2 & 0xC0) != 0x80)
+                        throw new UTFDataFormatException(
+                            "malformed input around byte " + count);
+                    chararr[chararr_count++]=(char)(((c & 0x1F) << 6) |
+                                                    (char2 & 0x3F));
+                    break;
+                case 14:
+                    /* 1110 xxxx  10xx xxxx  10xx xxxx */
+                    count += 3;
+                    if (count > utflen)
+                        throw new UTFDataFormatException(
+                            "malformed input: partial character at end");
+                    char2 = (int) bytearr[count-2];
+                    char3 = (int) bytearr[count-1];
+                    if (((char2 & 0xC0) != 0x80) || ((char3 & 0xC0) != 0x80))
+                        throw new UTFDataFormatException(
+                            "malformed input around byte " + (count-1));
+                    chararr[chararr_count++]=(char)(((c     & 0x0F) << 12) |
+                                                    ((char2 & 0x3F) << 6)  |
+                                                    ((char3 & 0x3F) << 0));
+                    break;
+                default:
+                    /* 10xx xxxx,  1111 xxxx */
+                    throw new UTFDataFormatException(
+                        "malformed input around byte " + count);
+            }
+        }
+        // The number of chars produced may be less than utflen
+        return new String(chararr, 0, chararr_count);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/EOFException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/EOFException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Signals that an end of file or end of stream has been reached
+ * unexpectedly during input.
+ * <p>
+ * This exception is mainly used by data input streams to signal end of
+ * stream. Note that many other input operations return a special value on
+ * end of stream rather than throwing an exception.
+ * <p>
+ *
+ * @author  Frank Yellin
+ * @see     java.io.DataInputStream
+ * @see     java.io.IOException
+ * @since   JDK1.0
+ */
+public
+class EOFException extends IOException {
+    private static final long serialVersionUID = 6433858223774886977L;
+
+    /**
+     * Constructs an <code>EOFException</code> with <code>null</code>
+     * as its error detail message.
+     */
+    public EOFException() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>EOFException</code> with the specified detail
+     * message. The string <code>s</code> may later be retrieved by the
+     * <code>{@link java.lang.Throwable#getMessage}</code> method of class
+     * <code>java.lang.Throwable</code>.
+     *
+     * @param   s   the detail message.
+     */
+    public EOFException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/FilterInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/FilterInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * A <code>FilterInputStream</code> contains
+ * some other input stream, which it uses as
+ * its  basic source of data, possibly transforming
+ * the data along the way or providing  additional
+ * functionality. The class <code>FilterInputStream</code>
+ * itself simply overrides all  methods of
+ * <code>InputStream</code> with versions that
+ * pass all requests to the contained  input
+ * stream. Subclasses of <code>FilterInputStream</code>
+ * may further override some of  these methods
+ * and may also provide additional methods
+ * and fields.
+ *
+ * @author  Jonathan Payne
+ * @since   JDK1.0
+ */
+public
+class FilterInputStream extends InputStream {
+    /**
+     * The input stream to be filtered.
+     */
+    protected volatile InputStream in;
+
+    /**
+     * Creates a <code>FilterInputStream</code>
+     * by assigning the  argument <code>in</code>
+     * to the field <code>this.in</code> so as
+     * to remember it for later use.
+     *
+     * @param   in   the underlying input stream, or <code>null</code> if
+     *          this instance is to be created without an underlying stream.
+     */
+    protected FilterInputStream(InputStream in) {
+        this.in = in;
+    }
+
+    /**
+     * Reads the next byte of data from this input stream. The value
+     * byte is returned as an <code>int</code> in the range
+     * <code>0</code> to <code>255</code>. If no byte is available
+     * because the end of the stream has been reached, the value
+     * <code>-1</code> is returned. This method blocks until input data
+     * is available, the end of the stream is detected, or an exception
+     * is thrown.
+     * <p>
+     * This method
+     * simply performs <code>in.read()</code> and returns the result.
+     *
+     * @return     the next byte of data, or <code>-1</code> if the end of the
+     *             stream is reached.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public int read() throws IOException {
+        return in.read();
+    }
+
+    /**
+     * Reads up to <code>byte.length</code> bytes of data from this
+     * input stream into an array of bytes. This method blocks until some
+     * input is available.
+     * <p>
+     * This method simply performs the call
+     * <code>read(b, 0, b.length)</code> and returns
+     * the  result. It is important that it does
+     * <i>not</i> do <code>in.read(b)</code> instead;
+     * certain subclasses of  <code>FilterInputStream</code>
+     * depend on the implementation strategy actually
+     * used.
+     *
+     * @param      b   the buffer into which the data is read.
+     * @return     the total number of bytes read into the buffer, or
+     *             <code>-1</code> if there is no more data because the end of
+     *             the stream has been reached.
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterInputStream#read(byte[], int, int)
+     */
+    public int read(byte b[]) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    /**
+     * Reads up to <code>len</code> bytes of data from this input stream
+     * into an array of bytes. If <code>len</code> is not zero, the method
+     * blocks until some input is available; otherwise, no
+     * bytes are read and <code>0</code> is returned.
+     * <p>
+     * This method simply performs <code>in.read(b, off, len)</code>
+     * and returns the result.
+     *
+     * @param      b     the buffer into which the data is read.
+     * @param      off   the start offset in the destination array <code>b</code>
+     * @param      len   the maximum number of bytes read.
+     * @return     the total number of bytes read into the buffer, or
+     *             <code>-1</code> if there is no more data because the end of
+     *             the stream has been reached.
+     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
+     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
+     * <code>len</code> is negative, or <code>len</code> is greater than
+     * <code>b.length - off</code>
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public int read(byte b[], int off, int len) throws IOException {
+        return in.read(b, off, len);
+    }
+
+    /**
+     * Skips over and discards <code>n</code> bytes of data from the
+     * input stream. The <code>skip</code> method may, for a variety of
+     * reasons, end up skipping over some smaller number of bytes,
+     * possibly <code>0</code>. The actual number of bytes skipped is
+     * returned.
+     * <p>
+     * This method simply performs <code>in.skip(n)</code>.
+     *
+     * @param      n   the number of bytes to be skipped.
+     * @return     the actual number of bytes skipped.
+     * @exception  IOException  if the stream does not support seek,
+     *                          or if some other I/O error occurs.
+     */
+    public long skip(long n) throws IOException {
+        return in.skip(n);
+    }
+
+    /**
+     * Returns an estimate of the number of bytes that can be read (or
+     * skipped over) from this input stream without blocking by the next
+     * caller of a method for this input stream. The next caller might be
+     * the same thread or another thread.  A single read or skip of this
+     * many bytes will not block, but may read or skip fewer bytes.
+     * <p>
+     * This method returns the result of {@link #in in}.available().
+     *
+     * @return     an estimate of the number of bytes that can be read (or skipped
+     *             over) from this input stream without blocking.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public int available() throws IOException {
+        return in.available();
+    }
+
+    /**
+     * Closes this input stream and releases any system resources
+     * associated with the stream.
+     * This
+     * method simply performs <code>in.close()</code>.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     */
+    public void close() throws IOException {
+        in.close();
+    }
+
+    /**
+     * Marks the current position in this input stream. A subsequent
+     * call to the <code>reset</code> method repositions this stream at
+     * the last marked position so that subsequent reads re-read the same bytes.
+     * <p>
+     * The <code>readlimit</code> argument tells this input stream to
+     * allow that many bytes to be read before the mark position gets
+     * invalidated.
+     * <p>
+     * This method simply performs <code>in.mark(readlimit)</code>.
+     *
+     * @param   readlimit   the maximum limit of bytes that can be read before
+     *                      the mark position becomes invalid.
+     * @see     java.io.FilterInputStream#in
+     * @see     java.io.FilterInputStream#reset()
+     */
+    public synchronized void mark(int readlimit) {
+        in.mark(readlimit);
+    }
+
+    /**
+     * Repositions this stream to the position at the time the
+     * <code>mark</code> method was last called on this input stream.
+     * <p>
+     * This method
+     * simply performs <code>in.reset()</code>.
+     * <p>
+     * Stream marks are intended to be used in
+     * situations where you need to read ahead a little to see what's in
+     * the stream. Often this is most easily done by invoking some
+     * general parser. If the stream is of the type handled by the
+     * parse, it just chugs along happily. If the stream is not of
+     * that type, the parser should toss an exception when it fails.
+     * If this happens within readlimit bytes, it allows the outer
+     * code to reset the stream and try another parser.
+     *
+     * @exception  IOException  if the stream has not been marked or if the
+     *               mark has been invalidated.
+     * @see        java.io.FilterInputStream#in
+     * @see        java.io.FilterInputStream#mark(int)
+     */
+    public synchronized void reset() throws IOException {
+        in.reset();
+    }
+
+    /**
+     * Tests if this input stream supports the <code>mark</code>
+     * and <code>reset</code> methods.
+     * This method
+     * simply performs <code>in.markSupported()</code>.
+     *
+     * @return  <code>true</code> if this stream type supports the
+     *          <code>mark</code> and <code>reset</code> method;
+     *          <code>false</code> otherwise.
+     * @see     java.io.FilterInputStream#in
+     * @see     java.io.InputStream#mark(int)
+     * @see     java.io.InputStream#reset()
+     */
+    public boolean markSupported() {
+        return in.markSupported();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/IOException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/IOException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Signals that an I/O exception of some sort has occurred. This
+ * class is the general class of exceptions produced by failed or
+ * interrupted I/O operations.
+ *
+ * @author  unascribed
+ * @see     java.io.InputStream
+ * @see     java.io.OutputStream
+ * @since   JDK1.0
+ */
+public
+class IOException extends Exception {
+    static final long serialVersionUID = 7818375828146090155L;
+
+    /**
+     * Constructs an {@code IOException} with {@code null}
+     * as its error detail message.
+     */
+    public IOException() {
+        super();
+    }
+
+    /**
+     * Constructs an {@code IOException} with the specified detail message.
+     *
+     * @param message
+     *        The detail message (which is saved for later retrieval
+     *        by the {@link #getMessage()} method)
+     */
+    public IOException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs an {@code IOException} with the specified detail message
+     * and cause.
+     *
+     * <p> Note that the detail message associated with {@code cause} is
+     * <i>not</i> automatically incorporated into this exception's detail
+     * message.
+     *
+     * @param message
+     *        The detail message (which is saved for later retrieval
+     *        by the {@link #getMessage()} method)
+     *
+     * @param cause
+     *        The cause (which is saved for later retrieval by the
+     *        {@link #getCause()} method).  (A null value is permitted,
+     *        and indicates that the cause is nonexistent or unknown.)
+     *
+     * @since 1.6
+     */
+    public IOException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs an {@code IOException} with the specified cause and a
+     * detail message of {@code (cause==null ? null : cause.toString())}
+     * (which typically contains the class and detail message of {@code cause}).
+     * This constructor is useful for IO exceptions that are little more
+     * than wrappers for other throwables.
+     *
+     * @param cause
+     *        The cause (which is saved for later retrieval by the
+     *        {@link #getCause()} method).  (A null value is permitted,
+     *        and indicates that the cause is nonexistent or unknown.)
+     *
+     * @since 1.6
+     */
+    public IOException(Throwable cause) {
+        super(cause);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/InputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/InputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * This abstract class is the superclass of all classes representing
+ * an input stream of bytes.
+ *
+ * <p> Applications that need to define a subclass of <code>InputStream</code>
+ * must always provide a method that returns the next byte of input.
+ *
+ * @author  Arthur van Hoff
+ * @see     java.io.BufferedInputStream
+ * @see     java.io.ByteArrayInputStream
+ * @see     java.io.DataInputStream
+ * @see     java.io.FilterInputStream
+ * @see     java.io.InputStream#read()
+ * @see     java.io.OutputStream
+ * @see     java.io.PushbackInputStream
+ * @since   JDK1.0
+ */
+public abstract class InputStream implements Closeable {
+
+    // SKIP_BUFFER_SIZE is used to determine the size of skipBuffer
+    private static final int SKIP_BUFFER_SIZE = 2048;
+    // skipBuffer is initialized in skip(long), if needed.
+    private static byte[] skipBuffer;
+
+    /**
+     * Reads the next byte of data from the input stream. The value byte is
+     * returned as an <code>int</code> in the range <code>0</code> to
+     * <code>255</code>. If no byte is available because the end of the stream
+     * has been reached, the value <code>-1</code> is returned. This method
+     * blocks until input data is available, the end of the stream is detected,
+     * or an exception is thrown.
+     *
+     * <p> A subclass must provide an implementation of this method.
+     *
+     * @return     the next byte of data, or <code>-1</code> if the end of the
+     *             stream is reached.
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public abstract int read() throws IOException;
+
+    /**
+     * Reads some number of bytes from the input stream and stores them into
+     * the buffer array <code>b</code>. The number of bytes actually read is
+     * returned as an integer.  This method blocks until input data is
+     * available, end of file is detected, or an exception is thrown.
+     *
+     * <p> If the length of <code>b</code> is zero, then no bytes are read and
+     * <code>0</code> is returned; otherwise, there is an attempt to read at
+     * least one byte. If no byte is available because the stream is at the
+     * end of the file, the value <code>-1</code> is returned; otherwise, at
+     * least one byte is read and stored into <code>b</code>.
+     *
+     * <p> The first byte read is stored into element <code>b[0]</code>, the
+     * next one into <code>b[1]</code>, and so on. The number of bytes read is,
+     * at most, equal to the length of <code>b</code>. Let <i>k</i> be the
+     * number of bytes actually read; these bytes will be stored in elements
+     * <code>b[0]</code> through <code>b[</code><i>k</i><code>-1]</code>,
+     * leaving elements <code>b[</code><i>k</i><code>]</code> through
+     * <code>b[b.length-1]</code> unaffected.
+     *
+     * <p> The <code>read(b)</code> method for class <code>InputStream</code>
+     * has the same effect as: <pre><code> read(b, 0, b.length) </code></pre>
+     *
+     * @param      b   the buffer into which the data is read.
+     * @return     the total number of bytes read into the buffer, or
+     *             <code>-1</code> if there is no more data because the end of
+     *             the stream has been reached.
+     * @exception  IOException  If the first byte cannot be read for any reason
+     * other than the end of the file, if the input stream has been closed, or
+     * if some other I/O error occurs.
+     * @exception  NullPointerException  if <code>b</code> is <code>null</code>.
+     * @see        java.io.InputStream#read(byte[], int, int)
+     */
+    public int read(byte b[]) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    /**
+     * Reads up to <code>len</code> bytes of data from the input stream into
+     * an array of bytes.  An attempt is made to read as many as
+     * <code>len</code> bytes, but a smaller number may be read.
+     * The number of bytes actually read is returned as an integer.
+     *
+     * <p> This method blocks until input data is available, end of file is
+     * detected, or an exception is thrown.
+     *
+     * <p> If <code>len</code> is zero, then no bytes are read and
+     * <code>0</code> is returned; otherwise, there is an attempt to read at
+     * least one byte. If no byte is available because the stream is at end of
+     * file, the value <code>-1</code> is returned; otherwise, at least one
+     * byte is read and stored into <code>b</code>.
+     *
+     * <p> The first byte read is stored into element <code>b[off]</code>, the
+     * next one into <code>b[off+1]</code>, and so on. The number of bytes read
+     * is, at most, equal to <code>len</code>. Let <i>k</i> be the number of
+     * bytes actually read; these bytes will be stored in elements
+     * <code>b[off]</code> through <code>b[off+</code><i>k</i><code>-1]</code>,
+     * leaving elements <code>b[off+</code><i>k</i><code>]</code> through
+     * <code>b[off+len-1]</code> unaffected.
+     *
+     * <p> In every case, elements <code>b[0]</code> through
+     * <code>b[off]</code> and elements <code>b[off+len]</code> through
+     * <code>b[b.length-1]</code> are unaffected.
+     *
+     * <p> The <code>read(b,</code> <code>off,</code> <code>len)</code> method
+     * for class <code>InputStream</code> simply calls the method
+     * <code>read()</code> repeatedly. If the first such call results in an
+     * <code>IOException</code>, that exception is returned from the call to
+     * the <code>read(b,</code> <code>off,</code> <code>len)</code> method.  If
+     * any subsequent call to <code>read()</code> results in a
+     * <code>IOException</code>, the exception is caught and treated as if it
+     * were end of file; the bytes read up to that point are stored into
+     * <code>b</code> and the number of bytes read before the exception
+     * occurred is returned. The default implementation of this method blocks
+     * until the requested amount of input data <code>len</code> has been read,
+     * end of file is detected, or an exception is thrown. Subclasses are encouraged
+     * to provide a more efficient implementation of this method.
+     *
+     * @param      b     the buffer into which the data is read.
+     * @param      off   the start offset in array <code>b</code>
+     *                   at which the data is written.
+     * @param      len   the maximum number of bytes to read.
+     * @return     the total number of bytes read into the buffer, or
+     *             <code>-1</code> if there is no more data because the end of
+     *             the stream has been reached.
+     * @exception  IOException If the first byte cannot be read for any reason
+     * other than end of file, or if the input stream has been closed, or if
+     * some other I/O error occurs.
+     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
+     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
+     * <code>len</code> is negative, or <code>len</code> is greater than
+     * <code>b.length - off</code>
+     * @see        java.io.InputStream#read()
+     */
+    public int read(byte b[], int off, int len) throws IOException {
+        if (b == null) {
+            throw new NullPointerException();
+        } else if (off < 0 || len < 0 || len > b.length - off) {
+            throw new IndexOutOfBoundsException();
+        } else if (len == 0) {
+            return 0;
+        }
+
+        int c = read();
+        if (c == -1) {
+            return -1;
+        }
+        b[off] = (byte)c;
+
+        int i = 1;
+        try {
+            for (; i < len ; i++) {
+                c = read();
+                if (c == -1) {
+                    break;
+                }
+                b[off + i] = (byte)c;
+            }
+        } catch (IOException ee) {
+        }
+        return i;
+    }
+
+    /**
+     * Skips over and discards <code>n</code> bytes of data from this input
+     * stream. The <code>skip</code> method may, for a variety of reasons, end
+     * up skipping over some smaller number of bytes, possibly <code>0</code>.
+     * This may result from any of a number of conditions; reaching end of file
+     * before <code>n</code> bytes have been skipped is only one possibility.
+     * The actual number of bytes skipped is returned.  If <code>n</code> is
+     * negative, no bytes are skipped.
+     *
+     * <p> The <code>skip</code> method of this class creates a
+     * byte array and then repeatedly reads into it until <code>n</code> bytes
+     * have been read or the end of the stream has been reached. Subclasses are
+     * encouraged to provide a more efficient implementation of this method.
+     * For instance, the implementation may depend on the ability to seek.
+     *
+     * @param      n   the number of bytes to be skipped.
+     * @return     the actual number of bytes skipped.
+     * @exception  IOException  if the stream does not support seek,
+     *                          or if some other I/O error occurs.
+     */
+    public long skip(long n) throws IOException {
+
+        long remaining = n;
+        int nr;
+        if (skipBuffer == null)
+            skipBuffer = new byte[SKIP_BUFFER_SIZE];
+
+        byte[] localSkipBuffer = skipBuffer;
+
+        if (n <= 0) {
+            return 0;
+        }
+
+        while (remaining > 0) {
+            nr = read(localSkipBuffer, 0,
+                      (int) Math.min(SKIP_BUFFER_SIZE, remaining));
+            if (nr < 0) {
+                break;
+            }
+            remaining -= nr;
+        }
+
+        return n - remaining;
+    }
+
+    /**
+     * Returns an estimate of the number of bytes that can be read (or
+     * skipped over) from this input stream without blocking by the next
+     * invocation of a method for this input stream. The next invocation
+     * might be the same thread or another thread.  A single read or skip of this
+     * many bytes will not block, but may read or skip fewer bytes.
+     *
+     * <p> Note that while some implementations of {@code InputStream} will return
+     * the total number of bytes in the stream, many will not.  It is
+     * never correct to use the return value of this method to allocate
+     * a buffer intended to hold all data in this stream.
+     *
+     * <p> A subclass' implementation of this method may choose to throw an
+     * {@link IOException} if this input stream has been closed by
+     * invoking the {@link #close()} method.
+     *
+     * <p> The {@code available} method for class {@code InputStream} always
+     * returns {@code 0}.
+     *
+     * <p> This method should be overridden by subclasses.
+     *
+     * @return     an estimate of the number of bytes that can be read (or skipped
+     *             over) from this input stream without blocking or {@code 0} when
+     *             it reaches the end of the input stream.
+     * @exception  IOException if an I/O error occurs.
+     */
+    public int available() throws IOException {
+        return 0;
+    }
+
+    /**
+     * Closes this input stream and releases any system resources associated
+     * with the stream.
+     *
+     * <p> The <code>close</code> method of <code>InputStream</code> does
+     * nothing.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public void close() throws IOException {}
+
+    /**
+     * Marks the current position in this input stream. A subsequent call to
+     * the <code>reset</code> method repositions this stream at the last marked
+     * position so that subsequent reads re-read the same bytes.
+     *
+     * <p> The <code>readlimit</code> arguments tells this input stream to
+     * allow that many bytes to be read before the mark position gets
+     * invalidated.
+     *
+     * <p> The general contract of <code>mark</code> is that, if the method
+     * <code>markSupported</code> returns <code>true</code>, the stream somehow
+     * remembers all the bytes read after the call to <code>mark</code> and
+     * stands ready to supply those same bytes again if and whenever the method
+     * <code>reset</code> is called.  However, the stream is not required to
+     * remember any data at all if more than <code>readlimit</code> bytes are
+     * read from the stream before <code>reset</code> is called.
+     *
+     * <p> Marking a closed stream should not have any effect on the stream.
+     *
+     * <p> The <code>mark</code> method of <code>InputStream</code> does
+     * nothing.
+     *
+     * @param   readlimit   the maximum limit of bytes that can be read before
+     *                      the mark position becomes invalid.
+     * @see     java.io.InputStream#reset()
+     */
+    public synchronized void mark(int readlimit) {}
+
+    /**
+     * Repositions this stream to the position at the time the
+     * <code>mark</code> method was last called on this input stream.
+     *
+     * <p> The general contract of <code>reset</code> is:
+     *
+     * <p><ul>
+     *
+     * <li> If the method <code>markSupported</code> returns
+     * <code>true</code>, then:
+     *
+     *     <ul><li> If the method <code>mark</code> has not been called since
+     *     the stream was created, or the number of bytes read from the stream
+     *     since <code>mark</code> was last called is larger than the argument
+     *     to <code>mark</code> at that last call, then an
+     *     <code>IOException</code> might be thrown.
+     *
+     *     <li> If such an <code>IOException</code> is not thrown, then the
+     *     stream is reset to a state such that all the bytes read since the
+     *     most recent call to <code>mark</code> (or since the start of the
+     *     file, if <code>mark</code> has not been called) will be resupplied
+     *     to subsequent callers of the <code>read</code> method, followed by
+     *     any bytes that otherwise would have been the next input data as of
+     *     the time of the call to <code>reset</code>. </ul>
+     *
+     * <li> If the method <code>markSupported</code> returns
+     * <code>false</code>, then:
+     *
+     *     <ul><li> The call to <code>reset</code> may throw an
+     *     <code>IOException</code>.
+     *
+     *     <li> If an <code>IOException</code> is not thrown, then the stream
+     *     is reset to a fixed state that depends on the particular type of the
+     *     input stream and how it was created. The bytes that will be supplied
+     *     to subsequent callers of the <code>read</code> method depend on the
+     *     particular type of the input stream. </ul></ul>
+     *
+     * <p>The method <code>reset</code> for class <code>InputStream</code>
+     * does nothing except throw an <code>IOException</code>.
+     *
+     * @exception  IOException  if this stream has not been marked or if the
+     *               mark has been invalidated.
+     * @see     java.io.InputStream#mark(int)
+     * @see     java.io.IOException
+     */
+    public synchronized void reset() throws IOException {
+        throw new IOException("mark/reset not supported");
+    }
+
+    /**
+     * Tests if this input stream supports the <code>mark</code> and
+     * <code>reset</code> methods. Whether or not <code>mark</code> and
+     * <code>reset</code> are supported is an invariant property of a
+     * particular input stream instance. The <code>markSupported</code> method
+     * of <code>InputStream</code> returns <code>false</code>.
+     *
+     * @return  <code>true</code> if this stream instance supports the mark
+     *          and reset methods; <code>false</code> otherwise.
+     * @see     java.io.InputStream#mark(int)
+     * @see     java.io.InputStream#reset()
+     */
+    public boolean markSupported() {
+        return false;
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/PushbackInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/PushbackInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,385 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * A <code>PushbackInputStream</code> adds
+ * functionality to another input stream, namely
+ * the  ability to "push back" or "unread"
+ * one byte. This is useful in situations where
+ * it is  convenient for a fragment of code
+ * to read an indefinite number of data bytes
+ * that  are delimited by a particular byte
+ * value; after reading the terminating byte,
+ * the  code fragment can "unread" it, so that
+ * the next read operation on the input stream
+ * will reread the byte that was pushed back.
+ * For example, bytes representing the  characters
+ * constituting an identifier might be terminated
+ * by a byte representing an  operator character;
+ * a method whose job is to read just an identifier
+ * can read until it  sees the operator and
+ * then push the operator back to be re-read.
+ *
+ * @author  David Connelly
+ * @author  Jonathan Payne
+ * @since   JDK1.0
+ */
+public
+class PushbackInputStream extends FilterInputStream {
+    /**
+     * The pushback buffer.
+     * @since   JDK1.1
+     */
+    protected byte[] buf;
+
+    /**
+     * The position within the pushback buffer from which the next byte will
+     * be read.  When the buffer is empty, <code>pos</code> is equal to
+     * <code>buf.length</code>; when the buffer is full, <code>pos</code> is
+     * equal to zero.
+     *
+     * @since   JDK1.1
+     */
+    protected int pos;
+
+    /**
+     * Check to make sure that this stream has not been closed
+     */
+    private void ensureOpen() throws IOException {
+        if (in == null)
+            throw new IOException("Stream closed");
+    }
+
+    /**
+     * Creates a <code>PushbackInputStream</code>
+     * with a pushback buffer of the specified <code>size</code>,
+     * and saves its  argument, the input stream
+     * <code>in</code>, for later use. Initially,
+     * there is no pushed-back byte  (the field
+     * <code>pushBack</code> is initialized to
+     * <code>-1</code>).
+     *
+     * @param  in    the input stream from which bytes will be read.
+     * @param  size  the size of the pushback buffer.
+     * @exception IllegalArgumentException if size is <= 0
+     * @since  JDK1.1
+     */
+    public PushbackInputStream(InputStream in, int size) {
+        super(in);
+        if (size <= 0) {
+            throw new IllegalArgumentException("size <= 0");
+        }
+        this.buf = new byte[size];
+        this.pos = size;
+    }
+
+    /**
+     * Creates a <code>PushbackInputStream</code>
+     * and saves its  argument, the input stream
+     * <code>in</code>, for later use. Initially,
+     * there is no pushed-back byte  (the field
+     * <code>pushBack</code> is initialized to
+     * <code>-1</code>).
+     *
+     * @param   in   the input stream from which bytes will be read.
+     */
+    public PushbackInputStream(InputStream in) {
+        this(in, 1);
+    }
+
+    /**
+     * Reads the next byte of data from this input stream. The value
+     * byte is returned as an <code>int</code> in the range
+     * <code>0</code> to <code>255</code>. If no byte is available
+     * because the end of the stream has been reached, the value
+     * <code>-1</code> is returned. This method blocks until input data
+     * is available, the end of the stream is detected, or an exception
+     * is thrown.
+     *
+     * <p> This method returns the most recently pushed-back byte, if there is
+     * one, and otherwise calls the <code>read</code> method of its underlying
+     * input stream and returns whatever value that method returns.
+     *
+     * @return     the next byte of data, or <code>-1</code> if the end of the
+     *             stream has been reached.
+     * @exception  IOException  if this input stream has been closed by
+     *             invoking its {@link #close()} method,
+     *             or an I/O error occurs.
+     * @see        java.io.InputStream#read()
+     */
+    public int read() throws IOException {
+        ensureOpen();
+        if (pos < buf.length) {
+            return buf[pos++] & 0xff;
+        }
+        return super.read();
+    }
+
+    /**
+     * Reads up to <code>len</code> bytes of data from this input stream into
+     * an array of bytes.  This method first reads any pushed-back bytes; after
+     * that, if fewer than <code>len</code> bytes have been read then it
+     * reads from the underlying input stream. If <code>len</code> is not zero, the method
+     * blocks until at least 1 byte of input is available; otherwise, no
+     * bytes are read and <code>0</code> is returned.
+     *
+     * @param      b     the buffer into which the data is read.
+     * @param      off   the start offset in the destination array <code>b</code>
+     * @param      len   the maximum number of bytes read.
+     * @return     the total number of bytes read into the buffer, or
+     *             <code>-1</code> if there is no more data because the end of
+     *             the stream has been reached.
+     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
+     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
+     * <code>len</code> is negative, or <code>len</code> is greater than
+     * <code>b.length - off</code>
+     * @exception  IOException  if this input stream has been closed by
+     *             invoking its {@link #close()} method,
+     *             or an I/O error occurs.
+     * @see        java.io.InputStream#read(byte[], int, int)
+     */
+    public int read(byte[] b, int off, int len) throws IOException {
+        ensureOpen();
+        if (b == null) {
+            throw new NullPointerException();
+        } else if (off < 0 || len < 0 || len > b.length - off) {
+            throw new IndexOutOfBoundsException();
+        } else if (len == 0) {
+            return 0;
+        }
+
+        int avail = buf.length - pos;
+        if (avail > 0) {
+            if (len < avail) {
+                avail = len;
+            }
+            System.arraycopy(buf, pos, b, off, avail);
+            pos += avail;
+            off += avail;
+            len -= avail;
+        }
+        if (len > 0) {
+            len = super.read(b, off, len);
+            if (len == -1) {
+                return avail == 0 ? -1 : avail;
+            }
+            return avail + len;
+        }
+        return avail;
+    }
+
+    /**
+     * Pushes back a byte by copying it to the front of the pushback buffer.
+     * After this method returns, the next byte to be read will have the value
+     * <code>(byte)b</code>.
+     *
+     * @param      b   the <code>int</code> value whose low-order
+     *                  byte is to be pushed back.
+     * @exception IOException If there is not enough room in the pushback
+     *            buffer for the byte, or this input stream has been closed by
+     *            invoking its {@link #close()} method.
+     */
+    public void unread(int b) throws IOException {
+        ensureOpen();
+        if (pos == 0) {
+            throw new IOException("Push back buffer is full");
+        }
+        buf[--pos] = (byte)b;
+    }
+
+    /**
+     * Pushes back a portion of an array of bytes by copying it to the front
+     * of the pushback buffer.  After this method returns, the next byte to be
+     * read will have the value <code>b[off]</code>, the byte after that will
+     * have the value <code>b[off+1]</code>, and so forth.
+     *
+     * @param b the byte array to push back.
+     * @param off the start offset of the data.
+     * @param len the number of bytes to push back.
+     * @exception IOException If there is not enough room in the pushback
+     *            buffer for the specified number of bytes,
+     *            or this input stream has been closed by
+     *            invoking its {@link #close()} method.
+     * @since     JDK1.1
+     */
+    public void unread(byte[] b, int off, int len) throws IOException {
+        ensureOpen();
+        if (len > pos) {
+            throw new IOException("Push back buffer is full");
+        }
+        pos -= len;
+        System.arraycopy(b, off, buf, pos, len);
+    }
+
+    /**
+     * Pushes back an array of bytes by copying it to the front of the
+     * pushback buffer.  After this method returns, the next byte to be read
+     * will have the value <code>b[0]</code>, the byte after that will have the
+     * value <code>b[1]</code>, and so forth.
+     *
+     * @param b the byte array to push back
+     * @exception IOException If there is not enough room in the pushback
+     *            buffer for the specified number of bytes,
+     *            or this input stream has been closed by
+     *            invoking its {@link #close()} method.
+     * @since     JDK1.1
+     */
+    public void unread(byte[] b) throws IOException {
+        unread(b, 0, b.length);
+    }
+
+    /**
+     * Returns an estimate of the number of bytes that can be read (or
+     * skipped over) from this input stream without blocking by the next
+     * invocation of a method for this input stream. The next invocation might be
+     * the same thread or another thread.  A single read or skip of this
+     * many bytes will not block, but may read or skip fewer bytes.
+     *
+     * <p> The method returns the sum of the number of bytes that have been
+     * pushed back and the value returned by {@link
+     * java.io.FilterInputStream#available available}.
+     *
+     * @return     the number of bytes that can be read (or skipped over) from
+     *             the input stream without blocking.
+     * @exception  IOException  if this input stream has been closed by
+     *             invoking its {@link #close()} method,
+     *             or an I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     * @see        java.io.InputStream#available()
+     */
+    public int available() throws IOException {
+        ensureOpen();
+        int n = buf.length - pos;
+        int avail = super.available();
+        return n > (Integer.MAX_VALUE - avail)
+                    ? Integer.MAX_VALUE
+                    : n + avail;
+    }
+
+    /**
+     * Skips over and discards <code>n</code> bytes of data from this
+     * input stream. The <code>skip</code> method may, for a variety of
+     * reasons, end up skipping over some smaller number of bytes,
+     * possibly zero.  If <code>n</code> is negative, no bytes are skipped.
+     *
+     * <p> The <code>skip</code> method of <code>PushbackInputStream</code>
+     * first skips over the bytes in the pushback buffer, if any.  It then
+     * calls the <code>skip</code> method of the underlying input stream if
+     * more bytes need to be skipped.  The actual number of bytes skipped
+     * is returned.
+     *
+     * @param      n  {@inheritDoc}
+     * @return     {@inheritDoc}
+     * @exception  IOException  if the stream does not support seek,
+     *            or the stream has been closed by
+     *            invoking its {@link #close()} method,
+     *            or an I/O error occurs.
+     * @see        java.io.FilterInputStream#in
+     * @see        java.io.InputStream#skip(long n)
+     * @since      1.2
+     */
+    public long skip(long n) throws IOException {
+        ensureOpen();
+        if (n <= 0) {
+            return 0;
+        }
+
+        long pskip = buf.length - pos;
+        if (pskip > 0) {
+            if (n < pskip) {
+                pskip = n;
+            }
+            pos += pskip;
+            n -= pskip;
+        }
+        if (n > 0) {
+            pskip += super.skip(n);
+        }
+        return pskip;
+    }
+
+    /**
+     * Tests if this input stream supports the <code>mark</code> and
+     * <code>reset</code> methods, which it does not.
+     *
+     * @return   <code>false</code>, since this class does not support the
+     *           <code>mark</code> and <code>reset</code> methods.
+     * @see     java.io.InputStream#mark(int)
+     * @see     java.io.InputStream#reset()
+     */
+    public boolean markSupported() {
+        return false;
+    }
+
+    /**
+     * Marks the current position in this input stream.
+     *
+     * <p> The <code>mark</code> method of <code>PushbackInputStream</code>
+     * does nothing.
+     *
+     * @param   readlimit   the maximum limit of bytes that can be read before
+     *                      the mark position becomes invalid.
+     * @see     java.io.InputStream#reset()
+     */
+    public synchronized void mark(int readlimit) {
+    }
+
+    /**
+     * Repositions this stream to the position at the time the
+     * <code>mark</code> method was last called on this input stream.
+     *
+     * <p> The method <code>reset</code> for class
+     * <code>PushbackInputStream</code> does nothing except throw an
+     * <code>IOException</code>.
+     *
+     * @exception  IOException  if this method is invoked.
+     * @see     java.io.InputStream#mark(int)
+     * @see     java.io.IOException
+     */
+    public synchronized void reset() throws IOException {
+        throw new IOException("mark/reset not supported");
+    }
+
+    /**
+     * Closes this input stream and releases any system resources
+     * associated with the stream.
+     * Once the stream has been closed, further read(), unread(),
+     * available(), reset(), or skip() invocations will throw an IOException.
+     * Closing a previously closed stream has no effect.
+     *
+     * @exception  IOException  if an I/O error occurs.
+     */
+    public synchronized void close() throws IOException {
+        if (in == null)
+            return;
+        in.close();
+        in = null;
+        buf = null;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/Serializable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/Serializable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Serializability of a class is enabled by the class implementing the
+ * java.io.Serializable interface. Classes that do not implement this
+ * interface will not have any of their state serialized or
+ * deserialized.  All subtypes of a serializable class are themselves
+ * serializable.  The serialization interface has no methods or fields
+ * and serves only to identify the semantics of being serializable. <p>
+ *
+ * To allow subtypes of non-serializable classes to be serialized, the
+ * subtype may assume responsibility for saving and restoring the
+ * state of the supertype's public, protected, and (if accessible)
+ * package fields.  The subtype may assume this responsibility only if
+ * the class it extends has an accessible no-arg constructor to
+ * initialize the class's state.  It is an error to declare a class
+ * Serializable if this is not the case.  The error will be detected at
+ * runtime. <p>
+ *
+ * During deserialization, the fields of non-serializable classes will
+ * be initialized using the public or protected no-arg constructor of
+ * the class.  A no-arg constructor must be accessible to the subclass
+ * that is serializable.  The fields of serializable subclasses will
+ * be restored from the stream. <p>
+ *
+ * When traversing a graph, an object may be encountered that does not
+ * support the Serializable interface. In this case the
+ * NotSerializableException will be thrown and will identify the class
+ * of the non-serializable object. <p>
+ *
+ * Classes that require special handling during the serialization and
+ * deserialization process must implement special methods with these exact
+ * signatures: <p>
+ *
+ * <PRE>
+ * private void writeObject(java.io.ObjectOutputStream out)
+ *     throws IOException
+ * private void readObject(java.io.ObjectInputStream in)
+ *     throws IOException, ClassNotFoundException;
+ * private void readObjectNoData()
+ *     throws ObjectStreamException;
+ * </PRE>
+ *
+ * <p>The writeObject method is responsible for writing the state of the
+ * object for its particular class so that the corresponding
+ * readObject method can restore it.  The default mechanism for saving
+ * the Object's fields can be invoked by calling
+ * out.defaultWriteObject. The method does not need to concern
+ * itself with the state belonging to its superclasses or subclasses.
+ * State is saved by writing the individual fields to the
+ * ObjectOutputStream using the writeObject method or by using the
+ * methods for primitive data types supported by DataOutput.
+ *
+ * <p>The readObject method is responsible for reading from the stream and
+ * restoring the classes fields. It may call in.defaultReadObject to invoke
+ * the default mechanism for restoring the object's non-static and
+ * non-transient fields.  The defaultReadObject method uses information in
+ * the stream to assign the fields of the object saved in the stream with the
+ * correspondingly named fields in the current object.  This handles the case
+ * when the class has evolved to add new fields. The method does not need to
+ * concern itself with the state belonging to its superclasses or subclasses.
+ * State is saved by writing the individual fields to the
+ * ObjectOutputStream using the writeObject method or by using the
+ * methods for primitive data types supported by DataOutput.
+ *
+ * <p>The readObjectNoData method is responsible for initializing the state of
+ * the object for its particular class in the event that the serialization
+ * stream does not list the given class as a superclass of the object being
+ * deserialized.  This may occur in cases where the receiving party uses a
+ * different version of the deserialized instance's class than the sending
+ * party, and the receiver's version extends classes that are not extended by
+ * the sender's version.  This may also occur if the serialization stream has
+ * been tampered; hence, readObjectNoData is useful for initializing
+ * deserialized objects properly despite a "hostile" or incomplete source
+ * stream.
+ *
+ * <p>Serializable classes that need to designate an alternative object to be
+ * used when writing an object to the stream should implement this
+ * special method with the exact signature: <p>
+ *
+ * <PRE>
+ * ANY-ACCESS-MODIFIER Object writeReplace() throws ObjectStreamException;
+ * </PRE><p>
+ *
+ * This writeReplace method is invoked by serialization if the method
+ * exists and it would be accessible from a method defined within the
+ * class of the object being serialized. Thus, the method can have private,
+ * protected and package-private access. Subclass access to this method
+ * follows java accessibility rules. <p>
+ *
+ * Classes that need to designate a replacement when an instance of it
+ * is read from the stream should implement this special method with the
+ * exact signature.<p>
+ *
+ * <PRE>
+ * ANY-ACCESS-MODIFIER Object readResolve() throws ObjectStreamException;
+ * </PRE><p>
+ *
+ * This readResolve method follows the same invocation rules and
+ * accessibility rules as writeReplace.<p>
+ *
+ * The serialization runtime associates with each serializable class a version
+ * number, called a serialVersionUID, which is used during deserialization to
+ * verify that the sender and receiver of a serialized object have loaded
+ * classes for that object that are compatible with respect to serialization.
+ * If the receiver has loaded a class for the object that has a different
+ * serialVersionUID than that of the corresponding sender's class, then
+ * deserialization will result in an {@link InvalidClassException}.  A
+ * serializable class can declare its own serialVersionUID explicitly by
+ * declaring a field named <code>"serialVersionUID"</code> that must be static,
+ * final, and of type <code>long</code>:<p>
+ *
+ * <PRE>
+ * ANY-ACCESS-MODIFIER static final long serialVersionUID = 42L;
+ * </PRE>
+ *
+ * If a serializable class does not explicitly declare a serialVersionUID, then
+ * the serialization runtime will calculate a default serialVersionUID value
+ * for that class based on various aspects of the class, as described in the
+ * Java(TM) Object Serialization Specification.  However, it is <em>strongly
+ * recommended</em> that all serializable classes explicitly declare
+ * serialVersionUID values, since the default serialVersionUID computation is
+ * highly sensitive to class details that may vary depending on compiler
+ * implementations, and can thus result in unexpected
+ * <code>InvalidClassException</code>s during deserialization.  Therefore, to
+ * guarantee a consistent serialVersionUID value across different java compiler
+ * implementations, a serializable class must declare an explicit
+ * serialVersionUID value.  It is also strongly advised that explicit
+ * serialVersionUID declarations use the <code>private</code> modifier where
+ * possible, since such declarations apply only to the immediately declaring
+ * class--serialVersionUID fields are not useful as inherited members. Array
+ * classes cannot declare an explicit serialVersionUID, so they always have
+ * the default computed value, but the requirement for matching
+ * serialVersionUID values is waived for array classes.
+ *
+ * @author  unascribed
+ * @see java.io.ObjectOutputStream
+ * @see java.io.ObjectInputStream
+ * @see java.io.ObjectOutput
+ * @see java.io.ObjectInput
+ * @see java.io.Externalizable
+ * @since   JDK1.1
+ */
+public interface Serializable {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/UTFDataFormatException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/UTFDataFormatException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.io;
+
+/**
+ * Signals that a malformed string in
+ * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
+ * format has been read in a data
+ * input stream or by any class that implements the data input
+ * interface.
+ * See the
+ * <a href="DataInput.html#modified-utf-8"><code>DataInput</code></a>
+ * class description for the format in
+ * which modified UTF-8 strings are read and written.
+ *
+ * @author  Frank Yellin
+ * @see     java.io.DataInput
+ * @see     java.io.DataInputStream#readUTF(java.io.DataInput)
+ * @see     java.io.IOException
+ * @since   JDK1.0
+ */
+public
+class UTFDataFormatException extends IOException {
+    private static final long serialVersionUID = 420743449228280612L;
+
+    /**
+     * Constructs a <code>UTFDataFormatException</code> with
+     * <code>null</code> as its error detail message.
+     */
+    public UTFDataFormatException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>UTFDataFormatException</code> with the
+     * specified detail message. The string <code>s</code> can be
+     * retrieved later by the
+     * <code>{@link java.lang.Throwable#getMessage}</code>
+     * method of class <code>java.lang.Throwable</code>.
+     *
+     * @param   s   the detail message.
+     */
+    public UTFDataFormatException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/io/UnsupportedEncodingException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/io/UnsupportedEncodingException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.io;
+
+/**
+ * The Character Encoding is not supported.
+ *
+ * @author  Asmus Freytag
+ * @since   JDK1.1
+ */
+public class UnsupportedEncodingException
+    extends IOException
+{
+    private static final long serialVersionUID = -4274276298326136670L;
+
+    /**
+     * Constructs an UnsupportedEncodingException without a detail message.
+     */
+    public UnsupportedEncodingException() {
+        super();
+    }
+
+    /**
+     * Constructs an UnsupportedEncodingException with a detail message.
+     * @param s Describes the reason for the exception.
+     */
+    public UnsupportedEncodingException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/AbstractStringBuilder.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/AbstractStringBuilder.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1414 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * A mutable sequence of characters.
+ * <p>
+ * Implements a modifiable string. At any point in time it contains some
+ * particular sequence of characters, but the length and content of the
+ * sequence can be changed through certain method calls.
+ *
+ * @author      Michael McCloskey
+ * @author      Martin Buchholz
+ * @author      Ulf Zibis
+ * @since       1.5
+ */
+abstract class AbstractStringBuilder implements Appendable, CharSequence {
+    /**
+     * The value is used for character storage.
+     */
+    char[] value;
+
+    /**
+     * The count is the number of characters used.
+     */
+    int count;
+
+    /**
+     * This no-arg constructor is necessary for serialization of subclasses.
+     */
+    AbstractStringBuilder() {
+    }
+
+    /**
+     * Creates an AbstractStringBuilder of the specified capacity.
+     */
+    AbstractStringBuilder(int capacity) {
+        value = new char[capacity];
+    }
+
+    /**
+     * Returns the length (character count).
+     *
+     * @return  the length of the sequence of characters currently
+     *          represented by this object
+     */
+    public int length() {
+        return count;
+    }
+
+    /**
+     * Returns the current capacity. The capacity is the amount of storage
+     * available for newly inserted characters, beyond which an allocation
+     * will occur.
+     *
+     * @return  the current capacity
+     */
+    public int capacity() {
+        return value.length;
+    }
+
+    /**
+     * Ensures that the capacity is at least equal to the specified minimum.
+     * If the current capacity is less than the argument, then a new internal
+     * array is allocated with greater capacity. The new capacity is the
+     * larger of:
+     * <ul>
+     * <li>The <code>minimumCapacity</code> argument.
+     * <li>Twice the old capacity, plus <code>2</code>.
+     * </ul>
+     * If the <code>minimumCapacity</code> argument is nonpositive, this
+     * method takes no action and simply returns.
+     *
+     * @param   minimumCapacity   the minimum desired capacity.
+     */
+    public void ensureCapacity(int minimumCapacity) {
+        if (minimumCapacity > 0)
+            ensureCapacityInternal(minimumCapacity);
+    }
+
+    /**
+     * This method has the same contract as ensureCapacity, but is
+     * never synchronized.
+     */
+    private void ensureCapacityInternal(int minimumCapacity) {
+        // overflow-conscious code
+        if (minimumCapacity - value.length > 0)
+            expandCapacity(minimumCapacity);
+    }
+
+    /**
+     * This implements the expansion semantics of ensureCapacity with no
+     * size check or synchronization.
+     */
+    void expandCapacity(int minimumCapacity) {
+        int newCapacity = value.length * 2 + 2;
+        if (newCapacity - minimumCapacity < 0)
+            newCapacity = minimumCapacity;
+        if (newCapacity < 0) {
+            if (minimumCapacity < 0) // overflow
+                throw new OutOfMemoryError();
+            newCapacity = Integer.MAX_VALUE;
+        }
+        value = System.expandArray(value, newCapacity);
+    }
+
+    /**
+     * Attempts to reduce storage used for the character sequence.
+     * If the buffer is larger than necessary to hold its current sequence of
+     * characters, then it may be resized to become more space efficient.
+     * Calling this method may, but is not required to, affect the value
+     * returned by a subsequent call to the {@link #capacity()} method.
+     */
+    public void trimToSize() {
+        if (count < value.length) {
+            value = copyOf(value, count);
+        }
+    }
+
+    /**
+     * Sets the length of the character sequence.
+     * The sequence is changed to a new character sequence
+     * whose length is specified by the argument. For every nonnegative
+     * index <i>k</i> less than <code>newLength</code>, the character at
+     * index <i>k</i> in the new character sequence is the same as the
+     * character at index <i>k</i> in the old sequence if <i>k</i> is less
+     * than the length of the old character sequence; otherwise, it is the
+     * null character <code>'&#92;u0000'</code>.
+     *
+     * In other words, if the <code>newLength</code> argument is less than
+     * the current length, the length is changed to the specified length.
+     * <p>
+     * If the <code>newLength</code> argument is greater than or equal
+     * to the current length, sufficient null characters
+     * (<code>'&#92;u0000'</code>) are appended so that
+     * length becomes the <code>newLength</code> argument.
+     * <p>
+     * The <code>newLength</code> argument must be greater than or equal
+     * to <code>0</code>.
+     *
+     * @param      newLength   the new length
+     * @throws     IndexOutOfBoundsException  if the
+     *               <code>newLength</code> argument is negative.
+     */
+    public void setLength(int newLength) {
+        if (newLength < 0)
+            throw new StringIndexOutOfBoundsException(newLength);
+        ensureCapacityInternal(newLength);
+
+        if (count < newLength) {
+            for (; count < newLength; count++)
+                value[count] = '\0';
+        } else {
+            count = newLength;
+        }
+    }
+
+    /**
+     * Returns the <code>char</code> value in this sequence at the specified index.
+     * The first <code>char</code> value is at index <code>0</code>, the next at index
+     * <code>1</code>, and so on, as in array indexing.
+     * <p>
+     * The index argument must be greater than or equal to
+     * <code>0</code>, and less than the length of this sequence.
+     *
+     * <p>If the <code>char</code> value specified by the index is a
+     * <a href="Character.html#unicode">surrogate</a>, the surrogate
+     * value is returned.
+     *
+     * @param      index   the index of the desired <code>char</code> value.
+     * @return     the <code>char</code> value at the specified index.
+     * @throws     IndexOutOfBoundsException  if <code>index</code> is
+     *             negative or greater than or equal to <code>length()</code>.
+     */
+    public char charAt(int index) {
+        if ((index < 0) || (index >= count))
+            throw new StringIndexOutOfBoundsException(index);
+        return value[index];
+    }
+
+    /**
+     * Returns the character (Unicode code point) at the specified
+     * index. The index refers to <code>char</code> values
+     * (Unicode code units) and ranges from <code>0</code> to
+     * {@link #length()}<code> - 1</code>.
+     *
+     * <p> If the <code>char</code> value specified at the given index
+     * is in the high-surrogate range, the following index is less
+     * than the length of this sequence, and the
+     * <code>char</code> value at the following index is in the
+     * low-surrogate range, then the supplementary code point
+     * corresponding to this surrogate pair is returned. Otherwise,
+     * the <code>char</code> value at the given index is returned.
+     *
+     * @param      index the index to the <code>char</code> values
+     * @return     the code point value of the character at the
+     *             <code>index</code>
+     * @exception  IndexOutOfBoundsException  if the <code>index</code>
+     *             argument is negative or not less than the length of this
+     *             sequence.
+     */
+    public int codePointAt(int index) {
+        if ((index < 0) || (index >= count)) {
+            throw new StringIndexOutOfBoundsException(index);
+        }
+        return Character.codePointAt(value, index);
+    }
+
+    /**
+     * Returns the character (Unicode code point) before the specified
+     * index. The index refers to <code>char</code> values
+     * (Unicode code units) and ranges from <code>1</code> to {@link
+     * #length()}.
+     *
+     * <p> If the <code>char</code> value at <code>(index - 1)</code>
+     * is in the low-surrogate range, <code>(index - 2)</code> is not
+     * negative, and the <code>char</code> value at <code>(index -
+     * 2)</code> is in the high-surrogate range, then the
+     * supplementary code point value of the surrogate pair is
+     * returned. If the <code>char</code> value at <code>index -
+     * 1</code> is an unpaired low-surrogate or a high-surrogate, the
+     * surrogate value is returned.
+     *
+     * @param     index the index following the code point that should be returned
+     * @return    the Unicode code point value before the given index.
+     * @exception IndexOutOfBoundsException if the <code>index</code>
+     *            argument is less than 1 or greater than the length
+     *            of this sequence.
+     */
+    public int codePointBefore(int index) {
+        int i = index - 1;
+        if ((i < 0) || (i >= count)) {
+            throw new StringIndexOutOfBoundsException(index);
+        }
+        return Character.codePointBefore(value, index);
+    }
+
+    /**
+     * Returns the number of Unicode code points in the specified text
+     * range of this sequence. The text range begins at the specified
+     * <code>beginIndex</code> and extends to the <code>char</code> at
+     * index <code>endIndex - 1</code>. Thus the length (in
+     * <code>char</code>s) of the text range is
+     * <code>endIndex-beginIndex</code>. Unpaired surrogates within
+     * this sequence count as one code point each.
+     *
+     * @param beginIndex the index to the first <code>char</code> of
+     * the text range.
+     * @param endIndex the index after the last <code>char</code> of
+     * the text range.
+     * @return the number of Unicode code points in the specified text
+     * range
+     * @exception IndexOutOfBoundsException if the
+     * <code>beginIndex</code> is negative, or <code>endIndex</code>
+     * is larger than the length of this sequence, or
+     * <code>beginIndex</code> is larger than <code>endIndex</code>.
+     */
+    public int codePointCount(int beginIndex, int endIndex) {
+        if (beginIndex < 0 || endIndex > count || beginIndex > endIndex) {
+            throw new IndexOutOfBoundsException();
+        }
+        return Character.codePointCountImpl(value, beginIndex, endIndex-beginIndex);
+    }
+
+    /**
+     * Returns the index within this sequence that is offset from the
+     * given <code>index</code> by <code>codePointOffset</code> code
+     * points. Unpaired surrogates within the text range given by
+     * <code>index</code> and <code>codePointOffset</code> count as
+     * one code point each.
+     *
+     * @param index the index to be offset
+     * @param codePointOffset the offset in code points
+     * @return the index within this sequence
+     * @exception IndexOutOfBoundsException if <code>index</code>
+     *   is negative or larger then the length of this sequence,
+     *   or if <code>codePointOffset</code> is positive and the subsequence
+     *   starting with <code>index</code> has fewer than
+     *   <code>codePointOffset</code> code points,
+     *   or if <code>codePointOffset</code> is negative and the subsequence
+     *   before <code>index</code> has fewer than the absolute value of
+     *   <code>codePointOffset</code> code points.
+     */
+    public int offsetByCodePoints(int index, int codePointOffset) {
+        if (index < 0 || index > count) {
+            throw new IndexOutOfBoundsException();
+        }
+        return Character.offsetByCodePointsImpl(value, 0, count,
+                                                index, codePointOffset);
+    }
+
+    /**
+     * Characters are copied from this sequence into the
+     * destination character array <code>dst</code>. The first character to
+     * be copied is at index <code>srcBegin</code>; the last character to
+     * be copied is at index <code>srcEnd-1</code>. The total number of
+     * characters to be copied is <code>srcEnd-srcBegin</code>. The
+     * characters are copied into the subarray of <code>dst</code> starting
+     * at index <code>dstBegin</code> and ending at index:
+     * <p><blockquote><pre>
+     * dstbegin + (srcEnd-srcBegin) - 1
+     * </pre></blockquote>
+     *
+     * @param      srcBegin   start copying at this offset.
+     * @param      srcEnd     stop copying at this offset.
+     * @param      dst        the array to copy the data into.
+     * @param      dstBegin   offset into <code>dst</code>.
+     * @throws     NullPointerException if <code>dst</code> is
+     *             <code>null</code>.
+     * @throws     IndexOutOfBoundsException  if any of the following is true:
+     *             <ul>
+     *             <li><code>srcBegin</code> is negative
+     *             <li><code>dstBegin</code> is negative
+     *             <li>the <code>srcBegin</code> argument is greater than
+     *             the <code>srcEnd</code> argument.
+     *             <li><code>srcEnd</code> is greater than
+     *             <code>this.length()</code>.
+     *             <li><code>dstBegin+srcEnd-srcBegin</code> is greater than
+     *             <code>dst.length</code>
+     *             </ul>
+     */
+    public void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin)
+    {
+        if (srcBegin < 0)
+            throw new StringIndexOutOfBoundsException(srcBegin);
+        if ((srcEnd < 0) || (srcEnd > count))
+            throw new StringIndexOutOfBoundsException(srcEnd);
+        if (srcBegin > srcEnd)
+            throw new StringIndexOutOfBoundsException("srcBegin > srcEnd");
+        System.arraycopy(value, srcBegin, dst, dstBegin, srcEnd - srcBegin);
+    }
+
+    /**
+     * The character at the specified index is set to <code>ch</code>. This
+     * sequence is altered to represent a new character sequence that is
+     * identical to the old character sequence, except that it contains the
+     * character <code>ch</code> at position <code>index</code>.
+     * <p>
+     * The index argument must be greater than or equal to
+     * <code>0</code>, and less than the length of this sequence.
+     *
+     * @param      index   the index of the character to modify.
+     * @param      ch      the new character.
+     * @throws     IndexOutOfBoundsException  if <code>index</code> is
+     *             negative or greater than or equal to <code>length()</code>.
+     */
+    public void setCharAt(int index, char ch) {
+        if ((index < 0) || (index >= count))
+            throw new StringIndexOutOfBoundsException(index);
+        value[index] = ch;
+    }
+
+    /**
+     * Appends the string representation of the {@code Object} argument.
+     * <p>
+     * The overall effect is exactly as if the argument were converted
+     * to a string by the method {@link String#valueOf(Object)},
+     * and the characters of that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   obj   an {@code Object}.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(Object obj) {
+        return append(String.valueOf(obj));
+    }
+
+    /**
+     * Appends the specified string to this character sequence.
+     * <p>
+     * The characters of the {@code String} argument are appended, in
+     * order, increasing the length of this sequence by the length of the
+     * argument. If {@code str} is {@code null}, then the four
+     * characters {@code "null"} are appended.
+     * <p>
+     * Let <i>n</i> be the length of this character sequence just prior to
+     * execution of the {@code append} method. Then the character at
+     * index <i>k</i> in the new character sequence is equal to the character
+     * at index <i>k</i> in the old character sequence, if <i>k</i> is less
+     * than <i>n</i>; otherwise, it is equal to the character at index
+     * <i>k-n</i> in the argument {@code str}.
+     *
+     * @param   str   a string.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(String str) {
+        if (str == null) str = "null";
+        int len = str.length();
+        ensureCapacityInternal(count + len);
+        str.getChars(0, len, value, count);
+        count += len;
+        return this;
+    }
+
+    // Documentation in subclasses because of synchro difference
+    public AbstractStringBuilder append(StringBuffer sb) {
+        if (sb == null)
+            return append("null");
+        int len = sb.length();
+        ensureCapacityInternal(count + len);
+        sb.getChars(0, len, value, count);
+        count += len;
+        return this;
+    }
+
+    // Documentation in subclasses because of synchro difference
+    public AbstractStringBuilder append(CharSequence s) {
+        if (s == null)
+            s = "null";
+        if (s instanceof String)
+            return this.append((String)s);
+        if (s instanceof StringBuffer)
+            return this.append((StringBuffer)s);
+        return this.append(s, 0, s.length());
+    }
+
+    /**
+     * Appends a subsequence of the specified {@code CharSequence} to this
+     * sequence.
+     * <p>
+     * Characters of the argument {@code s}, starting at
+     * index {@code start}, are appended, in order, to the contents of
+     * this sequence up to the (exclusive) index {@code end}. The length
+     * of this sequence is increased by the value of {@code end - start}.
+     * <p>
+     * Let <i>n</i> be the length of this character sequence just prior to
+     * execution of the {@code append} method. Then the character at
+     * index <i>k</i> in this character sequence becomes equal to the
+     * character at index <i>k</i> in this sequence, if <i>k</i> is less than
+     * <i>n</i>; otherwise, it is equal to the character at index
+     * <i>k+start-n</i> in the argument {@code s}.
+     * <p>
+     * If {@code s} is {@code null}, then this method appends
+     * characters as if the s parameter was a sequence containing the four
+     * characters {@code "null"}.
+     *
+     * @param   s the sequence to append.
+     * @param   start   the starting index of the subsequence to be appended.
+     * @param   end     the end index of the subsequence to be appended.
+     * @return  a reference to this object.
+     * @throws     IndexOutOfBoundsException if
+     *             {@code start} is negative, or
+     *             {@code start} is greater than {@code end} or
+     *             {@code end} is greater than {@code s.length()}
+     */
+    public AbstractStringBuilder append(CharSequence s, int start, int end) {
+        if (s == null)
+            s = "null";
+        if ((start < 0) || (start > end) || (end > s.length()))
+            throw new IndexOutOfBoundsException(
+                "start " + start + ", end " + end + ", s.length() "
+                + s.length());
+        int len = end - start;
+        ensureCapacityInternal(count + len);
+        for (int i = start, j = count; i < end; i++, j++)
+            value[j] = s.charAt(i);
+        count += len;
+        return this;
+    }
+
+    /**
+     * Appends the string representation of the {@code char} array
+     * argument to this sequence.
+     * <p>
+     * The characters of the array argument are appended, in order, to
+     * the contents of this sequence. The length of this sequence
+     * increases by the length of the argument.
+     * <p>
+     * The overall effect is exactly as if the argument were converted
+     * to a string by the method {@link String#valueOf(char[])},
+     * and the characters of that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   str   the characters to be appended.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(char[] str) {
+        int len = str.length;
+        ensureCapacityInternal(count + len);
+        System.arraycopy(str, 0, value, count, len);
+        count += len;
+        return this;
+    }
+
+    /**
+     * Appends the string representation of a subarray of the
+     * {@code char} array argument to this sequence.
+     * <p>
+     * Characters of the {@code char} array {@code str}, starting at
+     * index {@code offset}, are appended, in order, to the contents
+     * of this sequence. The length of this sequence increases
+     * by the value of {@code len}.
+     * <p>
+     * The overall effect is exactly as if the arguments were converted
+     * to a string by the method {@link String#valueOf(char[],int,int)},
+     * and the characters of that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   str      the characters to be appended.
+     * @param   offset   the index of the first {@code char} to append.
+     * @param   len      the number of {@code char}s to append.
+     * @return  a reference to this object.
+     * @throws IndexOutOfBoundsException
+     *         if {@code offset < 0} or {@code len < 0}
+     *         or {@code offset+len > str.length}
+     */
+    public AbstractStringBuilder append(char str[], int offset, int len) {
+        if (len > 0)                // let arraycopy report AIOOBE for len < 0
+            ensureCapacityInternal(count + len);
+        System.arraycopy(str, offset, value, count, len);
+        count += len;
+        return this;
+    }
+
+    /**
+     * Appends the string representation of the {@code boolean}
+     * argument to the sequence.
+     * <p>
+     * The overall effect is exactly as if the argument were converted
+     * to a string by the method {@link String#valueOf(boolean)},
+     * and the characters of that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   b   a {@code boolean}.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(boolean b) {
+        if (b) {
+            ensureCapacityInternal(count + 4);
+            value[count++] = 't';
+            value[count++] = 'r';
+            value[count++] = 'u';
+            value[count++] = 'e';
+        } else {
+            ensureCapacityInternal(count + 5);
+            value[count++] = 'f';
+            value[count++] = 'a';
+            value[count++] = 'l';
+            value[count++] = 's';
+            value[count++] = 'e';
+        }
+        return this;
+    }
+
+    /**
+     * Appends the string representation of the {@code char}
+     * argument to this sequence.
+     * <p>
+     * The argument is appended to the contents of this sequence.
+     * The length of this sequence increases by {@code 1}.
+     * <p>
+     * The overall effect is exactly as if the argument were converted
+     * to a string by the method {@link String#valueOf(char)},
+     * and the character in that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   c   a {@code char}.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(char c) {
+        ensureCapacityInternal(count + 1);
+        value[count++] = c;
+        return this;
+    }
+
+    /**
+     * Appends the string representation of the {@code int}
+     * argument to this sequence.
+     * <p>
+     * The overall effect is exactly as if the argument were converted
+     * to a string by the method {@link String#valueOf(int)},
+     * and the characters of that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   i   an {@code int}.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(int i) {
+        return append(Integer.toString(i));
+    }
+
+    /**
+     * Appends the string representation of the {@code long}
+     * argument to this sequence.
+     * <p>
+     * The overall effect is exactly as if the argument were converted
+     * to a string by the method {@link String#valueOf(long)},
+     * and the characters of that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   l   a {@code long}.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(long l) {
+        if (l == Long.MIN_VALUE) {
+            append("-9223372036854775808");
+            return this;
+        }
+        int appendedLength = (l < 0) ? Long.stringSize(-l) + 1
+                                     : Long.stringSize(l);
+        int spaceNeeded = count + appendedLength;
+        ensureCapacityInternal(spaceNeeded);
+        Long.getChars(l, spaceNeeded, value);
+        count = spaceNeeded;
+        return this;
+    }
+
+    /**
+     * Appends the string representation of the {@code float}
+     * argument to this sequence.
+     * <p>
+     * The overall effect is exactly as if the argument were converted
+     * to a string by the method {@link String#valueOf(float)},
+     * and the characters of that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   f   a {@code float}.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(float f) {
+        return append(Float.toString(f));
+    }
+
+    /**
+     * Appends the string representation of the {@code double}
+     * argument to this sequence.
+     * <p>
+     * The overall effect is exactly as if the argument were converted
+     * to a string by the method {@link String#valueOf(double)},
+     * and the characters of that string were then
+     * {@link #append(String) appended} to this character sequence.
+     *
+     * @param   d   a {@code double}.
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder append(double d) {
+        return append(Double.toString(d));
+    }
+
+    /**
+     * Removes the characters in a substring of this sequence.
+     * The substring begins at the specified {@code start} and extends to
+     * the character at index {@code end - 1} or to the end of the
+     * sequence if no such character exists. If
+     * {@code start} is equal to {@code end}, no changes are made.
+     *
+     * @param      start  The beginning index, inclusive.
+     * @param      end    The ending index, exclusive.
+     * @return     This object.
+     * @throws     StringIndexOutOfBoundsException  if {@code start}
+     *             is negative, greater than {@code length()}, or
+     *             greater than {@code end}.
+     */
+    public AbstractStringBuilder delete(int start, int end) {
+        if (start < 0)
+            throw new StringIndexOutOfBoundsException(start);
+        if (end > count)
+            end = count;
+        if (start > end)
+            throw new StringIndexOutOfBoundsException();
+        int len = end - start;
+        if (len > 0) {
+            System.arraycopy(value, start+len, value, start, count-end);
+            count -= len;
+        }
+        return this;
+    }
+
+    /**
+     * Appends the string representation of the {@code codePoint}
+     * argument to this sequence.
+     *
+     * <p> The argument is appended to the contents of this sequence.
+     * The length of this sequence increases by
+     * {@link Character#charCount(int) Character.charCount(codePoint)}.
+     *
+     * <p> The overall effect is exactly as if the argument were
+     * converted to a {@code char} array by the method
+     * {@link Character#toChars(int)} and the character in that array
+     * were then {@link #append(char[]) appended} to this character
+     * sequence.
+     *
+     * @param   codePoint   a Unicode code point
+     * @return  a reference to this object.
+     * @exception IllegalArgumentException if the specified
+     * {@code codePoint} isn't a valid Unicode code point
+     */
+    public AbstractStringBuilder appendCodePoint(int codePoint) {
+        final int count = this.count;
+
+        if (Character.isBmpCodePoint(codePoint)) {
+            ensureCapacityInternal(count + 1);
+            value[count] = (char) codePoint;
+            this.count = count + 1;
+        } else if (Character.isValidCodePoint(codePoint)) {
+            ensureCapacityInternal(count + 2);
+            Character.toSurrogates(codePoint, value, count);
+            this.count = count + 2;
+        } else {
+            throw new IllegalArgumentException();
+        }
+        return this;
+    }
+
+    /**
+     * Removes the <code>char</code> at the specified position in this
+     * sequence. This sequence is shortened by one <code>char</code>.
+     *
+     * <p>Note: If the character at the given index is a supplementary
+     * character, this method does not remove the entire character. If
+     * correct handling of supplementary characters is required,
+     * determine the number of <code>char</code>s to remove by calling
+     * <code>Character.charCount(thisSequence.codePointAt(index))</code>,
+     * where <code>thisSequence</code> is this sequence.
+     *
+     * @param       index  Index of <code>char</code> to remove
+     * @return      This object.
+     * @throws      StringIndexOutOfBoundsException  if the <code>index</code>
+     *              is negative or greater than or equal to
+     *              <code>length()</code>.
+     */
+    public AbstractStringBuilder deleteCharAt(int index) {
+        if ((index < 0) || (index >= count))
+            throw new StringIndexOutOfBoundsException(index);
+        System.arraycopy(value, index+1, value, index, count-index-1);
+        count--;
+        return this;
+    }
+
+    /**
+     * Replaces the characters in a substring of this sequence
+     * with characters in the specified <code>String</code>. The substring
+     * begins at the specified <code>start</code> and extends to the character
+     * at index <code>end - 1</code> or to the end of the
+     * sequence if no such character exists. First the
+     * characters in the substring are removed and then the specified
+     * <code>String</code> is inserted at <code>start</code>. (This
+     * sequence will be lengthened to accommodate the
+     * specified String if necessary.)
+     *
+     * @param      start    The beginning index, inclusive.
+     * @param      end      The ending index, exclusive.
+     * @param      str   String that will replace previous contents.
+     * @return     This object.
+     * @throws     StringIndexOutOfBoundsException  if <code>start</code>
+     *             is negative, greater than <code>length()</code>, or
+     *             greater than <code>end</code>.
+     */
+    public AbstractStringBuilder replace(int start, int end, String str) {
+        if (start < 0)
+            throw new StringIndexOutOfBoundsException(start);
+        if (start > count)
+            throw new StringIndexOutOfBoundsException("start > length()");
+        if (start > end)
+            throw new StringIndexOutOfBoundsException("start > end");
+
+        if (end > count)
+            end = count;
+        int len = str.length();
+        int newCount = count + len - (end - start);
+        ensureCapacityInternal(newCount);
+
+        System.arraycopy(value, end, value, start + len, count - end);
+        str.getChars(value, start);
+        count = newCount;
+        return this;
+    }
+
+    /**
+     * Returns a new <code>String</code> that contains a subsequence of
+     * characters currently contained in this character sequence. The
+     * substring begins at the specified index and extends to the end of
+     * this sequence.
+     *
+     * @param      start    The beginning index, inclusive.
+     * @return     The new string.
+     * @throws     StringIndexOutOfBoundsException  if <code>start</code> is
+     *             less than zero, or greater than the length of this object.
+     */
+    public String substring(int start) {
+        return substring(start, count);
+    }
+
+    /**
+     * Returns a new character sequence that is a subsequence of this sequence.
+     *
+     * <p> An invocation of this method of the form
+     *
+     * <blockquote><pre>
+     * sb.subSequence(begin,&nbsp;end)</pre></blockquote>
+     *
+     * behaves in exactly the same way as the invocation
+     *
+     * <blockquote><pre>
+     * sb.substring(begin,&nbsp;end)</pre></blockquote>
+     *
+     * This method is provided so that this class can
+     * implement the {@link CharSequence} interface. </p>
+     *
+     * @param      start   the start index, inclusive.
+     * @param      end     the end index, exclusive.
+     * @return     the specified subsequence.
+     *
+     * @throws  IndexOutOfBoundsException
+     *          if <tt>start</tt> or <tt>end</tt> are negative,
+     *          if <tt>end</tt> is greater than <tt>length()</tt>,
+     *          or if <tt>start</tt> is greater than <tt>end</tt>
+     * @spec JSR-51
+     */
+    public CharSequence subSequence(int start, int end) {
+        return substring(start, end);
+    }
+
+    /**
+     * Returns a new <code>String</code> that contains a subsequence of
+     * characters currently contained in this sequence. The
+     * substring begins at the specified <code>start</code> and
+     * extends to the character at index <code>end - 1</code>.
+     *
+     * @param      start    The beginning index, inclusive.
+     * @param      end      The ending index, exclusive.
+     * @return     The new string.
+     * @throws     StringIndexOutOfBoundsException  if <code>start</code>
+     *             or <code>end</code> are negative or greater than
+     *             <code>length()</code>, or <code>start</code> is
+     *             greater than <code>end</code>.
+     */
+    public String substring(int start, int end) {
+        if (start < 0)
+            throw new StringIndexOutOfBoundsException(start);
+        if (end > count)
+            throw new StringIndexOutOfBoundsException(end);
+        if (start > end)
+            throw new StringIndexOutOfBoundsException(end - start);
+        return new String(value, start, end - start);
+    }
+
+    /**
+     * Inserts the string representation of a subarray of the {@code str}
+     * array argument into this sequence. The subarray begins at the
+     * specified {@code offset} and extends {@code len} {@code char}s.
+     * The characters of the subarray are inserted into this sequence at
+     * the position indicated by {@code index}. The length of this
+     * sequence increases by {@code len} {@code char}s.
+     *
+     * @param      index    position at which to insert subarray.
+     * @param      str       A {@code char} array.
+     * @param      offset   the index of the first {@code char} in subarray to
+     *             be inserted.
+     * @param      len      the number of {@code char}s in the subarray to
+     *             be inserted.
+     * @return     This object
+     * @throws     StringIndexOutOfBoundsException  if {@code index}
+     *             is negative or greater than {@code length()}, or
+     *             {@code offset} or {@code len} are negative, or
+     *             {@code (offset+len)} is greater than
+     *             {@code str.length}.
+     */
+    public AbstractStringBuilder insert(int index, char[] str, int offset,
+                                        int len)
+    {
+        if ((index < 0) || (index > length()))
+            throw new StringIndexOutOfBoundsException(index);
+        if ((offset < 0) || (len < 0) || (offset > str.length - len))
+            throw new StringIndexOutOfBoundsException(
+                "offset " + offset + ", len " + len + ", str.length "
+                + str.length);
+        ensureCapacityInternal(count + len);
+        System.arraycopy(value, index, value, index + len, count - index);
+        System.arraycopy(str, offset, value, index, len);
+        count += len;
+        return this;
+    }
+
+    /**
+     * Inserts the string representation of the {@code Object}
+     * argument into this character sequence.
+     * <p>
+     * The overall effect is exactly as if the second argument were
+     * converted to a string by the method {@link String#valueOf(Object)},
+     * and the characters of that string were then
+     * {@link #insert(int,String) inserted} into this character
+     * sequence at the indicated offset.
+     * <p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      obj      an {@code Object}.
+     * @return     a reference to this object.
+     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, Object obj) {
+        return insert(offset, String.valueOf(obj));
+    }
+
+    /**
+     * Inserts the string into this character sequence.
+     * <p>
+     * The characters of the {@code String} argument are inserted, in
+     * order, into this sequence at the indicated offset, moving up any
+     * characters originally above that position and increasing the length
+     * of this sequence by the length of the argument. If
+     * {@code str} is {@code null}, then the four characters
+     * {@code "null"} are inserted into this sequence.
+     * <p>
+     * The character at index <i>k</i> in the new character sequence is
+     * equal to:
+     * <ul>
+     * <li>the character at index <i>k</i> in the old character sequence, if
+     * <i>k</i> is less than {@code offset}
+     * <li>the character at index <i>k</i>{@code -offset} in the
+     * argument {@code str}, if <i>k</i> is not less than
+     * {@code offset} but is less than {@code offset+str.length()}
+     * <li>the character at index <i>k</i>{@code -str.length()} in the
+     * old character sequence, if <i>k</i> is not less than
+     * {@code offset+str.length()}
+     * </ul><p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      str      a string.
+     * @return     a reference to this object.
+     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, String str) {
+        if ((offset < 0) || (offset > length()))
+            throw new StringIndexOutOfBoundsException(offset);
+        if (str == null)
+            str = "null";
+        int len = str.length();
+        ensureCapacityInternal(count + len);
+        System.arraycopy(value, offset, value, offset + len, count - offset);
+        str.getChars(value, offset);
+        count += len;
+        return this;
+    }
+
+    /**
+     * Inserts the string representation of the {@code char} array
+     * argument into this sequence.
+     * <p>
+     * The characters of the array argument are inserted into the
+     * contents of this sequence at the position indicated by
+     * {@code offset}. The length of this sequence increases by
+     * the length of the argument.
+     * <p>
+     * The overall effect is exactly as if the second argument were
+     * converted to a string by the method {@link String#valueOf(char[])},
+     * and the characters of that string were then
+     * {@link #insert(int,String) inserted} into this character
+     * sequence at the indicated offset.
+     * <p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      str      a character array.
+     * @return     a reference to this object.
+     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, char[] str) {
+        if ((offset < 0) || (offset > length()))
+            throw new StringIndexOutOfBoundsException(offset);
+        int len = str.length;
+        ensureCapacityInternal(count + len);
+        System.arraycopy(value, offset, value, offset + len, count - offset);
+        System.arraycopy(str, 0, value, offset, len);
+        count += len;
+        return this;
+    }
+
+    /**
+     * Inserts the specified {@code CharSequence} into this sequence.
+     * <p>
+     * The characters of the {@code CharSequence} argument are inserted,
+     * in order, into this sequence at the indicated offset, moving up
+     * any characters originally above that position and increasing the length
+     * of this sequence by the length of the argument s.
+     * <p>
+     * The result of this method is exactly the same as if it were an
+     * invocation of this object's
+     * {@link #insert(int,CharSequence,int,int) insert}(dstOffset, s, 0, s.length())
+     * method.
+     *
+     * <p>If {@code s} is {@code null}, then the four characters
+     * {@code "null"} are inserted into this sequence.
+     *
+     * @param      dstOffset   the offset.
+     * @param      s the sequence to be inserted
+     * @return     a reference to this object.
+     * @throws     IndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int dstOffset, CharSequence s) {
+        if (s == null)
+            s = "null";
+        if (s instanceof String)
+            return this.insert(dstOffset, (String)s);
+        return this.insert(dstOffset, s, 0, s.length());
+    }
+
+    /**
+     * Inserts a subsequence of the specified {@code CharSequence} into
+     * this sequence.
+     * <p>
+     * The subsequence of the argument {@code s} specified by
+     * {@code start} and {@code end} are inserted,
+     * in order, into this sequence at the specified destination offset, moving
+     * up any characters originally above that position. The length of this
+     * sequence is increased by {@code end - start}.
+     * <p>
+     * The character at index <i>k</i> in this sequence becomes equal to:
+     * <ul>
+     * <li>the character at index <i>k</i> in this sequence, if
+     * <i>k</i> is less than {@code dstOffset}
+     * <li>the character at index <i>k</i>{@code +start-dstOffset} in
+     * the argument {@code s}, if <i>k</i> is greater than or equal to
+     * {@code dstOffset} but is less than {@code dstOffset+end-start}
+     * <li>the character at index <i>k</i>{@code -(end-start)} in this
+     * sequence, if <i>k</i> is greater than or equal to
+     * {@code dstOffset+end-start}
+     * </ul><p>
+     * The {@code dstOffset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     * <p>The start argument must be nonnegative, and not greater than
+     * {@code end}.
+     * <p>The end argument must be greater than or equal to
+     * {@code start}, and less than or equal to the length of s.
+     *
+     * <p>If {@code s} is {@code null}, then this method inserts
+     * characters as if the s parameter was a sequence containing the four
+     * characters {@code "null"}.
+     *
+     * @param      dstOffset   the offset in this sequence.
+     * @param      s       the sequence to be inserted.
+     * @param      start   the starting index of the subsequence to be inserted.
+     * @param      end     the end index of the subsequence to be inserted.
+     * @return     a reference to this object.
+     * @throws     IndexOutOfBoundsException  if {@code dstOffset}
+     *             is negative or greater than {@code this.length()}, or
+     *              {@code start} or {@code end} are negative, or
+     *              {@code start} is greater than {@code end} or
+     *              {@code end} is greater than {@code s.length()}
+     */
+     public AbstractStringBuilder insert(int dstOffset, CharSequence s,
+                                         int start, int end) {
+        if (s == null)
+            s = "null";
+        if ((dstOffset < 0) || (dstOffset > this.length()))
+            throw new IndexOutOfBoundsException("dstOffset "+dstOffset);
+        if ((start < 0) || (end < 0) || (start > end) || (end > s.length()))
+            throw new IndexOutOfBoundsException(
+                "start " + start + ", end " + end + ", s.length() "
+                + s.length());
+        int len = end - start;
+        ensureCapacityInternal(count + len);
+        System.arraycopy(value, dstOffset, value, dstOffset + len,
+                         count - dstOffset);
+        for (int i=start; i<end; i++)
+            value[dstOffset++] = s.charAt(i);
+        count += len;
+        return this;
+    }
+
+    /**
+     * Inserts the string representation of the {@code boolean}
+     * argument into this sequence.
+     * <p>
+     * The overall effect is exactly as if the second argument were
+     * converted to a string by the method {@link String#valueOf(boolean)},
+     * and the characters of that string were then
+     * {@link #insert(int,String) inserted} into this character
+     * sequence at the indicated offset.
+     * <p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      b        a {@code boolean}.
+     * @return     a reference to this object.
+     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, boolean b) {
+        return insert(offset, String.valueOf(b));
+    }
+
+    /**
+     * Inserts the string representation of the {@code char}
+     * argument into this sequence.
+     * <p>
+     * The overall effect is exactly as if the second argument were
+     * converted to a string by the method {@link String#valueOf(char)},
+     * and the character in that string were then
+     * {@link #insert(int,String) inserted} into this character
+     * sequence at the indicated offset.
+     * <p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      c        a {@code char}.
+     * @return     a reference to this object.
+     * @throws     IndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, char c) {
+        ensureCapacityInternal(count + 1);
+        System.arraycopy(value, offset, value, offset + 1, count - offset);
+        value[offset] = c;
+        count += 1;
+        return this;
+    }
+
+    /**
+     * Inserts the string representation of the second {@code int}
+     * argument into this sequence.
+     * <p>
+     * The overall effect is exactly as if the second argument were
+     * converted to a string by the method {@link String#valueOf(int)},
+     * and the characters of that string were then
+     * {@link #insert(int,String) inserted} into this character
+     * sequence at the indicated offset.
+     * <p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      i        an {@code int}.
+     * @return     a reference to this object.
+     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, int i) {
+        return insert(offset, String.valueOf(i));
+    }
+
+    /**
+     * Inserts the string representation of the {@code long}
+     * argument into this sequence.
+     * <p>
+     * The overall effect is exactly as if the second argument were
+     * converted to a string by the method {@link String#valueOf(long)},
+     * and the characters of that string were then
+     * {@link #insert(int,String) inserted} into this character
+     * sequence at the indicated offset.
+     * <p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      l        a {@code long}.
+     * @return     a reference to this object.
+     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, long l) {
+        return insert(offset, String.valueOf(l));
+    }
+
+    /**
+     * Inserts the string representation of the {@code float}
+     * argument into this sequence.
+     * <p>
+     * The overall effect is exactly as if the second argument were
+     * converted to a string by the method {@link String#valueOf(float)},
+     * and the characters of that string were then
+     * {@link #insert(int,String) inserted} into this character
+     * sequence at the indicated offset.
+     * <p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      f        a {@code float}.
+     * @return     a reference to this object.
+     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, float f) {
+        return insert(offset, String.valueOf(f));
+    }
+
+    /**
+     * Inserts the string representation of the {@code double}
+     * argument into this sequence.
+     * <p>
+     * The overall effect is exactly as if the second argument were
+     * converted to a string by the method {@link String#valueOf(double)},
+     * and the characters of that string were then
+     * {@link #insert(int,String) inserted} into this character
+     * sequence at the indicated offset.
+     * <p>
+     * The {@code offset} argument must be greater than or equal to
+     * {@code 0}, and less than or equal to the {@linkplain #length() length}
+     * of this sequence.
+     *
+     * @param      offset   the offset.
+     * @param      d        a {@code double}.
+     * @return     a reference to this object.
+     * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
+     */
+    public AbstractStringBuilder insert(int offset, double d) {
+        return insert(offset, String.valueOf(d));
+    }
+
+    /**
+     * Returns the index within this string of the first occurrence of the
+     * specified substring. The integer returned is the smallest value
+     * <i>k</i> such that:
+     * <blockquote><pre>
+     * this.toString().startsWith(str, <i>k</i>)
+     * </pre></blockquote>
+     * is <code>true</code>.
+     *
+     * @param   str   any string.
+     * @return  if the string argument occurs as a substring within this
+     *          object, then the index of the first character of the first
+     *          such substring is returned; if it does not occur as a
+     *          substring, <code>-1</code> is returned.
+     * @throws  java.lang.NullPointerException if <code>str</code> is
+     *          <code>null</code>.
+     */
+    public int indexOf(String str) {
+        return indexOf(str, 0);
+    }
+
+    /**
+     * Returns the index within this string of the first occurrence of the
+     * specified substring, starting at the specified index.  The integer
+     * returned is the smallest value <tt>k</tt> for which:
+     * <blockquote><pre>
+     *     k >= Math.min(fromIndex, str.length()) &&
+     *                   this.toString().startsWith(str, k)
+     * </pre></blockquote>
+     * If no such value of <i>k</i> exists, then -1 is returned.
+     *
+     * @param   str         the substring for which to search.
+     * @param   fromIndex   the index from which to start the search.
+     * @return  the index within this string of the first occurrence of the
+     *          specified substring, starting at the specified index.
+     * @throws  java.lang.NullPointerException if <code>str</code> is
+     *            <code>null</code>.
+     */
+    public int indexOf(String str, int fromIndex) {
+        return toString().indexOf(str, fromIndex);
+    }
+
+    /**
+     * Returns the index within this string of the rightmost occurrence
+     * of the specified substring.  The rightmost empty string "" is
+     * considered to occur at the index value <code>this.length()</code>.
+     * The returned index is the largest value <i>k</i> such that
+     * <blockquote><pre>
+     * this.toString().startsWith(str, k)
+     * </pre></blockquote>
+     * is true.
+     *
+     * @param   str   the substring to search for.
+     * @return  if the string argument occurs one or more times as a substring
+     *          within this object, then the index of the first character of
+     *          the last such substring is returned. If it does not occur as
+     *          a substring, <code>-1</code> is returned.
+     * @throws  java.lang.NullPointerException  if <code>str</code> is
+     *          <code>null</code>.
+     */
+    public int lastIndexOf(String str) {
+        return lastIndexOf(str, count);
+    }
+
+    /**
+     * Returns the index within this string of the last occurrence of the
+     * specified substring. The integer returned is the largest value <i>k</i>
+     * such that:
+     * <blockquote><pre>
+     *     k <= Math.min(fromIndex, str.length()) &&
+     *                   this.toString().startsWith(str, k)
+     * </pre></blockquote>
+     * If no such value of <i>k</i> exists, then -1 is returned.
+     *
+     * @param   str         the substring to search for.
+     * @param   fromIndex   the index to start the search from.
+     * @return  the index within this sequence of the last occurrence of the
+     *          specified substring.
+     * @throws  java.lang.NullPointerException if <code>str</code> is
+     *          <code>null</code>.
+     */
+    public int lastIndexOf(String str, int fromIndex) {
+        return String.lastIndexOf(value, 0, count,
+                              str.toCharArray(), 0, str.length(), fromIndex);
+    }
+
+    /**
+     * Causes this character sequence to be replaced by the reverse of
+     * the sequence. If there are any surrogate pairs included in the
+     * sequence, these are treated as single characters for the
+     * reverse operation. Thus, the order of the high-low surrogates
+     * is never reversed.
+     *
+     * Let <i>n</i> be the character length of this character sequence
+     * (not the length in <code>char</code> values) just prior to
+     * execution of the <code>reverse</code> method. Then the
+     * character at index <i>k</i> in the new character sequence is
+     * equal to the character at index <i>n-k-1</i> in the old
+     * character sequence.
+     *
+     * <p>Note that the reverse operation may result in producing
+     * surrogate pairs that were unpaired low-surrogates and
+     * high-surrogates before the operation. For example, reversing
+     * "&#92;uDC00&#92;uD800" produces "&#92;uD800&#92;uDC00" which is
+     * a valid surrogate pair.
+     *
+     * @return  a reference to this object.
+     */
+    public AbstractStringBuilder reverse() {
+        boolean hasSurrogate = false;
+        int n = count - 1;
+        for (int j = (n-1) >> 1; j >= 0; --j) {
+            char temp = value[j];
+            char temp2 = value[n - j];
+            if (!hasSurrogate) {
+                hasSurrogate = (temp >= Character.MIN_SURROGATE && temp <= Character.MAX_SURROGATE)
+                    || (temp2 >= Character.MIN_SURROGATE && temp2 <= Character.MAX_SURROGATE);
+            }
+            value[j] = temp2;
+            value[n - j] = temp;
+        }
+        if (hasSurrogate) {
+            // Reverse back all valid surrogate pairs
+            for (int i = 0; i < count - 1; i++) {
+                char c2 = value[i];
+                if (Character.isLowSurrogate(c2)) {
+                    char c1 = value[i + 1];
+                    if (Character.isHighSurrogate(c1)) {
+                        value[i++] = c1;
+                        value[i] = c2;
+                    }
+                }
+            }
+        }
+        return this;
+    }
+
+    /**
+     * Returns a string representing the data in this sequence.
+     * A new <code>String</code> object is allocated and initialized to
+     * contain the character sequence currently represented by this
+     * object. This <code>String</code> is then returned. Subsequent
+     * changes to this sequence do not affect the contents of the
+     * <code>String</code>.
+     *
+     * @return  a string representation of this sequence of characters.
+     */
+    public abstract String toString();
+
+    /**
+     * Needed by <tt>String</tt> for the contentEquals method.
+     */
+    final char[] getValue() {
+        return value;
+    }
+
+    static char[] copyOfRange(char[] original, int from, int to) {
+        int newLength = to - from;
+        if (newLength < 0) {
+            throw new IllegalArgumentException(from + " > " + to);
+        }
+        char[] copy = new char[newLength];
+        System.arraycopy(original, from, copy, 0, Math.min(original.length - from, newLength));
+        return copy;
+    }
+
+    // access system property
+    static String getProperty(String nm) {
+        return null;
+    }
+
+    static char[] copyOf(char[] original, int newLength) {
+        char[] copy = new char[newLength];
+        System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+        return copy;
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Appendable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Appendable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.io.IOException;
+
+/**
+ * An object to which <tt>char</tt> sequences and values can be appended.  The
+ * <tt>Appendable</tt> interface must be implemented by any class whose
+ * instances are intended to receive formatted output from a {@link
+ * java.util.Formatter}.
+ *
+ * <p> The characters to be appended should be valid Unicode characters as
+ * described in <a href="Character.html#unicode">Unicode Character
+ * Representation</a>.  Note that supplementary characters may be composed of
+ * multiple 16-bit <tt>char</tt> values.
+ *
+ * <p> Appendables are not necessarily safe for multithreaded access.  Thread
+ * safety is the responsibility of classes that extend and implement this
+ * interface.
+ *
+ * <p> Since this interface may be implemented by existing classes
+ * with different styles of error handling there is no guarantee that
+ * errors will be propagated to the invoker.
+ *
+ * @since 1.5
+ */
+public interface Appendable {
+
+    /**
+     * Appends the specified character sequence to this <tt>Appendable</tt>.
+     *
+     * <p> Depending on which class implements the character sequence
+     * <tt>csq</tt>, the entire sequence may not be appended.  For
+     * instance, if <tt>csq</tt> is a {@link java.nio.CharBuffer} then
+     * the subsequence to append is defined by the buffer's position and limit.
+     *
+     * @param  csq
+     *         The character sequence to append.  If <tt>csq</tt> is
+     *         <tt>null</tt>, then the four characters <tt>"null"</tt> are
+     *         appended to this Appendable.
+     *
+     * @return  A reference to this <tt>Appendable</tt>
+     *
+     * @throws  IOException
+     *          If an I/O error occurs
+     */
+    Appendable append(CharSequence csq) throws IOException;
+
+    /**
+     * Appends a subsequence of the specified character sequence to this
+     * <tt>Appendable</tt>.
+     *
+     * <p> An invocation of this method of the form <tt>out.append(csq, start,
+     * end)</tt> when <tt>csq</tt> is not <tt>null</tt>, behaves in
+     * exactly the same way as the invocation
+     *
+     * <pre>
+     *     out.append(csq.subSequence(start, end)) </pre>
+     *
+     * @param  csq
+     *         The character sequence from which a subsequence will be
+     *         appended.  If <tt>csq</tt> is <tt>null</tt>, then characters
+     *         will be appended as if <tt>csq</tt> contained the four
+     *         characters <tt>"null"</tt>.
+     *
+     * @param  start
+     *         The index of the first character in the subsequence
+     *
+     * @param  end
+     *         The index of the character following the last character in the
+     *         subsequence
+     *
+     * @return  A reference to this <tt>Appendable</tt>
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If <tt>start</tt> or <tt>end</tt> are negative, <tt>start</tt>
+     *          is greater than <tt>end</tt>, or <tt>end</tt> is greater than
+     *          <tt>csq.length()</tt>
+     *
+     * @throws  IOException
+     *          If an I/O error occurs
+     */
+    Appendable append(CharSequence csq, int start, int end) throws IOException;
+
+    /**
+     * Appends the specified character to this <tt>Appendable</tt>.
+     *
+     * @param  c
+     *         The character to append
+     *
+     * @return  A reference to this <tt>Appendable</tt>
+     *
+     * @throws  IOException
+     *          If an I/O error occurs
+     */
+    Appendable append(char c) throws IOException;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that an array has been accessed with an
+ * illegal index. The index is either negative or greater than or
+ * equal to the size of the array.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class ArrayIndexOutOfBoundsException extends IndexOutOfBoundsException {
+    private static final long serialVersionUID = -5116101128118950844L;
+
+    /**
+     * Constructs an <code>ArrayIndexOutOfBoundsException</code> with no
+     * detail message.
+     */
+    public ArrayIndexOutOfBoundsException() {
+        super();
+    }
+
+    /**
+     * Constructs a new <code>ArrayIndexOutOfBoundsException</code>
+     * class with an argument indicating the illegal index.
+     *
+     * @param   index   the illegal index.
+     */
+    public ArrayIndexOutOfBoundsException(int index) {
+        super("Array index out of range: " + index);
+    }
+
+    /**
+     * Constructs an <code>ArrayIndexOutOfBoundsException</code> class
+     * with the specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public ArrayIndexOutOfBoundsException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/ArrayStoreException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/ArrayStoreException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that an attempt has been made to store the
+ * wrong type of object into an array of objects. For example, the
+ * following code generates an <code>ArrayStoreException</code>:
+ * <p><blockquote><pre>
+ *     Object x[] = new String[3];
+ *     x[0] = new Integer(0);
+ * </pre></blockquote>
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class ArrayStoreException extends RuntimeException {
+    private static final long serialVersionUID = -4522193890499838241L;
+
+    /**
+     * Constructs an <code>ArrayStoreException</code> with no detail message.
+     */
+    public ArrayStoreException() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>ArrayStoreException</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public ArrayStoreException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/AssertionError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/AssertionError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that an assertion has failed.
+ *
+ * <p>The seven one-argument public constructors provided by this
+ * class ensure that the assertion error returned by the invocation:
+ * <pre>
+ *     new AssertionError(<i>expression</i>)
+ * </pre>
+ * has as its detail message the <i>string conversion</i> of
+ * <i>expression</i> (as defined in section 15.18.1.1 of
+ * <cite>The Java&trade; Language Specification</cite>),
+ * regardless of the type of <i>expression</i>.
+ *
+ * @since   1.4
+ */
+public class AssertionError extends Error {
+    private static final long serialVersionUID = -5013299493970297370L;
+
+    /**
+     * Constructs an AssertionError with no detail message.
+     */
+    public AssertionError() {
+    }
+
+    /**
+     * This internal constructor does no processing on its string argument,
+     * even if it is a null reference.  The public constructors will
+     * never call this constructor with a null argument.
+     */
+    private AssertionError(String detailMessage) {
+        super(detailMessage);
+    }
+
+    /**
+     * Constructs an AssertionError with its detail message derived
+     * from the specified object, which is converted to a string as
+     * defined in section 15.18.1.1 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     *<p>
+     * If the specified object is an instance of {@code Throwable}, it
+     * becomes the <i>cause</i> of the newly constructed assertion error.
+     *
+     * @param detailMessage value to be used in constructing detail message
+     * @see   Throwable#getCause()
+     */
+    public AssertionError(Object detailMessage) {
+        this("" +  detailMessage);
+        if (detailMessage instanceof Throwable)
+            initCause((Throwable) detailMessage);
+    }
+
+    /**
+     * Constructs an AssertionError with its detail message derived
+     * from the specified <code>boolean</code>, which is converted to
+     * a string as defined in section 15.18.1.1 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * @param detailMessage value to be used in constructing detail message
+     */
+    public AssertionError(boolean detailMessage) {
+        this("" +  detailMessage);
+    }
+
+    /**
+     * Constructs an AssertionError with its detail message derived
+     * from the specified <code>char</code>, which is converted to a
+     * string as defined in section 15.18.1.1 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * @param detailMessage value to be used in constructing detail message
+     */
+    public AssertionError(char detailMessage) {
+        this("" +  detailMessage);
+    }
+
+    /**
+     * Constructs an AssertionError with its detail message derived
+     * from the specified <code>int</code>, which is converted to a
+     * string as defined in section 15.18.1.1 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * @param detailMessage value to be used in constructing detail message
+     */
+    public AssertionError(int detailMessage) {
+        this("" +  detailMessage);
+    }
+
+    /**
+     * Constructs an AssertionError with its detail message derived
+     * from the specified <code>long</code>, which is converted to a
+     * string as defined in section 15.18.1.1 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * @param detailMessage value to be used in constructing detail message
+     */
+    public AssertionError(long detailMessage) {
+        this("" +  detailMessage);
+    }
+
+    /**
+     * Constructs an AssertionError with its detail message derived
+     * from the specified <code>float</code>, which is converted to a
+     * string as defined in section 15.18.1.1 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * @param detailMessage value to be used in constructing detail message
+     */
+    public AssertionError(float detailMessage) {
+        this("" +  detailMessage);
+    }
+
+    /**
+     * Constructs an AssertionError with its detail message derived
+     * from the specified <code>double</code>, which is converted to a
+     * string as defined in section 15.18.1.1 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * @param detailMessage value to be used in constructing detail message
+     */
+    public AssertionError(double detailMessage) {
+        this("" +  detailMessage);
+    }
+
+    /**
+     * Constructs a new {@code AssertionError} with the specified
+     * detail message and cause.
+     *
+     * <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this error's detail message.
+     *
+     * @param  message the detail message, may be {@code null}
+     * @param  cause the cause, may be {@code null}
+     *
+     * @since 1.7
+     */
+    public AssertionError(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/AutoCloseable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/AutoCloseable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * A resource that must be closed when it is no longer needed.
+ *
+ * @author Josh Bloch
+ * @since 1.7
+ */
+public interface AutoCloseable {
+    /**
+     * Closes this resource, relinquishing any underlying resources.
+     * This method is invoked automatically on objects managed by the
+     * {@code try}-with-resources statement.
+     *
+     * <p>While this interface method is declared to throw {@code
+     * Exception}, implementers are <em>strongly</em> encouraged to
+     * declare concrete implementations of the {@code close} method to
+     * throw more specific exceptions, or to throw no exception at all
+     * if the close operation cannot fail.
+     *
+     * <p><em>Implementers of this interface are also strongly advised
+     * to not have the {@code close} method throw {@link
+     * InterruptedException}.</em>
+     *
+     * This exception interacts with a thread's interrupted status,
+     * and runtime misbehavior is likely to occur if an {@code
+     * InterruptedException} is {@linkplain Throwable#addSuppressed
+     * suppressed}.
+     *
+     * More generally, if it would cause problems for an
+     * exception to be suppressed, the {@code AutoCloseable.close}
+     * method should not throw it.
+     *
+     * <p>Note that unlike the {@link java.io.Closeable#close close}
+     * method of {@link java.io.Closeable}, this {@code close} method
+     * is <em>not</em> required to be idempotent.  In other words,
+     * calling this {@code close} method more than once may have some
+     * visible side effect, unlike {@code Closeable.close} which is
+     * required to have no effect if called more than once.
+     *
+     * However, implementers of this interface are strongly encouraged
+     * to make their {@code close} methods idempotent.
+     *
+     * @throws Exception if this resource cannot be closed
+     */
+    void close() throws Exception;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Boolean.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Boolean.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ * The Boolean class wraps a value of the primitive type
+ * {@code boolean} in an object. An object of type
+ * {@code Boolean} contains a single field whose type is
+ * {@code boolean}.
+ * <p>
+ * In addition, this class provides many methods for
+ * converting a {@code boolean} to a {@code String} and a
+ * {@code String} to a {@code boolean}, as well as other
+ * constants and methods useful when dealing with a
+ * {@code boolean}.
+ *
+ * @author  Arthur van Hoff
+ * @since   JDK1.0
+ */
+public final class Boolean implements java.io.Serializable,
+                                      Comparable<Boolean>
+{
+    /**
+     * The {@code Boolean} object corresponding to the primitive
+     * value {@code true}.
+     */
+    public static final Boolean TRUE = new Boolean(true);
+
+    /**
+     * The {@code Boolean} object corresponding to the primitive
+     * value {@code false}.
+     */
+    public static final Boolean FALSE = new Boolean(false);
+
+    /**
+     * The Class object representing the primitive type boolean.
+     *
+     * @since   JDK1.1
+     */
+    public static final Class<Boolean> TYPE = Class.getPrimitiveClass("boolean");
+
+    /**
+     * The value of the Boolean.
+     *
+     * @serial
+     */
+    private final boolean value;
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = -3665804199014368530L;
+
+    /**
+     * Allocates a {@code Boolean} object representing the
+     * {@code value} argument.
+     *
+     * <p><b>Note: It is rarely appropriate to use this constructor.
+     * Unless a <i>new</i> instance is required, the static factory
+     * {@link #valueOf(boolean)} is generally a better choice. It is
+     * likely to yield significantly better space and time performance.</b>
+     *
+     * @param   value   the value of the {@code Boolean}.
+     */
+    public Boolean(boolean value) {
+        this.value = value;
+    }
+
+    /**
+     * Allocates a {@code Boolean} object representing the value
+     * {@code true} if the string argument is not {@code null}
+     * and is equal, ignoring case, to the string {@code "true"}.
+     * Otherwise, allocate a {@code Boolean} object representing the
+     * value {@code false}. Examples:<p>
+     * {@code new Boolean("True")} produces a {@code Boolean} object
+     * that represents {@code true}.<br>
+     * {@code new Boolean("yes")} produces a {@code Boolean} object
+     * that represents {@code false}.
+     *
+     * @param   s   the string to be converted to a {@code Boolean}.
+     */
+    public Boolean(String s) {
+        this(toBoolean(s));
+    }
+
+    /**
+     * Parses the string argument as a boolean.  The {@code boolean}
+     * returned represents the value {@code true} if the string argument
+     * is not {@code null} and is equal, ignoring case, to the string
+     * {@code "true"}. <p>
+     * Example: {@code Boolean.parseBoolean("True")} returns {@code true}.<br>
+     * Example: {@code Boolean.parseBoolean("yes")} returns {@code false}.
+     *
+     * @param      s   the {@code String} containing the boolean
+     *                 representation to be parsed
+     * @return     the boolean represented by the string argument
+     * @since 1.5
+     */
+    public static boolean parseBoolean(String s) {
+        return toBoolean(s);
+    }
+
+    /**
+     * Returns the value of this {@code Boolean} object as a boolean
+     * primitive.
+     *
+     * @return  the primitive {@code boolean} value of this object.
+     */
+    public boolean booleanValue() {
+        return value;
+    }
+
+    /**
+     * Returns a {@code Boolean} instance representing the specified
+     * {@code boolean} value.  If the specified {@code boolean} value
+     * is {@code true}, this method returns {@code Boolean.TRUE};
+     * if it is {@code false}, this method returns {@code Boolean.FALSE}.
+     * If a new {@code Boolean} instance is not required, this method
+     * should generally be used in preference to the constructor
+     * {@link #Boolean(boolean)}, as this method is likely to yield
+     * significantly better space and time performance.
+     *
+     * @param  b a boolean value.
+     * @return a {@code Boolean} instance representing {@code b}.
+     * @since  1.4
+     */
+    public static Boolean valueOf(boolean b) {
+        return (b ? TRUE : FALSE);
+    }
+
+    /**
+     * Returns a {@code Boolean} with a value represented by the
+     * specified string.  The {@code Boolean} returned represents a
+     * true value if the string argument is not {@code null}
+     * and is equal, ignoring case, to the string {@code "true"}.
+     *
+     * @param   s   a string.
+     * @return  the {@code Boolean} value represented by the string.
+     */
+    public static Boolean valueOf(String s) {
+        return toBoolean(s) ? TRUE : FALSE;
+    }
+
+    /**
+     * Returns a {@code String} object representing the specified
+     * boolean.  If the specified boolean is {@code true}, then
+     * the string {@code "true"} will be returned, otherwise the
+     * string {@code "false"} will be returned.
+     *
+     * @param b the boolean to be converted
+     * @return the string representation of the specified {@code boolean}
+     * @since 1.4
+     */
+    public static String toString(boolean b) {
+        return b ? "true" : "false";
+    }
+
+    /**
+     * Returns a {@code String} object representing this Boolean's
+     * value.  If this object represents the value {@code true},
+     * a string equal to {@code "true"} is returned. Otherwise, a
+     * string equal to {@code "false"} is returned.
+     *
+     * @return  a string representation of this object.
+     */
+    public String toString() {
+        return value ? "true" : "false";
+    }
+
+    /**
+     * Returns a hash code for this {@code Boolean} object.
+     *
+     * @return  the integer {@code 1231} if this object represents
+     * {@code true}; returns the integer {@code 1237} if this
+     * object represents {@code false}.
+     */
+    public int hashCode() {
+        return value ? 1231 : 1237;
+    }
+
+    /**
+     * Returns {@code true} if and only if the argument is not
+     * {@code null} and is a {@code Boolean} object that
+     * represents the same {@code boolean} value as this object.
+     *
+     * @param   obj   the object to compare with.
+     * @return  {@code true} if the Boolean objects represent the
+     *          same value; {@code false} otherwise.
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof Boolean) {
+            return value == ((Boolean)obj).booleanValue();
+        }
+        return false;
+    }
+
+    /**
+     * Returns {@code true} if and only if the system property
+     * named by the argument exists and is equal to the string
+     * {@code "true"}. (Beginning with version 1.0.2 of the
+     * Java<small><sup>TM</sup></small> platform, the test of
+     * this string is case insensitive.) A system property is accessible
+     * through {@code getProperty}, a method defined by the
+     * {@code System} class.
+     * <p>
+     * If there is no property with the specified name, or if the specified
+     * name is empty or null, then {@code false} is returned.
+     *
+     * @param   name   the system property name.
+     * @return  the {@code boolean} value of the system property.
+     * @see     java.lang.System#getProperty(java.lang.String)
+     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
+     */
+    public static boolean getBoolean(String name) {
+        boolean result = false;
+        try {
+            result = toBoolean(AbstractStringBuilder.getProperty(name));
+        } catch (IllegalArgumentException e) {
+        } catch (NullPointerException e) {
+        }
+        return result;
+    }
+
+    /**
+     * Compares this {@code Boolean} instance with another.
+     *
+     * @param   b the {@code Boolean} instance to be compared
+     * @return  zero if this object represents the same boolean value as the
+     *          argument; a positive value if this object represents true
+     *          and the argument represents false; and a negative value if
+     *          this object represents false and the argument represents true
+     * @throws  NullPointerException if the argument is {@code null}
+     * @see     Comparable
+     * @since  1.5
+     */
+    public int compareTo(Boolean b) {
+        return compare(this.value, b.value);
+    }
+
+    /**
+     * Compares two {@code boolean} values.
+     * The value returned is identical to what would be returned by:
+     * <pre>
+     *    Boolean.valueOf(x).compareTo(Boolean.valueOf(y))
+     * </pre>
+     *
+     * @param  x the first {@code boolean} to compare
+     * @param  y the second {@code boolean} to compare
+     * @return the value {@code 0} if {@code x == y};
+     *         a value less than {@code 0} if {@code !x && y}; and
+     *         a value greater than {@code 0} if {@code x && !y}
+     * @since 1.7
+     */
+    public static int compare(boolean x, boolean y) {
+        return (x == y) ? 0 : (x ? 1 : -1);
+    }
+
+    private static boolean toBoolean(String name) {
+        return ((name != null) && name.equalsIgnoreCase("true"));
+    }
+    static {
+        // as last step of initialization, initialize valueOf method
+        initValueOf();
+    }
+    @JavaScriptBody(args = {  }, body = 
+        "vm.java_lang_Boolean(false)" +
+        ".valueOf = function() { return this._value(); };"
+    )
+    private native static void initValueOf();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Byte.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Byte.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,452 @@
+/*
+ * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ *
+ * The {@code Byte} class wraps a value of primitive type {@code byte}
+ * in an object.  An object of type {@code Byte} contains a single
+ * field whose type is {@code byte}.
+ *
+ * <p>In addition, this class provides several methods for converting
+ * a {@code byte} to a {@code String} and a {@code String} to a {@code
+ * byte}, as well as other constants and methods useful when dealing
+ * with a {@code byte}.
+ *
+ * @author  Nakul Saraiya
+ * @author  Joseph D. Darcy
+ * @see     java.lang.Number
+ * @since   JDK1.1
+ */
+public final class Byte extends Number implements Comparable<Byte> {
+
+    /**
+     * A constant holding the minimum value a {@code byte} can
+     * have, -2<sup>7</sup>.
+     */
+    public static final byte   MIN_VALUE = -128;
+
+    /**
+     * A constant holding the maximum value a {@code byte} can
+     * have, 2<sup>7</sup>-1.
+     */
+    public static final byte   MAX_VALUE = 127;
+
+    /**
+     * The {@code Class} instance representing the primitive type
+     * {@code byte}.
+     */
+    public static final Class<Byte>     TYPE = (Class<Byte>) Class.getPrimitiveClass("byte");
+
+    /**
+     * Returns a new {@code String} object representing the
+     * specified {@code byte}. The radix is assumed to be 10.
+     *
+     * @param b the {@code byte} to be converted
+     * @return the string representation of the specified {@code byte}
+     * @see java.lang.Integer#toString(int)
+     */
+    public static String toString(byte b) {
+        return Integer.toString((int)b, 10);
+    }
+
+    private static class ByteCache {
+        private ByteCache(){}
+
+        static final Byte cache[] = new Byte[-(-128) + 127 + 1];
+
+        static {
+            for(int i = 0; i < cache.length; i++)
+                cache[i] = new Byte((byte)(i - 128));
+        }
+    }
+
+    /**
+     * Returns a {@code Byte} instance representing the specified
+     * {@code byte} value.
+     * If a new {@code Byte} instance is not required, this method
+     * should generally be used in preference to the constructor
+     * {@link #Byte(byte)}, as this method is likely to yield
+     * significantly better space and time performance since
+     * all byte values are cached.
+     *
+     * @param  b a byte value.
+     * @return a {@code Byte} instance representing {@code b}.
+     * @since  1.5
+     */
+    public static Byte valueOf(byte b) {
+        final int offset = 128;
+        return ByteCache.cache[(int)b + offset];
+    }
+
+    /**
+     * Parses the string argument as a signed {@code byte} in the
+     * radix specified by the second argument. The characters in the
+     * string must all be digits, of the specified radix (as
+     * determined by whether {@link java.lang.Character#digit(char,
+     * int)} returns a nonnegative value) except that the first
+     * character may be an ASCII minus sign {@code '-'}
+     * (<code>'&#92;u002D'</code>) to indicate a negative value or an
+     * ASCII plus sign {@code '+'} (<code>'&#92;u002B'</code>) to
+     * indicate a positive value.  The resulting {@code byte} value is
+     * returned.
+     *
+     * <p>An exception of type {@code NumberFormatException} is
+     * thrown if any of the following situations occurs:
+     * <ul>
+     * <li> The first argument is {@code null} or is a string of
+     * length zero.
+     *
+     * <li> The radix is either smaller than {@link
+     * java.lang.Character#MIN_RADIX} or larger than {@link
+     * java.lang.Character#MAX_RADIX}.
+     *
+     * <li> Any character of the string is not a digit of the
+     * specified radix, except that the first character may be a minus
+     * sign {@code '-'} (<code>'&#92;u002D'</code>) or plus sign
+     * {@code '+'} (<code>'&#92;u002B'</code>) provided that the
+     * string is longer than length 1.
+     *
+     * <li> The value represented by the string is not a value of type
+     * {@code byte}.
+     * </ul>
+     *
+     * @param s         the {@code String} containing the
+     *                  {@code byte}
+     *                  representation to be parsed
+     * @param radix     the radix to be used while parsing {@code s}
+     * @return          the {@code byte} value represented by the string
+     *                   argument in the specified radix
+     * @throws          NumberFormatException If the string does
+     *                  not contain a parsable {@code byte}.
+     */
+    public static byte parseByte(String s, int radix)
+        throws NumberFormatException {
+        int i = Integer.parseInt(s, radix);
+        if (i < MIN_VALUE || i > MAX_VALUE)
+            throw new NumberFormatException(
+                "Value out of range. Value:\"" + s + "\" Radix:" + radix);
+        return (byte)i;
+    }
+
+    /**
+     * Parses the string argument as a signed decimal {@code
+     * byte}. The characters in the string must all be decimal digits,
+     * except that the first character may be an ASCII minus sign
+     * {@code '-'} (<code>'&#92;u002D'</code>) to indicate a negative
+     * value or an ASCII plus sign {@code '+'}
+     * (<code>'&#92;u002B'</code>) to indicate a positive value. The
+     * resulting {@code byte} value is returned, exactly as if the
+     * argument and the radix 10 were given as arguments to the {@link
+     * #parseByte(java.lang.String, int)} method.
+     *
+     * @param s         a {@code String} containing the
+     *                  {@code byte} representation to be parsed
+     * @return          the {@code byte} value represented by the
+     *                  argument in decimal
+     * @throws          NumberFormatException if the string does not
+     *                  contain a parsable {@code byte}.
+     */
+    public static byte parseByte(String s) throws NumberFormatException {
+        return parseByte(s, 10);
+    }
+
+    /**
+     * Returns a {@code Byte} object holding the value
+     * extracted from the specified {@code String} when parsed
+     * with the radix given by the second argument. The first argument
+     * is interpreted as representing a signed {@code byte} in
+     * the radix specified by the second argument, exactly as if the
+     * argument were given to the {@link #parseByte(java.lang.String,
+     * int)} method. The result is a {@code Byte} object that
+     * represents the {@code byte} value specified by the string.
+     *
+     * <p> In other words, this method returns a {@code Byte} object
+     * equal to the value of:
+     *
+     * <blockquote>
+     * {@code new Byte(Byte.parseByte(s, radix))}
+     * </blockquote>
+     *
+     * @param s         the string to be parsed
+     * @param radix     the radix to be used in interpreting {@code s}
+     * @return          a {@code Byte} object holding the value
+     *                  represented by the string argument in the
+     *                  specified radix.
+     * @throws          NumberFormatException If the {@code String} does
+     *                  not contain a parsable {@code byte}.
+     */
+    public static Byte valueOf(String s, int radix)
+        throws NumberFormatException {
+        return valueOf(parseByte(s, radix));
+    }
+
+    /**
+     * Returns a {@code Byte} object holding the value
+     * given by the specified {@code String}. The argument is
+     * interpreted as representing a signed decimal {@code byte},
+     * exactly as if the argument were given to the {@link
+     * #parseByte(java.lang.String)} method. The result is a
+     * {@code Byte} object that represents the {@code byte}
+     * value specified by the string.
+     *
+     * <p> In other words, this method returns a {@code Byte} object
+     * equal to the value of:
+     *
+     * <blockquote>
+     * {@code new Byte(Byte.parseByte(s))}
+     * </blockquote>
+     *
+     * @param s         the string to be parsed
+     * @return          a {@code Byte} object holding the value
+     *                  represented by the string argument
+     * @throws          NumberFormatException If the {@code String} does
+     *                  not contain a parsable {@code byte}.
+     */
+    public static Byte valueOf(String s) throws NumberFormatException {
+        return valueOf(s, 10);
+    }
+
+    /**
+     * Decodes a {@code String} into a {@code Byte}.
+     * Accepts decimal, hexadecimal, and octal numbers given by
+     * the following grammar:
+     *
+     * <blockquote>
+     * <dl>
+     * <dt><i>DecodableString:</i>
+     * <dd><i>Sign<sub>opt</sub> DecimalNumeral</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0x} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i>
+     * <p>
+     * <dt><i>Sign:</i>
+     * <dd>{@code -}
+     * <dd>{@code +}
+     * </dl>
+     * </blockquote>
+     *
+     * <i>DecimalNumeral</i>, <i>HexDigits</i>, and <i>OctalDigits</i>
+     * are as defined in section 3.10.1 of
+     * <cite>The Java&trade; Language Specification</cite>,
+     * except that underscores are not accepted between digits.
+     *
+     * <p>The sequence of characters following an optional
+     * sign and/or radix specifier ("{@code 0x}", "{@code 0X}",
+     * "{@code #}", or leading zero) is parsed as by the {@code
+     * Byte.parseByte} method with the indicated radix (10, 16, or 8).
+     * This sequence of characters must represent a positive value or
+     * a {@link NumberFormatException} will be thrown.  The result is
+     * negated if first character of the specified {@code String} is
+     * the minus sign.  No whitespace characters are permitted in the
+     * {@code String}.
+     *
+     * @param     nm the {@code String} to decode.
+     * @return   a {@code Byte} object holding the {@code byte}
+     *          value represented by {@code nm}
+     * @throws  NumberFormatException  if the {@code String} does not
+     *            contain a parsable {@code byte}.
+     * @see java.lang.Byte#parseByte(java.lang.String, int)
+     */
+    public static Byte decode(String nm) throws NumberFormatException {
+        int i = Integer.decode(nm);
+        if (i < MIN_VALUE || i > MAX_VALUE)
+            throw new NumberFormatException(
+                    "Value " + i + " out of range from input " + nm);
+        return valueOf((byte)i);
+    }
+
+    /**
+     * The value of the {@code Byte}.
+     *
+     * @serial
+     */
+    private final byte value;
+
+    /**
+     * Constructs a newly allocated {@code Byte} object that
+     * represents the specified {@code byte} value.
+     *
+     * @param value     the value to be represented by the
+     *                  {@code Byte}.
+     */
+    public Byte(byte value) {
+        this.value = value;
+    }
+
+    /**
+     * Constructs a newly allocated {@code Byte} object that
+     * represents the {@code byte} value indicated by the
+     * {@code String} parameter. The string is converted to a
+     * {@code byte} value in exactly the manner used by the
+     * {@code parseByte} method for radix 10.
+     *
+     * @param s         the {@code String} to be converted to a
+     *                  {@code Byte}
+     * @throws           NumberFormatException If the {@code String}
+     *                  does not contain a parsable {@code byte}.
+     * @see        java.lang.Byte#parseByte(java.lang.String, int)
+     */
+    public Byte(String s) throws NumberFormatException {
+        this.value = parseByte(s, 10);
+    }
+
+    /**
+     * Returns the value of this {@code Byte} as a
+     * {@code byte}.
+     */
+    public byte byteValue() {
+        return value;
+    }
+
+    /**
+     * Returns the value of this {@code Byte} as a
+     * {@code short}.
+     */
+    public short shortValue() {
+        return (short)value;
+    }
+
+    /**
+     * Returns the value of this {@code Byte} as an
+     * {@code int}.
+     */
+    public int intValue() {
+        return (int)value;
+    }
+
+    /**
+     * Returns the value of this {@code Byte} as a
+     * {@code long}.
+     */
+    public long longValue() {
+        return (long)value;
+    }
+
+    /**
+     * Returns the value of this {@code Byte} as a
+     * {@code float}.
+     */
+    public float floatValue() {
+        return (float)value;
+    }
+
+    /**
+     * Returns the value of this {@code Byte} as a
+     * {@code double}.
+     */
+    public double doubleValue() {
+        return (double)value;
+    }
+
+    /**
+     * Returns a {@code String} object representing this
+     * {@code Byte}'s value.  The value is converted to signed
+     * decimal representation and returned as a string, exactly as if
+     * the {@code byte} value were given as an argument to the
+     * {@link java.lang.Byte#toString(byte)} method.
+     *
+     * @return  a string representation of the value of this object in
+     *          base&nbsp;10.
+     */
+    public String toString() {
+        return Integer.toString((int)value);
+    }
+
+    /**
+     * Returns a hash code for this {@code Byte}; equal to the result
+     * of invoking {@code intValue()}.
+     *
+     * @return a hash code value for this {@code Byte}
+     */
+    public int hashCode() {
+        return (int)value;
+    }
+
+    /**
+     * Compares this object to the specified object.  The result is
+     * {@code true} if and only if the argument is not
+     * {@code null} and is a {@code Byte} object that
+     * contains the same {@code byte} value as this object.
+     *
+     * @param obj       the object to compare with
+     * @return          {@code true} if the objects are the same;
+     *                  {@code false} otherwise.
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof Byte) {
+            return value == ((Byte)obj).byteValue();
+        }
+        return false;
+    }
+
+    /**
+     * Compares two {@code Byte} objects numerically.
+     *
+     * @param   anotherByte   the {@code Byte} to be compared.
+     * @return  the value {@code 0} if this {@code Byte} is
+     *          equal to the argument {@code Byte}; a value less than
+     *          {@code 0} if this {@code Byte} is numerically less
+     *          than the argument {@code Byte}; and a value greater than
+     *           {@code 0} if this {@code Byte} is numerically
+     *           greater than the argument {@code Byte} (signed
+     *           comparison).
+     * @since   1.2
+     */
+    public int compareTo(Byte anotherByte) {
+        return compare(this.value, anotherByte.value);
+    }
+
+    /**
+     * Compares two {@code byte} values numerically.
+     * The value returned is identical to what would be returned by:
+     * <pre>
+     *    Byte.valueOf(x).compareTo(Byte.valueOf(y))
+     * </pre>
+     *
+     * @param  x the first {@code byte} to compare
+     * @param  y the second {@code byte} to compare
+     * @return the value {@code 0} if {@code x == y};
+     *         a value less than {@code 0} if {@code x < y}; and
+     *         a value greater than {@code 0} if {@code x > y}
+     * @since 1.7
+     */
+    public static int compare(byte x, byte y) {
+        return x - y;
+    }
+
+    /**
+     * The number of bits used to represent a {@code byte} value in two's
+     * complement binary form.
+     *
+     * @since 1.5
+     */
+    public static final int SIZE = 8;
+
+    /** use serialVersionUID from JDK 1.1. for interoperability */
+    private static final long serialVersionUID = -7183698231559129828L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/CharSequence.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/CharSequence.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+
+/**
+ * A <tt>CharSequence</tt> is a readable sequence of <code>char</code> values. This
+ * interface provides uniform, read-only access to many different kinds of
+ * <code>char</code> sequences.
+ * A <code>char</code> value represents a character in the <i>Basic
+ * Multilingual Plane (BMP)</i> or a surrogate. Refer to <a
+ * href="Character.html#unicode">Unicode Character Representation</a> for details.
+ *
+ * <p> This interface does not refine the general contracts of the {@link
+ * java.lang.Object#equals(java.lang.Object) equals} and {@link
+ * java.lang.Object#hashCode() hashCode} methods.  The result of comparing two
+ * objects that implement <tt>CharSequence</tt> is therefore, in general,
+ * undefined.  Each object may be implemented by a different class, and there
+ * is no guarantee that each class will be capable of testing its instances
+ * for equality with those of the other.  It is therefore inappropriate to use
+ * arbitrary <tt>CharSequence</tt> instances as elements in a set or as keys in
+ * a map. </p>
+ *
+ * @author Mike McCloskey
+ * @since 1.4
+ * @spec JSR-51
+ */
+
+public interface CharSequence {
+
+    /**
+     * Returns the length of this character sequence.  The length is the number
+     * of 16-bit <code>char</code>s in the sequence.</p>
+     *
+     * @return  the number of <code>char</code>s in this sequence
+     */
+    int length();
+
+    /**
+     * Returns the <code>char</code> value at the specified index.  An index ranges from zero
+     * to <tt>length() - 1</tt>.  The first <code>char</code> value of the sequence is at
+     * index zero, the next at index one, and so on, as for array
+     * indexing. </p>
+     *
+     * <p>If the <code>char</code> value specified by the index is a
+     * <a href="{@docRoot}/java/lang/Character.html#unicode">surrogate</a>, the surrogate
+     * value is returned.
+     *
+     * @param   index   the index of the <code>char</code> value to be returned
+     *
+     * @return  the specified <code>char</code> value
+     *
+     * @throws  IndexOutOfBoundsException
+     *          if the <tt>index</tt> argument is negative or not less than
+     *          <tt>length()</tt>
+     */
+    char charAt(int index);
+
+    /**
+     * Returns a new <code>CharSequence</code> that is a subsequence of this sequence.
+     * The subsequence starts with the <code>char</code> value at the specified index and
+     * ends with the <code>char</code> value at index <tt>end - 1</tt>.  The length
+     * (in <code>char</code>s) of the
+     * returned sequence is <tt>end - start</tt>, so if <tt>start == end</tt>
+     * then an empty sequence is returned. </p>
+     *
+     * @param   start   the start index, inclusive
+     * @param   end     the end index, exclusive
+     *
+     * @return  the specified subsequence
+     *
+     * @throws  IndexOutOfBoundsException
+     *          if <tt>start</tt> or <tt>end</tt> are negative,
+     *          if <tt>end</tt> is greater than <tt>length()</tt>,
+     *          or if <tt>start</tt> is greater than <tt>end</tt>
+     */
+    CharSequence subSequence(int start, int end);
+
+    /**
+     * Returns a string containing the characters in this sequence in the same
+     * order as this sequence.  The length of the string will be the length of
+     * this sequence. </p>
+     *
+     * @return  a string consisting of exactly this sequence of characters
+     */
+    public String toString();
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Character.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Character.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,2529 @@
+/*
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ * The {@code Character} class wraps a value of the primitive
+ * type {@code char} in an object. An object of type
+ * {@code Character} contains a single field whose type is
+ * {@code char}.
+ * <p>
+ * In addition, this class provides several methods for determining
+ * a character's category (lowercase letter, digit, etc.) and for converting
+ * characters from uppercase to lowercase and vice versa.
+ * <p>
+ * Character information is based on the Unicode Standard, version 6.0.0.
+ * <p>
+ * The methods and data of class {@code Character} are defined by
+ * the information in the <i>UnicodeData</i> file that is part of the
+ * Unicode Character Database maintained by the Unicode
+ * Consortium. This file specifies various properties including name
+ * and general category for every defined Unicode code point or
+ * character range.
+ * <p>
+ * The file and its description are available from the Unicode Consortium at:
+ * <ul>
+ * <li><a href="http://www.unicode.org">http://www.unicode.org</a>
+ * </ul>
+ *
+ * <h4><a name="unicode">Unicode Character Representations</a></h4>
+ *
+ * <p>The {@code char} data type (and therefore the value that a
+ * {@code Character} object encapsulates) are based on the
+ * original Unicode specification, which defined characters as
+ * fixed-width 16-bit entities. The Unicode Standard has since been
+ * changed to allow for characters whose representation requires more
+ * than 16 bits.  The range of legal <em>code point</em>s is now
+ * U+0000 to U+10FFFF, known as <em>Unicode scalar value</em>.
+ * (Refer to the <a
+ * href="http://www.unicode.org/reports/tr27/#notation"><i>
+ * definition</i></a> of the U+<i>n</i> notation in the Unicode
+ * Standard.)
+ *
+ * <p><a name="BMP">The set of characters from U+0000 to U+FFFF is
+ * sometimes referred to as the <em>Basic Multilingual Plane (BMP)</em>.
+ * <a name="supplementary">Characters</a> whose code points are greater
+ * than U+FFFF are called <em>supplementary character</em>s.  The Java
+ * platform uses the UTF-16 representation in {@code char} arrays and
+ * in the {@code String} and {@code StringBuffer} classes. In
+ * this representation, supplementary characters are represented as a pair
+ * of {@code char} values, the first from the <em>high-surrogates</em>
+ * range, (&#92;uD800-&#92;uDBFF), the second from the
+ * <em>low-surrogates</em> range (&#92;uDC00-&#92;uDFFF).
+ *
+ * <p>A {@code char} value, therefore, represents Basic
+ * Multilingual Plane (BMP) code points, including the surrogate
+ * code points, or code units of the UTF-16 encoding. An
+ * {@code int} value represents all Unicode code points,
+ * including supplementary code points. The lower (least significant)
+ * 21 bits of {@code int} are used to represent Unicode code
+ * points and the upper (most significant) 11 bits must be zero.
+ * Unless otherwise specified, the behavior with respect to
+ * supplementary characters and surrogate {@code char} values is
+ * as follows:
+ *
+ * <ul>
+ * <li>The methods that only accept a {@code char} value cannot support
+ * supplementary characters. They treat {@code char} values from the
+ * surrogate ranges as undefined characters. For example,
+ * {@code Character.isLetter('\u005CuD840')} returns {@code false}, even though
+ * this specific value if followed by any low-surrogate value in a string
+ * would represent a letter.
+ *
+ * <li>The methods that accept an {@code int} value support all
+ * Unicode characters, including supplementary characters. For
+ * example, {@code Character.isLetter(0x2F81A)} returns
+ * {@code true} because the code point value represents a letter
+ * (a CJK ideograph).
+ * </ul>
+ *
+ * <p>In the Java SE API documentation, <em>Unicode code point</em> is
+ * used for character values in the range between U+0000 and U+10FFFF,
+ * and <em>Unicode code unit</em> is used for 16-bit
+ * {@code char} values that are code units of the <em>UTF-16</em>
+ * encoding. For more information on Unicode terminology, refer to the
+ * <a href="http://www.unicode.org/glossary/">Unicode Glossary</a>.
+ *
+ * @author  Lee Boynton
+ * @author  Guy Steele
+ * @author  Akira Tanaka
+ * @author  Martin Buchholz
+ * @author  Ulf Zibis
+ * @since   1.0
+ */
+public final
+class Character implements java.io.Serializable, Comparable<Character> {
+    /**
+     * The minimum radix available for conversion to and from strings.
+     * The constant value of this field is the smallest value permitted
+     * for the radix argument in radix-conversion methods such as the
+     * {@code digit} method, the {@code forDigit} method, and the
+     * {@code toString} method of class {@code Integer}.
+     *
+     * @see     Character#digit(char, int)
+     * @see     Character#forDigit(int, int)
+     * @see     Integer#toString(int, int)
+     * @see     Integer#valueOf(String)
+     */
+    public static final int MIN_RADIX = 2;
+
+    /**
+     * The maximum radix available for conversion to and from strings.
+     * The constant value of this field is the largest value permitted
+     * for the radix argument in radix-conversion methods such as the
+     * {@code digit} method, the {@code forDigit} method, and the
+     * {@code toString} method of class {@code Integer}.
+     *
+     * @see     Character#digit(char, int)
+     * @see     Character#forDigit(int, int)
+     * @see     Integer#toString(int, int)
+     * @see     Integer#valueOf(String)
+     */
+    public static final int MAX_RADIX = 36;
+
+    /**
+     * The constant value of this field is the smallest value of type
+     * {@code char}, {@code '\u005Cu0000'}.
+     *
+     * @since   1.0.2
+     */
+    public static final char MIN_VALUE = '\u0000';
+
+    /**
+     * The constant value of this field is the largest value of type
+     * {@code char}, {@code '\u005CuFFFF'}.
+     *
+     * @since   1.0.2
+     */
+    public static final char MAX_VALUE = '\uFFFF';
+
+    /**
+     * The {@code Class} instance representing the primitive type
+     * {@code char}.
+     *
+     * @since   1.1
+     */
+    public static final Class<Character> TYPE = Class.getPrimitiveClass("char");
+
+    /*
+     * Normative general types
+     */
+
+    /*
+     * General character types
+     */
+
+    /**
+     * General category "Cn" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte UNASSIGNED = 0;
+
+    /**
+     * General category "Lu" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte UPPERCASE_LETTER = 1;
+
+    /**
+     * General category "Ll" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte LOWERCASE_LETTER = 2;
+
+    /**
+     * General category "Lt" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte TITLECASE_LETTER = 3;
+
+    /**
+     * General category "Lm" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte MODIFIER_LETTER = 4;
+
+    /**
+     * General category "Lo" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte OTHER_LETTER = 5;
+
+    /**
+     * General category "Mn" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte NON_SPACING_MARK = 6;
+
+    /**
+     * General category "Me" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte ENCLOSING_MARK = 7;
+
+    /**
+     * General category "Mc" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte COMBINING_SPACING_MARK = 8;
+
+    /**
+     * General category "Nd" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte DECIMAL_DIGIT_NUMBER        = 9;
+
+    /**
+     * General category "Nl" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte LETTER_NUMBER = 10;
+
+    /**
+     * General category "No" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte OTHER_NUMBER = 11;
+
+    /**
+     * General category "Zs" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte SPACE_SEPARATOR = 12;
+
+    /**
+     * General category "Zl" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte LINE_SEPARATOR = 13;
+
+    /**
+     * General category "Zp" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte PARAGRAPH_SEPARATOR = 14;
+
+    /**
+     * General category "Cc" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte CONTROL = 15;
+
+    /**
+     * General category "Cf" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte FORMAT = 16;
+
+    /**
+     * General category "Co" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte PRIVATE_USE = 18;
+
+    /**
+     * General category "Cs" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte SURROGATE = 19;
+
+    /**
+     * General category "Pd" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte DASH_PUNCTUATION = 20;
+
+    /**
+     * General category "Ps" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte START_PUNCTUATION = 21;
+
+    /**
+     * General category "Pe" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte END_PUNCTUATION = 22;
+
+    /**
+     * General category "Pc" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte CONNECTOR_PUNCTUATION = 23;
+
+    /**
+     * General category "Po" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte OTHER_PUNCTUATION = 24;
+
+    /**
+     * General category "Sm" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte MATH_SYMBOL = 25;
+
+    /**
+     * General category "Sc" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte CURRENCY_SYMBOL = 26;
+
+    /**
+     * General category "Sk" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte MODIFIER_SYMBOL = 27;
+
+    /**
+     * General category "So" in the Unicode specification.
+     * @since   1.1
+     */
+    public static final byte OTHER_SYMBOL = 28;
+
+    /**
+     * General category "Pi" in the Unicode specification.
+     * @since   1.4
+     */
+    public static final byte INITIAL_QUOTE_PUNCTUATION = 29;
+
+    /**
+     * General category "Pf" in the Unicode specification.
+     * @since   1.4
+     */
+    public static final byte FINAL_QUOTE_PUNCTUATION = 30;
+
+    /**
+     * Error flag. Use int (code point) to avoid confusion with U+FFFF.
+     */
+    static final int ERROR = 0xFFFFFFFF;
+
+
+    /**
+     * Undefined bidirectional character type. Undefined {@code char}
+     * values have undefined directionality in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_UNDEFINED = -1;
+
+    /**
+     * Strong bidirectional character type "L" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT = 0;
+
+    /**
+     * Strong bidirectional character type "R" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = 1;
+
+    /**
+    * Strong bidirectional character type "AL" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 2;
+
+    /**
+     * Weak bidirectional character type "EN" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER = 3;
+
+    /**
+     * Weak bidirectional character type "ES" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = 4;
+
+    /**
+     * Weak bidirectional character type "ET" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = 5;
+
+    /**
+     * Weak bidirectional character type "AN" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_ARABIC_NUMBER = 6;
+
+    /**
+     * Weak bidirectional character type "CS" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = 7;
+
+    /**
+     * Weak bidirectional character type "NSM" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_NONSPACING_MARK = 8;
+
+    /**
+     * Weak bidirectional character type "BN" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_BOUNDARY_NEUTRAL = 9;
+
+    /**
+     * Neutral bidirectional character type "B" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_PARAGRAPH_SEPARATOR = 10;
+
+    /**
+     * Neutral bidirectional character type "S" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_SEGMENT_SEPARATOR = 11;
+
+    /**
+     * Neutral bidirectional character type "WS" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_WHITESPACE = 12;
+
+    /**
+     * Neutral bidirectional character type "ON" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_OTHER_NEUTRALS = 13;
+
+    /**
+     * Strong bidirectional character type "LRE" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = 14;
+
+    /**
+     * Strong bidirectional character type "LRO" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = 15;
+
+    /**
+     * Strong bidirectional character type "RLE" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = 16;
+
+    /**
+     * Strong bidirectional character type "RLO" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = 17;
+
+    /**
+     * Weak bidirectional character type "PDF" in the Unicode specification.
+     * @since 1.4
+     */
+    public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 18;
+
+    /**
+     * The minimum value of a
+     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
+     * Unicode high-surrogate code unit</a>
+     * in the UTF-16 encoding, constant {@code '\u005CuD800'}.
+     * A high-surrogate is also known as a <i>leading-surrogate</i>.
+     *
+     * @since 1.5
+     */
+    public static final char MIN_HIGH_SURROGATE = '\uD800';
+
+    /**
+     * The maximum value of a
+     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
+     * Unicode high-surrogate code unit</a>
+     * in the UTF-16 encoding, constant {@code '\u005CuDBFF'}.
+     * A high-surrogate is also known as a <i>leading-surrogate</i>.
+     *
+     * @since 1.5
+     */
+    public static final char MAX_HIGH_SURROGATE = '\uDBFF';
+
+    /**
+     * The minimum value of a
+     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
+     * Unicode low-surrogate code unit</a>
+     * in the UTF-16 encoding, constant {@code '\u005CuDC00'}.
+     * A low-surrogate is also known as a <i>trailing-surrogate</i>.
+     *
+     * @since 1.5
+     */
+    public static final char MIN_LOW_SURROGATE  = '\uDC00';
+
+    /**
+     * The maximum value of a
+     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
+     * Unicode low-surrogate code unit</a>
+     * in the UTF-16 encoding, constant {@code '\u005CuDFFF'}.
+     * A low-surrogate is also known as a <i>trailing-surrogate</i>.
+     *
+     * @since 1.5
+     */
+    public static final char MAX_LOW_SURROGATE  = '\uDFFF';
+
+    /**
+     * The minimum value of a Unicode surrogate code unit in the
+     * UTF-16 encoding, constant {@code '\u005CuD800'}.
+     *
+     * @since 1.5
+     */
+    public static final char MIN_SURROGATE = MIN_HIGH_SURROGATE;
+
+    /**
+     * The maximum value of a Unicode surrogate code unit in the
+     * UTF-16 encoding, constant {@code '\u005CuDFFF'}.
+     *
+     * @since 1.5
+     */
+    public static final char MAX_SURROGATE = MAX_LOW_SURROGATE;
+
+    /**
+     * The minimum value of a
+     * <a href="http://www.unicode.org/glossary/#supplementary_code_point">
+     * Unicode supplementary code point</a>, constant {@code U+10000}.
+     *
+     * @since 1.5
+     */
+    public static final int MIN_SUPPLEMENTARY_CODE_POINT = 0x010000;
+
+    /**
+     * The minimum value of a
+     * <a href="http://www.unicode.org/glossary/#code_point">
+     * Unicode code point</a>, constant {@code U+0000}.
+     *
+     * @since 1.5
+     */
+    public static final int MIN_CODE_POINT = 0x000000;
+
+    /**
+     * The maximum value of a
+     * <a href="http://www.unicode.org/glossary/#code_point">
+     * Unicode code point</a>, constant {@code U+10FFFF}.
+     *
+     * @since 1.5
+     */
+    public static final int MAX_CODE_POINT = 0X10FFFF;
+
+
+    /**
+     * Instances of this class represent particular subsets of the Unicode
+     * character set.  The only family of subsets defined in the
+     * {@code Character} class is {@link Character.UnicodeBlock}.
+     * Other portions of the Java API may define other subsets for their
+     * own purposes.
+     *
+     * @since 1.2
+     */
+    public static class Subset  {
+
+        private String name;
+
+        /**
+         * Constructs a new {@code Subset} instance.
+         *
+         * @param  name  The name of this subset
+         * @exception NullPointerException if name is {@code null}
+         */
+        protected Subset(String name) {
+            if (name == null) {
+                throw new NullPointerException("name");
+            }
+            this.name = name;
+        }
+
+        /**
+         * Compares two {@code Subset} objects for equality.
+         * This method returns {@code true} if and only if
+         * {@code this} and the argument refer to the same
+         * object; since this method is {@code final}, this
+         * guarantee holds for all subclasses.
+         */
+        public final boolean equals(Object obj) {
+            return (this == obj);
+        }
+
+        /**
+         * Returns the standard hash code as defined by the
+         * {@link Object#hashCode} method.  This method
+         * is {@code final} in order to ensure that the
+         * {@code equals} and {@code hashCode} methods will
+         * be consistent in all subclasses.
+         */
+        public final int hashCode() {
+            return super.hashCode();
+        }
+
+        /**
+         * Returns the name of this subset.
+         */
+        public final String toString() {
+            return name;
+        }
+    }
+
+    // See http://www.unicode.org/Public/UNIDATA/Blocks.txt
+    // for the latest specification of Unicode Blocks.
+
+
+    /**
+     * The value of the {@code Character}.
+     *
+     * @serial
+     */
+    private final char value;
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = 3786198910865385080L;
+
+    /**
+     * Constructs a newly allocated {@code Character} object that
+     * represents the specified {@code char} value.
+     *
+     * @param  value   the value to be represented by the
+     *                  {@code Character} object.
+     */
+    public Character(char value) {
+        this.value = value;
+    }
+
+    private static class CharacterCache {
+        private CharacterCache(){}
+
+        static final Character cache[] = new Character[127 + 1];
+
+        static {
+            for (int i = 0; i < cache.length; i++)
+                cache[i] = new Character((char)i);
+        }
+    }
+
+    /**
+     * Returns a <tt>Character</tt> instance representing the specified
+     * <tt>char</tt> value.
+     * If a new <tt>Character</tt> instance is not required, this method
+     * should generally be used in preference to the constructor
+     * {@link #Character(char)}, as this method is likely to yield
+     * significantly better space and time performance by caching
+     * frequently requested values.
+     *
+     * This method will always cache values in the range {@code
+     * '\u005Cu0000'} to {@code '\u005Cu007F'}, inclusive, and may
+     * cache other values outside of this range.
+     *
+     * @param  c a char value.
+     * @return a <tt>Character</tt> instance representing <tt>c</tt>.
+     * @since  1.5
+     */
+    public static Character valueOf(char c) {
+        if (c <= 127) { // must cache
+            return CharacterCache.cache[(int)c];
+        }
+        return new Character(c);
+    }
+
+    /**
+     * Returns the value of this {@code Character} object.
+     * @return  the primitive {@code char} value represented by
+     *          this object.
+     */
+    public char charValue() {
+        return value;
+    }
+
+    /**
+     * Returns a hash code for this {@code Character}; equal to the result
+     * of invoking {@code charValue()}.
+     *
+     * @return a hash code value for this {@code Character}
+     */
+    public int hashCode() {
+        return (int)value;
+    }
+
+    /**
+     * Compares this object against the specified object.
+     * The result is {@code true} if and only if the argument is not
+     * {@code null} and is a {@code Character} object that
+     * represents the same {@code char} value as this object.
+     *
+     * @param   obj   the object to compare with.
+     * @return  {@code true} if the objects are the same;
+     *          {@code false} otherwise.
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof Character) {
+            return value == ((Character)obj).charValue();
+        }
+        return false;
+    }
+
+    /**
+     * Returns a {@code String} object representing this
+     * {@code Character}'s value.  The result is a string of
+     * length 1 whose sole component is the primitive
+     * {@code char} value represented by this
+     * {@code Character} object.
+     *
+     * @return  a string representation of this object.
+     */
+    public String toString() {
+        char buf[] = {value};
+        return String.valueOf(buf);
+    }
+
+    /**
+     * Returns a {@code String} object representing the
+     * specified {@code char}.  The result is a string of length
+     * 1 consisting solely of the specified {@code char}.
+     *
+     * @param c the {@code char} to be converted
+     * @return the string representation of the specified {@code char}
+     * @since 1.4
+     */
+    public static String toString(char c) {
+        return String.valueOf(c);
+    }
+
+    /**
+     * Determines whether the specified code point is a valid
+     * <a href="http://www.unicode.org/glossary/#code_point">
+     * Unicode code point value</a>.
+     *
+     * @param  codePoint the Unicode code point to be tested
+     * @return {@code true} if the specified code point value is between
+     *         {@link #MIN_CODE_POINT} and
+     *         {@link #MAX_CODE_POINT} inclusive;
+     *         {@code false} otherwise.
+     * @since  1.5
+     */
+    public static boolean isValidCodePoint(int codePoint) {
+        // Optimized form of:
+        //     codePoint >= MIN_CODE_POINT && codePoint <= MAX_CODE_POINT
+        int plane = codePoint >>> 16;
+        return plane < ((MAX_CODE_POINT + 1) >>> 16);
+    }
+
+    /**
+     * Determines whether the specified character (Unicode code point)
+     * is in the <a href="#BMP">Basic Multilingual Plane (BMP)</a>.
+     * Such code points can be represented using a single {@code char}.
+     *
+     * @param  codePoint the character (Unicode code point) to be tested
+     * @return {@code true} if the specified code point is between
+     *         {@link #MIN_VALUE} and {@link #MAX_VALUE} inclusive;
+     *         {@code false} otherwise.
+     * @since  1.7
+     */
+    public static boolean isBmpCodePoint(int codePoint) {
+        return codePoint >>> 16 == 0;
+        // Optimized form of:
+        //     codePoint >= MIN_VALUE && codePoint <= MAX_VALUE
+        // We consistently use logical shift (>>>) to facilitate
+        // additional runtime optimizations.
+    }
+
+    /**
+     * Determines whether the specified character (Unicode code point)
+     * is in the <a href="#supplementary">supplementary character</a> range.
+     *
+     * @param  codePoint the character (Unicode code point) to be tested
+     * @return {@code true} if the specified code point is between
+     *         {@link #MIN_SUPPLEMENTARY_CODE_POINT} and
+     *         {@link #MAX_CODE_POINT} inclusive;
+     *         {@code false} otherwise.
+     * @since  1.5
+     */
+    public static boolean isSupplementaryCodePoint(int codePoint) {
+        return codePoint >= MIN_SUPPLEMENTARY_CODE_POINT
+            && codePoint <  MAX_CODE_POINT + 1;
+    }
+
+    /**
+     * Determines if the given {@code char} value is a
+     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
+     * Unicode high-surrogate code unit</a>
+     * (also known as <i>leading-surrogate code unit</i>).
+     *
+     * <p>Such values do not represent characters by themselves,
+     * but are used in the representation of
+     * <a href="#supplementary">supplementary characters</a>
+     * in the UTF-16 encoding.
+     *
+     * @param  ch the {@code char} value to be tested.
+     * @return {@code true} if the {@code char} value is between
+     *         {@link #MIN_HIGH_SURROGATE} and
+     *         {@link #MAX_HIGH_SURROGATE} inclusive;
+     *         {@code false} otherwise.
+     * @see    Character#isLowSurrogate(char)
+     * @see    Character.UnicodeBlock#of(int)
+     * @since  1.5
+     */
+    public static boolean isHighSurrogate(char ch) {
+        // Help VM constant-fold; MAX_HIGH_SURROGATE + 1 == MIN_LOW_SURROGATE
+        return ch >= MIN_HIGH_SURROGATE && ch < (MAX_HIGH_SURROGATE + 1);
+    }
+
+    /**
+     * Determines if the given {@code char} value is a
+     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
+     * Unicode low-surrogate code unit</a>
+     * (also known as <i>trailing-surrogate code unit</i>).
+     *
+     * <p>Such values do not represent characters by themselves,
+     * but are used in the representation of
+     * <a href="#supplementary">supplementary characters</a>
+     * in the UTF-16 encoding.
+     *
+     * @param  ch the {@code char} value to be tested.
+     * @return {@code true} if the {@code char} value is between
+     *         {@link #MIN_LOW_SURROGATE} and
+     *         {@link #MAX_LOW_SURROGATE} inclusive;
+     *         {@code false} otherwise.
+     * @see    Character#isHighSurrogate(char)
+     * @since  1.5
+     */
+    public static boolean isLowSurrogate(char ch) {
+        return ch >= MIN_LOW_SURROGATE && ch < (MAX_LOW_SURROGATE + 1);
+    }
+
+    /**
+     * Determines if the given {@code char} value is a Unicode
+     * <i>surrogate code unit</i>.
+     *
+     * <p>Such values do not represent characters by themselves,
+     * but are used in the representation of
+     * <a href="#supplementary">supplementary characters</a>
+     * in the UTF-16 encoding.
+     *
+     * <p>A char value is a surrogate code unit if and only if it is either
+     * a {@linkplain #isLowSurrogate(char) low-surrogate code unit} or
+     * a {@linkplain #isHighSurrogate(char) high-surrogate code unit}.
+     *
+     * @param  ch the {@code char} value to be tested.
+     * @return {@code true} if the {@code char} value is between
+     *         {@link #MIN_SURROGATE} and
+     *         {@link #MAX_SURROGATE} inclusive;
+     *         {@code false} otherwise.
+     * @since  1.7
+     */
+    public static boolean isSurrogate(char ch) {
+        return ch >= MIN_SURROGATE && ch < (MAX_SURROGATE + 1);
+    }
+
+    /**
+     * Determines whether the specified pair of {@code char}
+     * values is a valid
+     * <a href="http://www.unicode.org/glossary/#surrogate_pair">
+     * Unicode surrogate pair</a>.
+
+     * <p>This method is equivalent to the expression:
+     * <blockquote><pre>
+     * isHighSurrogate(high) && isLowSurrogate(low)
+     * </pre></blockquote>
+     *
+     * @param  high the high-surrogate code value to be tested
+     * @param  low the low-surrogate code value to be tested
+     * @return {@code true} if the specified high and
+     * low-surrogate code values represent a valid surrogate pair;
+     * {@code false} otherwise.
+     * @since  1.5
+     */
+    public static boolean isSurrogatePair(char high, char low) {
+        return isHighSurrogate(high) && isLowSurrogate(low);
+    }
+
+    /**
+     * Determines the number of {@code char} values needed to
+     * represent the specified character (Unicode code point). If the
+     * specified character is equal to or greater than 0x10000, then
+     * the method returns 2. Otherwise, the method returns 1.
+     *
+     * <p>This method doesn't validate the specified character to be a
+     * valid Unicode code point. The caller must validate the
+     * character value using {@link #isValidCodePoint(int) isValidCodePoint}
+     * if necessary.
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  2 if the character is a valid supplementary character; 1 otherwise.
+     * @see     Character#isSupplementaryCodePoint(int)
+     * @since   1.5
+     */
+    public static int charCount(int codePoint) {
+        return codePoint >= MIN_SUPPLEMENTARY_CODE_POINT ? 2 : 1;
+    }
+
+    /**
+     * Converts the specified surrogate pair to its supplementary code
+     * point value. This method does not validate the specified
+     * surrogate pair. The caller must validate it using {@link
+     * #isSurrogatePair(char, char) isSurrogatePair} if necessary.
+     *
+     * @param  high the high-surrogate code unit
+     * @param  low the low-surrogate code unit
+     * @return the supplementary code point composed from the
+     *         specified surrogate pair.
+     * @since  1.5
+     */
+    public static int toCodePoint(char high, char low) {
+        // Optimized form of:
+        // return ((high - MIN_HIGH_SURROGATE) << 10)
+        //         + (low - MIN_LOW_SURROGATE)
+        //         + MIN_SUPPLEMENTARY_CODE_POINT;
+        return ((high << 10) + low) + (MIN_SUPPLEMENTARY_CODE_POINT
+                                       - (MIN_HIGH_SURROGATE << 10)
+                                       - MIN_LOW_SURROGATE);
+    }
+
+    /**
+     * Returns the code point at the given index of the
+     * {@code CharSequence}. If the {@code char} value at
+     * the given index in the {@code CharSequence} is in the
+     * high-surrogate range, the following index is less than the
+     * length of the {@code CharSequence}, and the
+     * {@code char} value at the following index is in the
+     * low-surrogate range, then the supplementary code point
+     * corresponding to this surrogate pair is returned. Otherwise,
+     * the {@code char} value at the given index is returned.
+     *
+     * @param seq a sequence of {@code char} values (Unicode code
+     * units)
+     * @param index the index to the {@code char} values (Unicode
+     * code units) in {@code seq} to be converted
+     * @return the Unicode code point at the given index
+     * @exception NullPointerException if {@code seq} is null.
+     * @exception IndexOutOfBoundsException if the value
+     * {@code index} is negative or not less than
+     * {@link CharSequence#length() seq.length()}.
+     * @since  1.5
+     */
+    public static int codePointAt(CharSequence seq, int index) {
+        char c1 = seq.charAt(index++);
+        if (isHighSurrogate(c1)) {
+            if (index < seq.length()) {
+                char c2 = seq.charAt(index);
+                if (isLowSurrogate(c2)) {
+                    return toCodePoint(c1, c2);
+                }
+            }
+        }
+        return c1;
+    }
+
+    /**
+     * Returns the code point at the given index of the
+     * {@code char} array. If the {@code char} value at
+     * the given index in the {@code char} array is in the
+     * high-surrogate range, the following index is less than the
+     * length of the {@code char} array, and the
+     * {@code char} value at the following index is in the
+     * low-surrogate range, then the supplementary code point
+     * corresponding to this surrogate pair is returned. Otherwise,
+     * the {@code char} value at the given index is returned.
+     *
+     * @param a the {@code char} array
+     * @param index the index to the {@code char} values (Unicode
+     * code units) in the {@code char} array to be converted
+     * @return the Unicode code point at the given index
+     * @exception NullPointerException if {@code a} is null.
+     * @exception IndexOutOfBoundsException if the value
+     * {@code index} is negative or not less than
+     * the length of the {@code char} array.
+     * @since  1.5
+     */
+    public static int codePointAt(char[] a, int index) {
+        return codePointAtImpl(a, index, a.length);
+    }
+
+    /**
+     * Returns the code point at the given index of the
+     * {@code char} array, where only array elements with
+     * {@code index} less than {@code limit} can be used. If
+     * the {@code char} value at the given index in the
+     * {@code char} array is in the high-surrogate range, the
+     * following index is less than the {@code limit}, and the
+     * {@code char} value at the following index is in the
+     * low-surrogate range, then the supplementary code point
+     * corresponding to this surrogate pair is returned. Otherwise,
+     * the {@code char} value at the given index is returned.
+     *
+     * @param a the {@code char} array
+     * @param index the index to the {@code char} values (Unicode
+     * code units) in the {@code char} array to be converted
+     * @param limit the index after the last array element that
+     * can be used in the {@code char} array
+     * @return the Unicode code point at the given index
+     * @exception NullPointerException if {@code a} is null.
+     * @exception IndexOutOfBoundsException if the {@code index}
+     * argument is negative or not less than the {@code limit}
+     * argument, or if the {@code limit} argument is negative or
+     * greater than the length of the {@code char} array.
+     * @since  1.5
+     */
+    public static int codePointAt(char[] a, int index, int limit) {
+        if (index >= limit || limit < 0 || limit > a.length) {
+            throw new IndexOutOfBoundsException();
+        }
+        return codePointAtImpl(a, index, limit);
+    }
+
+    // throws ArrayIndexOutofBoundsException if index out of bounds
+    static int codePointAtImpl(char[] a, int index, int limit) {
+        char c1 = a[index++];
+        if (isHighSurrogate(c1)) {
+            if (index < limit) {
+                char c2 = a[index];
+                if (isLowSurrogate(c2)) {
+                    return toCodePoint(c1, c2);
+                }
+            }
+        }
+        return c1;
+    }
+
+    /**
+     * Returns the code point preceding the given index of the
+     * {@code CharSequence}. If the {@code char} value at
+     * {@code (index - 1)} in the {@code CharSequence} is in
+     * the low-surrogate range, {@code (index - 2)} is not
+     * negative, and the {@code char} value at {@code (index - 2)}
+     * in the {@code CharSequence} is in the
+     * high-surrogate range, then the supplementary code point
+     * corresponding to this surrogate pair is returned. Otherwise,
+     * the {@code char} value at {@code (index - 1)} is
+     * returned.
+     *
+     * @param seq the {@code CharSequence} instance
+     * @param index the index following the code point that should be returned
+     * @return the Unicode code point value before the given index.
+     * @exception NullPointerException if {@code seq} is null.
+     * @exception IndexOutOfBoundsException if the {@code index}
+     * argument is less than 1 or greater than {@link
+     * CharSequence#length() seq.length()}.
+     * @since  1.5
+     */
+    public static int codePointBefore(CharSequence seq, int index) {
+        char c2 = seq.charAt(--index);
+        if (isLowSurrogate(c2)) {
+            if (index > 0) {
+                char c1 = seq.charAt(--index);
+                if (isHighSurrogate(c1)) {
+                    return toCodePoint(c1, c2);
+                }
+            }
+        }
+        return c2;
+    }
+
+    /**
+     * Returns the code point preceding the given index of the
+     * {@code char} array. If the {@code char} value at
+     * {@code (index - 1)} in the {@code char} array is in
+     * the low-surrogate range, {@code (index - 2)} is not
+     * negative, and the {@code char} value at {@code (index - 2)}
+     * in the {@code char} array is in the
+     * high-surrogate range, then the supplementary code point
+     * corresponding to this surrogate pair is returned. Otherwise,
+     * the {@code char} value at {@code (index - 1)} is
+     * returned.
+     *
+     * @param a the {@code char} array
+     * @param index the index following the code point that should be returned
+     * @return the Unicode code point value before the given index.
+     * @exception NullPointerException if {@code a} is null.
+     * @exception IndexOutOfBoundsException if the {@code index}
+     * argument is less than 1 or greater than the length of the
+     * {@code char} array
+     * @since  1.5
+     */
+    public static int codePointBefore(char[] a, int index) {
+        return codePointBeforeImpl(a, index, 0);
+    }
+
+    /**
+     * Returns the code point preceding the given index of the
+     * {@code char} array, where only array elements with
+     * {@code index} greater than or equal to {@code start}
+     * can be used. If the {@code char} value at {@code (index - 1)}
+     * in the {@code char} array is in the
+     * low-surrogate range, {@code (index - 2)} is not less than
+     * {@code start}, and the {@code char} value at
+     * {@code (index - 2)} in the {@code char} array is in
+     * the high-surrogate range, then the supplementary code point
+     * corresponding to this surrogate pair is returned. Otherwise,
+     * the {@code char} value at {@code (index - 1)} is
+     * returned.
+     *
+     * @param a the {@code char} array
+     * @param index the index following the code point that should be returned
+     * @param start the index of the first array element in the
+     * {@code char} array
+     * @return the Unicode code point value before the given index.
+     * @exception NullPointerException if {@code a} is null.
+     * @exception IndexOutOfBoundsException if the {@code index}
+     * argument is not greater than the {@code start} argument or
+     * is greater than the length of the {@code char} array, or
+     * if the {@code start} argument is negative or not less than
+     * the length of the {@code char} array.
+     * @since  1.5
+     */
+    public static int codePointBefore(char[] a, int index, int start) {
+        if (index <= start || start < 0 || start >= a.length) {
+            throw new IndexOutOfBoundsException();
+        }
+        return codePointBeforeImpl(a, index, start);
+    }
+
+    // throws ArrayIndexOutofBoundsException if index-1 out of bounds
+    static int codePointBeforeImpl(char[] a, int index, int start) {
+        char c2 = a[--index];
+        if (isLowSurrogate(c2)) {
+            if (index > start) {
+                char c1 = a[--index];
+                if (isHighSurrogate(c1)) {
+                    return toCodePoint(c1, c2);
+                }
+            }
+        }
+        return c2;
+    }
+
+    /**
+     * Returns the leading surrogate (a
+     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
+     * high surrogate code unit</a>) of the
+     * <a href="http://www.unicode.org/glossary/#surrogate_pair">
+     * surrogate pair</a>
+     * representing the specified supplementary character (Unicode
+     * code point) in the UTF-16 encoding.  If the specified character
+     * is not a
+     * <a href="Character.html#supplementary">supplementary character</a>,
+     * an unspecified {@code char} is returned.
+     *
+     * <p>If
+     * {@link #isSupplementaryCodePoint isSupplementaryCodePoint(x)}
+     * is {@code true}, then
+     * {@link #isHighSurrogate isHighSurrogate}{@code (highSurrogate(x))} and
+     * {@link #toCodePoint toCodePoint}{@code (highSurrogate(x), }{@link #lowSurrogate lowSurrogate}{@code (x)) == x}
+     * are also always {@code true}.
+     *
+     * @param   codePoint a supplementary character (Unicode code point)
+     * @return  the leading surrogate code unit used to represent the
+     *          character in the UTF-16 encoding
+     * @since   1.7
+     */
+    public static char highSurrogate(int codePoint) {
+        return (char) ((codePoint >>> 10)
+            + (MIN_HIGH_SURROGATE - (MIN_SUPPLEMENTARY_CODE_POINT >>> 10)));
+    }
+
+    /**
+     * Returns the trailing surrogate (a
+     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
+     * low surrogate code unit</a>) of the
+     * <a href="http://www.unicode.org/glossary/#surrogate_pair">
+     * surrogate pair</a>
+     * representing the specified supplementary character (Unicode
+     * code point) in the UTF-16 encoding.  If the specified character
+     * is not a
+     * <a href="Character.html#supplementary">supplementary character</a>,
+     * an unspecified {@code char} is returned.
+     *
+     * <p>If
+     * {@link #isSupplementaryCodePoint isSupplementaryCodePoint(x)}
+     * is {@code true}, then
+     * {@link #isLowSurrogate isLowSurrogate}{@code (lowSurrogate(x))} and
+     * {@link #toCodePoint toCodePoint}{@code (}{@link #highSurrogate highSurrogate}{@code (x), lowSurrogate(x)) == x}
+     * are also always {@code true}.
+     *
+     * @param   codePoint a supplementary character (Unicode code point)
+     * @return  the trailing surrogate code unit used to represent the
+     *          character in the UTF-16 encoding
+     * @since   1.7
+     */
+    public static char lowSurrogate(int codePoint) {
+        return (char) ((codePoint & 0x3ff) + MIN_LOW_SURROGATE);
+    }
+
+    /**
+     * Converts the specified character (Unicode code point) to its
+     * UTF-16 representation. If the specified code point is a BMP
+     * (Basic Multilingual Plane or Plane 0) value, the same value is
+     * stored in {@code dst[dstIndex]}, and 1 is returned. If the
+     * specified code point is a supplementary character, its
+     * surrogate values are stored in {@code dst[dstIndex]}
+     * (high-surrogate) and {@code dst[dstIndex+1]}
+     * (low-surrogate), and 2 is returned.
+     *
+     * @param  codePoint the character (Unicode code point) to be converted.
+     * @param  dst an array of {@code char} in which the
+     * {@code codePoint}'s UTF-16 value is stored.
+     * @param dstIndex the start index into the {@code dst}
+     * array where the converted value is stored.
+     * @return 1 if the code point is a BMP code point, 2 if the
+     * code point is a supplementary code point.
+     * @exception IllegalArgumentException if the specified
+     * {@code codePoint} is not a valid Unicode code point.
+     * @exception NullPointerException if the specified {@code dst} is null.
+     * @exception IndexOutOfBoundsException if {@code dstIndex}
+     * is negative or not less than {@code dst.length}, or if
+     * {@code dst} at {@code dstIndex} doesn't have enough
+     * array element(s) to store the resulting {@code char}
+     * value(s). (If {@code dstIndex} is equal to
+     * {@code dst.length-1} and the specified
+     * {@code codePoint} is a supplementary character, the
+     * high-surrogate value is not stored in
+     * {@code dst[dstIndex]}.)
+     * @since  1.5
+     */
+    public static int toChars(int codePoint, char[] dst, int dstIndex) {
+        if (isBmpCodePoint(codePoint)) {
+            dst[dstIndex] = (char) codePoint;
+            return 1;
+        } else if (isValidCodePoint(codePoint)) {
+            toSurrogates(codePoint, dst, dstIndex);
+            return 2;
+        } else {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    /**
+     * Converts the specified character (Unicode code point) to its
+     * UTF-16 representation stored in a {@code char} array. If
+     * the specified code point is a BMP (Basic Multilingual Plane or
+     * Plane 0) value, the resulting {@code char} array has
+     * the same value as {@code codePoint}. If the specified code
+     * point is a supplementary code point, the resulting
+     * {@code char} array has the corresponding surrogate pair.
+     *
+     * @param  codePoint a Unicode code point
+     * @return a {@code char} array having
+     *         {@code codePoint}'s UTF-16 representation.
+     * @exception IllegalArgumentException if the specified
+     * {@code codePoint} is not a valid Unicode code point.
+     * @since  1.5
+     */
+    public static char[] toChars(int codePoint) {
+        if (isBmpCodePoint(codePoint)) {
+            return new char[] { (char) codePoint };
+        } else if (isValidCodePoint(codePoint)) {
+            char[] result = new char[2];
+            toSurrogates(codePoint, result, 0);
+            return result;
+        } else {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    static void toSurrogates(int codePoint, char[] dst, int index) {
+        // We write elements "backwards" to guarantee all-or-nothing
+        dst[index+1] = lowSurrogate(codePoint);
+        dst[index] = highSurrogate(codePoint);
+    }
+
+    /**
+     * Returns the number of Unicode code points in the text range of
+     * the specified char sequence. The text range begins at the
+     * specified {@code beginIndex} and extends to the
+     * {@code char} at index {@code endIndex - 1}. Thus the
+     * length (in {@code char}s) of the text range is
+     * {@code endIndex-beginIndex}. Unpaired surrogates within
+     * the text range count as one code point each.
+     *
+     * @param seq the char sequence
+     * @param beginIndex the index to the first {@code char} of
+     * the text range.
+     * @param endIndex the index after the last {@code char} of
+     * the text range.
+     * @return the number of Unicode code points in the specified text
+     * range
+     * @exception NullPointerException if {@code seq} is null.
+     * @exception IndexOutOfBoundsException if the
+     * {@code beginIndex} is negative, or {@code endIndex}
+     * is larger than the length of the given sequence, or
+     * {@code beginIndex} is larger than {@code endIndex}.
+     * @since  1.5
+     */
+    public static int codePointCount(CharSequence seq, int beginIndex, int endIndex) {
+        int length = seq.length();
+        if (beginIndex < 0 || endIndex > length || beginIndex > endIndex) {
+            throw new IndexOutOfBoundsException();
+        }
+        int n = endIndex - beginIndex;
+        for (int i = beginIndex; i < endIndex; ) {
+            if (isHighSurrogate(seq.charAt(i++)) && i < endIndex &&
+                isLowSurrogate(seq.charAt(i))) {
+                n--;
+                i++;
+            }
+        }
+        return n;
+    }
+
+    /**
+     * Returns the number of Unicode code points in a subarray of the
+     * {@code char} array argument. The {@code offset}
+     * argument is the index of the first {@code char} of the
+     * subarray and the {@code count} argument specifies the
+     * length of the subarray in {@code char}s. Unpaired
+     * surrogates within the subarray count as one code point each.
+     *
+     * @param a the {@code char} array
+     * @param offset the index of the first {@code char} in the
+     * given {@code char} array
+     * @param count the length of the subarray in {@code char}s
+     * @return the number of Unicode code points in the specified subarray
+     * @exception NullPointerException if {@code a} is null.
+     * @exception IndexOutOfBoundsException if {@code offset} or
+     * {@code count} is negative, or if {@code offset +
+     * count} is larger than the length of the given array.
+     * @since  1.5
+     */
+    public static int codePointCount(char[] a, int offset, int count) {
+        if (count > a.length - offset || offset < 0 || count < 0) {
+            throw new IndexOutOfBoundsException();
+        }
+        return codePointCountImpl(a, offset, count);
+    }
+
+    static int codePointCountImpl(char[] a, int offset, int count) {
+        int endIndex = offset + count;
+        int n = count;
+        for (int i = offset; i < endIndex; ) {
+            if (isHighSurrogate(a[i++]) && i < endIndex &&
+                isLowSurrogate(a[i])) {
+                n--;
+                i++;
+            }
+        }
+        return n;
+    }
+
+    /**
+     * Returns the index within the given char sequence that is offset
+     * from the given {@code index} by {@code codePointOffset}
+     * code points. Unpaired surrogates within the text range given by
+     * {@code index} and {@code codePointOffset} count as
+     * one code point each.
+     *
+     * @param seq the char sequence
+     * @param index the index to be offset
+     * @param codePointOffset the offset in code points
+     * @return the index within the char sequence
+     * @exception NullPointerException if {@code seq} is null.
+     * @exception IndexOutOfBoundsException if {@code index}
+     *   is negative or larger then the length of the char sequence,
+     *   or if {@code codePointOffset} is positive and the
+     *   subsequence starting with {@code index} has fewer than
+     *   {@code codePointOffset} code points, or if
+     *   {@code codePointOffset} is negative and the subsequence
+     *   before {@code index} has fewer than the absolute value
+     *   of {@code codePointOffset} code points.
+     * @since 1.5
+     */
+    public static int offsetByCodePoints(CharSequence seq, int index,
+                                         int codePointOffset) {
+        int length = seq.length();
+        if (index < 0 || index > length) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        int x = index;
+        if (codePointOffset >= 0) {
+            int i;
+            for (i = 0; x < length && i < codePointOffset; i++) {
+                if (isHighSurrogate(seq.charAt(x++)) && x < length &&
+                    isLowSurrogate(seq.charAt(x))) {
+                    x++;
+                }
+            }
+            if (i < codePointOffset) {
+                throw new IndexOutOfBoundsException();
+            }
+        } else {
+            int i;
+            for (i = codePointOffset; x > 0 && i < 0; i++) {
+                if (isLowSurrogate(seq.charAt(--x)) && x > 0 &&
+                    isHighSurrogate(seq.charAt(x-1))) {
+                    x--;
+                }
+            }
+            if (i < 0) {
+                throw new IndexOutOfBoundsException();
+            }
+        }
+        return x;
+    }
+
+    /**
+     * Returns the index within the given {@code char} subarray
+     * that is offset from the given {@code index} by
+     * {@code codePointOffset} code points. The
+     * {@code start} and {@code count} arguments specify a
+     * subarray of the {@code char} array. Unpaired surrogates
+     * within the text range given by {@code index} and
+     * {@code codePointOffset} count as one code point each.
+     *
+     * @param a the {@code char} array
+     * @param start the index of the first {@code char} of the
+     * subarray
+     * @param count the length of the subarray in {@code char}s
+     * @param index the index to be offset
+     * @param codePointOffset the offset in code points
+     * @return the index within the subarray
+     * @exception NullPointerException if {@code a} is null.
+     * @exception IndexOutOfBoundsException
+     *   if {@code start} or {@code count} is negative,
+     *   or if {@code start + count} is larger than the length of
+     *   the given array,
+     *   or if {@code index} is less than {@code start} or
+     *   larger then {@code start + count},
+     *   or if {@code codePointOffset} is positive and the text range
+     *   starting with {@code index} and ending with {@code start + count - 1}
+     *   has fewer than {@code codePointOffset} code
+     *   points,
+     *   or if {@code codePointOffset} is negative and the text range
+     *   starting with {@code start} and ending with {@code index - 1}
+     *   has fewer than the absolute value of
+     *   {@code codePointOffset} code points.
+     * @since 1.5
+     */
+    public static int offsetByCodePoints(char[] a, int start, int count,
+                                         int index, int codePointOffset) {
+        if (count > a.length-start || start < 0 || count < 0
+            || index < start || index > start+count) {
+            throw new IndexOutOfBoundsException();
+        }
+        return offsetByCodePointsImpl(a, start, count, index, codePointOffset);
+    }
+
+    static int offsetByCodePointsImpl(char[]a, int start, int count,
+                                      int index, int codePointOffset) {
+        int x = index;
+        if (codePointOffset >= 0) {
+            int limit = start + count;
+            int i;
+            for (i = 0; x < limit && i < codePointOffset; i++) {
+                if (isHighSurrogate(a[x++]) && x < limit &&
+                    isLowSurrogate(a[x])) {
+                    x++;
+                }
+            }
+            if (i < codePointOffset) {
+                throw new IndexOutOfBoundsException();
+            }
+        } else {
+            int i;
+            for (i = codePointOffset; x > start && i < 0; i++) {
+                if (isLowSurrogate(a[--x]) && x > start &&
+                    isHighSurrogate(a[x-1])) {
+                    x--;
+                }
+            }
+            if (i < 0) {
+                throw new IndexOutOfBoundsException();
+            }
+        }
+        return x;
+    }
+
+    /**
+     * Determines if the specified character is a lowercase character.
+     * <p>
+     * A character is lowercase if its general category type, provided
+     * by {@code Character.getType(ch)}, is
+     * {@code LOWERCASE_LETTER}, or it has contributory property
+     * Other_Lowercase as defined by the Unicode Standard.
+     * <p>
+     * The following are examples of lowercase characters:
+     * <p><blockquote><pre>
+     * a b c d e f g h i j k l m n o p q r s t u v w x y z
+     * '&#92;u00DF' '&#92;u00E0' '&#92;u00E1' '&#92;u00E2' '&#92;u00E3' '&#92;u00E4' '&#92;u00E5' '&#92;u00E6'
+     * '&#92;u00E7' '&#92;u00E8' '&#92;u00E9' '&#92;u00EA' '&#92;u00EB' '&#92;u00EC' '&#92;u00ED' '&#92;u00EE'
+     * '&#92;u00EF' '&#92;u00F0' '&#92;u00F1' '&#92;u00F2' '&#92;u00F3' '&#92;u00F4' '&#92;u00F5' '&#92;u00F6'
+     * '&#92;u00F8' '&#92;u00F9' '&#92;u00FA' '&#92;u00FB' '&#92;u00FC' '&#92;u00FD' '&#92;u00FE' '&#92;u00FF'
+     * </pre></blockquote>
+     * <p> Many other Unicode characters are lowercase too.
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isLowerCase(int)} method.
+     *
+     * @param   ch   the character to be tested.
+     * @return  {@code true} if the character is lowercase;
+     *          {@code false} otherwise.
+     * @see     Character#isLowerCase(char)
+     * @see     Character#isTitleCase(char)
+     * @see     Character#toLowerCase(char)
+     * @see     Character#getType(char)
+     */
+    public static boolean isLowerCase(char ch) {
+        return ch == toLowerCase(ch);
+    }
+
+    /**
+     * Determines if the specified character is an uppercase character.
+     * <p>
+     * A character is uppercase if its general category type, provided by
+     * {@code Character.getType(ch)}, is {@code UPPERCASE_LETTER}.
+     * or it has contributory property Other_Uppercase as defined by the Unicode Standard.
+     * <p>
+     * The following are examples of uppercase characters:
+     * <p><blockquote><pre>
+     * A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+     * '&#92;u00C0' '&#92;u00C1' '&#92;u00C2' '&#92;u00C3' '&#92;u00C4' '&#92;u00C5' '&#92;u00C6' '&#92;u00C7'
+     * '&#92;u00C8' '&#92;u00C9' '&#92;u00CA' '&#92;u00CB' '&#92;u00CC' '&#92;u00CD' '&#92;u00CE' '&#92;u00CF'
+     * '&#92;u00D0' '&#92;u00D1' '&#92;u00D2' '&#92;u00D3' '&#92;u00D4' '&#92;u00D5' '&#92;u00D6' '&#92;u00D8'
+     * '&#92;u00D9' '&#92;u00DA' '&#92;u00DB' '&#92;u00DC' '&#92;u00DD' '&#92;u00DE'
+     * </pre></blockquote>
+     * <p> Many other Unicode characters are uppercase too.<p>
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isUpperCase(int)} method.
+     *
+     * @param   ch   the character to be tested.
+     * @return  {@code true} if the character is uppercase;
+     *          {@code false} otherwise.
+     * @see     Character#isLowerCase(char)
+     * @see     Character#isTitleCase(char)
+     * @see     Character#toUpperCase(char)
+     * @see     Character#getType(char)
+     * @since   1.0
+     */
+    public static boolean isUpperCase(char ch) {
+        return ch == toUpperCase(ch);
+    }
+
+    /**
+     * Determines if the specified character is a titlecase character.
+     * <p>
+     * A character is a titlecase character if its general
+     * category type, provided by {@code Character.getType(ch)},
+     * is {@code TITLECASE_LETTER}.
+     * <p>
+     * Some characters look like pairs of Latin letters. For example, there
+     * is an uppercase letter that looks like "LJ" and has a corresponding
+     * lowercase letter that looks like "lj". A third form, which looks like "Lj",
+     * is the appropriate form to use when rendering a word in lowercase
+     * with initial capitals, as for a book title.
+     * <p>
+     * These are some of the Unicode characters for which this method returns
+     * {@code true}:
+     * <ul>
+     * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON}
+     * <li>{@code LATIN CAPITAL LETTER L WITH SMALL LETTER J}
+     * <li>{@code LATIN CAPITAL LETTER N WITH SMALL LETTER J}
+     * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z}
+     * </ul>
+     * <p> Many other Unicode characters are titlecase too.<p>
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isTitleCase(int)} method.
+     *
+     * @param   ch   the character to be tested.
+     * @return  {@code true} if the character is titlecase;
+     *          {@code false} otherwise.
+     * @see     Character#isLowerCase(char)
+     * @see     Character#isUpperCase(char)
+     * @see     Character#toTitleCase(char)
+     * @see     Character#getType(char)
+     * @since   1.0.2
+     */
+    public static boolean isTitleCase(char ch) {
+        return isTitleCase((int)ch);
+    }
+
+    /**
+     * Determines if the specified character (Unicode code point) is a titlecase character.
+     * <p>
+     * A character is a titlecase character if its general
+     * category type, provided by {@link Character#getType(int) getType(codePoint)},
+     * is {@code TITLECASE_LETTER}.
+     * <p>
+     * Some characters look like pairs of Latin letters. For example, there
+     * is an uppercase letter that looks like "LJ" and has a corresponding
+     * lowercase letter that looks like "lj". A third form, which looks like "Lj",
+     * is the appropriate form to use when rendering a word in lowercase
+     * with initial capitals, as for a book title.
+     * <p>
+     * These are some of the Unicode characters for which this method returns
+     * {@code true}:
+     * <ul>
+     * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON}
+     * <li>{@code LATIN CAPITAL LETTER L WITH SMALL LETTER J}
+     * <li>{@code LATIN CAPITAL LETTER N WITH SMALL LETTER J}
+     * <li>{@code LATIN CAPITAL LETTER D WITH SMALL LETTER Z}
+     * </ul>
+     * <p> Many other Unicode characters are titlecase too.<p>
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  {@code true} if the character is titlecase;
+     *          {@code false} otherwise.
+     * @see     Character#isLowerCase(int)
+     * @see     Character#isUpperCase(int)
+     * @see     Character#toTitleCase(int)
+     * @see     Character#getType(int)
+     * @since   1.5
+     */
+    public static boolean isTitleCase(int codePoint) {
+        return getType(codePoint) == Character.TITLECASE_LETTER;
+    }
+
+    /**
+     * Determines if the specified character is a digit.
+     * <p>
+     * A character is a digit if its general category type, provided
+     * by {@code Character.getType(ch)}, is
+     * {@code DECIMAL_DIGIT_NUMBER}.
+     * <p>
+     * Some Unicode character ranges that contain digits:
+     * <ul>
+     * <li>{@code '\u005Cu0030'} through {@code '\u005Cu0039'},
+     *     ISO-LATIN-1 digits ({@code '0'} through {@code '9'})
+     * <li>{@code '\u005Cu0660'} through {@code '\u005Cu0669'},
+     *     Arabic-Indic digits
+     * <li>{@code '\u005Cu06F0'} through {@code '\u005Cu06F9'},
+     *     Extended Arabic-Indic digits
+     * <li>{@code '\u005Cu0966'} through {@code '\u005Cu096F'},
+     *     Devanagari digits
+     * <li>{@code '\u005CuFF10'} through {@code '\u005CuFF19'},
+     *     Fullwidth digits
+     * </ul>
+     *
+     * Many other character ranges contain digits as well.
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isDigit(int)} method.
+     *
+     * @param   ch   the character to be tested.
+     * @return  {@code true} if the character is a digit;
+     *          {@code false} otherwise.
+     * @see     Character#digit(char, int)
+     * @see     Character#forDigit(int, int)
+     * @see     Character#getType(char)
+     */
+    public static boolean isDigit(char ch) {
+        return String.valueOf(ch).matches("\\d");
+    }
+
+    /**
+     * Determines if the specified character (Unicode code point) is a digit.
+     * <p>
+     * A character is a digit if its general category type, provided
+     * by {@link Character#getType(int) getType(codePoint)}, is
+     * {@code DECIMAL_DIGIT_NUMBER}.
+     * <p>
+     * Some Unicode character ranges that contain digits:
+     * <ul>
+     * <li>{@code '\u005Cu0030'} through {@code '\u005Cu0039'},
+     *     ISO-LATIN-1 digits ({@code '0'} through {@code '9'})
+     * <li>{@code '\u005Cu0660'} through {@code '\u005Cu0669'},
+     *     Arabic-Indic digits
+     * <li>{@code '\u005Cu06F0'} through {@code '\u005Cu06F9'},
+     *     Extended Arabic-Indic digits
+     * <li>{@code '\u005Cu0966'} through {@code '\u005Cu096F'},
+     *     Devanagari digits
+     * <li>{@code '\u005CuFF10'} through {@code '\u005CuFF19'},
+     *     Fullwidth digits
+     * </ul>
+     *
+     * Many other character ranges contain digits as well.
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  {@code true} if the character is a digit;
+     *          {@code false} otherwise.
+     * @see     Character#forDigit(int, int)
+     * @see     Character#getType(int)
+     * @since   1.5
+     */
+    public static boolean isDigit(int codePoint) {
+        return fromCodeChars(codePoint).matches("\\d");
+    }
+    
+    @JavaScriptBody(args = "c", body = "return String.fromCharCode(c);")
+    private native static String fromCodeChars(int codePoint);
+
+    /**
+     * Determines if a character is defined in Unicode.
+     * <p>
+     * A character is defined if at least one of the following is true:
+     * <ul>
+     * <li>It has an entry in the UnicodeData file.
+     * <li>It has a value in a range defined by the UnicodeData file.
+     * </ul>
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isDefined(int)} method.
+     *
+     * @param   ch   the character to be tested
+     * @return  {@code true} if the character has a defined meaning
+     *          in Unicode; {@code false} otherwise.
+     * @see     Character#isDigit(char)
+     * @see     Character#isLetter(char)
+     * @see     Character#isLetterOrDigit(char)
+     * @see     Character#isLowerCase(char)
+     * @see     Character#isTitleCase(char)
+     * @see     Character#isUpperCase(char)
+     * @since   1.0.2
+     */
+    public static boolean isDefined(char ch) {
+        return isDefined((int)ch);
+    }
+
+    /**
+     * Determines if a character (Unicode code point) is defined in Unicode.
+     * <p>
+     * A character is defined if at least one of the following is true:
+     * <ul>
+     * <li>It has an entry in the UnicodeData file.
+     * <li>It has a value in a range defined by the UnicodeData file.
+     * </ul>
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  {@code true} if the character has a defined meaning
+     *          in Unicode; {@code false} otherwise.
+     * @see     Character#isDigit(int)
+     * @see     Character#isLetter(int)
+     * @see     Character#isLetterOrDigit(int)
+     * @see     Character#isLowerCase(int)
+     * @see     Character#isTitleCase(int)
+     * @see     Character#isUpperCase(int)
+     * @since   1.5
+     */
+    public static boolean isDefined(int codePoint) {
+        return getType(codePoint) != Character.UNASSIGNED;
+    }
+
+    /**
+     * Determines if the specified character is a letter.
+     * <p>
+     * A character is considered to be a letter if its general
+     * category type, provided by {@code Character.getType(ch)},
+     * is any of the following:
+     * <ul>
+     * <li> {@code UPPERCASE_LETTER}
+     * <li> {@code LOWERCASE_LETTER}
+     * <li> {@code TITLECASE_LETTER}
+     * <li> {@code MODIFIER_LETTER}
+     * <li> {@code OTHER_LETTER}
+     * </ul>
+     *
+     * Not all letters have case. Many characters are
+     * letters but are neither uppercase nor lowercase nor titlecase.
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isLetter(int)} method.
+     *
+     * @param   ch   the character to be tested.
+     * @return  {@code true} if the character is a letter;
+     *          {@code false} otherwise.
+     * @see     Character#isDigit(char)
+     * @see     Character#isJavaIdentifierStart(char)
+     * @see     Character#isJavaLetter(char)
+     * @see     Character#isJavaLetterOrDigit(char)
+     * @see     Character#isLetterOrDigit(char)
+     * @see     Character#isLowerCase(char)
+     * @see     Character#isTitleCase(char)
+     * @see     Character#isUnicodeIdentifierStart(char)
+     * @see     Character#isUpperCase(char)
+     */
+    public static boolean isLetter(char ch) {
+        return String.valueOf(ch).matches("\\w") && !isDigit(ch);
+    }
+
+    /**
+     * Determines if the specified character (Unicode code point) is a letter.
+     * <p>
+     * A character is considered to be a letter if its general
+     * category type, provided by {@link Character#getType(int) getType(codePoint)},
+     * is any of the following:
+     * <ul>
+     * <li> {@code UPPERCASE_LETTER}
+     * <li> {@code LOWERCASE_LETTER}
+     * <li> {@code TITLECASE_LETTER}
+     * <li> {@code MODIFIER_LETTER}
+     * <li> {@code OTHER_LETTER}
+     * </ul>
+     *
+     * Not all letters have case. Many characters are
+     * letters but are neither uppercase nor lowercase nor titlecase.
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  {@code true} if the character is a letter;
+     *          {@code false} otherwise.
+     * @see     Character#isDigit(int)
+     * @see     Character#isJavaIdentifierStart(int)
+     * @see     Character#isLetterOrDigit(int)
+     * @see     Character#isLowerCase(int)
+     * @see     Character#isTitleCase(int)
+     * @see     Character#isUnicodeIdentifierStart(int)
+     * @see     Character#isUpperCase(int)
+     * @since   1.5
+     */
+    public static boolean isLetter(int codePoint) {
+        return fromCodeChars(codePoint).matches("\\w") && !isDigit(codePoint);
+    }
+
+    /**
+     * Determines if the specified character is a letter or digit.
+     * <p>
+     * A character is considered to be a letter or digit if either
+     * {@code Character.isLetter(char ch)} or
+     * {@code Character.isDigit(char ch)} returns
+     * {@code true} for the character.
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isLetterOrDigit(int)} method.
+     *
+     * @param   ch   the character to be tested.
+     * @return  {@code true} if the character is a letter or digit;
+     *          {@code false} otherwise.
+     * @see     Character#isDigit(char)
+     * @see     Character#isJavaIdentifierPart(char)
+     * @see     Character#isJavaLetter(char)
+     * @see     Character#isJavaLetterOrDigit(char)
+     * @see     Character#isLetter(char)
+     * @see     Character#isUnicodeIdentifierPart(char)
+     * @since   1.0.2
+     */
+    public static boolean isLetterOrDigit(char ch) {
+        return String.valueOf(ch).matches("\\w");
+    }
+
+    /**
+     * Determines if the specified character (Unicode code point) is a letter or digit.
+     * <p>
+     * A character is considered to be a letter or digit if either
+     * {@link #isLetter(int) isLetter(codePoint)} or
+     * {@link #isDigit(int) isDigit(codePoint)} returns
+     * {@code true} for the character.
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  {@code true} if the character is a letter or digit;
+     *          {@code false} otherwise.
+     * @see     Character#isDigit(int)
+     * @see     Character#isJavaIdentifierPart(int)
+     * @see     Character#isLetter(int)
+     * @see     Character#isUnicodeIdentifierPart(int)
+     * @since   1.5
+     */
+    public static boolean isLetterOrDigit(int codePoint) {
+        return fromCodeChars(codePoint).matches("\\w");
+    }
+    
+    static int getType(int x) {
+        throw new UnsupportedOperationException();
+    }
+ 
+    /**
+     * Determines if the specified character is
+     * permissible as the first character in a Java identifier.
+     * <p>
+     * A character may start a Java identifier if and only if
+     * one of the following conditions is true:
+     * <ul>
+     * <li> {@link #isLetter(char) isLetter(ch)} returns {@code true}
+     * <li> {@link #getType(char) getType(ch)} returns {@code LETTER_NUMBER}
+     * <li> {@code ch} is a currency symbol (such as {@code '$'})
+     * <li> {@code ch} is a connecting punctuation character (such as {@code '_'}).
+     * </ul>
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isJavaIdentifierStart(int)} method.
+     *
+     * @param   ch the character to be tested.
+     * @return  {@code true} if the character may start a Java identifier;
+     *          {@code false} otherwise.
+     * @see     Character#isJavaIdentifierPart(char)
+     * @see     Character#isLetter(char)
+     * @see     Character#isUnicodeIdentifierStart(char)
+     * @see     javax.lang.model.SourceVersion#isIdentifier(CharSequence)
+     * @since   1.1
+     */
+    public static boolean isJavaIdentifierStart(char ch) {
+        return isJavaIdentifierStart((int)ch);
+    }
+
+    /**
+     * Determines if the character (Unicode code point) is
+     * permissible as the first character in a Java identifier.
+     * <p>
+     * A character may start a Java identifier if and only if
+     * one of the following conditions is true:
+     * <ul>
+     * <li> {@link #isLetter(int) isLetter(codePoint)}
+     *      returns {@code true}
+     * <li> {@link #getType(int) getType(codePoint)}
+     *      returns {@code LETTER_NUMBER}
+     * <li> the referenced character is a currency symbol (such as {@code '$'})
+     * <li> the referenced character is a connecting punctuation character
+     *      (such as {@code '_'}).
+     * </ul>
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  {@code true} if the character may start a Java identifier;
+     *          {@code false} otherwise.
+     * @see     Character#isJavaIdentifierPart(int)
+     * @see     Character#isLetter(int)
+     * @see     Character#isUnicodeIdentifierStart(int)
+     * @see     javax.lang.model.SourceVersion#isIdentifier(CharSequence)
+     * @since   1.5
+     */
+    public static boolean isJavaIdentifierStart(int codePoint) {
+        return 
+            ('A' <= codePoint && codePoint <= 'Z') ||
+            ('a' <= codePoint && codePoint <= 'z');
+    }
+
+    /**
+     * Determines if the specified character may be part of a Java
+     * identifier as other than the first character.
+     * <p>
+     * A character may be part of a Java identifier if any of the following
+     * are true:
+     * <ul>
+     * <li>  it is a letter
+     * <li>  it is a currency symbol (such as {@code '$'})
+     * <li>  it is a connecting punctuation character (such as {@code '_'})
+     * <li>  it is a digit
+     * <li>  it is a numeric letter (such as a Roman numeral character)
+     * <li>  it is a combining mark
+     * <li>  it is a non-spacing mark
+     * <li> {@code isIdentifierIgnorable} returns
+     * {@code true} for the character
+     * </ul>
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isJavaIdentifierPart(int)} method.
+     *
+     * @param   ch      the character to be tested.
+     * @return {@code true} if the character may be part of a
+     *          Java identifier; {@code false} otherwise.
+     * @see     Character#isIdentifierIgnorable(char)
+     * @see     Character#isJavaIdentifierStart(char)
+     * @see     Character#isLetterOrDigit(char)
+     * @see     Character#isUnicodeIdentifierPart(char)
+     * @see     javax.lang.model.SourceVersion#isIdentifier(CharSequence)
+     * @since   1.1
+     */
+    public static boolean isJavaIdentifierPart(char ch) {
+        return isJavaIdentifierPart((int)ch);
+    }
+
+    /**
+     * Determines if the character (Unicode code point) may be part of a Java
+     * identifier as other than the first character.
+     * <p>
+     * A character may be part of a Java identifier if any of the following
+     * are true:
+     * <ul>
+     * <li>  it is a letter
+     * <li>  it is a currency symbol (such as {@code '$'})
+     * <li>  it is a connecting punctuation character (such as {@code '_'})
+     * <li>  it is a digit
+     * <li>  it is a numeric letter (such as a Roman numeral character)
+     * <li>  it is a combining mark
+     * <li>  it is a non-spacing mark
+     * <li> {@link #isIdentifierIgnorable(int)
+     * isIdentifierIgnorable(codePoint)} returns {@code true} for
+     * the character
+     * </ul>
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return {@code true} if the character may be part of a
+     *          Java identifier; {@code false} otherwise.
+     * @see     Character#isIdentifierIgnorable(int)
+     * @see     Character#isJavaIdentifierStart(int)
+     * @see     Character#isLetterOrDigit(int)
+     * @see     Character#isUnicodeIdentifierPart(int)
+     * @see     javax.lang.model.SourceVersion#isIdentifier(CharSequence)
+     * @since   1.5
+     */
+    public static boolean isJavaIdentifierPart(int codePoint) {
+        return isJavaIdentifierStart(codePoint) ||
+            ('0' <= codePoint && codePoint <= '9') || codePoint == '$';
+    }
+   
+    /**
+     * Converts the character argument to lowercase using case
+     * mapping information from the UnicodeData file.
+     * <p>
+     * Note that
+     * {@code Character.isLowerCase(Character.toLowerCase(ch))}
+     * does not always return {@code true} for some ranges of
+     * characters, particularly those that are symbols or ideographs.
+     *
+     * <p>In general, {@link String#toLowerCase()} should be used to map
+     * characters to lowercase. {@code String} case mapping methods
+     * have several benefits over {@code Character} case mapping methods.
+     * {@code String} case mapping methods can perform locale-sensitive
+     * mappings, context-sensitive mappings, and 1:M character mappings, whereas
+     * the {@code Character} case mapping methods cannot.
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #toLowerCase(int)} method.
+     *
+     * @param   ch   the character to be converted.
+     * @return  the lowercase equivalent of the character, if any;
+     *          otherwise, the character itself.
+     * @see     Character#isLowerCase(char)
+     * @see     String#toLowerCase()
+     */
+    public static char toLowerCase(char ch) {
+        return String.valueOf(ch).toLowerCase().charAt(0);
+    }
+
+    /**
+     * Converts the character argument to uppercase using case mapping
+     * information from the UnicodeData file.
+     * <p>
+     * Note that
+     * {@code Character.isUpperCase(Character.toUpperCase(ch))}
+     * does not always return {@code true} for some ranges of
+     * characters, particularly those that are symbols or ideographs.
+     *
+     * <p>In general, {@link String#toUpperCase()} should be used to map
+     * characters to uppercase. {@code String} case mapping methods
+     * have several benefits over {@code Character} case mapping methods.
+     * {@code String} case mapping methods can perform locale-sensitive
+     * mappings, context-sensitive mappings, and 1:M character mappings, whereas
+     * the {@code Character} case mapping methods cannot.
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #toUpperCase(int)} method.
+     *
+     * @param   ch   the character to be converted.
+     * @return  the uppercase equivalent of the character, if any;
+     *          otherwise, the character itself.
+     * @see     Character#isUpperCase(char)
+     * @see     String#toUpperCase()
+     */
+    public static char toUpperCase(char ch) {
+        return String.valueOf(ch).toUpperCase().charAt(0);
+    }
+
+    /**
+     * Returns the numeric value of the character {@code ch} in the
+     * specified radix.
+     * <p>
+     * If the radix is not in the range {@code MIN_RADIX} &le;
+     * {@code radix} &le; {@code MAX_RADIX} or if the
+     * value of {@code ch} is not a valid digit in the specified
+     * radix, {@code -1} is returned. A character is a valid digit
+     * if at least one of the following is true:
+     * <ul>
+     * <li>The method {@code isDigit} is {@code true} of the character
+     *     and the Unicode decimal digit value of the character (or its
+     *     single-character decomposition) is less than the specified radix.
+     *     In this case the decimal digit value is returned.
+     * <li>The character is one of the uppercase Latin letters
+     *     {@code 'A'} through {@code 'Z'} and its code is less than
+     *     {@code radix + 'A' - 10}.
+     *     In this case, {@code ch - 'A' + 10}
+     *     is returned.
+     * <li>The character is one of the lowercase Latin letters
+     *     {@code 'a'} through {@code 'z'} and its code is less than
+     *     {@code radix + 'a' - 10}.
+     *     In this case, {@code ch - 'a' + 10}
+     *     is returned.
+     * <li>The character is one of the fullwidth uppercase Latin letters A
+     *     ({@code '\u005CuFF21'}) through Z ({@code '\u005CuFF3A'})
+     *     and its code is less than
+     *     {@code radix + '\u005CuFF21' - 10}.
+     *     In this case, {@code ch - '\u005CuFF21' + 10}
+     *     is returned.
+     * <li>The character is one of the fullwidth lowercase Latin letters a
+     *     ({@code '\u005CuFF41'}) through z ({@code '\u005CuFF5A'})
+     *     and its code is less than
+     *     {@code radix + '\u005CuFF41' - 10}.
+     *     In this case, {@code ch - '\u005CuFF41' + 10}
+     *     is returned.
+     * </ul>
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #digit(int, int)} method.
+     *
+     * @param   ch      the character to be converted.
+     * @param   radix   the radix.
+     * @return  the numeric value represented by the character in the
+     *          specified radix.
+     * @see     Character#forDigit(int, int)
+     * @see     Character#isDigit(char)
+     */
+    public static int digit(char ch, int radix) {
+        return digit((int)ch, radix);
+    }
+
+    /**
+     * Returns the numeric value of the specified character (Unicode
+     * code point) in the specified radix.
+     *
+     * <p>If the radix is not in the range {@code MIN_RADIX} &le;
+     * {@code radix} &le; {@code MAX_RADIX} or if the
+     * character is not a valid digit in the specified
+     * radix, {@code -1} is returned. A character is a valid digit
+     * if at least one of the following is true:
+     * <ul>
+     * <li>The method {@link #isDigit(int) isDigit(codePoint)} is {@code true} of the character
+     *     and the Unicode decimal digit value of the character (or its
+     *     single-character decomposition) is less than the specified radix.
+     *     In this case the decimal digit value is returned.
+     * <li>The character is one of the uppercase Latin letters
+     *     {@code 'A'} through {@code 'Z'} and its code is less than
+     *     {@code radix + 'A' - 10}.
+     *     In this case, {@code codePoint - 'A' + 10}
+     *     is returned.
+     * <li>The character is one of the lowercase Latin letters
+     *     {@code 'a'} through {@code 'z'} and its code is less than
+     *     {@code radix + 'a' - 10}.
+     *     In this case, {@code codePoint - 'a' + 10}
+     *     is returned.
+     * <li>The character is one of the fullwidth uppercase Latin letters A
+     *     ({@code '\u005CuFF21'}) through Z ({@code '\u005CuFF3A'})
+     *     and its code is less than
+     *     {@code radix + '\u005CuFF21' - 10}.
+     *     In this case,
+     *     {@code codePoint - '\u005CuFF21' + 10}
+     *     is returned.
+     * <li>The character is one of the fullwidth lowercase Latin letters a
+     *     ({@code '\u005CuFF41'}) through z ({@code '\u005CuFF5A'})
+     *     and its code is less than
+     *     {@code radix + '\u005CuFF41'- 10}.
+     *     In this case,
+     *     {@code codePoint - '\u005CuFF41' + 10}
+     *     is returned.
+     * </ul>
+     *
+     * @param   codePoint the character (Unicode code point) to be converted.
+     * @param   radix   the radix.
+     * @return  the numeric value represented by the character in the
+     *          specified radix.
+     * @see     Character#forDigit(int, int)
+     * @see     Character#isDigit(int)
+     * @since   1.5
+     */
+    @JavaScriptBody(args = { "codePoint", "radix" }, body=
+        "var x = parseInt(String.fromCharCode(codePoint), radix);\n"
+      + "return isNaN(x) ? -1 : x;"
+    )
+    public static int digit(int codePoint, int radix) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the {@code int} value that the specified Unicode
+     * character represents. For example, the character
+     * {@code '\u005Cu216C'} (the roman numeral fifty) will return
+     * an int with a value of 50.
+     * <p>
+     * The letters A-Z in their uppercase ({@code '\u005Cu0041'} through
+     * {@code '\u005Cu005A'}), lowercase
+     * ({@code '\u005Cu0061'} through {@code '\u005Cu007A'}), and
+     * full width variant ({@code '\u005CuFF21'} through
+     * {@code '\u005CuFF3A'} and {@code '\u005CuFF41'} through
+     * {@code '\u005CuFF5A'}) forms have numeric values from 10
+     * through 35. This is independent of the Unicode specification,
+     * which does not assign numeric values to these {@code char}
+     * values.
+     * <p>
+     * If the character does not have a numeric value, then -1 is returned.
+     * If the character has a numeric value that cannot be represented as a
+     * nonnegative integer (for example, a fractional value), then -2
+     * is returned.
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #getNumericValue(int)} method.
+     *
+     * @param   ch      the character to be converted.
+     * @return  the numeric value of the character, as a nonnegative {@code int}
+     *           value; -2 if the character has a numeric value that is not a
+     *          nonnegative integer; -1 if the character has no numeric value.
+     * @see     Character#forDigit(int, int)
+     * @see     Character#isDigit(char)
+     * @since   1.1
+     */
+    public static int getNumericValue(char ch) {
+        return getNumericValue((int)ch);
+    }
+
+    /**
+     * Returns the {@code int} value that the specified
+     * character (Unicode code point) represents. For example, the character
+     * {@code '\u005Cu216C'} (the Roman numeral fifty) will return
+     * an {@code int} with a value of 50.
+     * <p>
+     * The letters A-Z in their uppercase ({@code '\u005Cu0041'} through
+     * {@code '\u005Cu005A'}), lowercase
+     * ({@code '\u005Cu0061'} through {@code '\u005Cu007A'}), and
+     * full width variant ({@code '\u005CuFF21'} through
+     * {@code '\u005CuFF3A'} and {@code '\u005CuFF41'} through
+     * {@code '\u005CuFF5A'}) forms have numeric values from 10
+     * through 35. This is independent of the Unicode specification,
+     * which does not assign numeric values to these {@code char}
+     * values.
+     * <p>
+     * If the character does not have a numeric value, then -1 is returned.
+     * If the character has a numeric value that cannot be represented as a
+     * nonnegative integer (for example, a fractional value), then -2
+     * is returned.
+     *
+     * @param   codePoint the character (Unicode code point) to be converted.
+     * @return  the numeric value of the character, as a nonnegative {@code int}
+     *          value; -2 if the character has a numeric value that is not a
+     *          nonnegative integer; -1 if the character has no numeric value.
+     * @see     Character#forDigit(int, int)
+     * @see     Character#isDigit(int)
+     * @since   1.5
+     */
+    public static int getNumericValue(int codePoint) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Determines if the specified character is ISO-LATIN-1 white space.
+     * This method returns {@code true} for the following five
+     * characters only:
+     * <table>
+     * <tr><td>{@code '\t'}</td>            <td>{@code U+0009}</td>
+     *     <td>{@code HORIZONTAL TABULATION}</td></tr>
+     * <tr><td>{@code '\n'}</td>            <td>{@code U+000A}</td>
+     *     <td>{@code NEW LINE}</td></tr>
+     * <tr><td>{@code '\f'}</td>            <td>{@code U+000C}</td>
+     *     <td>{@code FORM FEED}</td></tr>
+     * <tr><td>{@code '\r'}</td>            <td>{@code U+000D}</td>
+     *     <td>{@code CARRIAGE RETURN}</td></tr>
+     * <tr><td>{@code '&nbsp;'}</td>  <td>{@code U+0020}</td>
+     *     <td>{@code SPACE}</td></tr>
+     * </table>
+     *
+     * @param      ch   the character to be tested.
+     * @return     {@code true} if the character is ISO-LATIN-1 white
+     *             space; {@code false} otherwise.
+     * @see        Character#isSpaceChar(char)
+     * @see        Character#isWhitespace(char)
+     * @deprecated Replaced by isWhitespace(char).
+     */
+    @Deprecated
+    public static boolean isSpace(char ch) {
+        return (ch <= 0x0020) &&
+            (((((1L << 0x0009) |
+            (1L << 0x000A) |
+            (1L << 0x000C) |
+            (1L << 0x000D) |
+            (1L << 0x0020)) >> ch) & 1L) != 0);
+    }
+
+
+
+    /**
+     * Determines if the specified character is white space according to Java.
+     * A character is a Java whitespace character if and only if it satisfies
+     * one of the following criteria:
+     * <ul>
+     * <li> It is a Unicode space character ({@code SPACE_SEPARATOR},
+     *      {@code LINE_SEPARATOR}, or {@code PARAGRAPH_SEPARATOR})
+     *      but is not also a non-breaking space ({@code '\u005Cu00A0'},
+     *      {@code '\u005Cu2007'}, {@code '\u005Cu202F'}).
+     * <li> It is {@code '\u005Ct'}, U+0009 HORIZONTAL TABULATION.
+     * <li> It is {@code '\u005Cn'}, U+000A LINE FEED.
+     * <li> It is {@code '\u005Cu000B'}, U+000B VERTICAL TABULATION.
+     * <li> It is {@code '\u005Cf'}, U+000C FORM FEED.
+     * <li> It is {@code '\u005Cr'}, U+000D CARRIAGE RETURN.
+     * <li> It is {@code '\u005Cu001C'}, U+001C FILE SEPARATOR.
+     * <li> It is {@code '\u005Cu001D'}, U+001D GROUP SEPARATOR.
+     * <li> It is {@code '\u005Cu001E'}, U+001E RECORD SEPARATOR.
+     * <li> It is {@code '\u005Cu001F'}, U+001F UNIT SEPARATOR.
+     * </ul>
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isWhitespace(int)} method.
+     *
+     * @param   ch the character to be tested.
+     * @return  {@code true} if the character is a Java whitespace
+     *          character; {@code false} otherwise.
+     * @see     Character#isSpaceChar(char)
+     * @since   1.1
+     */
+    public static boolean isWhitespace(char ch) {
+        return isWhitespace((int)ch);
+    }
+
+    /**
+     * Determines if the specified character (Unicode code point) is
+     * white space according to Java.  A character is a Java
+     * whitespace character if and only if it satisfies one of the
+     * following criteria:
+     * <ul>
+     * <li> It is a Unicode space character ({@link #SPACE_SEPARATOR},
+     *      {@link #LINE_SEPARATOR}, or {@link #PARAGRAPH_SEPARATOR})
+     *      but is not also a non-breaking space ({@code '\u005Cu00A0'},
+     *      {@code '\u005Cu2007'}, {@code '\u005Cu202F'}).
+     * <li> It is {@code '\u005Ct'}, U+0009 HORIZONTAL TABULATION.
+     * <li> It is {@code '\u005Cn'}, U+000A LINE FEED.
+     * <li> It is {@code '\u005Cu000B'}, U+000B VERTICAL TABULATION.
+     * <li> It is {@code '\u005Cf'}, U+000C FORM FEED.
+     * <li> It is {@code '\u005Cr'}, U+000D CARRIAGE RETURN.
+     * <li> It is {@code '\u005Cu001C'}, U+001C FILE SEPARATOR.
+     * <li> It is {@code '\u005Cu001D'}, U+001D GROUP SEPARATOR.
+     * <li> It is {@code '\u005Cu001E'}, U+001E RECORD SEPARATOR.
+     * <li> It is {@code '\u005Cu001F'}, U+001F UNIT SEPARATOR.
+     * </ul>
+     * <p>
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  {@code true} if the character is a Java whitespace
+     *          character; {@code false} otherwise.
+     * @see     Character#isSpaceChar(int)
+     * @since   1.5
+     */
+    public static boolean isWhitespace(int codePoint) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Determines if the specified character is an ISO control
+     * character.  A character is considered to be an ISO control
+     * character if its code is in the range {@code '\u005Cu0000'}
+     * through {@code '\u005Cu001F'} or in the range
+     * {@code '\u005Cu007F'} through {@code '\u005Cu009F'}.
+     *
+     * <p><b>Note:</b> This method cannot handle <a
+     * href="#supplementary"> supplementary characters</a>. To support
+     * all Unicode characters, including supplementary characters, use
+     * the {@link #isISOControl(int)} method.
+     *
+     * @param   ch      the character to be tested.
+     * @return  {@code true} if the character is an ISO control character;
+     *          {@code false} otherwise.
+     *
+     * @see     Character#isSpaceChar(char)
+     * @see     Character#isWhitespace(char)
+     * @since   1.1
+     */
+    public static boolean isISOControl(char ch) {
+        return isISOControl((int)ch);
+    }
+
+    /**
+     * Determines if the referenced character (Unicode code point) is an ISO control
+     * character.  A character is considered to be an ISO control
+     * character if its code is in the range {@code '\u005Cu0000'}
+     * through {@code '\u005Cu001F'} or in the range
+     * {@code '\u005Cu007F'} through {@code '\u005Cu009F'}.
+     *
+     * @param   codePoint the character (Unicode code point) to be tested.
+     * @return  {@code true} if the character is an ISO control character;
+     *          {@code false} otherwise.
+     * @see     Character#isSpaceChar(int)
+     * @see     Character#isWhitespace(int)
+     * @since   1.5
+     */
+    public static boolean isISOControl(int codePoint) {
+        // Optimized form of:
+        //     (codePoint >= 0x00 && codePoint <= 0x1F) ||
+        //     (codePoint >= 0x7F && codePoint <= 0x9F);
+        return codePoint <= 0x9F &&
+            (codePoint >= 0x7F || (codePoint >>> 5 == 0));
+    }
+
+    /**
+     * Determines the character representation for a specific digit in
+     * the specified radix. If the value of {@code radix} is not a
+     * valid radix, or the value of {@code digit} is not a valid
+     * digit in the specified radix, the null character
+     * ({@code '\u005Cu0000'}) is returned.
+     * <p>
+     * The {@code radix} argument is valid if it is greater than or
+     * equal to {@code MIN_RADIX} and less than or equal to
+     * {@code MAX_RADIX}. The {@code digit} argument is valid if
+     * {@code 0 <= digit < radix}.
+     * <p>
+     * If the digit is less than 10, then
+     * {@code '0' + digit} is returned. Otherwise, the value
+     * {@code 'a' + digit - 10} is returned.
+     *
+     * @param   digit   the number to convert to a character.
+     * @param   radix   the radix.
+     * @return  the {@code char} representation of the specified digit
+     *          in the specified radix.
+     * @see     Character#MIN_RADIX
+     * @see     Character#MAX_RADIX
+     * @see     Character#digit(char, int)
+     */
+    public static char forDigit(int digit, int radix) {
+        if ((digit >= radix) || (digit < 0)) {
+            return '\0';
+        }
+        if ((radix < Character.MIN_RADIX) || (radix > Character.MAX_RADIX)) {
+            return '\0';
+        }
+        if (digit < 10) {
+            return (char)('0' + digit);
+        }
+        return (char)('a' - 10 + digit);
+    }
+
+    /**
+     * Compares two {@code Character} objects numerically.
+     *
+     * @param   anotherCharacter   the {@code Character} to be compared.
+
+     * @return  the value {@code 0} if the argument {@code Character}
+     *          is equal to this {@code Character}; a value less than
+     *          {@code 0} if this {@code Character} is numerically less
+     *          than the {@code Character} argument; and a value greater than
+     *          {@code 0} if this {@code Character} is numerically greater
+     *          than the {@code Character} argument (unsigned comparison).
+     *          Note that this is strictly a numerical comparison; it is not
+     *          locale-dependent.
+     * @since   1.2
+     */
+    public int compareTo(Character anotherCharacter) {
+        return compare(this.value, anotherCharacter.value);
+    }
+
+    /**
+     * Compares two {@code char} values numerically.
+     * The value returned is identical to what would be returned by:
+     * <pre>
+     *    Character.valueOf(x).compareTo(Character.valueOf(y))
+     * </pre>
+     *
+     * @param  x the first {@code char} to compare
+     * @param  y the second {@code char} to compare
+     * @return the value {@code 0} if {@code x == y};
+     *         a value less than {@code 0} if {@code x < y}; and
+     *         a value greater than {@code 0} if {@code x > y}
+     * @since 1.7
+     */
+    public static int compare(char x, char y) {
+        return x - y;
+    }
+
+
+    /**
+     * The number of bits used to represent a <tt>char</tt> value in unsigned
+     * binary form, constant {@code 16}.
+     *
+     * @since 1.5
+     */
+    public static final int SIZE = 16;
+
+    /**
+     * Returns the value obtained by reversing the order of the bytes in the
+     * specified <tt>char</tt> value.
+     *
+     * @return the value obtained by reversing (or, equivalently, swapping)
+     *     the bytes in the specified <tt>char</tt> value.
+     * @since 1.5
+     */
+    public static char reverseBytes(char ch) {
+        return (char) (((ch & 0xFF00) >> 8) | (ch << 8));
+    }
+
+    static {
+        // as last step of initialization, initialize valueOf method
+        initValueOf();
+    }
+    @JavaScriptBody(args = {}, body = 
+        "vm.java_lang_Character(false)." +
+        "valueOf = function() { return this._value(); };"
+    )
+    private native static void initValueOf();
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Class.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Class.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1390 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.io.ByteArrayInputStream;
+import org.apidesign.bck2brwsr.emul.reflect.AnnotationImpl;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.TypeVariable;
+import java.net.URL;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.emul.reflect.MethodImpl;
+
+/**
+ * Instances of the class {@code Class} represent classes and
+ * interfaces in a running Java application.  An enum is a kind of
+ * class and an annotation is a kind of interface.  Every array also
+ * belongs to a class that is reflected as a {@code Class} object
+ * that is shared by all arrays with the same element type and number
+ * of dimensions.  The primitive Java types ({@code boolean},
+ * {@code byte}, {@code char}, {@code short},
+ * {@code int}, {@code long}, {@code float}, and
+ * {@code double}), and the keyword {@code void} are also
+ * represented as {@code Class} objects.
+ *
+ * <p> {@code Class} has no public constructor. Instead {@code Class}
+ * objects are constructed automatically by the Java Virtual Machine as classes
+ * are loaded and by calls to the {@code defineClass} method in the class
+ * loader.
+ *
+ * <p> The following example uses a {@code Class} object to print the
+ * class name of an object:
+ *
+ * <p> <blockquote><pre>
+ *     void printClassName(Object obj) {
+ *         System.out.println("The class of " + obj +
+ *                            " is " + obj.getClass().getName());
+ *     }
+ * </pre></blockquote>
+ *
+ * <p> It is also possible to get the {@code Class} object for a named
+ * type (or for void) using a class literal.  See Section 15.8.2 of
+ * <cite>The Java&trade; Language Specification</cite>.
+ * For example:
+ *
+ * <p> <blockquote>
+ *     {@code System.out.println("The name of class Foo is: "+Foo.class.getName());}
+ * </blockquote>
+ *
+ * @param <T> the type of the class modeled by this {@code Class}
+ * object.  For example, the type of {@code String.class} is {@code
+ * Class<String>}.  Use {@code Class<?>} if the class being modeled is
+ * unknown.
+ *
+ * @author  unascribed
+ * @see     java.lang.ClassLoader#defineClass(byte[], int, int)
+ * @since   JDK1.0
+ */
+public final
+    class Class<T> implements java.io.Serializable,
+                              java.lang.reflect.GenericDeclaration,
+                              java.lang.reflect.Type,
+                              java.lang.reflect.AnnotatedElement {
+    private static final int ANNOTATION= 0x00002000;
+    private static final int ENUM      = 0x00004000;
+    private static final int SYNTHETIC = 0x00001000;
+
+    /*
+     * Constructor. Only the Java Virtual Machine creates Class
+     * objects.
+     */
+    private Class() {}
+
+
+    /**
+     * Converts the object to a string. The string representation is the
+     * string "class" or "interface", followed by a space, and then by the
+     * fully qualified name of the class in the format returned by
+     * {@code getName}.  If this {@code Class} object represents a
+     * primitive type, this method returns the name of the primitive type.  If
+     * this {@code Class} object represents void this method returns
+     * "void".
+     *
+     * @return a string representation of this class object.
+     */
+    public String toString() {
+        return (isInterface() ? "interface " : (isPrimitive() ? "" : "class "))
+            + getName();
+    }
+
+
+    /**
+     * Returns the {@code Class} object associated with the class or
+     * interface with the given string name.  Invoking this method is
+     * equivalent to:
+     *
+     * <blockquote>
+     *  {@code Class.forName(className, true, currentLoader)}
+     * </blockquote>
+     *
+     * where {@code currentLoader} denotes the defining class loader of
+     * the current class.
+     *
+     * <p> For example, the following code fragment returns the
+     * runtime {@code Class} descriptor for the class named
+     * {@code java.lang.Thread}:
+     *
+     * <blockquote>
+     *   {@code Class t = Class.forName("java.lang.Thread")}
+     * </blockquote>
+     * <p>
+     * A call to {@code forName("X")} causes the class named
+     * {@code X} to be initialized.
+     *
+     * @param      className   the fully qualified name of the desired class.
+     * @return     the {@code Class} object for the class with the
+     *             specified name.
+     * @exception LinkageError if the linkage fails
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *            by this method fails
+     * @exception ClassNotFoundException if the class cannot be located
+     */
+    public static Class<?> forName(String className)
+    throws ClassNotFoundException {
+        if (className.startsWith("[")) {
+            Class<?> arrType = defineArray(className);
+            Class<?> c = arrType;
+            while (c != null && c.isArray()) {
+                c = c.getComponentType0(); // verify component type is sane
+            }
+            return arrType;
+        }
+        Class<?> c = loadCls(className, className.replace('.', '_'));
+        if (c == null) {
+            throw new ClassNotFoundException(className);
+        }
+        return c;
+    }
+
+
+    /**
+     * Returns the {@code Class} object associated with the class or
+     * interface with the given string name, using the given class loader.
+     * Given the fully qualified name for a class or interface (in the same
+     * format returned by {@code getName}) this method attempts to
+     * locate, load, and link the class or interface.  The specified class
+     * loader is used to load the class or interface.  If the parameter
+     * {@code loader} is null, the class is loaded through the bootstrap
+     * class loader.  The class is initialized only if the
+     * {@code initialize} parameter is {@code true} and if it has
+     * not been initialized earlier.
+     *
+     * <p> If {@code name} denotes a primitive type or void, an attempt
+     * will be made to locate a user-defined class in the unnamed package whose
+     * name is {@code name}. Therefore, this method cannot be used to
+     * obtain any of the {@code Class} objects representing primitive
+     * types or void.
+     *
+     * <p> If {@code name} denotes an array class, the component type of
+     * the array class is loaded but not initialized.
+     *
+     * <p> For example, in an instance method the expression:
+     *
+     * <blockquote>
+     *  {@code Class.forName("Foo")}
+     * </blockquote>
+     *
+     * is equivalent to:
+     *
+     * <blockquote>
+     *  {@code Class.forName("Foo", true, this.getClass().getClassLoader())}
+     * </blockquote>
+     *
+     * Note that this method throws errors related to loading, linking or
+     * initializing as specified in Sections 12.2, 12.3 and 12.4 of <em>The
+     * Java Language Specification</em>.
+     * Note that this method does not check whether the requested class
+     * is accessible to its caller.
+     *
+     * <p> If the {@code loader} is {@code null}, and a security
+     * manager is present, and the caller's class loader is not null, then this
+     * method calls the security manager's {@code checkPermission} method
+     * with a {@code RuntimePermission("getClassLoader")} permission to
+     * ensure it's ok to access the bootstrap class loader.
+     *
+     * @param name       fully qualified name of the desired class
+     * @param initialize whether the class must be initialized
+     * @param loader     class loader from which the class must be loaded
+     * @return           class object representing the desired class
+     *
+     * @exception LinkageError if the linkage fails
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *            by this method fails
+     * @exception ClassNotFoundException if the class cannot be located by
+     *            the specified class loader
+     *
+     * @see       java.lang.Class#forName(String)
+     * @see       java.lang.ClassLoader
+     * @since     1.2
+     */
+    public static Class<?> forName(String name, boolean initialize,
+                                   ClassLoader loader)
+        throws ClassNotFoundException
+    {
+        return forName(name);
+    }
+    
+    @JavaScriptBody(args = {"n", "c" }, body =
+        "if (!vm[c]) {\n"
+      + "  if (vm.loadClass) {\n"
+      + "    vm.loadClass(n);\n"
+      + "  }\n"
+      + "  if (!vm[c]) return null;\n"
+      + "}\n"
+      + "vm[c](false);"
+      + "return vm[c].$class;"
+    )
+    private static native Class<?> loadCls(String n, String c);
+
+
+    /**
+     * Creates a new instance of the class represented by this {@code Class}
+     * object.  The class is instantiated as if by a {@code new}
+     * expression with an empty argument list.  The class is initialized if it
+     * has not already been initialized.
+     *
+     * <p>Note that this method propagates any exception thrown by the
+     * nullary constructor, including a checked exception.  Use of
+     * this method effectively bypasses the compile-time exception
+     * checking that would otherwise be performed by the compiler.
+     * The {@link
+     * java.lang.reflect.Constructor#newInstance(java.lang.Object...)
+     * Constructor.newInstance} method avoids this problem by wrapping
+     * any exception thrown by the constructor in a (checked) {@link
+     * java.lang.reflect.InvocationTargetException}.
+     *
+     * @return     a newly allocated instance of the class represented by this
+     *             object.
+     * @exception  IllegalAccessException  if the class or its nullary
+     *               constructor is not accessible.
+     * @exception  InstantiationException
+     *               if this {@code Class} represents an abstract class,
+     *               an interface, an array class, a primitive type, or void;
+     *               or if the class has no nullary constructor;
+     *               or if the instantiation fails for some other reason.
+     * @exception  ExceptionInInitializerError if the initialization
+     *               provoked by this method fails.
+     * @exception  SecurityException
+     *             If a security manager, <i>s</i>, is present and any of the
+     *             following conditions is met:
+     *
+     *             <ul>
+     *
+     *             <li> invocation of
+     *             {@link SecurityManager#checkMemberAccess
+     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
+     *             creation of new instances of this class
+     *
+     *             <li> the caller's class loader is not the same as or an
+     *             ancestor of the class loader for the current class and
+     *             invocation of {@link SecurityManager#checkPackageAccess
+     *             s.checkPackageAccess()} denies access to the package
+     *             of this class
+     *
+     *             </ul>
+     *
+     */
+    @JavaScriptBody(args = { "self", "illegal" }, body =
+          "\nvar c = self.cnstr;"
+        + "\nif (c['cons__V']) {"
+        + "\n  if ((c.cons__V.access & 0x1) != 0) {"
+        + "\n    var inst = c();"
+        + "\n    c.cons__V.call(inst);"
+        + "\n    return inst;"
+        + "\n  }"
+        + "\n  return illegal;"
+        + "\n}"
+        + "\nreturn null;"
+    )
+    private static native Object newInstance0(Class<?> self, Object illegal);
+    
+    public T newInstance()
+        throws InstantiationException, IllegalAccessException
+    {
+        Object illegal = new Object();
+        Object inst = newInstance0(this, illegal);
+        if (inst == null) {
+            throw new InstantiationException(getName());
+        }
+        if (inst == illegal) {
+            throw new IllegalAccessException();
+        }
+        return (T)inst;
+    }
+
+    /**
+     * Determines if the specified {@code Object} is assignment-compatible
+     * with the object represented by this {@code Class}.  This method is
+     * the dynamic equivalent of the Java language {@code instanceof}
+     * operator. The method returns {@code true} if the specified
+     * {@code Object} argument is non-null and can be cast to the
+     * reference type represented by this {@code Class} object without
+     * raising a {@code ClassCastException.} It returns {@code false}
+     * otherwise.
+     *
+     * <p> Specifically, if this {@code Class} object represents a
+     * declared class, this method returns {@code true} if the specified
+     * {@code Object} argument is an instance of the represented class (or
+     * of any of its subclasses); it returns {@code false} otherwise. If
+     * this {@code Class} object represents an array class, this method
+     * returns {@code true} if the specified {@code Object} argument
+     * can be converted to an object of the array class by an identity
+     * conversion or by a widening reference conversion; it returns
+     * {@code false} otherwise. If this {@code Class} object
+     * represents an interface, this method returns {@code true} if the
+     * class or any superclass of the specified {@code Object} argument
+     * implements this interface; it returns {@code false} otherwise. If
+     * this {@code Class} object represents a primitive type, this method
+     * returns {@code false}.
+     *
+     * @param   obj the object to check
+     * @return  true if {@code obj} is an instance of this class
+     *
+     * @since JDK1.1
+     */
+    public boolean isInstance(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (isArray()) {
+            return isAssignableFrom(obj.getClass());
+        }
+        
+        String prop = "$instOf_" + getName().replace('.', '_');
+        return hasProperty(obj, prop);
+    }
+    
+    @JavaScriptBody(args = { "who", "prop" }, body = 
+        "if (who[prop]) return true; else return false;"
+    )
+    private static native boolean hasProperty(Object who, String prop);
+
+
+    /**
+     * Determines if the class or interface represented by this
+     * {@code Class} object is either the same as, or is a superclass or
+     * superinterface of, the class or interface represented by the specified
+     * {@code Class} parameter. It returns {@code true} if so;
+     * otherwise it returns {@code false}. If this {@code Class}
+     * object represents a primitive type, this method returns
+     * {@code true} if the specified {@code Class} parameter is
+     * exactly this {@code Class} object; otherwise it returns
+     * {@code false}.
+     *
+     * <p> Specifically, this method tests whether the type represented by the
+     * specified {@code Class} parameter can be converted to the type
+     * represented by this {@code Class} object via an identity conversion
+     * or via a widening reference conversion. See <em>The Java Language
+     * Specification</em>, sections 5.1.1 and 5.1.4 , for details.
+     *
+     * @param cls the {@code Class} object to be checked
+     * @return the {@code boolean} value indicating whether objects of the
+     * type {@code cls} can be assigned to objects of this class
+     * @exception NullPointerException if the specified Class parameter is
+     *            null.
+     * @since JDK1.1
+     */
+    public boolean isAssignableFrom(Class<?> cls) {
+        if (this == cls) {
+            return true;
+        }
+        
+        if (isArray()) {
+            final Class<?> cmpType = cls.getComponentType();
+            if (isPrimitive()) {
+                return this == cmpType;
+            }
+            return cmpType != null && getComponentType().isAssignableFrom(cmpType);
+        }
+        String prop = "$instOf_" + getName().replace('.', '_');
+        return hasCnstrProperty(cls, prop);
+    }
+
+    @JavaScriptBody(args = { "who", "prop" }, body = 
+        "if (who.cnstr.prototype[prop]) return true; else return false;"
+    )
+    private static native boolean hasCnstrProperty(Object who, String prop);
+    
+    
+    /**
+     * Determines if the specified {@code Class} object represents an
+     * interface type.
+     *
+     * @return  {@code true} if this object represents an interface;
+     *          {@code false} otherwise.
+     */
+    public boolean isInterface() {
+        return (getAccess() & 0x200) != 0;
+    }
+    
+    @JavaScriptBody(args = {}, body = "return this.access;")
+    private native int getAccess();
+
+
+    /**
+     * Determines if this {@code Class} object represents an array class.
+     *
+     * @return  {@code true} if this object represents an array class;
+     *          {@code false} otherwise.
+     * @since   JDK1.1
+     */
+    public boolean isArray() {
+        return hasProperty(this, "array"); // NOI18N
+    }
+
+
+    /**
+     * Determines if the specified {@code Class} object represents a
+     * primitive type.
+     *
+     * <p> There are nine predefined {@code Class} objects to represent
+     * the eight primitive types and void.  These are created by the Java
+     * Virtual Machine, and have the same names as the primitive types that
+     * they represent, namely {@code boolean}, {@code byte},
+     * {@code char}, {@code short}, {@code int},
+     * {@code long}, {@code float}, and {@code double}.
+     *
+     * <p> These objects may only be accessed via the following public static
+     * final variables, and are the only {@code Class} objects for which
+     * this method returns {@code true}.
+     *
+     * @return true if and only if this class represents a primitive type
+     *
+     * @see     java.lang.Boolean#TYPE
+     * @see     java.lang.Character#TYPE
+     * @see     java.lang.Byte#TYPE
+     * @see     java.lang.Short#TYPE
+     * @see     java.lang.Integer#TYPE
+     * @see     java.lang.Long#TYPE
+     * @see     java.lang.Float#TYPE
+     * @see     java.lang.Double#TYPE
+     * @see     java.lang.Void#TYPE
+     * @since JDK1.1
+     */
+    @JavaScriptBody(args = {}, body = 
+           "if (this.primitive) return true;"
+        + "else return false;"
+    )
+    public native boolean isPrimitive();
+
+    /**
+     * Returns true if this {@code Class} object represents an annotation
+     * type.  Note that if this method returns true, {@link #isInterface()}
+     * would also return true, as all annotation types are also interfaces.
+     *
+     * @return {@code true} if this class object represents an annotation
+     *      type; {@code false} otherwise
+     * @since 1.5
+     */
+    public boolean isAnnotation() {
+        return (getModifiers() & ANNOTATION) != 0;
+    }
+
+    /**
+     * Returns {@code true} if this class is a synthetic class;
+     * returns {@code false} otherwise.
+     * @return {@code true} if and only if this class is a synthetic class as
+     *         defined by the Java Language Specification.
+     * @since 1.5
+     */
+    public boolean isSynthetic() {
+        return (getModifiers() & SYNTHETIC) != 0;
+    }
+
+    /**
+     * Returns the  name of the entity (class, interface, array class,
+     * primitive type, or void) represented by this {@code Class} object,
+     * as a {@code String}.
+     *
+     * <p> If this class object represents a reference type that is not an
+     * array type then the binary name of the class is returned, as specified
+     * by
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * <p> If this class object represents a primitive type or void, then the
+     * name returned is a {@code String} equal to the Java language
+     * keyword corresponding to the primitive type or void.
+     *
+     * <p> If this class object represents a class of arrays, then the internal
+     * form of the name consists of the name of the element type preceded by
+     * one or more '{@code [}' characters representing the depth of the array
+     * nesting.  The encoding of element type names is as follows:
+     *
+     * <blockquote><table summary="Element types and encodings">
+     * <tr><th> Element Type <th> &nbsp;&nbsp;&nbsp; <th> Encoding
+     * <tr><td> boolean      <td> &nbsp;&nbsp;&nbsp; <td align=center> Z
+     * <tr><td> byte         <td> &nbsp;&nbsp;&nbsp; <td align=center> B
+     * <tr><td> char         <td> &nbsp;&nbsp;&nbsp; <td align=center> C
+     * <tr><td> class or interface
+     *                       <td> &nbsp;&nbsp;&nbsp; <td align=center> L<i>classname</i>;
+     * <tr><td> double       <td> &nbsp;&nbsp;&nbsp; <td align=center> D
+     * <tr><td> float        <td> &nbsp;&nbsp;&nbsp; <td align=center> F
+     * <tr><td> int          <td> &nbsp;&nbsp;&nbsp; <td align=center> I
+     * <tr><td> long         <td> &nbsp;&nbsp;&nbsp; <td align=center> J
+     * <tr><td> short        <td> &nbsp;&nbsp;&nbsp; <td align=center> S
+     * </table></blockquote>
+     *
+     * <p> The class or interface name <i>classname</i> is the binary name of
+     * the class specified above.
+     *
+     * <p> Examples:
+     * <blockquote><pre>
+     * String.class.getName()
+     *     returns "java.lang.String"
+     * byte.class.getName()
+     *     returns "byte"
+     * (new Object[3]).getClass().getName()
+     *     returns "[Ljava.lang.Object;"
+     * (new int[3][4][5][6][7][8][9]).getClass().getName()
+     *     returns "[[[[[[[I"
+     * </pre></blockquote>
+     *
+     * @return  the name of the class or interface
+     *          represented by this object.
+     */
+    public String getName() {
+        return jvmName().replace('/', '.');
+    }
+
+    @JavaScriptBody(args = {}, body = "return this.jvmName;")
+    private native String jvmName();
+
+    
+    /**
+     * Returns an array of {@code TypeVariable} objects that represent the
+     * type variables declared by the generic declaration represented by this
+     * {@code GenericDeclaration} object, in declaration order.  Returns an
+     * array of length 0 if the underlying generic declaration declares no type
+     * variables.
+     *
+     * @return an array of {@code TypeVariable} objects that represent
+     *     the type variables declared by this generic declaration
+     * @throws java.lang.reflect.GenericSignatureFormatError if the generic
+     *     signature of this generic declaration does not conform to
+     *     the format specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @since 1.5
+     */
+    public TypeVariable<Class<T>>[] getTypeParameters() {
+        throw new UnsupportedOperationException();
+    }
+ 
+    /**
+     * Returns the {@code Class} representing the superclass of the entity
+     * (class, interface, primitive type or void) represented by this
+     * {@code Class}.  If this {@code Class} represents either the
+     * {@code Object} class, an interface, a primitive type, or void, then
+     * null is returned.  If this object represents an array class then the
+     * {@code Class} object representing the {@code Object} class is
+     * returned.
+     *
+     * @return the superclass of the class represented by this object.
+     */
+    @JavaScriptBody(args = {}, body = "return this.superclass;")
+    public native Class<? super T> getSuperclass();
+
+    /**
+     * Returns the Java language modifiers for this class or interface, encoded
+     * in an integer. The modifiers consist of the Java Virtual Machine's
+     * constants for {@code public}, {@code protected},
+     * {@code private}, {@code final}, {@code static},
+     * {@code abstract} and {@code interface}; they should be decoded
+     * using the methods of class {@code Modifier}.
+     *
+     * <p> If the underlying class is an array class, then its
+     * {@code public}, {@code private} and {@code protected}
+     * modifiers are the same as those of its component type.  If this
+     * {@code Class} represents a primitive type or void, its
+     * {@code public} modifier is always {@code true}, and its
+     * {@code protected} and {@code private} modifiers are always
+     * {@code false}. If this object represents an array class, a
+     * primitive type or void, then its {@code final} modifier is always
+     * {@code true} and its interface modifier is always
+     * {@code false}. The values of its other modifiers are not determined
+     * by this specification.
+     *
+     * <p> The modifier encodings are defined in <em>The Java Virtual Machine
+     * Specification</em>, table 4.1.
+     *
+     * @return the {@code int} representing the modifiers for this class
+     * @see     java.lang.reflect.Modifier
+     * @since JDK1.1
+     */
+    public int getModifiers() {
+        return getAccess();
+    }
+
+
+    /**
+     * Returns the simple name of the underlying class as given in the
+     * source code. Returns an empty string if the underlying class is
+     * anonymous.
+     *
+     * <p>The simple name of an array is the simple name of the
+     * component type with "[]" appended.  In particular the simple
+     * name of an array whose component type is anonymous is "[]".
+     *
+     * @return the simple name of the underlying class
+     * @since 1.5
+     */
+    public String getSimpleName() {
+        if (isArray())
+            return getComponentType().getSimpleName()+"[]";
+
+        String simpleName = getSimpleBinaryName();
+        if (simpleName == null) { // top level class
+            simpleName = getName();
+            return simpleName.substring(simpleName.lastIndexOf(".")+1); // strip the package name
+        }
+        // According to JLS3 "Binary Compatibility" (13.1) the binary
+        // name of non-package classes (not top level) is the binary
+        // name of the immediately enclosing class followed by a '$' followed by:
+        // (for nested and inner classes): the simple name.
+        // (for local classes): 1 or more digits followed by the simple name.
+        // (for anonymous classes): 1 or more digits.
+
+        // Since getSimpleBinaryName() will strip the binary name of
+        // the immediatly enclosing class, we are now looking at a
+        // string that matches the regular expression "\$[0-9]*"
+        // followed by a simple name (considering the simple of an
+        // anonymous class to be the empty string).
+
+        // Remove leading "\$[0-9]*" from the name
+        int length = simpleName.length();
+        if (length < 1 || simpleName.charAt(0) != '$')
+            throw new IllegalStateException("Malformed class name");
+        int index = 1;
+        while (index < length && isAsciiDigit(simpleName.charAt(index)))
+            index++;
+        // Eventually, this is the empty string iff this is an anonymous class
+        return simpleName.substring(index);
+    }
+
+    /**
+     * Returns the "simple binary name" of the underlying class, i.e.,
+     * the binary name without the leading enclosing class name.
+     * Returns {@code null} if the underlying class is a top level
+     * class.
+     */
+    private String getSimpleBinaryName() {
+        Class<?> enclosingClass = null; // XXX getEnclosingClass();
+        if (enclosingClass == null) // top level class
+            return null;
+        // Otherwise, strip the enclosing class' name
+        try {
+            return getName().substring(enclosingClass.getName().length());
+        } catch (IndexOutOfBoundsException ex) {
+            throw new IllegalStateException("Malformed class name");
+        }
+    }
+
+    /**
+     * Returns an array containing {@code Field} objects reflecting all
+     * the accessible public fields of the class or interface represented by
+     * this {@code Class} object.  The elements in the array returned are
+     * not sorted and are not in any particular order.  This method returns an
+     * array of length 0 if the class or interface has no accessible public
+     * fields, or if it represents an array class, a primitive type, or void.
+     *
+     * <p> Specifically, if this {@code Class} object represents a class,
+     * this method returns the public fields of this class and of all its
+     * superclasses.  If this {@code Class} object represents an
+     * interface, this method returns the fields of this interface and of all
+     * its superinterfaces.
+     *
+     * <p> The implicit length field for array class is not reflected by this
+     * method. User code should use the methods of class {@code Array} to
+     * manipulate arrays.
+     *
+     * <p> See <em>The Java Language Specification</em>, sections 8.2 and 8.3.
+     *
+     * @return the array of {@code Field} objects representing the
+     * public fields
+     * @exception  SecurityException
+     *             If a security manager, <i>s</i>, is present and any of the
+     *             following conditions is met:
+     *
+     *             <ul>
+     *
+     *             <li> invocation of
+     *             {@link SecurityManager#checkMemberAccess
+     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
+     *             access to the fields within this class
+     *
+     *             <li> the caller's class loader is not the same as or an
+     *             ancestor of the class loader for the current class and
+     *             invocation of {@link SecurityManager#checkPackageAccess
+     *             s.checkPackageAccess()} denies access to the package
+     *             of this class
+     *
+     *             </ul>
+     *
+     * @since JDK1.1
+     */
+    public Field[] getFields() throws SecurityException {
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns an array containing {@code Method} objects reflecting all
+     * the public <em>member</em> methods of the class or interface represented
+     * by this {@code Class} object, including those declared by the class
+     * or interface and those inherited from superclasses and
+     * superinterfaces.  Array classes return all the (public) member methods
+     * inherited from the {@code Object} class.  The elements in the array
+     * returned are not sorted and are not in any particular order.  This
+     * method returns an array of length 0 if this {@code Class} object
+     * represents a class or interface that has no public member methods, or if
+     * this {@code Class} object represents a primitive type or void.
+     *
+     * <p> The class initialization method {@code <clinit>} is not
+     * included in the returned array. If the class declares multiple public
+     * member methods with the same parameter types, they are all included in
+     * the returned array.
+     *
+     * <p> See <em>The Java Language Specification</em>, sections 8.2 and 8.4.
+     *
+     * @return the array of {@code Method} objects representing the
+     * public methods of this class
+     * @exception  SecurityException
+     *             If a security manager, <i>s</i>, is present and any of the
+     *             following conditions is met:
+     *
+     *             <ul>
+     *
+     *             <li> invocation of
+     *             {@link SecurityManager#checkMemberAccess
+     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
+     *             access to the methods within this class
+     *
+     *             <li> the caller's class loader is not the same as or an
+     *             ancestor of the class loader for the current class and
+     *             invocation of {@link SecurityManager#checkPackageAccess
+     *             s.checkPackageAccess()} denies access to the package
+     *             of this class
+     *
+     *             </ul>
+     *
+     * @since JDK1.1
+     */
+    public Method[] getMethods() throws SecurityException {
+        return MethodImpl.findMethods(this, 0x01);
+    }
+
+    /**
+     * Returns a {@code Field} object that reflects the specified public
+     * member field of the class or interface represented by this
+     * {@code Class} object. The {@code name} parameter is a
+     * {@code String} specifying the simple name of the desired field.
+     *
+     * <p> The field to be reflected is determined by the algorithm that
+     * follows.  Let C be the class represented by this object:
+     * <OL>
+     * <LI> If C declares a public field with the name specified, that is the
+     *      field to be reflected.</LI>
+     * <LI> If no field was found in step 1 above, this algorithm is applied
+     *      recursively to each direct superinterface of C. The direct
+     *      superinterfaces are searched in the order they were declared.</LI>
+     * <LI> If no field was found in steps 1 and 2 above, and C has a
+     *      superclass S, then this algorithm is invoked recursively upon S.
+     *      If C has no superclass, then a {@code NoSuchFieldException}
+     *      is thrown.</LI>
+     * </OL>
+     *
+     * <p> See <em>The Java Language Specification</em>, sections 8.2 and 8.3.
+     *
+     * @param name the field name
+     * @return  the {@code Field} object of this class specified by
+     * {@code name}
+     * @exception NoSuchFieldException if a field with the specified name is
+     *              not found.
+     * @exception NullPointerException if {@code name} is {@code null}
+     * @exception  SecurityException
+     *             If a security manager, <i>s</i>, is present and any of the
+     *             following conditions is met:
+     *
+     *             <ul>
+     *
+     *             <li> invocation of
+     *             {@link SecurityManager#checkMemberAccess
+     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
+     *             access to the field
+     *
+     *             <li> the caller's class loader is not the same as or an
+     *             ancestor of the class loader for the current class and
+     *             invocation of {@link SecurityManager#checkPackageAccess
+     *             s.checkPackageAccess()} denies access to the package
+     *             of this class
+     *
+     *             </ul>
+     *
+     * @since JDK1.1
+     */
+    public Field getField(String name)
+        throws SecurityException {
+        throw new SecurityException();
+    }
+    
+    
+    /**
+     * Returns a {@code Method} object that reflects the specified public
+     * member method of the class or interface represented by this
+     * {@code Class} object. The {@code name} parameter is a
+     * {@code String} specifying the simple name of the desired method. The
+     * {@code parameterTypes} parameter is an array of {@code Class}
+     * objects that identify the method's formal parameter types, in declared
+     * order. If {@code parameterTypes} is {@code null}, it is
+     * treated as if it were an empty array.
+     *
+     * <p> If the {@code name} is "{@code <init>};"or "{@code <clinit>}" a
+     * {@code NoSuchMethodException} is raised. Otherwise, the method to
+     * be reflected is determined by the algorithm that follows.  Let C be the
+     * class represented by this object:
+     * <OL>
+     * <LI> C is searched for any <I>matching methods</I>. If no matching
+     *      method is found, the algorithm of step 1 is invoked recursively on
+     *      the superclass of C.</LI>
+     * <LI> If no method was found in step 1 above, the superinterfaces of C
+     *      are searched for a matching method. If any such method is found, it
+     *      is reflected.</LI>
+     * </OL>
+     *
+     * To find a matching method in a class C:&nbsp; If C declares exactly one
+     * public method with the specified name and exactly the same formal
+     * parameter types, that is the method reflected. If more than one such
+     * method is found in C, and one of these methods has a return type that is
+     * more specific than any of the others, that method is reflected;
+     * otherwise one of the methods is chosen arbitrarily.
+     *
+     * <p>Note that there may be more than one matching method in a
+     * class because while the Java language forbids a class to
+     * declare multiple methods with the same signature but different
+     * return types, the Java virtual machine does not.  This
+     * increased flexibility in the virtual machine can be used to
+     * implement various language features.  For example, covariant
+     * returns can be implemented with {@linkplain
+     * java.lang.reflect.Method#isBridge bridge methods}; the bridge
+     * method and the method being overridden would have the same
+     * signature but different return types.
+     *
+     * <p> See <em>The Java Language Specification</em>, sections 8.2 and 8.4.
+     *
+     * @param name the name of the method
+     * @param parameterTypes the list of parameters
+     * @return the {@code Method} object that matches the specified
+     * {@code name} and {@code parameterTypes}
+     * @exception NoSuchMethodException if a matching method is not found
+     *            or if the name is "&lt;init&gt;"or "&lt;clinit&gt;".
+     * @exception NullPointerException if {@code name} is {@code null}
+     * @exception  SecurityException
+     *             If a security manager, <i>s</i>, is present and any of the
+     *             following conditions is met:
+     *
+     *             <ul>
+     *
+     *             <li> invocation of
+     *             {@link SecurityManager#checkMemberAccess
+     *             s.checkMemberAccess(this, Member.PUBLIC)} denies
+     *             access to the method
+     *
+     *             <li> the caller's class loader is not the same as or an
+     *             ancestor of the class loader for the current class and
+     *             invocation of {@link SecurityManager#checkPackageAccess
+     *             s.checkPackageAccess()} denies access to the package
+     *             of this class
+     *
+     *             </ul>
+     *
+     * @since JDK1.1
+     */
+    public Method getMethod(String name, Class<?>... parameterTypes)
+        throws SecurityException, NoSuchMethodException {
+        Method m = MethodImpl.findMethod(this, name, parameterTypes);
+        if (m == null) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(getName()).append('.').append(name).append('(');
+            String sep = "";
+            for (int i = 0; i < parameterTypes.length; i++) {
+                sb.append(sep).append(parameterTypes[i].getName());
+                sep = ", ";
+            }
+            sb.append(')');
+            throw new NoSuchMethodException(sb.toString());
+        }
+        return m;
+    }
+    
+    /**
+     * Returns an array of {@code Method} objects reflecting all the
+     * methods declared by the class or interface represented by this
+     * {@code Class} object. This includes public, protected, default
+     * (package) access, and private methods, but excludes inherited methods.
+     * The elements in the array returned are not sorted and are not in any
+     * particular order.  This method returns an array of length 0 if the class
+     * or interface declares no methods, or if this {@code Class} object
+     * represents a primitive type, an array class, or void.  The class
+     * initialization method {@code <clinit>} is not included in the
+     * returned array. If the class declares multiple public member methods
+     * with the same parameter types, they are all included in the returned
+     * array.
+     *
+     * <p> See <em>The Java Language Specification</em>, section 8.2.
+     *
+     * @return    the array of {@code Method} objects representing all the
+     * declared methods of this class
+     * @exception  SecurityException
+     *             If a security manager, <i>s</i>, is present and any of the
+     *             following conditions is met:
+     *
+     *             <ul>
+     *
+     *             <li> invocation of
+     *             {@link SecurityManager#checkMemberAccess
+     *             s.checkMemberAccess(this, Member.DECLARED)} denies
+     *             access to the declared methods within this class
+     *
+     *             <li> the caller's class loader is not the same as or an
+     *             ancestor of the class loader for the current class and
+     *             invocation of {@link SecurityManager#checkPackageAccess
+     *             s.checkPackageAccess()} denies access to the package
+     *             of this class
+     *
+     *             </ul>
+     *
+     * @since JDK1.1
+     */
+    public Method[] getDeclaredMethods() throws SecurityException {
+        throw new SecurityException();
+    }
+    
+    /**
+     * Character.isDigit answers {@code true} to some non-ascii
+     * digits.  This one does not.
+     */
+    private static boolean isAsciiDigit(char c) {
+        return '0' <= c && c <= '9';
+    }
+
+    /**
+     * Returns the canonical name of the underlying class as
+     * defined by the Java Language Specification.  Returns null if
+     * the underlying class does not have a canonical name (i.e., if
+     * it is a local or anonymous class or an array whose component
+     * type does not have a canonical name).
+     * @return the canonical name of the underlying class if it exists, and
+     * {@code null} otherwise.
+     * @since 1.5
+     */
+    public String getCanonicalName() {
+        if (isArray()) {
+            String canonicalName = getComponentType().getCanonicalName();
+            if (canonicalName != null)
+                return canonicalName + "[]";
+            else
+                return null;
+        }
+//        if (isLocalOrAnonymousClass())
+//            return null;
+//        Class<?> enclosingClass = getEnclosingClass();
+        Class<?> enclosingClass = null;
+        if (enclosingClass == null) { // top level class
+            return getName();
+        } else {
+            String enclosingName = enclosingClass.getCanonicalName();
+            if (enclosingName == null)
+                return null;
+            return enclosingName + "." + getSimpleName();
+        }
+    }
+
+    /**
+     * Finds a resource with a given name.  The rules for searching resources
+     * associated with a given class are implemented by the defining
+     * {@linkplain ClassLoader class loader} of the class.  This method
+     * delegates to this object's class loader.  If this object was loaded by
+     * the bootstrap class loader, the method delegates to {@link
+     * ClassLoader#getSystemResourceAsStream}.
+     *
+     * <p> Before delegation, an absolute resource name is constructed from the
+     * given resource name using this algorithm:
+     *
+     * <ul>
+     *
+     * <li> If the {@code name} begins with a {@code '/'}
+     * (<tt>'&#92;u002f'</tt>), then the absolute name of the resource is the
+     * portion of the {@code name} following the {@code '/'}.
+     *
+     * <li> Otherwise, the absolute name is of the following form:
+     *
+     * <blockquote>
+     *   {@code modified_package_name/name}
+     * </blockquote>
+     *
+     * <p> Where the {@code modified_package_name} is the package name of this
+     * object with {@code '/'} substituted for {@code '.'}
+     * (<tt>'&#92;u002e'</tt>).
+     *
+     * </ul>
+     *
+     * @param  name name of the desired resource
+     * @return      A {@link java.io.InputStream} object or {@code null} if
+     *              no resource with this name is found
+     * @throws  NullPointerException If {@code name} is {@code null}
+     * @since  JDK1.1
+     */
+     public InputStream getResourceAsStream(String name) {
+        name = resolveName(name);
+        byte[] arr = getResourceAsStream0(name);
+        return arr == null ? null : new ByteArrayInputStream(arr);
+     }
+     
+     @JavaScriptBody(args = "name", body = 
+         "return (vm.loadBytes) ? vm.loadBytes(name) : null;"
+     )
+     private static native byte[] getResourceAsStream0(String name);
+
+    /**
+     * Finds a resource with a given name.  The rules for searching resources
+     * associated with a given class are implemented by the defining
+     * {@linkplain ClassLoader class loader} of the class.  This method
+     * delegates to this object's class loader.  If this object was loaded by
+     * the bootstrap class loader, the method delegates to {@link
+     * ClassLoader#getSystemResource}.
+     *
+     * <p> Before delegation, an absolute resource name is constructed from the
+     * given resource name using this algorithm:
+     *
+     * <ul>
+     *
+     * <li> If the {@code name} begins with a {@code '/'}
+     * (<tt>'&#92;u002f'</tt>), then the absolute name of the resource is the
+     * portion of the {@code name} following the {@code '/'}.
+     *
+     * <li> Otherwise, the absolute name is of the following form:
+     *
+     * <blockquote>
+     *   {@code modified_package_name/name}
+     * </blockquote>
+     *
+     * <p> Where the {@code modified_package_name} is the package name of this
+     * object with {@code '/'} substituted for {@code '.'}
+     * (<tt>'&#92;u002e'</tt>).
+     *
+     * </ul>
+     *
+     * @param  name name of the desired resource
+     * @return      A  {@link java.net.URL} object or {@code null} if no
+     *              resource with this name is found
+     * @since  JDK1.1
+     */
+    public java.net.URL getResource(String name) {
+        InputStream is = getResourceAsStream(name);
+        return is == null ? null : newResourceURL(URL.class, "res:/" + name, is);
+    }
+    
+    @JavaScriptBody(args = { "url", "spec", "is" }, body = 
+        "var u = url.cnstr(true);\n"
+      + "u.constructor.cons__VLjava_lang_String_2Ljava_io_InputStream_2.call(u, spec, is);\n"
+      + "return u;"
+    )
+    private static native URL newResourceURL(Class<URL> url, String spec, InputStream is);
+
+   /**
+     * Add a package name prefix if the name is not absolute Remove leading "/"
+     * if name is absolute
+     */
+    private String resolveName(String name) {
+        if (name == null) {
+            return name;
+        }
+        if (!name.startsWith("/")) {
+            Class<?> c = this;
+            while (c.isArray()) {
+                c = c.getComponentType();
+            }
+            String baseName = c.getName();
+            int index = baseName.lastIndexOf('.');
+            if (index != -1) {
+                name = baseName.substring(0, index).replace('.', '/')
+                    +"/"+name;
+            }
+        } else {
+            name = name.substring(1);
+        }
+        return name;
+    }
+    
+    /**
+     * Returns the class loader for the class.  Some implementations may use
+     * null to represent the bootstrap class loader. This method will return
+     * null in such implementations if this class was loaded by the bootstrap
+     * class loader.
+     *
+     * <p> If a security manager is present, and the caller's class loader is
+     * not null and the caller's class loader is not the same as or an ancestor of
+     * the class loader for the class whose class loader is requested, then
+     * this method calls the security manager's {@code checkPermission}
+     * method with a {@code RuntimePermission("getClassLoader")}
+     * permission to ensure it's ok to access the class loader for the class.
+     *
+     * <p>If this object
+     * represents a primitive type or void, null is returned.
+     *
+     * @return  the class loader that loaded the class or interface
+     *          represented by this object.
+     * @throws SecurityException
+     *    if a security manager exists and its
+     *    {@code checkPermission} method denies
+     *    access to the class loader for the class.
+     * @see java.lang.ClassLoader
+     * @see SecurityManager#checkPermission
+     * @see java.lang.RuntimePermission
+     */
+    public ClassLoader getClassLoader() {
+        throw new SecurityException();
+    }
+
+    /**
+     * Determines the interfaces implemented by the class or interface
+     * represented by this object.
+     *
+     * <p> If this object represents a class, the return value is an array
+     * containing objects representing all interfaces implemented by the
+     * class. The order of the interface objects in the array corresponds to
+     * the order of the interface names in the {@code implements} clause
+     * of the declaration of the class represented by this object. For
+     * example, given the declaration:
+     * <blockquote>
+     * {@code class Shimmer implements FloorWax, DessertTopping { ... }}
+     * </blockquote>
+     * suppose the value of {@code s} is an instance of
+     * {@code Shimmer}; the value of the expression:
+     * <blockquote>
+     * {@code s.getClass().getInterfaces()[0]}
+     * </blockquote>
+     * is the {@code Class} object that represents interface
+     * {@code FloorWax}; and the value of:
+     * <blockquote>
+     * {@code s.getClass().getInterfaces()[1]}
+     * </blockquote>
+     * is the {@code Class} object that represents interface
+     * {@code DessertTopping}.
+     *
+     * <p> If this object represents an interface, the array contains objects
+     * representing all interfaces extended by the interface. The order of the
+     * interface objects in the array corresponds to the order of the interface
+     * names in the {@code extends} clause of the declaration of the
+     * interface represented by this object.
+     *
+     * <p> If this object represents a class or interface that implements no
+     * interfaces, the method returns an array of length 0.
+     *
+     * <p> If this object represents a primitive type or void, the method
+     * returns an array of length 0.
+     *
+     * @return an array of interfaces implemented by this class.
+     */
+    public native Class<?>[] getInterfaces();
+    
+    /**
+     * Returns the {@code Class} representing the component type of an
+     * array.  If this class does not represent an array class this method
+     * returns null.
+     *
+     * @return the {@code Class} representing the component type of this
+     * class if this class is an array
+     * @see     java.lang.reflect.Array
+     * @since JDK1.1
+     */
+    public Class<?> getComponentType() {
+        if (isArray()) {
+            try {
+                return getComponentType0();
+            } catch (ClassNotFoundException cnfe) {
+                throw new IllegalStateException(cnfe);
+            }
+        }
+        return null;
+    }
+
+    private Class<?> getComponentType0() throws ClassNotFoundException {
+        String n = getName().substring(1);
+        switch (n.charAt(0)) {
+            case 'L': 
+                n = n.substring(1, n.length() - 1);
+                return Class.forName(n);
+            case 'I':
+                return Integer.TYPE;
+            case 'J':
+                return Long.TYPE;
+            case 'D':
+                return Double.TYPE;
+            case 'F':
+                return Float.TYPE;
+            case 'B':
+                return Byte.TYPE;
+            case 'Z':
+                return Boolean.TYPE;
+            case 'S':
+                return Short.TYPE;
+            case 'V':
+                return Void.TYPE;
+            case 'C':
+                return Character.TYPE;
+            case '[':
+                return defineArray(n);
+            default:
+                throw new ClassNotFoundException("Unknown component type of " + getName());
+        }
+    }
+    
+    @JavaScriptBody(args = { "sig" }, body = 
+        "var c = Array[sig];\n" +
+        "if (c) return c;\n" +
+        "c = vm.java_lang_Class(true);\n" +
+        "c.jvmName = sig;\n" +
+        "c.superclass = vm.java_lang_Object(false).$class;\n" +
+        "c.array = true;\n" +
+        "Array[sig] = c;\n" +
+        "return c;"
+    )
+    private static native Class<?> defineArray(String sig);
+    
+    /**
+     * Returns true if and only if this class was declared as an enum in the
+     * source code.
+     *
+     * @return true if and only if this class was declared as an enum in the
+     *     source code
+     * @since 1.5
+     */
+    public boolean isEnum() {
+        // An enum must both directly extend java.lang.Enum and have
+        // the ENUM bit set; classes for specialized enum constants
+        // don't do the former.
+        return (this.getModifiers() & ENUM) != 0 &&
+        this.getSuperclass() == java.lang.Enum.class;
+    }
+
+    /**
+     * Casts an object to the class or interface represented
+     * by this {@code Class} object.
+     *
+     * @param obj the object to be cast
+     * @return the object after casting, or null if obj is null
+     *
+     * @throws ClassCastException if the object is not
+     * null and is not assignable to the type T.
+     *
+     * @since 1.5
+     */
+    public T cast(Object obj) {
+        if (obj != null && !isInstance(obj))
+            throw new ClassCastException(cannotCastMsg(obj));
+        return (T) obj;
+    }
+
+    private String cannotCastMsg(Object obj) {
+        return "Cannot cast " + obj.getClass().getName() + " to " + getName();
+    }
+
+    /**
+     * Casts this {@code Class} object to represent a subclass of the class
+     * represented by the specified class object.  Checks that that the cast
+     * is valid, and throws a {@code ClassCastException} if it is not.  If
+     * this method succeeds, it always returns a reference to this class object.
+     *
+     * <p>This method is useful when a client needs to "narrow" the type of
+     * a {@code Class} object to pass it to an API that restricts the
+     * {@code Class} objects that it is willing to accept.  A cast would
+     * generate a compile-time warning, as the correctness of the cast
+     * could not be checked at runtime (because generic types are implemented
+     * by erasure).
+     *
+     * @return this {@code Class} object, cast to represent a subclass of
+     *    the specified class object.
+     * @throws ClassCastException if this {@code Class} object does not
+     *    represent a subclass of the specified class (here "subclass" includes
+     *    the class itself).
+     * @since 1.5
+     */
+    public <U> Class<? extends U> asSubclass(Class<U> clazz) {
+        if (clazz.isAssignableFrom(this))
+            return (Class<? extends U>) this;
+        else
+            throw new ClassCastException(this.toString());
+    }
+
+    @JavaScriptBody(args = { "ac" }, 
+        body = 
+          "if (this.anno) {"
+        + "  return this.anno['L' + ac.jvmName + ';'];"
+        + "} else return null;"
+    )
+    private Object getAnnotationData(Class<?> annotationClass) {
+        throw new UnsupportedOperationException();
+    }
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
+        Object data = getAnnotationData(annotationClass);
+        return data == null ? null : AnnotationImpl.create(annotationClass, data);
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    @JavaScriptBody(args = { "ac" }, 
+        body = "if (this.anno && this.anno['L' + ac.jvmName + ';']) { return true; }"
+        + "else return false;"
+    )
+    public boolean isAnnotationPresent(
+        Class<? extends Annotation> annotationClass) {
+        if (annotationClass == null)
+            throw new NullPointerException();
+
+        return getAnnotation(annotationClass) != null;
+    }
+
+    @JavaScriptBody(args = {}, body = "return this.anno;")
+    private Object getAnnotationData() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 1.5
+     */
+    public Annotation[] getAnnotations() {
+        Object data = getAnnotationData();
+        return data == null ? new Annotation[0] : AnnotationImpl.create(data);
+    }
+
+    /**
+     * @since 1.5
+     */
+    public Annotation[] getDeclaredAnnotations()  {
+        throw new UnsupportedOperationException();
+    }
+
+    @JavaScriptBody(args = "type", body = ""
+        + "var c = vm.java_lang_Class(true);"
+        + "c.jvmName = type;"
+        + "c.primitive = true;"
+        + "return c;"
+    )
+    native static Class getPrimitiveClass(String type);
+
+    @JavaScriptBody(args = {}, body = 
+        "return vm.desiredAssertionStatus ? vm.desiredAssertionStatus : false;"
+    )
+    public native boolean desiredAssertionStatus();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/ClassCastException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/ClassCastException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that the code has attempted to cast an object
+ * to a subclass of which it is not an instance. For example, the
+ * following code generates a <code>ClassCastException</code>:
+ * <p><blockquote><pre>
+ *     Object x = new Integer(0);
+ *     System.out.println((String)x);
+ * </pre></blockquote>
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class ClassCastException extends RuntimeException {
+    private static final long serialVersionUID = -9223365651070458532L;
+
+    /**
+     * Constructs a <code>ClassCastException</code> with no detail message.
+     */
+    public ClassCastException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>ClassCastException</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public ClassCastException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/ClassFormatError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/ClassFormatError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when the Java Virtual Machine attempts to read a class
+ * file and determines that the file is malformed or otherwise cannot
+ * be interpreted as a class file.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class ClassFormatError extends LinkageError {
+    private static final long serialVersionUID = -8420114879011949195L;
+
+    /**
+     * Constructs a <code>ClassFormatError</code> with no detail message.
+     */
+    public ClassFormatError() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>ClassFormatError</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public ClassFormatError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/ClassLoader.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/ClassLoader.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,936 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.lang;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ * A class loader is an object that is responsible for loading classes. The
+ * class <tt>ClassLoader</tt> is an abstract class.  Given the <a
+ * href="#name">binary name</a> of a class, a class loader should attempt to
+ * locate or generate data that constitutes a definition for the class.  A
+ * typical strategy is to transform the name into a file name and then read a
+ * "class file" of that name from a file system.
+ *
+ * <p> Every {@link Class <tt>Class</tt>} object contains a {@link
+ * Class#getClassLoader() reference} to the <tt>ClassLoader</tt> that defined
+ * it.
+ *
+ * <p> <tt>Class</tt> objects for array classes are not created by class
+ * loaders, but are created automatically as required by the Java runtime.
+ * The class loader for an array class, as returned by {@link
+ * Class#getClassLoader()} is the same as the class loader for its element
+ * type; if the element type is a primitive type, then the array class has no
+ * class loader.
+ *
+ * <p> Applications implement subclasses of <tt>ClassLoader</tt> in order to
+ * extend the manner in which the Java virtual machine dynamically loads
+ * classes.
+ *
+ * <p> Class loaders may typically be used by security managers to indicate
+ * security domains.
+ *
+ * <p> The <tt>ClassLoader</tt> class uses a delegation model to search for
+ * classes and resources.  Each instance of <tt>ClassLoader</tt> has an
+ * associated parent class loader.  When requested to find a class or
+ * resource, a <tt>ClassLoader</tt> instance will delegate the search for the
+ * class or resource to its parent class loader before attempting to find the
+ * class or resource itself.  The virtual machine's built-in class loader,
+ * called the "bootstrap class loader", does not itself have a parent but may
+ * serve as the parent of a <tt>ClassLoader</tt> instance.
+ *
+ * <p> Class loaders that support concurrent loading of classes are known as
+ * <em>parallel capable</em> class loaders and are required to register
+ * themselves at their class initialization time by invoking the
+ * {@link
+ * #registerAsParallelCapable <tt>ClassLoader.registerAsParallelCapable</tt>}
+ * method. Note that the <tt>ClassLoader</tt> class is registered as parallel
+ * capable by default. However, its subclasses still need to register themselves
+ * if they are parallel capable. <br>
+ * In environments in which the delegation model is not strictly
+ * hierarchical, class loaders need to be parallel capable, otherwise class
+ * loading can lead to deadlocks because the loader lock is held for the
+ * duration of the class loading process (see {@link #loadClass
+ * <tt>loadClass</tt>} methods).
+ *
+ * <p> Normally, the Java virtual machine loads classes from the local file
+ * system in a platform-dependent manner.  For example, on UNIX systems, the
+ * virtual machine loads classes from the directory defined by the
+ * <tt>CLASSPATH</tt> environment variable.
+ *
+ * <p> However, some classes may not originate from a file; they may originate
+ * from other sources, such as the network, or they could be constructed by an
+ * application.  The method {@link #defineClass(String, byte[], int, int)
+ * <tt>defineClass</tt>} converts an array of bytes into an instance of class
+ * <tt>Class</tt>. Instances of this newly defined class can be created using
+ * {@link Class#newInstance <tt>Class.newInstance</tt>}.
+ *
+ * <p> The methods and constructors of objects created by a class loader may
+ * reference other classes.  To determine the class(es) referred to, the Java
+ * virtual machine invokes the {@link #loadClass <tt>loadClass</tt>} method of
+ * the class loader that originally created the class.
+ *
+ * <p> For example, an application could create a network class loader to
+ * download class files from a server.  Sample code might look like:
+ *
+ * <blockquote><pre>
+ *   ClassLoader loader&nbsp;= new NetworkClassLoader(host,&nbsp;port);
+ *   Object main&nbsp;= loader.loadClass("Main", true).newInstance();
+ *       &nbsp;.&nbsp;.&nbsp;.
+ * </pre></blockquote>
+ *
+ * <p> The network class loader subclass must define the methods {@link
+ * #findClass <tt>findClass</tt>} and <tt>loadClassData</tt> to load a class
+ * from the network.  Once it has downloaded the bytes that make up the class,
+ * it should use the method {@link #defineClass <tt>defineClass</tt>} to
+ * create a class instance.  A sample implementation is:
+ *
+ * <blockquote><pre>
+ *     class NetworkClassLoader extends ClassLoader {
+ *         String host;
+ *         int port;
+ *
+ *         public Class findClass(String name) {
+ *             byte[] b = loadClassData(name);
+ *             return defineClass(name, b, 0, b.length);
+ *         }
+ *
+ *         private byte[] loadClassData(String name) {
+ *             // load the class data from the connection
+ *             &nbsp;.&nbsp;.&nbsp;.
+ *         }
+ *     }
+ * </pre></blockquote>
+ *
+ * <h4> <a name="name">Binary names</a> </h4>
+ *
+ * <p> Any class name provided as a {@link String} parameter to methods in
+ * <tt>ClassLoader</tt> must be a binary name as defined by
+ * <cite>The Java&trade; Language Specification</cite>.
+ *
+ * <p> Examples of valid class names include:
+ * <blockquote><pre>
+ *   "java.lang.String"
+ *   "javax.swing.JSpinner$DefaultEditor"
+ *   "java.security.KeyStore$Builder$FileBuilder$1"
+ *   "java.net.URLClassLoader$3$1"
+ * </pre></blockquote>
+ *
+ * @see      #resolveClass(Class)
+ * @since 1.0
+ */
+public abstract class ClassLoader {
+
+    @JavaScriptBody(args = {}, body = "")
+    private static native void registerNatives();
+    static {
+        registerNatives();
+    }
+
+    // The parent class loader for delegation
+    // Note: VM hardcoded the offset of this field, thus all new fields
+    // must be added *after* it.
+    private final ClassLoader parent;
+
+
+    /**
+     * Creates a new class loader using the specified parent class loader for
+     * delegation.
+     *
+     * <p> If there is a security manager, its {@link
+     * SecurityManager#checkCreateClassLoader()
+     * <tt>checkCreateClassLoader</tt>} method is invoked.  This may result in
+     * a security exception.  </p>
+     *
+     * @param  parent
+     *         The parent class loader
+     *
+     * @throws  SecurityException
+     *          If a security manager exists and its
+     *          <tt>checkCreateClassLoader</tt> method doesn't allow creation
+     *          of a new class loader.
+     *
+     * @since  1.2
+     */
+    protected ClassLoader(ClassLoader parent) {
+        throw new SecurityException();
+    }
+
+    /**
+     * Creates a new class loader using the <tt>ClassLoader</tt> returned by
+     * the method {@link #getSystemClassLoader()
+     * <tt>getSystemClassLoader()</tt>} as the parent class loader.
+     *
+     * <p> If there is a security manager, its {@link
+     * SecurityManager#checkCreateClassLoader()
+     * <tt>checkCreateClassLoader</tt>} method is invoked.  This may result in
+     * a security exception.  </p>
+     *
+     * @throws  SecurityException
+     *          If a security manager exists and its
+     *          <tt>checkCreateClassLoader</tt> method doesn't allow creation
+     *          of a new class loader.
+     */
+    protected ClassLoader() {
+        throw new SecurityException();
+    }
+
+    // -- Class --
+
+    /**
+     * Loads the class with the specified <a href="#name">binary name</a>.
+     * This method searches for classes in the same manner as the {@link
+     * #loadClass(String, boolean)} method.  It is invoked by the Java virtual
+     * machine to resolve class references.  Invoking this method is equivalent
+     * to invoking {@link #loadClass(String, boolean) <tt>loadClass(name,
+     * false)</tt>}.  </p>
+     *
+     * @param  name
+     *         The <a href="#name">binary name</a> of the class
+     *
+     * @return  The resulting <tt>Class</tt> object
+     *
+     * @throws  ClassNotFoundException
+     *          If the class was not found
+     */
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        return loadClass(name, false);
+    }
+
+    /**
+     * Loads the class with the specified <a href="#name">binary name</a>.  The
+     * default implementation of this method searches for classes in the
+     * following order:
+     *
+     * <p><ol>
+     *
+     *   <li><p> Invoke {@link #findLoadedClass(String)} to check if the class
+     *   has already been loaded.  </p></li>
+     *
+     *   <li><p> Invoke the {@link #loadClass(String) <tt>loadClass</tt>} method
+     *   on the parent class loader.  If the parent is <tt>null</tt> the class
+     *   loader built-in to the virtual machine is used, instead.  </p></li>
+     *
+     *   <li><p> Invoke the {@link #findClass(String)} method to find the
+     *   class.  </p></li>
+     *
+     * </ol>
+     *
+     * <p> If the class was found using the above steps, and the
+     * <tt>resolve</tt> flag is true, this method will then invoke the {@link
+     * #resolveClass(Class)} method on the resulting <tt>Class</tt> object.
+     *
+     * <p> Subclasses of <tt>ClassLoader</tt> are encouraged to override {@link
+     * #findClass(String)}, rather than this method.  </p>
+     *
+     * <p> Unless overridden, this method synchronizes on the result of
+     * {@link #getClassLoadingLock <tt>getClassLoadingLock</tt>} method
+     * during the entire class loading process.
+     *
+     * @param  name
+     *         The <a href="#name">binary name</a> of the class
+     *
+     * @param  resolve
+     *         If <tt>true</tt> then resolve the class
+     *
+     * @return  The resulting <tt>Class</tt> object
+     *
+     * @throws  ClassNotFoundException
+     *          If the class could not be found
+     */
+    protected Class<?> loadClass(String name, boolean resolve)
+        throws ClassNotFoundException
+    {
+        synchronized (getClassLoadingLock(name)) {
+            // First, check if the class has already been loaded
+            Class c = findLoadedClass(name);
+            if (c == null) {
+                try {
+                    if (parent != null) {
+                        c = parent.loadClass(name, false);
+                    } else {
+                        c = findBootstrapClassOrNull(name);
+                    }
+                } catch (ClassNotFoundException e) {
+                    // ClassNotFoundException thrown if class not found
+                    // from the non-null parent class loader
+                }
+
+                if (c == null) {
+                    // If still not found, then invoke findClass in order
+                    // to find the class.
+                    c = findClass(name);
+
+//                    // this is the defining class loader; record the stats
+//                    sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0);
+//                    sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1);
+//                    sun.misc.PerfCounter.getFindClasses().increment();
+                }
+            }
+            if (resolve) {
+                resolveClass(c);
+            }
+            return c;
+        }
+    }
+
+    /**
+     * Returns the lock object for class loading operations.
+     * For backward compatibility, the default implementation of this method
+     * behaves as follows. If this ClassLoader object is registered as
+     * parallel capable, the method returns a dedicated object associated
+     * with the specified class name. Otherwise, the method returns this
+     * ClassLoader object. </p>
+     *
+     * @param  className
+     *         The name of the to-be-loaded class
+     *
+     * @return the lock for class loading operations
+     *
+     * @throws NullPointerException
+     *         If registered as parallel capable and <tt>className</tt> is null
+     *
+     * @see #loadClass(String, boolean)
+     *
+     * @since  1.7
+     */
+    protected Object getClassLoadingLock(String className) {
+        Object lock = this;
+        return lock;
+    }
+
+    /**
+     * Finds the class with the specified <a href="#name">binary name</a>.
+     * This method should be overridden by class loader implementations that
+     * follow the delegation model for loading classes, and will be invoked by
+     * the {@link #loadClass <tt>loadClass</tt>} method after checking the
+     * parent class loader for the requested class.  The default implementation
+     * throws a <tt>ClassNotFoundException</tt>.  </p>
+     *
+     * @param  name
+     *         The <a href="#name">binary name</a> of the class
+     *
+     * @return  The resulting <tt>Class</tt> object
+     *
+     * @throws  ClassNotFoundException
+     *          If the class could not be found
+     *
+     * @since  1.2
+     */
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        throw new ClassNotFoundException(name);
+    }
+
+    /**
+     * Converts an array of bytes into an instance of class <tt>Class</tt>.
+     * Before the <tt>Class</tt> can be used it must be resolved.  This method
+     * is deprecated in favor of the version that takes a <a
+     * href="#name">binary name</a> as its first argument, and is more secure.
+     *
+     * @param  b
+     *         The bytes that make up the class data.  The bytes in positions
+     *         <tt>off</tt> through <tt>off+len-1</tt> should have the format
+     *         of a valid class file as defined by
+     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
+     *
+     * @param  off
+     *         The start offset in <tt>b</tt> of the class data
+     *
+     * @param  len
+     *         The length of the class data
+     *
+     * @return  The <tt>Class</tt> object that was created from the specified
+     *          class data
+     *
+     * @throws  ClassFormatError
+     *          If the data did not contain a valid class
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If either <tt>off</tt> or <tt>len</tt> is negative, or if
+     *          <tt>off+len</tt> is greater than <tt>b.length</tt>.
+     *
+     * @throws  SecurityException
+     *          If an attempt is made to add this class to a package that
+     *          contains classes that were signed by a different set of
+     *          certificates than this class, or if an attempt is made
+     *          to define a class in a package with a fully-qualified name
+     *          that starts with "{@code java.}".
+     *
+     * @see  #loadClass(String, boolean)
+     * @see  #resolveClass(Class)
+     *
+     * @deprecated  Replaced by {@link #defineClass(String, byte[], int, int)
+     * defineClass(String, byte[], int, int)}
+     */
+    @Deprecated
+    protected final Class<?> defineClass(byte[] b, int off, int len)
+        throws ClassFormatError
+    {
+        throw new SecurityException();
+    }
+
+    /**
+     * Converts an array of bytes into an instance of class <tt>Class</tt>.
+     * Before the <tt>Class</tt> can be used it must be resolved.
+     *
+     * <p> This method assigns a default {@link java.security.ProtectionDomain
+     * <tt>ProtectionDomain</tt>} to the newly defined class.  The
+     * <tt>ProtectionDomain</tt> is effectively granted the same set of
+     * permissions returned when {@link
+     * java.security.Policy#getPermissions(java.security.CodeSource)
+     * <tt>Policy.getPolicy().getPermissions(new CodeSource(null, null))</tt>}
+     * is invoked.  The default domain is created on the first invocation of
+     * {@link #defineClass(String, byte[], int, int) <tt>defineClass</tt>},
+     * and re-used on subsequent invocations.
+     *
+     * <p> To assign a specific <tt>ProtectionDomain</tt> to the class, use
+     * the {@link #defineClass(String, byte[], int, int,
+     * java.security.ProtectionDomain) <tt>defineClass</tt>} method that takes a
+     * <tt>ProtectionDomain</tt> as one of its arguments.  </p>
+     *
+     * @param  name
+     *         The expected <a href="#name">binary name</a> of the class, or
+     *         <tt>null</tt> if not known
+     *
+     * @param  b
+     *         The bytes that make up the class data.  The bytes in positions
+     *         <tt>off</tt> through <tt>off+len-1</tt> should have the format
+     *         of a valid class file as defined by
+     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
+     *
+     * @param  off
+     *         The start offset in <tt>b</tt> of the class data
+     *
+     * @param  len
+     *         The length of the class data
+     *
+     * @return  The <tt>Class</tt> object that was created from the specified
+     *          class data.
+     *
+     * @throws  ClassFormatError
+     *          If the data did not contain a valid class
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If either <tt>off</tt> or <tt>len</tt> is negative, or if
+     *          <tt>off+len</tt> is greater than <tt>b.length</tt>.
+     *
+     * @throws  SecurityException
+     *          If an attempt is made to add this class to a package that
+     *          contains classes that were signed by a different set of
+     *          certificates than this class (which is unsigned), or if
+     *          <tt>name</tt> begins with "<tt>java.</tt>".
+     *
+     * @see  #loadClass(String, boolean)
+     * @see  #resolveClass(Class)
+     * @see  java.security.CodeSource
+     * @see  java.security.SecureClassLoader
+     *
+     * @since  1.1
+     */
+    protected final Class<?> defineClass(String name, byte[] b, int off, int len)
+        throws ClassFormatError
+    {
+        throw new SecurityException();
+    }
+
+    /**
+     * Links the specified class.  This (misleadingly named) method may be
+     * used by a class loader to link a class.  If the class <tt>c</tt> has
+     * already been linked, then this method simply returns. Otherwise, the
+     * class is linked as described in the "Execution" chapter of
+     * <cite>The Java&trade; Language Specification</cite>.
+     * </p>
+     *
+     * @param  c
+     *         The class to link
+     *
+     * @throws  NullPointerException
+     *          If <tt>c</tt> is <tt>null</tt>.
+     *
+     * @see  #defineClass(String, byte[], int, int)
+     */
+    protected final void resolveClass(Class<?> c) {
+        resolveClass0(c);
+    }
+
+    private native void resolveClass0(Class c);
+
+
+    /**
+     * Returns the class with the given <a href="#name">binary name</a> if this
+     * loader has been recorded by the Java virtual machine as an initiating
+     * loader of a class with that <a href="#name">binary name</a>.  Otherwise
+     * <tt>null</tt> is returned.  </p>
+     *
+     * @param  name
+     *         The <a href="#name">binary name</a> of the class
+     *
+     * @return  The <tt>Class</tt> object, or <tt>null</tt> if the class has
+     *          not been loaded
+     *
+     * @since  1.1
+     */
+    protected final Class<?> findLoadedClass(String name) {
+        if (!checkName(name))
+            return null;
+        return findLoadedClass0(name);
+    }
+
+    private native final Class findLoadedClass0(String name);
+
+    /**
+     * Sets the signers of a class.  This should be invoked after defining a
+     * class.  </p>
+     *
+     * @param  c
+     *         The <tt>Class</tt> object
+     *
+     * @param  signers
+     *         The signers for the class
+     *
+     * @since  1.1
+     */
+    protected final void setSigners(Class<?> c, Object[] signers) {
+        //c.setSigners(signers);
+        throw new UnsupportedOperationException();
+    }
+
+
+    // -- Resource --
+
+    /**
+     * Finds the resource with the given name.  A resource is some data
+     * (images, audio, text, etc) that can be accessed by class code in a way
+     * that is independent of the location of the code.
+     *
+     * <p> The name of a resource is a '<tt>/</tt>'-separated path name that
+     * identifies the resource.
+     *
+     * <p> This method will first search the parent class loader for the
+     * resource; if the parent is <tt>null</tt> the path of the class loader
+     * built-in to the virtual machine is searched.  That failing, this method
+     * will invoke {@link #findResource(String)} to find the resource.  </p>
+     *
+     * @param  name
+     *         The resource name
+     *
+     * @return  A <tt>URL</tt> object for reading the resource, or
+     *          <tt>null</tt> if the resource could not be found or the invoker
+     *          doesn't have adequate  privileges to get the resource.
+     *
+     * @since  1.1
+     */
+    public URL getResource(String name) {
+        URL url;
+        if (parent != null) {
+            url = parent.getResource(name);
+        } else {
+            url = getBootstrapResource(name);
+        }
+        if (url == null) {
+            url = findResource(name);
+        }
+        return url;
+    }
+
+    /**
+     * Finds all the resources with the given name. A resource is some data
+     * (images, audio, text, etc) that can be accessed by class code in a way
+     * that is independent of the location of the code.
+     *
+     * <p>The name of a resource is a <tt>/</tt>-separated path name that
+     * identifies the resource.
+     *
+     * <p> The search order is described in the documentation for {@link
+     * #getResource(String)}.  </p>
+     *
+     * @param  name
+     *         The resource name
+     *
+     * @return  An enumeration of {@link java.net.URL <tt>URL</tt>} objects for
+     *          the resource.  If no resources could  be found, the enumeration
+     *          will be empty.  Resources that the class loader doesn't have
+     *          access to will not be in the enumeration.
+     *
+     * @throws  IOException
+     *          If I/O errors occur
+     *
+     * @see  #findResources(String)
+     *
+     * @since  1.2
+     */
+    public Enumeration<URL> getResources(String name) throws IOException {
+        Enumeration[] tmp = new Enumeration[2];
+        if (parent != null) {
+            tmp[0] = parent.getResources(name);
+        } else {
+            tmp[0] = getBootstrapResources(name);
+        }
+        tmp[1] = findResources(name);
+
+        return new CompoundEnumeration(tmp);
+    }
+
+    /**
+     * Finds the resource with the given name. Class loader implementations
+     * should override this method to specify where to find resources.  </p>
+     *
+     * @param  name
+     *         The resource name
+     *
+     * @return  A <tt>URL</tt> object for reading the resource, or
+     *          <tt>null</tt> if the resource could not be found
+     *
+     * @since  1.2
+     */
+    protected URL findResource(String name) {
+        return null;
+    }
+
+    /**
+     * Returns an enumeration of {@link java.net.URL <tt>URL</tt>} objects
+     * representing all the resources with the given name. Class loader
+     * implementations should override this method to specify where to load
+     * resources from.  </p>
+     *
+     * @param  name
+     *         The resource name
+     *
+     * @return  An enumeration of {@link java.net.URL <tt>URL</tt>} objects for
+     *          the resources
+     *
+     * @throws  IOException
+     *          If I/O errors occur
+     *
+     * @since  1.2
+     */
+    protected Enumeration<URL> findResources(String name) throws IOException {
+        return new CompoundEnumeration(new Enumeration[0]);
+    }
+
+    // index 0: java.lang.ClassLoader.class
+    // index 1: the immediate caller of index 0.
+    // index 2: the immediate caller of index 1.
+    private static native Class<? extends ClassLoader> getCaller(int index);
+
+    /**
+     * Registers the caller as parallel capable.</p>
+     * The registration succeeds if and only if all of the following
+     * conditions are met: <br>
+     * 1. no instance of the caller has been created</p>
+     * 2. all of the super classes (except class Object) of the caller are
+     * registered as parallel capable</p>
+     * Note that once a class loader is registered as parallel capable, there
+     * is no way to change it back. </p>
+     *
+     * @return  true if the caller is successfully registered as
+     *          parallel capable and false if otherwise.
+     *
+     * @since   1.7
+     */
+//    protected static boolean registerAsParallelCapable() {
+//        return false;
+//    }
+
+    /**
+     * Find a resource of the specified name from the search path used to load
+     * classes.  This method locates the resource through the system class
+     * loader (see {@link #getSystemClassLoader()}).  </p>
+     *
+     * @param  name
+     *         The resource name
+     *
+     * @return  A {@link java.net.URL <tt>URL</tt>} object for reading the
+     *          resource, or <tt>null</tt> if the resource could not be found
+     *
+     * @since  1.1
+     */
+    public static URL getSystemResource(String name) {
+        ClassLoader system = getSystemClassLoader();
+        if (system == null) {
+            return getBootstrapResource(name);
+        }
+        return system.getResource(name);
+    }
+
+    /**
+     * Finds all resources of the specified name from the search path used to
+     * load classes.  The resources thus found are returned as an
+     * {@link java.util.Enumeration <tt>Enumeration</tt>} of {@link
+     * java.net.URL <tt>URL</tt>} objects.
+     *
+     * <p> The search order is described in the documentation for {@link
+     * #getSystemResource(String)}.  </p>
+     *
+     * @param  name
+     *         The resource name
+     *
+     * @return  An enumeration of resource {@link java.net.URL <tt>URL</tt>}
+     *          objects
+     *
+     * @throws  IOException
+     *          If I/O errors occur
+
+     * @since  1.2
+     */
+    public static Enumeration<URL> getSystemResources(String name)
+        throws IOException
+    {
+        ClassLoader system = null; // getSystemClassLoader();
+        if (system == null) {
+            return getBootstrapResources(name);
+        }
+        return system.getResources(name);
+    }
+
+
+
+    /**
+     * Returns an input stream for reading the specified resource.
+     *
+     * <p> The search order is described in the documentation for {@link
+     * #getResource(String)}.  </p>
+     *
+     * @param  name
+     *         The resource name
+     *
+     * @return  An input stream for reading the resource, or <tt>null</tt>
+     *          if the resource could not be found
+     *
+     * @since  1.1
+     */
+    public InputStream getResourceAsStream(String name) {
+        URL url = getResource(name);
+        try {
+            return url != null ? url.openStream() : null;
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Open for reading, a resource of the specified name from the search path
+     * used to load classes.  This method locates the resource through the
+     * system class loader (see {@link #getSystemClassLoader()}).  </p>
+     *
+     * @param  name
+     *         The resource name
+     *
+     * @return  An input stream for reading the resource, or <tt>null</tt>
+     *          if the resource could not be found
+     *
+     * @since  1.1
+     */
+    public static InputStream getSystemResourceAsStream(String name) {
+        URL url = getSystemResource(name);
+        try {
+            return url != null ? url.openStream() : null;
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
+
+    // -- Hierarchy --
+
+    /**
+     * Returns the parent class loader for delegation. Some implementations may
+     * use <tt>null</tt> to represent the bootstrap class loader. This method
+     * will return <tt>null</tt> in such implementations if this class loader's
+     * parent is the bootstrap class loader.
+     *
+     * <p> If a security manager is present, and the invoker's class loader is
+     * not <tt>null</tt> and is not an ancestor of this class loader, then this
+     * method invokes the security manager's {@link
+     * SecurityManager#checkPermission(java.security.Permission)
+     * <tt>checkPermission</tt>} method with a {@link
+     * RuntimePermission#RuntimePermission(String)
+     * <tt>RuntimePermission("getClassLoader")</tt>} permission to verify
+     * access to the parent class loader is permitted.  If not, a
+     * <tt>SecurityException</tt> will be thrown.  </p>
+     *
+     * @return  The parent <tt>ClassLoader</tt>
+     *
+     * @throws  SecurityException
+     *          If a security manager exists and its <tt>checkPermission</tt>
+     *          method doesn't allow access to this class loader's parent class
+     *          loader.
+     *
+     * @since  1.2
+     */
+    public final ClassLoader getParent() {
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns the system class loader for delegation.  This is the default
+     * delegation parent for new <tt>ClassLoader</tt> instances, and is
+     * typically the class loader used to start the application.
+     *
+     * <p> This method is first invoked early in the runtime's startup
+     * sequence, at which point it creates the system class loader and sets it
+     * as the context class loader of the invoking <tt>Thread</tt>.
+     *
+     * <p> The default system class loader is an implementation-dependent
+     * instance of this class.
+     *
+     * <p> If the system property "<tt>java.system.class.loader</tt>" is defined
+     * when this method is first invoked then the value of that property is
+     * taken to be the name of a class that will be returned as the system
+     * class loader.  The class is loaded using the default system class loader
+     * and must define a public constructor that takes a single parameter of
+     * type <tt>ClassLoader</tt> which is used as the delegation parent.  An
+     * instance is then created using this constructor with the default system
+     * class loader as the parameter.  The resulting class loader is defined
+     * to be the system class loader.
+     *
+     * <p> If a security manager is present, and the invoker's class loader is
+     * not <tt>null</tt> and the invoker's class loader is not the same as or
+     * an ancestor of the system class loader, then this method invokes the
+     * security manager's {@link
+     * SecurityManager#checkPermission(java.security.Permission)
+     * <tt>checkPermission</tt>} method with a {@link
+     * RuntimePermission#RuntimePermission(String)
+     * <tt>RuntimePermission("getClassLoader")</tt>} permission to verify
+     * access to the system class loader.  If not, a
+     * <tt>SecurityException</tt> will be thrown.  </p>
+     *
+     * @return  The system <tt>ClassLoader</tt> for delegation, or
+     *          <tt>null</tt> if none
+     *
+     * @throws  SecurityException
+     *          If a security manager exists and its <tt>checkPermission</tt>
+     *          method doesn't allow access to the system class loader.
+     *
+     * @throws  IllegalStateException
+     *          If invoked recursively during the construction of the class
+     *          loader specified by the "<tt>java.system.class.loader</tt>"
+     *          property.
+     *
+     * @throws  Error
+     *          If the system property "<tt>java.system.class.loader</tt>"
+     *          is defined but the named class could not be loaded, the
+     *          provider class does not define the required constructor, or an
+     *          exception is thrown by that constructor when it is invoked. The
+     *          underlying cause of the error can be retrieved via the
+     *          {@link Throwable#getCause()} method.
+     *
+     * @revised  1.4
+     */
+    public static ClassLoader getSystemClassLoader() {
+        throw new SecurityException();
+    }
+
+    // Returns true if the specified class loader can be found in this class
+    // loader's delegation chain.
+    boolean isAncestor(ClassLoader cl) {
+        ClassLoader acl = this;
+        do {
+            acl = acl.parent;
+            if (cl == acl) {
+                return true;
+            }
+        } while (acl != null);
+        return false;
+    }
+
+    private boolean checkName(String name) {
+        throw new UnsupportedOperationException(); 
+    }
+
+    private Class findBootstrapClassOrNull(String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    private static URL getBootstrapResource(String name) {
+        throw new UnsupportedOperationException();
+    }
+
+    private static Enumeration<URL> getBootstrapResources(String name) {
+        URL u = Object.class.getResource("/" + name);
+        return new OneOrZeroEnum(u);
+    }
+    
+    private static class OneOrZeroEnum implements Enumeration<URL> {
+        private URL u;
+
+        public OneOrZeroEnum(URL u) {
+            this.u = u;
+        }
+
+        public boolean hasMoreElements() {
+            return u != null;
+        }
+
+        public URL nextElement() {
+            URL r = u;
+            if (r == null) {
+                throw new NoSuchElementException();
+            }
+            u = null;
+            return r;
+        }
+    }
+
+    private static class CompoundEnumeration implements Enumeration<URL> {
+        private URL next;
+        private int index;
+        private final Enumeration[] arr;
+
+        public CompoundEnumeration(Enumeration[] arr) {
+            this.arr = arr;
+            this.index = 0;
+        }
+
+        public boolean hasMoreElements() {
+            if (next == null) {
+                if (arr[index].hasMoreElements()) {
+                    next = (URL) arr[index].nextElement();
+                } else {
+                    if (index < arr.length) {
+                        index++;
+                        return hasMoreElements();
+                    }
+                }
+            }
+            return next != null;
+        }
+
+        public URL nextElement() {
+            if (!hasMoreElements()) {
+                throw new NoSuchElementException();
+            }
+            URL r = next;
+            next = null;
+            return r;
+        }
+        
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/ClassNotFoundException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/ClassNotFoundException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when an application tries to load in a class through its
+ * string name using:
+ * <ul>
+ * <li>The <code>forName</code> method in class <code>Class</code>.
+ * <li>The <code>findSystemClass</code> method in class
+ *     <code>ClassLoader</code> .
+ * <li>The <code>loadClass</code> method in class <code>ClassLoader</code>.
+ * </ul>
+ * <p>
+ * but no definition for the class with the specified name could be found.
+ *
+ * <p>As of release 1.4, this exception has been retrofitted to conform to
+ * the general purpose exception-chaining mechanism.  The "optional exception
+ * that was raised while loading the class" that may be provided at
+ * construction time and accessed via the {@link #getException()} method is
+ * now known as the <i>cause</i>, and may be accessed via the {@link
+ * Throwable#getCause()} method, as well as the aforementioned "legacy method."
+ *
+ * @author  unascribed
+ * @see     java.lang.Class#forName(java.lang.String)
+ * @see     java.lang.ClassLoader#findSystemClass(java.lang.String)
+ * @see     java.lang.ClassLoader#loadClass(java.lang.String, boolean)
+ * @since   JDK1.0
+ */
+public class ClassNotFoundException extends ReflectiveOperationException {
+    /**
+     * use serialVersionUID from JDK 1.1.X for interoperability
+     */
+     private static final long serialVersionUID = 9176873029745254542L;
+
+    /**
+     * This field holds the exception ex if the
+     * ClassNotFoundException(String s, Throwable ex) constructor was
+     * used to instantiate the object
+     * @serial
+     * @since 1.2
+     */
+    private Throwable ex;
+
+    /**
+     * Constructs a <code>ClassNotFoundException</code> with no detail message.
+     */
+    public ClassNotFoundException() {
+        super((Throwable)null);  // Disallow initCause
+    }
+
+    /**
+     * Constructs a <code>ClassNotFoundException</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public ClassNotFoundException(String s) {
+        super(s, null);  //  Disallow initCause
+    }
+
+    /**
+     * Constructs a <code>ClassNotFoundException</code> with the
+     * specified detail message and optional exception that was
+     * raised while loading the class.
+     *
+     * @param s the detail message
+     * @param ex the exception that was raised while loading the class
+     * @since 1.2
+     */
+    public ClassNotFoundException(String s, Throwable ex) {
+        super(s, null);  //  Disallow initCause
+        this.ex = ex;
+    }
+
+    /**
+     * Returns the exception that was raised if an error occurred while
+     * attempting to load the class. Otherwise, returns <tt>null</tt>.
+     *
+     * <p>This method predates the general-purpose exception chaining facility.
+     * The {@link Throwable#getCause()} method is now the preferred means of
+     * obtaining this information.
+     *
+     * @return the <code>Exception</code> that was raised while loading a class
+     * @since 1.2
+     */
+    public Throwable getException() {
+        return ex;
+    }
+
+    /**
+     * Returns the cause of this exception (the exception that was raised
+     * if an error occurred while attempting to load the class; otherwise
+     * <tt>null</tt>).
+     *
+     * @return  the cause of this exception.
+     * @since   1.4
+     */
+    public Throwable getCause() {
+        return ex;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/CloneNotSupportedException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/CloneNotSupportedException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that the <code>clone</code> method in class
+ * <code>Object</code> has been called to clone an object, but that
+ * the object's class does not implement the <code>Cloneable</code>
+ * interface.
+ * <p>
+ * Applications that override the <code>clone</code> method can also
+ * throw this exception to indicate that an object could not or
+ * should not be cloned.
+ *
+ * @author  unascribed
+ * @see     java.lang.Cloneable
+ * @see     java.lang.Object#clone()
+ * @since   JDK1.0
+ */
+
+public
+class CloneNotSupportedException extends Exception {
+    private static final long serialVersionUID = 5195511250079656443L;
+
+    /**
+     * Constructs a <code>CloneNotSupportedException</code> with no
+     * detail message.
+     */
+    public CloneNotSupportedException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>CloneNotSupportedException</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public CloneNotSupportedException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Cloneable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Cloneable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * A class implements the <code>Cloneable</code> interface to
+ * indicate to the {@link java.lang.Object#clone()} method that it
+ * is legal for that method to make a
+ * field-for-field copy of instances of that class.
+ * <p>
+ * Invoking Object's clone method on an instance that does not implement the
+ * <code>Cloneable</code> interface results in the exception
+ * <code>CloneNotSupportedException</code> being thrown.
+ * <p>
+ * By convention, classes that implement this interface should override
+ * <tt>Object.clone</tt> (which is protected) with a public method.
+ * See {@link java.lang.Object#clone()} for details on overriding this
+ * method.
+ * <p>
+ * Note that this interface does <i>not</i> contain the <tt>clone</tt> method.
+ * Therefore, it is not possible to clone an object merely by virtue of the
+ * fact that it implements this interface.  Even if the clone method is invoked
+ * reflectively, there is no guarantee that it will succeed.
+ *
+ * @author  unascribed
+ * @see     java.lang.CloneNotSupportedException
+ * @see     java.lang.Object#clone()
+ * @since   JDK1.0
+ */
+public interface Cloneable {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Comparable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Comparable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * This interface imposes a total ordering on the objects of each class that
+ * implements it.  This ordering is referred to as the class's <i>natural
+ * ordering</i>, and the class's <tt>compareTo</tt> method is referred to as
+ * its <i>natural comparison method</i>.<p>
+ *
+ * Lists (and arrays) of objects that implement this interface can be sorted
+ * automatically by {@link Collections#sort(List) Collections.sort} (and
+ * {@link Arrays#sort(Object[]) Arrays.sort}).  Objects that implement this
+ * interface can be used as keys in a {@linkplain SortedMap sorted map} or as
+ * elements in a {@linkplain SortedSet sorted set}, without the need to
+ * specify a {@linkplain Comparator comparator}.<p>
+ *
+ * The natural ordering for a class <tt>C</tt> is said to be <i>consistent
+ * with equals</i> if and only if <tt>e1.compareTo(e2) == 0</tt> has
+ * the same boolean value as <tt>e1.equals(e2)</tt> for every
+ * <tt>e1</tt> and <tt>e2</tt> of class <tt>C</tt>.  Note that <tt>null</tt>
+ * is not an instance of any class, and <tt>e.compareTo(null)</tt> should
+ * throw a <tt>NullPointerException</tt> even though <tt>e.equals(null)</tt>
+ * returns <tt>false</tt>.<p>
+ *
+ * It is strongly recommended (though not required) that natural orderings be
+ * consistent with equals.  This is so because sorted sets (and sorted maps)
+ * without explicit comparators behave "strangely" when they are used with
+ * elements (or keys) whose natural ordering is inconsistent with equals.  In
+ * particular, such a sorted set (or sorted map) violates the general contract
+ * for set (or map), which is defined in terms of the <tt>equals</tt>
+ * method.<p>
+ *
+ * For example, if one adds two keys <tt>a</tt> and <tt>b</tt> such that
+ * <tt>(!a.equals(b) && a.compareTo(b) == 0)</tt> to a sorted
+ * set that does not use an explicit comparator, the second <tt>add</tt>
+ * operation returns false (and the size of the sorted set does not increase)
+ * because <tt>a</tt> and <tt>b</tt> are equivalent from the sorted set's
+ * perspective.<p>
+ *
+ * Virtually all Java core classes that implement <tt>Comparable</tt> have natural
+ * orderings that are consistent with equals.  One exception is
+ * <tt>java.math.BigDecimal</tt>, whose natural ordering equates
+ * <tt>BigDecimal</tt> objects with equal values and different precisions
+ * (such as 4.0 and 4.00).<p>
+ *
+ * For the mathematically inclined, the <i>relation</i> that defines
+ * the natural ordering on a given class C is:<pre>
+ *       {(x, y) such that x.compareTo(y) &lt;= 0}.
+ * </pre> The <i>quotient</i> for this total order is: <pre>
+ *       {(x, y) such that x.compareTo(y) == 0}.
+ * </pre>
+ *
+ * It follows immediately from the contract for <tt>compareTo</tt> that the
+ * quotient is an <i>equivalence relation</i> on <tt>C</tt>, and that the
+ * natural ordering is a <i>total order</i> on <tt>C</tt>.  When we say that a
+ * class's natural ordering is <i>consistent with equals</i>, we mean that the
+ * quotient for the natural ordering is the equivalence relation defined by
+ * the class's {@link Object#equals(Object) equals(Object)} method:<pre>
+ *     {(x, y) such that x.equals(y)}. </pre><p>
+ *
+ * This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <T> the type of objects that this object may be compared to
+ *
+ * @author  Josh Bloch
+ * @see java.util.Comparator
+ * @since 1.2
+ */
+
+public interface Comparable<T> {
+    /**
+     * Compares this object with the specified object for order.  Returns a
+     * negative integer, zero, or a positive integer as this object is less
+     * than, equal to, or greater than the specified object.
+     *
+     * <p>The implementor must ensure <tt>sgn(x.compareTo(y)) ==
+     * -sgn(y.compareTo(x))</tt> for all <tt>x</tt> and <tt>y</tt>.  (This
+     * implies that <tt>x.compareTo(y)</tt> must throw an exception iff
+     * <tt>y.compareTo(x)</tt> throws an exception.)
+     *
+     * <p>The implementor must also ensure that the relation is transitive:
+     * <tt>(x.compareTo(y)&gt;0 &amp;&amp; y.compareTo(z)&gt;0)</tt> implies
+     * <tt>x.compareTo(z)&gt;0</tt>.
+     *
+     * <p>Finally, the implementor must ensure that <tt>x.compareTo(y)==0</tt>
+     * implies that <tt>sgn(x.compareTo(z)) == sgn(y.compareTo(z))</tt>, for
+     * all <tt>z</tt>.
+     *
+     * <p>It is strongly recommended, but <i>not</i> strictly required that
+     * <tt>(x.compareTo(y)==0) == (x.equals(y))</tt>.  Generally speaking, any
+     * class that implements the <tt>Comparable</tt> interface and violates
+     * this condition should clearly indicate this fact.  The recommended
+     * language is "Note: this class has a natural ordering that is
+     * inconsistent with equals."
+     *
+     * <p>In the foregoing description, the notation
+     * <tt>sgn(</tt><i>expression</i><tt>)</tt> designates the mathematical
+     * <i>signum</i> function, which is defined to return one of <tt>-1</tt>,
+     * <tt>0</tt>, or <tt>1</tt> according to whether the value of
+     * <i>expression</i> is negative, zero or positive.
+     *
+     * @param   o the object to be compared.
+     * @return  a negative integer, zero, or a positive integer as this object
+     *          is less than, equal to, or greater than the specified object.
+     *
+     * @throws NullPointerException if the specified object is null
+     * @throws ClassCastException if the specified object's type prevents it
+     *         from being compared to this object.
+     */
+    public int compareTo(T o);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Deprecated.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Deprecated.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+
+/**
+ * A program element annotated &#64;Deprecated is one that programmers
+ * are discouraged from using, typically because it is dangerous,
+ * or because a better alternative exists.  Compilers warn when a
+ * deprecated program element is used or overridden in non-deprecated code.
+ *
+ * @author  Neal Gafter
+ * @since 1.5
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(value={CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})
+public @interface Deprecated {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Double.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Double.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1030 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ * The {@code Double} class wraps a value of the primitive type
+ * {@code double} in an object. An object of type
+ * {@code Double} contains a single field whose type is
+ * {@code double}.
+ *
+ * <p>In addition, this class provides several methods for converting a
+ * {@code double} to a {@code String} and a
+ * {@code String} to a {@code double}, as well as other
+ * constants and methods useful when dealing with a
+ * {@code double}.
+ *
+ * @author  Lee Boynton
+ * @author  Arthur van Hoff
+ * @author  Joseph D. Darcy
+ * @since JDK1.0
+ */
+public final class Double extends Number implements Comparable<Double> {
+    /**
+     * A constant holding the positive infinity of type
+     * {@code double}. It is equal to the value returned by
+     * {@code Double.longBitsToDouble(0x7ff0000000000000L)}.
+     */
+    public static final double POSITIVE_INFINITY = 1.0 / 0.0;
+
+    /**
+     * A constant holding the negative infinity of type
+     * {@code double}. It is equal to the value returned by
+     * {@code Double.longBitsToDouble(0xfff0000000000000L)}.
+     */
+    public static final double NEGATIVE_INFINITY = -1.0 / 0.0;
+
+    /**
+     * A constant holding a Not-a-Number (NaN) value of type
+     * {@code double}. It is equivalent to the value returned by
+     * {@code Double.longBitsToDouble(0x7ff8000000000000L)}.
+     */
+    public static final double NaN = 0.0d / 0.0;
+
+    /**
+     * A constant holding the largest positive finite value of type
+     * {@code double},
+     * (2-2<sup>-52</sup>)&middot;2<sup>1023</sup>.  It is equal to
+     * the hexadecimal floating-point literal
+     * {@code 0x1.fffffffffffffP+1023} and also equal to
+     * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
+     */
+    public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
+
+    /**
+     * A constant holding the smallest positive normal value of type
+     * {@code double}, 2<sup>-1022</sup>.  It is equal to the
+     * hexadecimal floating-point literal {@code 0x1.0p-1022} and also
+     * equal to {@code Double.longBitsToDouble(0x0010000000000000L)}.
+     *
+     * @since 1.6
+     */
+    public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
+
+    /**
+     * A constant holding the smallest positive nonzero value of type
+     * {@code double}, 2<sup>-1074</sup>. It is equal to the
+     * hexadecimal floating-point literal
+     * {@code 0x0.0000000000001P-1022} and also equal to
+     * {@code Double.longBitsToDouble(0x1L)}.
+     */
+    public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
+
+    /**
+     * Maximum exponent a finite {@code double} variable may have.
+     * It is equal to the value returned by
+     * {@code Math.getExponent(Double.MAX_VALUE)}.
+     *
+     * @since 1.6
+     */
+    public static final int MAX_EXPONENT = 1023;
+
+    /**
+     * Minimum exponent a normalized {@code double} variable may
+     * have.  It is equal to the value returned by
+     * {@code Math.getExponent(Double.MIN_NORMAL)}.
+     *
+     * @since 1.6
+     */
+    public static final int MIN_EXPONENT = -1022;
+
+    /**
+     * The number of bits used to represent a {@code double} value.
+     *
+     * @since 1.5
+     */
+    public static final int SIZE = 64;
+
+    /**
+     * The {@code Class} instance representing the primitive type
+     * {@code double}.
+     *
+     * @since JDK1.1
+     */
+    public static final Class<Double>   TYPE = (Class<Double>) Class.getPrimitiveClass("double");
+
+    /**
+     * Returns a string representation of the {@code double}
+     * argument. All characters mentioned below are ASCII characters.
+     * <ul>
+     * <li>If the argument is NaN, the result is the string
+     *     "{@code NaN}".
+     * <li>Otherwise, the result is a string that represents the sign and
+     * magnitude (absolute value) of the argument. If the sign is negative,
+     * the first character of the result is '{@code -}'
+     * (<code>'&#92;u002D'</code>); if the sign is positive, no sign character
+     * appears in the result. As for the magnitude <i>m</i>:
+     * <ul>
+     * <li>If <i>m</i> is infinity, it is represented by the characters
+     * {@code "Infinity"}; thus, positive infinity produces the result
+     * {@code "Infinity"} and negative infinity produces the result
+     * {@code "-Infinity"}.
+     *
+     * <li>If <i>m</i> is zero, it is represented by the characters
+     * {@code "0.0"}; thus, negative zero produces the result
+     * {@code "-0.0"} and positive zero produces the result
+     * {@code "0.0"}.
+     *
+     * <li>If <i>m</i> is greater than or equal to 10<sup>-3</sup> but less
+     * than 10<sup>7</sup>, then it is represented as the integer part of
+     * <i>m</i>, in decimal form with no leading zeroes, followed by
+     * '{@code .}' (<code>'&#92;u002E'</code>), followed by one or
+     * more decimal digits representing the fractional part of <i>m</i>.
+     *
+     * <li>If <i>m</i> is less than 10<sup>-3</sup> or greater than or
+     * equal to 10<sup>7</sup>, then it is represented in so-called
+     * "computerized scientific notation." Let <i>n</i> be the unique
+     * integer such that 10<sup><i>n</i></sup> &le; <i>m</i> {@literal <}
+     * 10<sup><i>n</i>+1</sup>; then let <i>a</i> be the
+     * mathematically exact quotient of <i>m</i> and
+     * 10<sup><i>n</i></sup> so that 1 &le; <i>a</i> {@literal <} 10. The
+     * magnitude is then represented as the integer part of <i>a</i>,
+     * as a single decimal digit, followed by '{@code .}'
+     * (<code>'&#92;u002E'</code>), followed by decimal digits
+     * representing the fractional part of <i>a</i>, followed by the
+     * letter '{@code E}' (<code>'&#92;u0045'</code>), followed
+     * by a representation of <i>n</i> as a decimal integer, as
+     * produced by the method {@link Integer#toString(int)}.
+     * </ul>
+     * </ul>
+     * How many digits must be printed for the fractional part of
+     * <i>m</i> or <i>a</i>? There must be at least one digit to represent
+     * the fractional part, and beyond that as many, but only as many, more
+     * digits as are needed to uniquely distinguish the argument value from
+     * adjacent values of type {@code double}. That is, suppose that
+     * <i>x</i> is the exact mathematical value represented by the decimal
+     * representation produced by this method for a finite nonzero argument
+     * <i>d</i>. Then <i>d</i> must be the {@code double} value nearest
+     * to <i>x</i>; or if two {@code double} values are equally close
+     * to <i>x</i>, then <i>d</i> must be one of them and the least
+     * significant bit of the significand of <i>d</i> must be {@code 0}.
+     *
+     * <p>To create localized string representations of a floating-point
+     * value, use subclasses of {@link java.text.NumberFormat}.
+     *
+     * @param   d   the {@code double} to be converted.
+     * @return a string representation of the argument.
+     */
+    @JavaScriptBody(args="d", body="var f = Math.floor(d);\n" +
+        "var r = d.toString();" +
+        "if (f === d && isFinite(d) && r.indexOf('e') === -1) return r + '.0';\n" +
+        " else return r;"
+    )
+    public static native String toString(double d);
+
+    /**
+     * Returns a hexadecimal string representation of the
+     * {@code double} argument. All characters mentioned below
+     * are ASCII characters.
+     *
+     * <ul>
+     * <li>If the argument is NaN, the result is the string
+     *     "{@code NaN}".
+     * <li>Otherwise, the result is a string that represents the sign
+     * and magnitude of the argument. If the sign is negative, the
+     * first character of the result is '{@code -}'
+     * (<code>'&#92;u002D'</code>); if the sign is positive, no sign
+     * character appears in the result. As for the magnitude <i>m</i>:
+     *
+     * <ul>
+     * <li>If <i>m</i> is infinity, it is represented by the string
+     * {@code "Infinity"}; thus, positive infinity produces the
+     * result {@code "Infinity"} and negative infinity produces
+     * the result {@code "-Infinity"}.
+     *
+     * <li>If <i>m</i> is zero, it is represented by the string
+     * {@code "0x0.0p0"}; thus, negative zero produces the result
+     * {@code "-0x0.0p0"} and positive zero produces the result
+     * {@code "0x0.0p0"}.
+     *
+     * <li>If <i>m</i> is a {@code double} value with a
+     * normalized representation, substrings are used to represent the
+     * significand and exponent fields.  The significand is
+     * represented by the characters {@code "0x1."}
+     * followed by a lowercase hexadecimal representation of the rest
+     * of the significand as a fraction.  Trailing zeros in the
+     * hexadecimal representation are removed unless all the digits
+     * are zero, in which case a single zero is used. Next, the
+     * exponent is represented by {@code "p"} followed
+     * by a decimal string of the unbiased exponent as if produced by
+     * a call to {@link Integer#toString(int) Integer.toString} on the
+     * exponent value.
+     *
+     * <li>If <i>m</i> is a {@code double} value with a subnormal
+     * representation, the significand is represented by the
+     * characters {@code "0x0."} followed by a
+     * hexadecimal representation of the rest of the significand as a
+     * fraction.  Trailing zeros in the hexadecimal representation are
+     * removed. Next, the exponent is represented by
+     * {@code "p-1022"}.  Note that there must be at
+     * least one nonzero digit in a subnormal significand.
+     *
+     * </ul>
+     *
+     * </ul>
+     *
+     * <table border>
+     * <caption><h3>Examples</h3></caption>
+     * <tr><th>Floating-point Value</th><th>Hexadecimal String</th>
+     * <tr><td>{@code 1.0}</td> <td>{@code 0x1.0p0}</td>
+     * <tr><td>{@code -1.0}</td>        <td>{@code -0x1.0p0}</td>
+     * <tr><td>{@code 2.0}</td> <td>{@code 0x1.0p1}</td>
+     * <tr><td>{@code 3.0}</td> <td>{@code 0x1.8p1}</td>
+     * <tr><td>{@code 0.5}</td> <td>{@code 0x1.0p-1}</td>
+     * <tr><td>{@code 0.25}</td>        <td>{@code 0x1.0p-2}</td>
+     * <tr><td>{@code Double.MAX_VALUE}</td>
+     *     <td>{@code 0x1.fffffffffffffp1023}</td>
+     * <tr><td>{@code Minimum Normal Value}</td>
+     *     <td>{@code 0x1.0p-1022}</td>
+     * <tr><td>{@code Maximum Subnormal Value}</td>
+     *     <td>{@code 0x0.fffffffffffffp-1022}</td>
+     * <tr><td>{@code Double.MIN_VALUE}</td>
+     *     <td>{@code 0x0.0000000000001p-1022}</td>
+     * </table>
+     * @param   d   the {@code double} to be converted.
+     * @return a hex string representation of the argument.
+     * @since 1.5
+     * @author Joseph D. Darcy
+     */
+    public static String toHexString(double d) {
+        throw new UnsupportedOperationException();
+//        /*
+//         * Modeled after the "a" conversion specifier in C99, section
+//         * 7.19.6.1; however, the output of this method is more
+//         * tightly specified.
+//         */
+//        if (!FpUtils.isFinite(d) )
+//            // For infinity and NaN, use the decimal output.
+//            return Double.toString(d);
+//        else {
+//            // Initialized to maximum size of output.
+//            StringBuffer answer = new StringBuffer(24);
+//
+//            if (FpUtils.rawCopySign(1.0, d) == -1.0) // value is negative,
+//                answer.append("-");                  // so append sign info
+//
+//            answer.append("0x");
+//
+//            d = Math.abs(d);
+//
+//            if(d == 0.0) {
+//                answer.append("0.0p0");
+//            }
+//            else {
+//                boolean subnormal = (d < DoubleConsts.MIN_NORMAL);
+//
+//                // Isolate significand bits and OR in a high-order bit
+//                // so that the string representation has a known
+//                // length.
+//                long signifBits = (Double.doubleToLongBits(d)
+//                                   & DoubleConsts.SIGNIF_BIT_MASK) |
+//                    0x1000000000000000L;
+//
+//                // Subnormal values have a 0 implicit bit; normal
+//                // values have a 1 implicit bit.
+//                answer.append(subnormal ? "0." : "1.");
+//
+//                // Isolate the low-order 13 digits of the hex
+//                // representation.  If all the digits are zero,
+//                // replace with a single 0; otherwise, remove all
+//                // trailing zeros.
+//                String signif = Long.toHexString(signifBits).substring(3,16);
+//                answer.append(signif.equals("0000000000000") ? // 13 zeros
+//                              "0":
+//                              signif.replaceFirst("0{1,12}$", ""));
+//
+//                // If the value is subnormal, use the E_min exponent
+//                // value for double; otherwise, extract and report d's
+//                // exponent (the representation of a subnormal uses
+//                // E_min -1).
+//                answer.append("p" + (subnormal ?
+//                               DoubleConsts.MIN_EXPONENT:
+//                               FpUtils.getExponent(d) ));
+//            }
+//            return answer.toString();
+//        }
+    }
+
+    /**
+     * Returns a {@code Double} object holding the
+     * {@code double} value represented by the argument string
+     * {@code s}.
+     *
+     * <p>If {@code s} is {@code null}, then a
+     * {@code NullPointerException} is thrown.
+     *
+     * <p>Leading and trailing whitespace characters in {@code s}
+     * are ignored.  Whitespace is removed as if by the {@link
+     * String#trim} method; that is, both ASCII space and control
+     * characters are removed. The rest of {@code s} should
+     * constitute a <i>FloatValue</i> as described by the lexical
+     * syntax rules:
+     *
+     * <blockquote>
+     * <dl>
+     * <dt><i>FloatValue:</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code NaN}
+     * <dd><i>Sign<sub>opt</sub></i> {@code Infinity}
+     * <dd><i>Sign<sub>opt</sub> FloatingPointLiteral</i>
+     * <dd><i>Sign<sub>opt</sub> HexFloatingPointLiteral</i>
+     * <dd><i>SignedInteger</i>
+     * </dl>
+     *
+     * <p>
+     *
+     * <dl>
+     * <dt><i>HexFloatingPointLiteral</i>:
+     * <dd> <i>HexSignificand BinaryExponent FloatTypeSuffix<sub>opt</sub></i>
+     * </dl>
+     *
+     * <p>
+     *
+     * <dl>
+     * <dt><i>HexSignificand:</i>
+     * <dd><i>HexNumeral</i>
+     * <dd><i>HexNumeral</i> {@code .}
+     * <dd>{@code 0x} <i>HexDigits<sub>opt</sub>
+     *     </i>{@code .}<i> HexDigits</i>
+     * <dd>{@code 0X}<i> HexDigits<sub>opt</sub>
+     *     </i>{@code .} <i>HexDigits</i>
+     * </dl>
+     *
+     * <p>
+     *
+     * <dl>
+     * <dt><i>BinaryExponent:</i>
+     * <dd><i>BinaryExponentIndicator SignedInteger</i>
+     * </dl>
+     *
+     * <p>
+     *
+     * <dl>
+     * <dt><i>BinaryExponentIndicator:</i>
+     * <dd>{@code p}
+     * <dd>{@code P}
+     * </dl>
+     *
+     * </blockquote>
+     *
+     * where <i>Sign</i>, <i>FloatingPointLiteral</i>,
+     * <i>HexNumeral</i>, <i>HexDigits</i>, <i>SignedInteger</i> and
+     * <i>FloatTypeSuffix</i> are as defined in the lexical structure
+     * sections of
+     * <cite>The Java&trade; Language Specification</cite>,
+     * except that underscores are not accepted between digits.
+     * If {@code s} does not have the form of
+     * a <i>FloatValue</i>, then a {@code NumberFormatException}
+     * is thrown. Otherwise, {@code s} is regarded as
+     * representing an exact decimal value in the usual
+     * "computerized scientific notation" or as an exact
+     * hexadecimal value; this exact numerical value is then
+     * conceptually converted to an "infinitely precise"
+     * binary value that is then rounded to type {@code double}
+     * by the usual round-to-nearest rule of IEEE 754 floating-point
+     * arithmetic, which includes preserving the sign of a zero
+     * value.
+     *
+     * Note that the round-to-nearest rule also implies overflow and
+     * underflow behaviour; if the exact value of {@code s} is large
+     * enough in magnitude (greater than or equal to ({@link
+     * #MAX_VALUE} + {@link Math#ulp(double) ulp(MAX_VALUE)}/2),
+     * rounding to {@code double} will result in an infinity and if the
+     * exact value of {@code s} is small enough in magnitude (less
+     * than or equal to {@link #MIN_VALUE}/2), rounding to float will
+     * result in a zero.
+     *
+     * Finally, after rounding a {@code Double} object representing
+     * this {@code double} value is returned.
+     *
+     * <p> To interpret localized string representations of a
+     * floating-point value, use subclasses of {@link
+     * java.text.NumberFormat}.
+     *
+     * <p>Note that trailing format specifiers, specifiers that
+     * determine the type of a floating-point literal
+     * ({@code 1.0f} is a {@code float} value;
+     * {@code 1.0d} is a {@code double} value), do
+     * <em>not</em> influence the results of this method.  In other
+     * words, the numerical value of the input string is converted
+     * directly to the target floating-point type.  The two-step
+     * sequence of conversions, string to {@code float} followed
+     * by {@code float} to {@code double}, is <em>not</em>
+     * equivalent to converting a string directly to
+     * {@code double}. For example, the {@code float}
+     * literal {@code 0.1f} is equal to the {@code double}
+     * value {@code 0.10000000149011612}; the {@code float}
+     * literal {@code 0.1f} represents a different numerical
+     * value than the {@code double} literal
+     * {@code 0.1}. (The numerical value 0.1 cannot be exactly
+     * represented in a binary floating-point number.)
+     *
+     * <p>To avoid calling this method on an invalid string and having
+     * a {@code NumberFormatException} be thrown, the regular
+     * expression below can be used to screen the input string:
+     *
+     * <code>
+     * <pre>
+     *  final String Digits     = "(\\p{Digit}+)";
+     *  final String HexDigits  = "(\\p{XDigit}+)";
+     *  // an exponent is 'e' or 'E' followed by an optionally
+     *  // signed decimal integer.
+     *  final String Exp        = "[eE][+-]?"+Digits;
+     *  final String fpRegex    =
+     *      ("[\\x00-\\x20]*"+  // Optional leading "whitespace"
+     *       "[+-]?(" + // Optional sign character
+     *       "NaN|" +           // "NaN" string
+     *       "Infinity|" +      // "Infinity" string
+     *
+     *       // A decimal floating-point string representing a finite positive
+     *       // number without a leading sign has at most five basic pieces:
+     *       // Digits . Digits ExponentPart FloatTypeSuffix
+     *       //
+     *       // Since this method allows integer-only strings as input
+     *       // in addition to strings of floating-point literals, the
+     *       // two sub-patterns below are simplifications of the grammar
+     *       // productions from section 3.10.2 of
+     *       // <cite>The Java&trade; Language Specification</cite>.
+     *
+     *       // Digits ._opt Digits_opt ExponentPart_opt FloatTypeSuffix_opt
+     *       "((("+Digits+"(\\.)?("+Digits+"?)("+Exp+")?)|"+
+     *
+     *       // . Digits ExponentPart_opt FloatTypeSuffix_opt
+     *       "(\\.("+Digits+")("+Exp+")?)|"+
+     *
+     *       // Hexadecimal strings
+     *       "((" +
+     *        // 0[xX] HexDigits ._opt BinaryExponent FloatTypeSuffix_opt
+     *        "(0[xX]" + HexDigits + "(\\.)?)|" +
+     *
+     *        // 0[xX] HexDigits_opt . HexDigits BinaryExponent FloatTypeSuffix_opt
+     *        "(0[xX]" + HexDigits + "?(\\.)" + HexDigits + ")" +
+     *
+     *        ")[pP][+-]?" + Digits + "))" +
+     *       "[fFdD]?))" +
+     *       "[\\x00-\\x20]*");// Optional trailing "whitespace"
+     *
+     *  if (Pattern.matches(fpRegex, myString))
+     *      Double.valueOf(myString); // Will not throw NumberFormatException
+     *  else {
+     *      // Perform suitable alternative action
+     *  }
+     * </pre>
+     * </code>
+     *
+     * @param      s   the string to be parsed.
+     * @return     a {@code Double} object holding the value
+     *             represented by the {@code String} argument.
+     * @throws     NumberFormatException  if the string does not contain a
+     *             parsable number.
+     */
+    @JavaScriptBody(args="s", body="return parseFloat(s);")
+    public static Double valueOf(String s) throws NumberFormatException {
+        throw new UnsupportedOperationException();
+//        return new Double(FloatingDecimal.readJavaFormatString(s).doubleValue());
+    }
+
+    /**
+     * Returns a {@code Double} instance representing the specified
+     * {@code double} value.
+     * If a new {@code Double} instance is not required, this method
+     * should generally be used in preference to the constructor
+     * {@link #Double(double)}, as this method is likely to yield
+     * significantly better space and time performance by caching
+     * frequently requested values.
+     *
+     * @param  d a double value.
+     * @return a {@code Double} instance representing {@code d}.
+     * @since  1.5
+     */
+    public static Double valueOf(double d) {
+        return new Double(d);
+    }
+
+    /**
+     * Returns a new {@code double} initialized to the value
+     * represented by the specified {@code String}, as performed
+     * by the {@code valueOf} method of class
+     * {@code Double}.
+     *
+     * @param  s   the string to be parsed.
+     * @return the {@code double} value represented by the string
+     *         argument.
+     * @throws NullPointerException  if the string is null
+     * @throws NumberFormatException if the string does not contain
+     *         a parsable {@code double}.
+     * @see    java.lang.Double#valueOf(String)
+     * @since 1.2
+     */
+    @JavaScriptBody(args="s", body="return parseFloat(s);")
+    public static double parseDouble(String s) throws NumberFormatException {
+        throw new UnsupportedOperationException();
+//        return FloatingDecimal.readJavaFormatString(s).doubleValue();
+    }
+
+    /**
+     * Returns {@code true} if the specified number is a
+     * Not-a-Number (NaN) value, {@code false} otherwise.
+     *
+     * @param   v   the value to be tested.
+     * @return  {@code true} if the value of the argument is NaN;
+     *          {@code false} otherwise.
+     */
+    static public boolean isNaN(double v) {
+        return (v != v);
+    }
+
+    /**
+     * Returns {@code true} if the specified number is infinitely
+     * large in magnitude, {@code false} otherwise.
+     *
+     * @param   v   the value to be tested.
+     * @return  {@code true} if the value of the argument is positive
+     *          infinity or negative infinity; {@code false} otherwise.
+     */
+    static public boolean isInfinite(double v) {
+        return (v == POSITIVE_INFINITY) || (v == NEGATIVE_INFINITY);
+    }
+
+    /**
+     * The value of the Double.
+     *
+     * @serial
+     */
+    private final double value;
+
+    /**
+     * Constructs a newly allocated {@code Double} object that
+     * represents the primitive {@code double} argument.
+     *
+     * @param   value   the value to be represented by the {@code Double}.
+     */
+    public Double(double value) {
+        this.value = value;
+    }
+
+    /**
+     * Constructs a newly allocated {@code Double} object that
+     * represents the floating-point value of type {@code double}
+     * represented by the string. The string is converted to a
+     * {@code double} value as if by the {@code valueOf} method.
+     *
+     * @param  s  a string to be converted to a {@code Double}.
+     * @throws    NumberFormatException  if the string does not contain a
+     *            parsable number.
+     * @see       java.lang.Double#valueOf(java.lang.String)
+     */
+    public Double(String s) throws NumberFormatException {
+        // REMIND: this is inefficient
+        this(valueOf(s).doubleValue());
+    }
+
+    /**
+     * Returns {@code true} if this {@code Double} value is
+     * a Not-a-Number (NaN), {@code false} otherwise.
+     *
+     * @return  {@code true} if the value represented by this object is
+     *          NaN; {@code false} otherwise.
+     */
+    public boolean isNaN() {
+        return isNaN(value);
+    }
+
+    /**
+     * Returns {@code true} if this {@code Double} value is
+     * infinitely large in magnitude, {@code false} otherwise.
+     *
+     * @return  {@code true} if the value represented by this object is
+     *          positive infinity or negative infinity;
+     *          {@code false} otherwise.
+     */
+    public boolean isInfinite() {
+        return isInfinite(value);
+    }
+
+    /**
+     * Returns a string representation of this {@code Double} object.
+     * The primitive {@code double} value represented by this
+     * object is converted to a string exactly as if by the method
+     * {@code toString} of one argument.
+     *
+     * @return  a {@code String} representation of this object.
+     * @see java.lang.Double#toString(double)
+     */
+    public String toString() {
+        return toString(value);
+    }
+
+    /**
+     * Returns the value of this {@code Double} as a {@code byte} (by
+     * casting to a {@code byte}).
+     *
+     * @return  the {@code double} value represented by this object
+     *          converted to type {@code byte}
+     * @since JDK1.1
+     */
+    public byte byteValue() {
+        return (byte)value;
+    }
+
+    /**
+     * Returns the value of this {@code Double} as a
+     * {@code short} (by casting to a {@code short}).
+     *
+     * @return  the {@code double} value represented by this object
+     *          converted to type {@code short}
+     * @since JDK1.1
+     */
+    public short shortValue() {
+        return (short)value;
+    }
+
+    /**
+     * Returns the value of this {@code Double} as an
+     * {@code int} (by casting to type {@code int}).
+     *
+     * @return  the {@code double} value represented by this object
+     *          converted to type {@code int}
+     */
+    public int intValue() {
+        return (int)value;
+    }
+
+    /**
+     * Returns the value of this {@code Double} as a
+     * {@code long} (by casting to type {@code long}).
+     *
+     * @return  the {@code double} value represented by this object
+     *          converted to type {@code long}
+     */
+    public long longValue() {
+        return (long)value;
+    }
+
+    /**
+     * Returns the {@code float} value of this
+     * {@code Double} object.
+     *
+     * @return  the {@code double} value represented by this object
+     *          converted to type {@code float}
+     * @since JDK1.0
+     */
+    public float floatValue() {
+        return (float)value;
+    }
+
+    /**
+     * Returns the {@code double} value of this
+     * {@code Double} object.
+     *
+     * @return the {@code double} value represented by this object
+     */
+    public double doubleValue() {
+        return (double)value;
+    }
+
+    /**
+     * Returns a hash code for this {@code Double} object. The
+     * result is the exclusive OR of the two halves of the
+     * {@code long} integer bit representation, exactly as
+     * produced by the method {@link #doubleToLongBits(double)}, of
+     * the primitive {@code double} value represented by this
+     * {@code Double} object. That is, the hash code is the value
+     * of the expression:
+     *
+     * <blockquote>
+     *  {@code (int)(v^(v>>>32))}
+     * </blockquote>
+     *
+     * where {@code v} is defined by:
+     *
+     * <blockquote>
+     *  {@code long v = Double.doubleToLongBits(this.doubleValue());}
+     * </blockquote>
+     *
+     * @return  a {@code hash code} value for this object.
+     */
+    public int hashCode() {
+        long bits = doubleToLongBits(value);
+        return (int)(bits ^ (bits >>> 32));
+    }
+
+    /**
+     * Compares this object against the specified object.  The result
+     * is {@code true} if and only if the argument is not
+     * {@code null} and is a {@code Double} object that
+     * represents a {@code double} that has the same value as the
+     * {@code double} represented by this object. For this
+     * purpose, two {@code double} values are considered to be
+     * the same if and only if the method {@link
+     * #doubleToLongBits(double)} returns the identical
+     * {@code long} value when applied to each.
+     *
+     * <p>Note that in most cases, for two instances of class
+     * {@code Double}, {@code d1} and {@code d2}, the
+     * value of {@code d1.equals(d2)} is {@code true} if and
+     * only if
+     *
+     * <blockquote>
+     *  {@code d1.doubleValue() == d2.doubleValue()}
+     * </blockquote>
+     *
+     * <p>also has the value {@code true}. However, there are two
+     * exceptions:
+     * <ul>
+     * <li>If {@code d1} and {@code d2} both represent
+     *     {@code Double.NaN}, then the {@code equals} method
+     *     returns {@code true}, even though
+     *     {@code Double.NaN==Double.NaN} has the value
+     *     {@code false}.
+     * <li>If {@code d1} represents {@code +0.0} while
+     *     {@code d2} represents {@code -0.0}, or vice versa,
+     *     the {@code equal} test has the value {@code false},
+     *     even though {@code +0.0==-0.0} has the value {@code true}.
+     * </ul>
+     * This definition allows hash tables to operate properly.
+     * @param   obj   the object to compare with.
+     * @return  {@code true} if the objects are the same;
+     *          {@code false} otherwise.
+     * @see java.lang.Double#doubleToLongBits(double)
+     */
+    public boolean equals(Object obj) {
+        return (obj instanceof Double)
+               && (((Double)obj).value) == value;
+    }
+
+    /**
+     * Returns a representation of the specified floating-point value
+     * according to the IEEE 754 floating-point "double
+     * format" bit layout.
+     *
+     * <p>Bit 63 (the bit that is selected by the mask
+     * {@code 0x8000000000000000L}) represents the sign of the
+     * floating-point number. Bits
+     * 62-52 (the bits that are selected by the mask
+     * {@code 0x7ff0000000000000L}) represent the exponent. Bits 51-0
+     * (the bits that are selected by the mask
+     * {@code 0x000fffffffffffffL}) represent the significand
+     * (sometimes called the mantissa) of the floating-point number.
+     *
+     * <p>If the argument is positive infinity, the result is
+     * {@code 0x7ff0000000000000L}.
+     *
+     * <p>If the argument is negative infinity, the result is
+     * {@code 0xfff0000000000000L}.
+     *
+     * <p>If the argument is NaN, the result is
+     * {@code 0x7ff8000000000000L}.
+     *
+     * <p>In all cases, the result is a {@code long} integer that, when
+     * given to the {@link #longBitsToDouble(long)} method, will produce a
+     * floating-point value the same as the argument to
+     * {@code doubleToLongBits} (except all NaN values are
+     * collapsed to a single "canonical" NaN value).
+     *
+     * @param   value   a {@code double} precision floating-point number.
+     * @return the bits that represent the floating-point number.
+     */
+    public static long doubleToLongBits(double value) {
+        final long EXP_BIT_MASK = 9218868437227405312L;
+        final long SIGNIF_BIT_MASK = 4503599627370495L;
+        
+        long result = doubleToRawLongBits(value);
+        // Check for NaN based on values of bit fields, maximum
+        // exponent and nonzero significand.
+        if ( ((result & EXP_BIT_MASK) ==
+              EXP_BIT_MASK) &&
+             (result & SIGNIF_BIT_MASK) != 0L)
+            result = 0x7ff8000000000000L;
+        return result;
+    }
+
+    /**
+     * Returns a representation of the specified floating-point value
+     * according to the IEEE 754 floating-point "double
+     * format" bit layout, preserving Not-a-Number (NaN) values.
+     *
+     * <p>Bit 63 (the bit that is selected by the mask
+     * {@code 0x8000000000000000L}) represents the sign of the
+     * floating-point number. Bits
+     * 62-52 (the bits that are selected by the mask
+     * {@code 0x7ff0000000000000L}) represent the exponent. Bits 51-0
+     * (the bits that are selected by the mask
+     * {@code 0x000fffffffffffffL}) represent the significand
+     * (sometimes called the mantissa) of the floating-point number.
+     *
+     * <p>If the argument is positive infinity, the result is
+     * {@code 0x7ff0000000000000L}.
+     *
+     * <p>If the argument is negative infinity, the result is
+     * {@code 0xfff0000000000000L}.
+     *
+     * <p>If the argument is NaN, the result is the {@code long}
+     * integer representing the actual NaN value.  Unlike the
+     * {@code doubleToLongBits} method,
+     * {@code doubleToRawLongBits} does not collapse all the bit
+     * patterns encoding a NaN to a single "canonical" NaN
+     * value.
+     *
+     * <p>In all cases, the result is a {@code long} integer that,
+     * when given to the {@link #longBitsToDouble(long)} method, will
+     * produce a floating-point value the same as the argument to
+     * {@code doubleToRawLongBits}.
+     *
+     * @param   value   a {@code double} precision floating-point number.
+     * @return the bits that represent the floating-point number.
+     * @since 1.3
+     */
+    public static long doubleToRawLongBits(double value) {
+        int[] arr = { 0, 0 };
+        doubleToRawLongBits(value, arr);
+        long l = arr[1];
+        return (l << 32) | arr[0];
+    }
+    
+    @JavaScriptBody(args = { "value", "arr" }, body = ""
+        + "var a = new ArrayBuffer(8);"
+        + "new Float64Array(a)[0] = value;"
+        + "var out = new Int32Array(a);"
+        + "arr[0] = out[0];"
+        + "arr[1] = out[1];"
+    )
+    private static native void doubleToRawLongBits(double value, int[] arr);
+
+    /**
+     * Returns the {@code double} value corresponding to a given
+     * bit representation.
+     * The argument is considered to be a representation of a
+     * floating-point value according to the IEEE 754 floating-point
+     * "double format" bit layout.
+     *
+     * <p>If the argument is {@code 0x7ff0000000000000L}, the result
+     * is positive infinity.
+     *
+     * <p>If the argument is {@code 0xfff0000000000000L}, the result
+     * is negative infinity.
+     *
+     * <p>If the argument is any value in the range
+     * {@code 0x7ff0000000000001L} through
+     * {@code 0x7fffffffffffffffL} or in the range
+     * {@code 0xfff0000000000001L} through
+     * {@code 0xffffffffffffffffL}, the result is a NaN.  No IEEE
+     * 754 floating-point operation provided by Java can distinguish
+     * between two NaN values of the same type with different bit
+     * patterns.  Distinct values of NaN are only distinguishable by
+     * use of the {@code Double.doubleToRawLongBits} method.
+     *
+     * <p>In all other cases, let <i>s</i>, <i>e</i>, and <i>m</i> be three
+     * values that can be computed from the argument:
+     *
+     * <blockquote><pre>
+     * int s = ((bits &gt;&gt; 63) == 0) ? 1 : -1;
+     * int e = (int)((bits &gt;&gt; 52) & 0x7ffL);
+     * long m = (e == 0) ?
+     *                 (bits & 0xfffffffffffffL) &lt;&lt; 1 :
+     *                 (bits & 0xfffffffffffffL) | 0x10000000000000L;
+     * </pre></blockquote>
+     *
+     * Then the floating-point result equals the value of the mathematical
+     * expression <i>s</i>&middot;<i>m</i>&middot;2<sup><i>e</i>-1075</sup>.
+     *
+     * <p>Note that this method may not be able to return a
+     * {@code double} NaN with exactly same bit pattern as the
+     * {@code long} argument.  IEEE 754 distinguishes between two
+     * kinds of NaNs, quiet NaNs and <i>signaling NaNs</i>.  The
+     * differences between the two kinds of NaN are generally not
+     * visible in Java.  Arithmetic operations on signaling NaNs turn
+     * them into quiet NaNs with a different, but often similar, bit
+     * pattern.  However, on some processors merely copying a
+     * signaling NaN also performs that conversion.  In particular,
+     * copying a signaling NaN to return it to the calling method
+     * may perform this conversion.  So {@code longBitsToDouble}
+     * may not be able to return a {@code double} with a
+     * signaling NaN bit pattern.  Consequently, for some
+     * {@code long} values,
+     * {@code doubleToRawLongBits(longBitsToDouble(start))} may
+     * <i>not</i> equal {@code start}.  Moreover, which
+     * particular bit patterns represent signaling NaNs is platform
+     * dependent; although all NaN bit patterns, quiet or signaling,
+     * must be in the NaN range identified above.
+     *
+     * @param   bits   any {@code long} integer.
+     * @return  the {@code double} floating-point value with the same
+     *          bit pattern.
+     */
+    @JavaScriptBody(args={ "bits" },
+        body=
+          "var hi = bits.high32();\n"
+        + "var s = (hi & 0x80000000) === 0 ? 1 : -1;\n"
+        + "var e = (hi >> 20) & 0x7ff;\n"
+        + "if (e === 0x7ff) {\n"
+        + "  if ((bits == 0) && ((hi & 0xfffff) === 0)) {\n"
+        + "    return (s > 0) ? Number.POSITIVE_INFINITY"
+                          + " : Number.NEGATIVE_INFINITY;\n"
+        + "  }\n"
+        + "  return Number.NaN;\n"
+        + "}\n"
+        + "var m = (hi & 0xfffff).next32(bits);\n"
+        + "if (e === 0) {\n"
+        + "  m = m.shl64(1);\n"
+        + "} else {\n"
+        + "  m.hi = m.high32() | 0x100000;\n"
+        + "}\n"
+        + "return s * m.toFP() * Math.pow(2.0, e - 1075);\n"
+    )
+    public static native double longBitsToDouble(long bits);
+
+    /**
+     * Compares two {@code Double} objects numerically.  There
+     * are two ways in which comparisons performed by this method
+     * differ from those performed by the Java language numerical
+     * comparison operators ({@code <, <=, ==, >=, >})
+     * when applied to primitive {@code double} values:
+     * <ul><li>
+     *          {@code Double.NaN} is considered by this method
+     *          to be equal to itself and greater than all other
+     *          {@code double} values (including
+     *          {@code Double.POSITIVE_INFINITY}).
+     * <li>
+     *          {@code 0.0d} is considered by this method to be greater
+     *          than {@code -0.0d}.
+     * </ul>
+     * This ensures that the <i>natural ordering</i> of
+     * {@code Double} objects imposed by this method is <i>consistent
+     * with equals</i>.
+     *
+     * @param   anotherDouble   the {@code Double} to be compared.
+     * @return  the value {@code 0} if {@code anotherDouble} is
+     *          numerically equal to this {@code Double}; a value
+     *          less than {@code 0} if this {@code Double}
+     *          is numerically less than {@code anotherDouble};
+     *          and a value greater than {@code 0} if this
+     *          {@code Double} is numerically greater than
+     *          {@code anotherDouble}.
+     *
+     * @since   1.2
+     */
+    public int compareTo(Double anotherDouble) {
+        return Double.compare(value, anotherDouble.value);
+    }
+
+    /**
+     * Compares the two specified {@code double} values. The sign
+     * of the integer value returned is the same as that of the
+     * integer that would be returned by the call:
+     * <pre>
+     *    new Double(d1).compareTo(new Double(d2))
+     * </pre>
+     *
+     * @param   d1        the first {@code double} to compare
+     * @param   d2        the second {@code double} to compare
+     * @return  the value {@code 0} if {@code d1} is
+     *          numerically equal to {@code d2}; a value less than
+     *          {@code 0} if {@code d1} is numerically less than
+     *          {@code d2}; and a value greater than {@code 0}
+     *          if {@code d1} is numerically greater than
+     *          {@code d2}.
+     * @since 1.4
+     */
+    public static int compare(double d1, double d2) {
+        if (d1 < d2)
+            return -1;           // Neither val is NaN, thisVal is smaller
+        if (d1 > d2)
+            return 1;            // Neither val is NaN, thisVal is larger
+
+        // Cannot use doubleToRawLongBits because of possibility of NaNs.
+        long thisBits    = Double.doubleToLongBits(d1);
+        long anotherBits = Double.doubleToLongBits(d2);
+
+        return (thisBits == anotherBits ?  0 : // Values are equal
+                (thisBits < anotherBits ? -1 : // (-0.0, 0.0) or (!NaN, NaN)
+                 1));                          // (0.0, -0.0) or (NaN, !NaN)
+    }
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = -9172774392245257468L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Enum.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Enum.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.io.Serializable;
+import java.io.IOException;
+
+/**
+ * This is the common base class of all Java language enumeration types.
+ *
+ * More information about enums, including descriptions of the
+ * implicitly declared methods synthesized by the compiler, can be
+ * found in section 8.9 of
+ * <cite>The Java&trade; Language Specification</cite>.
+ *
+ * <p> Note that when using an enumeration type as the type of a set
+ * or as the type of the keys in a map, specialized and efficient
+ * {@linkplain java.util.EnumSet set} and {@linkplain
+ * java.util.EnumMap map} implementations are available.
+ *
+ * @param <E> The enum type subclass
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see     Class#getEnumConstants()
+ * @see     java.util.EnumSet
+ * @see     java.util.EnumMap
+ * @since   1.5
+ */
+public abstract class Enum<E extends Enum<E>>
+        implements Comparable<E>, Serializable {
+    /**
+     * The name of this enum constant, as declared in the enum declaration.
+     * Most programmers should use the {@link #toString} method rather than
+     * accessing this field.
+     */
+    private final String name;
+
+    /**
+     * Returns the name of this enum constant, exactly as declared in its
+     * enum declaration.
+     *
+     * <b>Most programmers should use the {@link #toString} method in
+     * preference to this one, as the toString method may return
+     * a more user-friendly name.</b>  This method is designed primarily for
+     * use in specialized situations where correctness depends on getting the
+     * exact name, which will not vary from release to release.
+     *
+     * @return the name of this enum constant
+     */
+    public final String name() {
+        return name;
+    }
+
+    /**
+     * The ordinal of this enumeration constant (its position
+     * in the enum declaration, where the initial constant is assigned
+     * an ordinal of zero).
+     *
+     * Most programmers will have no use for this field.  It is designed
+     * for use by sophisticated enum-based data structures, such as
+     * {@link java.util.EnumSet} and {@link java.util.EnumMap}.
+     */
+    private final int ordinal;
+
+    /**
+     * Returns the ordinal of this enumeration constant (its position
+     * in its enum declaration, where the initial constant is assigned
+     * an ordinal of zero).
+     *
+     * Most programmers will have no use for this method.  It is
+     * designed for use by sophisticated enum-based data structures, such
+     * as {@link java.util.EnumSet} and {@link java.util.EnumMap}.
+     *
+     * @return the ordinal of this enumeration constant
+     */
+    public final int ordinal() {
+        return ordinal;
+    }
+
+    /**
+     * Sole constructor.  Programmers cannot invoke this constructor.
+     * It is for use by code emitted by the compiler in response to
+     * enum type declarations.
+     *
+     * @param name - The name of this enum constant, which is the identifier
+     *               used to declare it.
+     * @param ordinal - The ordinal of this enumeration constant (its position
+     *         in the enum declaration, where the initial constant is assigned
+     *         an ordinal of zero).
+     */
+    protected Enum(String name, int ordinal) {
+        this.name = name;
+        this.ordinal = ordinal;
+    }
+
+    /**
+     * Returns the name of this enum constant, as contained in the
+     * declaration.  This method may be overridden, though it typically
+     * isn't necessary or desirable.  An enum type should override this
+     * method when a more "programmer-friendly" string form exists.
+     *
+     * @return the name of this enum constant
+     */
+    public String toString() {
+        return name;
+    }
+
+    /**
+     * Returns true if the specified object is equal to this
+     * enum constant.
+     *
+     * @param other the object to be compared for equality with this object.
+     * @return  true if the specified object is equal to this
+     *          enum constant.
+     */
+    public final boolean equals(Object other) {
+        return this==other;
+    }
+
+    /**
+     * Returns a hash code for this enum constant.
+     *
+     * @return a hash code for this enum constant.
+     */
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+    /**
+     * Throws CloneNotSupportedException.  This guarantees that enums
+     * are never cloned, which is necessary to preserve their "singleton"
+     * status.
+     *
+     * @return (never returns)
+     */
+    protected final Object clone() throws CloneNotSupportedException {
+        throw new CloneNotSupportedException();
+    }
+
+    /**
+     * Compares this enum with the specified object for order.  Returns a
+     * negative integer, zero, or a positive integer as this object is less
+     * than, equal to, or greater than the specified object.
+     *
+     * Enum constants are only comparable to other enum constants of the
+     * same enum type.  The natural order implemented by this
+     * method is the order in which the constants are declared.
+     */
+    public final int compareTo(E o) {
+        Enum other = (Enum)o;
+        Enum self = this;
+        if (self.getClass() != other.getClass() && // optimization
+            self.getDeclaringClass() != other.getDeclaringClass())
+            throw new ClassCastException();
+        return self.ordinal - other.ordinal;
+    }
+
+    /**
+     * Returns the Class object corresponding to this enum constant's
+     * enum type.  Two enum constants e1 and  e2 are of the
+     * same enum type if and only if
+     *   e1.getDeclaringClass() == e2.getDeclaringClass().
+     * (The value returned by this method may differ from the one returned
+     * by the {@link Object#getClass} method for enum constants with
+     * constant-specific class bodies.)
+     *
+     * @return the Class object corresponding to this enum constant's
+     *     enum type
+     */
+    public final Class<E> getDeclaringClass() {
+        Class clazz = getClass();
+        Class zuper = clazz.getSuperclass();
+        return (zuper == Enum.class) ? clazz : zuper;
+    }
+
+    /**
+     * Returns the enum constant of the specified enum type with the
+     * specified name.  The name must match exactly an identifier used
+     * to declare an enum constant in this type.  (Extraneous whitespace
+     * characters are not permitted.)
+     *
+     * <p>Note that for a particular enum type {@code T}, the
+     * implicitly declared {@code public static T valueOf(String)}
+     * method on that enum may be used instead of this method to map
+     * from a name to the corresponding enum constant.  All the
+     * constants of an enum type can be obtained by calling the
+     * implicit {@code public static T[] values()} method of that
+     * type.
+     *
+     * @param <T> The enum type whose constant is to be returned
+     * @param enumType the {@code Class} object of the enum type from which
+     *      to return a constant
+     * @param name the name of the constant to return
+     * @return the enum constant of the specified enum type with the
+     *      specified name
+     * @throws IllegalArgumentException if the specified enum type has
+     *         no constant with the specified name, or the specified
+     *         class object does not represent an enum type
+     * @throws NullPointerException if {@code enumType} or {@code name}
+     *         is null
+     * @since 1.5
+     */
+    public static <T extends Enum<T>> T valueOf(Class<T> enumType,
+                                                String name) {
+        throw new UnsupportedOperationException();
+//        T result = enumType.enumConstantDirectory().get(name);
+//        if (result != null)
+//            return result;
+//        if (name == null)
+//            throw new NullPointerException("Name is null");
+//        throw new IllegalArgumentException(
+//            "No enum constant " + enumType.getCanonicalName() + "." + name);
+    }
+
+    /**
+     * enum classes cannot have finalize methods.
+     */
+    protected final void finalize() { }
+
+    /**
+     * prevent default deserialization
+     */
+//    private void readObject(ObjectInputStream in) throws IOException,
+//        ClassNotFoundException {
+//        throw new InvalidObjectException("can't deserialize enum");
+//    }
+//
+//    private void readObjectNoData() throws ObjectStreamException {
+//        throw new InvalidObjectException("can't deserialize enum");
+//    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Error.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Error.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * An {@code Error} is a subclass of {@code Throwable}
+ * that indicates serious problems that a reasonable application
+ * should not try to catch. Most such errors are abnormal conditions.
+ * The {@code ThreadDeath} error, though a "normal" condition,
+ * is also a subclass of {@code Error} because most applications
+ * should not try to catch it.
+ * <p>
+ * A method is not required to declare in its {@code throws}
+ * clause any subclasses of {@code Error} that might be thrown
+ * during the execution of the method but not caught, since these
+ * errors are abnormal conditions that should never occur.
+ *
+ * That is, {@code Error} and its subclasses are regarded as unchecked
+ * exceptions for the purposes of compile-time checking of exceptions.
+ *
+ * @author  Frank Yellin
+ * @see     java.lang.ThreadDeath
+ * @jls 11.2 Compile-Time Checking of Exceptions
+ * @since   JDK1.0
+ */
+public class Error extends Throwable {
+    static final long serialVersionUID = 4980196508277280342L;
+
+    /**
+     * Constructs a new error with {@code null} as its detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     */
+    public Error() {
+        super();
+    }
+
+    /**
+     * Constructs a new error with the specified detail message.  The
+     * cause is not initialized, and may subsequently be initialized by
+     * a call to {@link #initCause}.
+     *
+     * @param   message   the detail message. The detail message is saved for
+     *          later retrieval by the {@link #getMessage()} method.
+     */
+    public Error(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new error with the specified detail message and
+     * cause.  <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this error's detail message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link #getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.4
+     */
+    public Error(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new error with the specified cause and a detail
+     * message of {@code (cause==null ? null : cause.toString())} (which
+     * typically contains the class and detail message of {@code cause}).
+     * This constructor is useful for errors that are little more than
+     * wrappers for other throwables.
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.4
+     */
+    public Error(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Constructs a new error with the specified detail message,
+     * cause, suppression enabled or disabled, and writable stack
+     * trace enabled or disabled.
+     *
+     * @param  message the detail message.
+     * @param cause the cause.  (A {@code null} value is permitted,
+     * and indicates that the cause is nonexistent or unknown.)
+     * @param enableSuppression whether or not suppression is enabled
+     *                          or disabled
+     * @param writableStackTrace whether or not the stack trace should
+     *                           be writable
+     *
+     * @since 1.7
+     */
+    protected Error(String message, Throwable cause,
+                    boolean enableSuppression,
+                    boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Exception.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Exception.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * The class {@code Exception} and its subclasses are a form of
+ * {@code Throwable} that indicates conditions that a reasonable
+ * application might want to catch.
+ *
+ * <p>The class {@code Exception} and any subclasses that are not also
+ * subclasses of {@link RuntimeException} are <em>checked
+ * exceptions</em>.  Checked exceptions need to be declared in a
+ * method or constructor's {@code throws} clause if they can be thrown
+ * by the execution of the method or constructor and propagate outside
+ * the method or constructor boundary.
+ *
+ * @author  Frank Yellin
+ * @see     java.lang.Error
+ * @jls 11.2 Compile-Time Checking of Exceptions
+ * @since   JDK1.0
+ */
+public class Exception extends Throwable {
+    static final long serialVersionUID = -3387516993124229948L;
+
+    /**
+     * Constructs a new exception with {@code null} as its detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     */
+    public Exception() {
+        super();
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message.  The
+     * cause is not initialized, and may subsequently be initialized by
+     * a call to {@link #initCause}.
+     *
+     * @param   message   the detail message. The detail message is saved for
+     *          later retrieval by the {@link #getMessage()} method.
+     */
+    public Exception(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message and
+     * cause.  <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this exception's detail message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link #getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A <tt>null</tt> value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.4
+     */
+    public Exception(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail
+     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
+     * typically contains the class and detail message of <tt>cause</tt>).
+     * This constructor is useful for exceptions that are little more than
+     * wrappers for other throwables (for example, {@link
+     * java.security.PrivilegedActionException}).
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A <tt>null</tt> value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.4
+     */
+    public Exception(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message,
+     * cause, suppression enabled or disabled, and writable stack
+     * trace enabled or disabled.
+     *
+     * @param  message the detail message.
+     * @param cause the cause.  (A {@code null} value is permitted,
+     * and indicates that the cause is nonexistent or unknown.)
+     * @param enableSuppression whether or not suppression is enabled
+     *                          or disabled
+     * @param writableStackTrace whether or not the stack trace should
+     *                           be writable
+     * @since 1.7
+     */
+    protected Exception(String message, Throwable cause,
+                        boolean enableSuppression,
+                        boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Float.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Float.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,916 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ * The {@code Float} class wraps a value of primitive type
+ * {@code float} in an object. An object of type
+ * {@code Float} contains a single field whose type is
+ * {@code float}.
+ *
+ * <p>In addition, this class provides several methods for converting a
+ * {@code float} to a {@code String} and a
+ * {@code String} to a {@code float}, as well as other
+ * constants and methods useful when dealing with a
+ * {@code float}.
+ *
+ * @author  Lee Boynton
+ * @author  Arthur van Hoff
+ * @author  Joseph D. Darcy
+ * @since JDK1.0
+ */
+public final class Float extends Number implements Comparable<Float> {
+    /**
+     * A constant holding the positive infinity of type
+     * {@code float}. It is equal to the value returned by
+     * {@code Float.intBitsToFloat(0x7f800000)}.
+     */
+    public static final float POSITIVE_INFINITY = 1.0f / 0.0f;
+
+    /**
+     * A constant holding the negative infinity of type
+     * {@code float}. It is equal to the value returned by
+     * {@code Float.intBitsToFloat(0xff800000)}.
+     */
+    public static final float NEGATIVE_INFINITY = -1.0f / 0.0f;
+
+    /**
+     * A constant holding a Not-a-Number (NaN) value of type
+     * {@code float}.  It is equivalent to the value returned by
+     * {@code Float.intBitsToFloat(0x7fc00000)}.
+     */
+    public static final float NaN = 0.0f / 0.0f;
+
+    /**
+     * A constant holding the largest positive finite value of type
+     * {@code float}, (2-2<sup>-23</sup>)&middot;2<sup>127</sup>.
+     * It is equal to the hexadecimal floating-point literal
+     * {@code 0x1.fffffeP+127f} and also equal to
+     * {@code Float.intBitsToFloat(0x7f7fffff)}.
+     */
+    public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
+
+    /**
+     * A constant holding the smallest positive normal value of type
+     * {@code float}, 2<sup>-126</sup>.  It is equal to the
+     * hexadecimal floating-point literal {@code 0x1.0p-126f} and also
+     * equal to {@code Float.intBitsToFloat(0x00800000)}.
+     *
+     * @since 1.6
+     */
+    public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
+
+    /**
+     * A constant holding the smallest positive nonzero value of type
+     * {@code float}, 2<sup>-149</sup>. It is equal to the
+     * hexadecimal floating-point literal {@code 0x0.000002P-126f}
+     * and also equal to {@code Float.intBitsToFloat(0x1)}.
+     */
+    public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
+
+    /**
+     * Maximum exponent a finite {@code float} variable may have.  It
+     * is equal to the value returned by {@code
+     * Math.getExponent(Float.MAX_VALUE)}.
+     *
+     * @since 1.6
+     */
+    public static final int MAX_EXPONENT = 127;
+
+    /**
+     * Minimum exponent a normalized {@code float} variable may have.
+     * It is equal to the value returned by {@code
+     * Math.getExponent(Float.MIN_NORMAL)}.
+     *
+     * @since 1.6
+     */
+    public static final int MIN_EXPONENT = -126;
+
+    /**
+     * The number of bits used to represent a {@code float} value.
+     *
+     * @since 1.5
+     */
+    public static final int SIZE = 32;
+
+    /**
+     * The {@code Class} instance representing the primitive type
+     * {@code float}.
+     *
+     * @since JDK1.1
+     */
+    public static final Class<Float> TYPE = Class.getPrimitiveClass("float");
+
+    /**
+     * Returns a string representation of the {@code float}
+     * argument. All characters mentioned below are ASCII characters.
+     * <ul>
+     * <li>If the argument is NaN, the result is the string
+     * "{@code NaN}".
+     * <li>Otherwise, the result is a string that represents the sign and
+     *     magnitude (absolute value) of the argument. If the sign is
+     *     negative, the first character of the result is
+     *     '{@code -}' (<code>'&#92;u002D'</code>); if the sign is
+     *     positive, no sign character appears in the result. As for
+     *     the magnitude <i>m</i>:
+     * <ul>
+     * <li>If <i>m</i> is infinity, it is represented by the characters
+     *     {@code "Infinity"}; thus, positive infinity produces
+     *     the result {@code "Infinity"} and negative infinity
+     *     produces the result {@code "-Infinity"}.
+     * <li>If <i>m</i> is zero, it is represented by the characters
+     *     {@code "0.0"}; thus, negative zero produces the result
+     *     {@code "-0.0"} and positive zero produces the result
+     *     {@code "0.0"}.
+     * <li> If <i>m</i> is greater than or equal to 10<sup>-3</sup> but
+     *      less than 10<sup>7</sup>, then it is represented as the
+     *      integer part of <i>m</i>, in decimal form with no leading
+     *      zeroes, followed by '{@code .}'
+     *      (<code>'&#92;u002E'</code>), followed by one or more
+     *      decimal digits representing the fractional part of
+     *      <i>m</i>.
+     * <li> If <i>m</i> is less than 10<sup>-3</sup> or greater than or
+     *      equal to 10<sup>7</sup>, then it is represented in
+     *      so-called "computerized scientific notation." Let <i>n</i>
+     *      be the unique integer such that 10<sup><i>n</i> </sup>&le;
+     *      <i>m</i> {@literal <} 10<sup><i>n</i>+1</sup>; then let <i>a</i>
+     *      be the mathematically exact quotient of <i>m</i> and
+     *      10<sup><i>n</i></sup> so that 1 &le; <i>a</i> {@literal <} 10.
+     *      The magnitude is then represented as the integer part of
+     *      <i>a</i>, as a single decimal digit, followed by
+     *      '{@code .}' (<code>'&#92;u002E'</code>), followed by
+     *      decimal digits representing the fractional part of
+     *      <i>a</i>, followed by the letter '{@code E}'
+     *      (<code>'&#92;u0045'</code>), followed by a representation
+     *      of <i>n</i> as a decimal integer, as produced by the
+     *      method {@link java.lang.Integer#toString(int)}.
+     *
+     * </ul>
+     * </ul>
+     * How many digits must be printed for the fractional part of
+     * <i>m</i> or <i>a</i>? There must be at least one digit
+     * to represent the fractional part, and beyond that as many, but
+     * only as many, more digits as are needed to uniquely distinguish
+     * the argument value from adjacent values of type
+     * {@code float}. That is, suppose that <i>x</i> is the
+     * exact mathematical value represented by the decimal
+     * representation produced by this method for a finite nonzero
+     * argument <i>f</i>. Then <i>f</i> must be the {@code float}
+     * value nearest to <i>x</i>; or, if two {@code float} values are
+     * equally close to <i>x</i>, then <i>f</i> must be one of
+     * them and the least significant bit of the significand of
+     * <i>f</i> must be {@code 0}.
+     *
+     * <p>To create localized string representations of a floating-point
+     * value, use subclasses of {@link java.text.NumberFormat}.
+     *
+     * @param   f   the float to be converted.
+     * @return a string representation of the argument.
+     */
+    public static String toString(float f) {
+        return Double.toString(f);
+    }
+
+    /**
+     * Returns a hexadecimal string representation of the
+     * {@code float} argument. All characters mentioned below are
+     * ASCII characters.
+     *
+     * <ul>
+     * <li>If the argument is NaN, the result is the string
+     *     "{@code NaN}".
+     * <li>Otherwise, the result is a string that represents the sign and
+     * magnitude (absolute value) of the argument. If the sign is negative,
+     * the first character of the result is '{@code -}'
+     * (<code>'&#92;u002D'</code>); if the sign is positive, no sign character
+     * appears in the result. As for the magnitude <i>m</i>:
+     *
+     * <ul>
+     * <li>If <i>m</i> is infinity, it is represented by the string
+     * {@code "Infinity"}; thus, positive infinity produces the
+     * result {@code "Infinity"} and negative infinity produces
+     * the result {@code "-Infinity"}.
+     *
+     * <li>If <i>m</i> is zero, it is represented by the string
+     * {@code "0x0.0p0"}; thus, negative zero produces the result
+     * {@code "-0x0.0p0"} and positive zero produces the result
+     * {@code "0x0.0p0"}.
+     *
+     * <li>If <i>m</i> is a {@code float} value with a
+     * normalized representation, substrings are used to represent the
+     * significand and exponent fields.  The significand is
+     * represented by the characters {@code "0x1."}
+     * followed by a lowercase hexadecimal representation of the rest
+     * of the significand as a fraction.  Trailing zeros in the
+     * hexadecimal representation are removed unless all the digits
+     * are zero, in which case a single zero is used. Next, the
+     * exponent is represented by {@code "p"} followed
+     * by a decimal string of the unbiased exponent as if produced by
+     * a call to {@link Integer#toString(int) Integer.toString} on the
+     * exponent value.
+     *
+     * <li>If <i>m</i> is a {@code float} value with a subnormal
+     * representation, the significand is represented by the
+     * characters {@code "0x0."} followed by a
+     * hexadecimal representation of the rest of the significand as a
+     * fraction.  Trailing zeros in the hexadecimal representation are
+     * removed. Next, the exponent is represented by
+     * {@code "p-126"}.  Note that there must be at
+     * least one nonzero digit in a subnormal significand.
+     *
+     * </ul>
+     *
+     * </ul>
+     *
+     * <table border>
+     * <caption><h3>Examples</h3></caption>
+     * <tr><th>Floating-point Value</th><th>Hexadecimal String</th>
+     * <tr><td>{@code 1.0}</td> <td>{@code 0x1.0p0}</td>
+     * <tr><td>{@code -1.0}</td>        <td>{@code -0x1.0p0}</td>
+     * <tr><td>{@code 2.0}</td> <td>{@code 0x1.0p1}</td>
+     * <tr><td>{@code 3.0}</td> <td>{@code 0x1.8p1}</td>
+     * <tr><td>{@code 0.5}</td> <td>{@code 0x1.0p-1}</td>
+     * <tr><td>{@code 0.25}</td>        <td>{@code 0x1.0p-2}</td>
+     * <tr><td>{@code Float.MAX_VALUE}</td>
+     *     <td>{@code 0x1.fffffep127}</td>
+     * <tr><td>{@code Minimum Normal Value}</td>
+     *     <td>{@code 0x1.0p-126}</td>
+     * <tr><td>{@code Maximum Subnormal Value}</td>
+     *     <td>{@code 0x0.fffffep-126}</td>
+     * <tr><td>{@code Float.MIN_VALUE}</td>
+     *     <td>{@code 0x0.000002p-126}</td>
+     * </table>
+     * @param   f   the {@code float} to be converted.
+     * @return a hex string representation of the argument.
+     * @since 1.5
+     * @author Joseph D. Darcy
+     */
+    public static String toHexString(float f) {
+        throw new UnsupportedOperationException();
+//        if (Math.abs(f) < FloatConsts.MIN_NORMAL
+//            &&  f != 0.0f ) {// float subnormal
+//            // Adjust exponent to create subnormal double, then
+//            // replace subnormal double exponent with subnormal float
+//            // exponent
+//            String s = Double.toHexString(FpUtils.scalb((double)f,
+//                                                        /* -1022+126 */
+//                                                        DoubleConsts.MIN_EXPONENT-
+//                                                        FloatConsts.MIN_EXPONENT));
+//            return s.replaceFirst("p-1022$", "p-126");
+//        }
+//        else // double string will be the same as float string
+//            return Double.toHexString(f);
+    }
+
+    /**
+     * Returns a {@code Float} object holding the
+     * {@code float} value represented by the argument string
+     * {@code s}.
+     *
+     * <p>If {@code s} is {@code null}, then a
+     * {@code NullPointerException} is thrown.
+     *
+     * <p>Leading and trailing whitespace characters in {@code s}
+     * are ignored.  Whitespace is removed as if by the {@link
+     * String#trim} method; that is, both ASCII space and control
+     * characters are removed. The rest of {@code s} should
+     * constitute a <i>FloatValue</i> as described by the lexical
+     * syntax rules:
+     *
+     * <blockquote>
+     * <dl>
+     * <dt><i>FloatValue:</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code NaN}
+     * <dd><i>Sign<sub>opt</sub></i> {@code Infinity}
+     * <dd><i>Sign<sub>opt</sub> FloatingPointLiteral</i>
+     * <dd><i>Sign<sub>opt</sub> HexFloatingPointLiteral</i>
+     * <dd><i>SignedInteger</i>
+     * </dl>
+     *
+     * <p>
+     *
+     * <dl>
+     * <dt><i>HexFloatingPointLiteral</i>:
+     * <dd> <i>HexSignificand BinaryExponent FloatTypeSuffix<sub>opt</sub></i>
+     * </dl>
+     *
+     * <p>
+     *
+     * <dl>
+     * <dt><i>HexSignificand:</i>
+     * <dd><i>HexNumeral</i>
+     * <dd><i>HexNumeral</i> {@code .}
+     * <dd>{@code 0x} <i>HexDigits<sub>opt</sub>
+     *     </i>{@code .}<i> HexDigits</i>
+     * <dd>{@code 0X}<i> HexDigits<sub>opt</sub>
+     *     </i>{@code .} <i>HexDigits</i>
+     * </dl>
+     *
+     * <p>
+     *
+     * <dl>
+     * <dt><i>BinaryExponent:</i>
+     * <dd><i>BinaryExponentIndicator SignedInteger</i>
+     * </dl>
+     *
+     * <p>
+     *
+     * <dl>
+     * <dt><i>BinaryExponentIndicator:</i>
+     * <dd>{@code p}
+     * <dd>{@code P}
+     * </dl>
+     *
+     * </blockquote>
+     *
+     * where <i>Sign</i>, <i>FloatingPointLiteral</i>,
+     * <i>HexNumeral</i>, <i>HexDigits</i>, <i>SignedInteger</i> and
+     * <i>FloatTypeSuffix</i> are as defined in the lexical structure
+     * sections of
+     * <cite>The Java&trade; Language Specification</cite>,
+     * except that underscores are not accepted between digits.
+     * If {@code s} does not have the form of
+     * a <i>FloatValue</i>, then a {@code NumberFormatException}
+     * is thrown. Otherwise, {@code s} is regarded as
+     * representing an exact decimal value in the usual
+     * "computerized scientific notation" or as an exact
+     * hexadecimal value; this exact numerical value is then
+     * conceptually converted to an "infinitely precise"
+     * binary value that is then rounded to type {@code float}
+     * by the usual round-to-nearest rule of IEEE 754 floating-point
+     * arithmetic, which includes preserving the sign of a zero
+     * value.
+     *
+     * Note that the round-to-nearest rule also implies overflow and
+     * underflow behaviour; if the exact value of {@code s} is large
+     * enough in magnitude (greater than or equal to ({@link
+     * #MAX_VALUE} + {@link Math#ulp(float) ulp(MAX_VALUE)}/2),
+     * rounding to {@code float} will result in an infinity and if the
+     * exact value of {@code s} is small enough in magnitude (less
+     * than or equal to {@link #MIN_VALUE}/2), rounding to float will
+     * result in a zero.
+     *
+     * Finally, after rounding a {@code Float} object representing
+     * this {@code float} value is returned.
+     *
+     * <p>To interpret localized string representations of a
+     * floating-point value, use subclasses of {@link
+     * java.text.NumberFormat}.
+     *
+     * <p>Note that trailing format specifiers, specifiers that
+     * determine the type of a floating-point literal
+     * ({@code 1.0f} is a {@code float} value;
+     * {@code 1.0d} is a {@code double} value), do
+     * <em>not</em> influence the results of this method.  In other
+     * words, the numerical value of the input string is converted
+     * directly to the target floating-point type.  In general, the
+     * two-step sequence of conversions, string to {@code double}
+     * followed by {@code double} to {@code float}, is
+     * <em>not</em> equivalent to converting a string directly to
+     * {@code float}.  For example, if first converted to an
+     * intermediate {@code double} and then to
+     * {@code float}, the string<br>
+     * {@code "1.00000017881393421514957253748434595763683319091796875001d"}<br>
+     * results in the {@code float} value
+     * {@code 1.0000002f}; if the string is converted directly to
+     * {@code float}, <code>1.000000<b>1</b>f</code> results.
+     *
+     * <p>To avoid calling this method on an invalid string and having
+     * a {@code NumberFormatException} be thrown, the documentation
+     * for {@link Double#valueOf Double.valueOf} lists a regular
+     * expression which can be used to screen the input.
+     *
+     * @param   s   the string to be parsed.
+     * @return  a {@code Float} object holding the value
+     *          represented by the {@code String} argument.
+     * @throws  NumberFormatException  if the string does not contain a
+     *          parsable number.
+     */
+    public static Float valueOf(String s) throws NumberFormatException {
+        throw new UnsupportedOperationException();
+//        return new Float(FloatingDecimal.readJavaFormatString(s).floatValue());
+    }
+
+    /**
+     * Returns a {@code Float} instance representing the specified
+     * {@code float} value.
+     * If a new {@code Float} instance is not required, this method
+     * should generally be used in preference to the constructor
+     * {@link #Float(float)}, as this method is likely to yield
+     * significantly better space and time performance by caching
+     * frequently requested values.
+     *
+     * @param  f a float value.
+     * @return a {@code Float} instance representing {@code f}.
+     * @since  1.5
+     */
+    public static Float valueOf(float f) {
+        return new Float(f);
+    }
+
+    /**
+     * Returns a new {@code float} initialized to the value
+     * represented by the specified {@code String}, as performed
+     * by the {@code valueOf} method of class {@code Float}.
+     *
+     * @param  s the string to be parsed.
+     * @return the {@code float} value represented by the string
+     *         argument.
+     * @throws NullPointerException  if the string is null
+     * @throws NumberFormatException if the string does not contain a
+     *               parsable {@code float}.
+     * @see    java.lang.Float#valueOf(String)
+     * @since 1.2
+     */
+    public static float parseFloat(String s) throws NumberFormatException {
+        throw new UnsupportedOperationException();
+//        return FloatingDecimal.readJavaFormatString(s).floatValue();
+    }
+
+    /**
+     * Returns {@code true} if the specified number is a
+     * Not-a-Number (NaN) value, {@code false} otherwise.
+     *
+     * @param   v   the value to be tested.
+     * @return  {@code true} if the argument is NaN;
+     *          {@code false} otherwise.
+     */
+    static public boolean isNaN(float v) {
+        return (v != v);
+    }
+
+    /**
+     * Returns {@code true} if the specified number is infinitely
+     * large in magnitude, {@code false} otherwise.
+     *
+     * @param   v   the value to be tested.
+     * @return  {@code true} if the argument is positive infinity or
+     *          negative infinity; {@code false} otherwise.
+     */
+    static public boolean isInfinite(float v) {
+        return (v == POSITIVE_INFINITY) || (v == NEGATIVE_INFINITY);
+    }
+
+    /**
+     * The value of the Float.
+     *
+     * @serial
+     */
+    private final float value;
+
+    /**
+     * Constructs a newly allocated {@code Float} object that
+     * represents the primitive {@code float} argument.
+     *
+     * @param   value   the value to be represented by the {@code Float}.
+     */
+    public Float(float value) {
+        this.value = value;
+    }
+
+    /**
+     * Constructs a newly allocated {@code Float} object that
+     * represents the argument converted to type {@code float}.
+     *
+     * @param   value   the value to be represented by the {@code Float}.
+     */
+    public Float(double value) {
+        this.value = (float)value;
+    }
+
+    /**
+     * Constructs a newly allocated {@code Float} object that
+     * represents the floating-point value of type {@code float}
+     * represented by the string. The string is converted to a
+     * {@code float} value as if by the {@code valueOf} method.
+     *
+     * @param      s   a string to be converted to a {@code Float}.
+     * @throws  NumberFormatException  if the string does not contain a
+     *               parsable number.
+     * @see        java.lang.Float#valueOf(java.lang.String)
+     */
+    public Float(String s) throws NumberFormatException {
+        // REMIND: this is inefficient
+        this(valueOf(s).floatValue());
+    }
+
+    /**
+     * Returns {@code true} if this {@code Float} value is a
+     * Not-a-Number (NaN), {@code false} otherwise.
+     *
+     * @return  {@code true} if the value represented by this object is
+     *          NaN; {@code false} otherwise.
+     */
+    public boolean isNaN() {
+        return isNaN(value);
+    }
+
+    /**
+     * Returns {@code true} if this {@code Float} value is
+     * infinitely large in magnitude, {@code false} otherwise.
+     *
+     * @return  {@code true} if the value represented by this object is
+     *          positive infinity or negative infinity;
+     *          {@code false} otherwise.
+     */
+    public boolean isInfinite() {
+        return isInfinite(value);
+    }
+
+    /**
+     * Returns a string representation of this {@code Float} object.
+     * The primitive {@code float} value represented by this object
+     * is converted to a {@code String} exactly as if by the method
+     * {@code toString} of one argument.
+     *
+     * @return  a {@code String} representation of this object.
+     * @see java.lang.Float#toString(float)
+     */
+    public String toString() {
+        return Float.toString(value);
+    }
+
+    /**
+     * Returns the value of this {@code Float} as a {@code byte} (by
+     * casting to a {@code byte}).
+     *
+     * @return  the {@code float} value represented by this object
+     *          converted to type {@code byte}
+     */
+    public byte byteValue() {
+        return (byte)value;
+    }
+
+    /**
+     * Returns the value of this {@code Float} as a {@code short} (by
+     * casting to a {@code short}).
+     *
+     * @return  the {@code float} value represented by this object
+     *          converted to type {@code short}
+     * @since JDK1.1
+     */
+    public short shortValue() {
+        return (short)value;
+    }
+
+    /**
+     * Returns the value of this {@code Float} as an {@code int} (by
+     * casting to type {@code int}).
+     *
+     * @return  the {@code float} value represented by this object
+     *          converted to type {@code int}
+     */
+    public int intValue() {
+        return (int)value;
+    }
+
+    /**
+     * Returns value of this {@code Float} as a {@code long} (by
+     * casting to type {@code long}).
+     *
+     * @return  the {@code float} value represented by this object
+     *          converted to type {@code long}
+     */
+    public long longValue() {
+        return (long)value;
+    }
+
+    /**
+     * Returns the {@code float} value of this {@code Float} object.
+     *
+     * @return the {@code float} value represented by this object
+     */
+    public float floatValue() {
+        return value;
+    }
+
+    /**
+     * Returns the {@code double} value of this {@code Float} object.
+     *
+     * @return the {@code float} value represented by this
+     *         object is converted to type {@code double} and the
+     *         result of the conversion is returned.
+     */
+    public double doubleValue() {
+        return (double)value;
+    }
+
+    /**
+     * Returns a hash code for this {@code Float} object. The
+     * result is the integer bit representation, exactly as produced
+     * by the method {@link #floatToIntBits(float)}, of the primitive
+     * {@code float} value represented by this {@code Float}
+     * object.
+     *
+     * @return a hash code value for this object.
+     */
+    public int hashCode() {
+        return floatToIntBits(value);
+    }
+
+    /**
+
+     * Compares this object against the specified object.  The result
+     * is {@code true} if and only if the argument is not
+     * {@code null} and is a {@code Float} object that
+     * represents a {@code float} with the same value as the
+     * {@code float} represented by this object. For this
+     * purpose, two {@code float} values are considered to be the
+     * same if and only if the method {@link #floatToIntBits(float)}
+     * returns the identical {@code int} value when applied to
+     * each.
+     *
+     * <p>Note that in most cases, for two instances of class
+     * {@code Float}, {@code f1} and {@code f2}, the value
+     * of {@code f1.equals(f2)} is {@code true} if and only if
+     *
+     * <blockquote><pre>
+     *   f1.floatValue() == f2.floatValue()
+     * </pre></blockquote>
+     *
+     * <p>also has the value {@code true}. However, there are two exceptions:
+     * <ul>
+     * <li>If {@code f1} and {@code f2} both represent
+     *     {@code Float.NaN}, then the {@code equals} method returns
+     *     {@code true}, even though {@code Float.NaN==Float.NaN}
+     *     has the value {@code false}.
+     * <li>If {@code f1} represents {@code +0.0f} while
+     *     {@code f2} represents {@code -0.0f}, or vice
+     *     versa, the {@code equal} test has the value
+     *     {@code false}, even though {@code 0.0f==-0.0f}
+     *     has the value {@code true}.
+     * </ul>
+     *
+     * This definition allows hash tables to operate properly.
+     *
+     * @param obj the object to be compared
+     * @return  {@code true} if the objects are the same;
+     *          {@code false} otherwise.
+     * @see java.lang.Float#floatToIntBits(float)
+     */
+    public boolean equals(Object obj) {
+        return (obj instanceof Float)
+               && (floatToIntBits(((Float)obj).value) == floatToIntBits(value));
+    }
+
+    /**
+     * Returns a representation of the specified floating-point value
+     * according to the IEEE 754 floating-point "single format" bit
+     * layout.
+     *
+     * <p>Bit 31 (the bit that is selected by the mask
+     * {@code 0x80000000}) represents the sign of the floating-point
+     * number.
+     * Bits 30-23 (the bits that are selected by the mask
+     * {@code 0x7f800000}) represent the exponent.
+     * Bits 22-0 (the bits that are selected by the mask
+     * {@code 0x007fffff}) represent the significand (sometimes called
+     * the mantissa) of the floating-point number.
+     *
+     * <p>If the argument is positive infinity, the result is
+     * {@code 0x7f800000}.
+     *
+     * <p>If the argument is negative infinity, the result is
+     * {@code 0xff800000}.
+     *
+     * <p>If the argument is NaN, the result is {@code 0x7fc00000}.
+     *
+     * <p>In all cases, the result is an integer that, when given to the
+     * {@link #intBitsToFloat(int)} method, will produce a floating-point
+     * value the same as the argument to {@code floatToIntBits}
+     * (except all NaN values are collapsed to a single
+     * "canonical" NaN value).
+     *
+     * @param   value   a floating-point number.
+     * @return the bits that represent the floating-point number.
+     */
+    public static int floatToIntBits(float value) {
+        final int EXP_BIT_MASK = 2139095040;
+        final int SIGNIF_BIT_MASK = 8388607;
+        
+        int result = floatToRawIntBits(value);
+        // Check for NaN based on values of bit fields, maximum
+        // exponent and nonzero significand.
+        if ( ((result & EXP_BIT_MASK) ==
+              EXP_BIT_MASK) &&
+             (result & SIGNIF_BIT_MASK) != 0)
+            result = 0x7fc00000;
+        return result;
+    }
+
+    /**
+     * Returns a representation of the specified floating-point value
+     * according to the IEEE 754 floating-point "single format" bit
+     * layout, preserving Not-a-Number (NaN) values.
+     *
+     * <p>Bit 31 (the bit that is selected by the mask
+     * {@code 0x80000000}) represents the sign of the floating-point
+     * number.
+     * Bits 30-23 (the bits that are selected by the mask
+     * {@code 0x7f800000}) represent the exponent.
+     * Bits 22-0 (the bits that are selected by the mask
+     * {@code 0x007fffff}) represent the significand (sometimes called
+     * the mantissa) of the floating-point number.
+     *
+     * <p>If the argument is positive infinity, the result is
+     * {@code 0x7f800000}.
+     *
+     * <p>If the argument is negative infinity, the result is
+     * {@code 0xff800000}.
+     *
+     * <p>If the argument is NaN, the result is the integer representing
+     * the actual NaN value.  Unlike the {@code floatToIntBits}
+     * method, {@code floatToRawIntBits} does not collapse all the
+     * bit patterns encoding a NaN to a single "canonical"
+     * NaN value.
+     *
+     * <p>In all cases, the result is an integer that, when given to the
+     * {@link #intBitsToFloat(int)} method, will produce a
+     * floating-point value the same as the argument to
+     * {@code floatToRawIntBits}.
+     *
+     * @param   value   a floating-point number.
+     * @return the bits that represent the floating-point number.
+     * @since 1.3
+     */
+    @JavaScriptBody(args = { "value" }, body = ""
+        + "var a = new ArrayBuffer(4);"
+        + "new Float32Array(a)[0] = value;"
+        + "return new Int32Array(a)[0];"
+    )
+    public static native int floatToRawIntBits(float value);
+
+    /**
+     * Returns the {@code float} value corresponding to a given
+     * bit representation.
+     * The argument is considered to be a representation of a
+     * floating-point value according to the IEEE 754 floating-point
+     * "single format" bit layout.
+     *
+     * <p>If the argument is {@code 0x7f800000}, the result is positive
+     * infinity.
+     *
+     * <p>If the argument is {@code 0xff800000}, the result is negative
+     * infinity.
+     *
+     * <p>If the argument is any value in the range
+     * {@code 0x7f800001} through {@code 0x7fffffff} or in
+     * the range {@code 0xff800001} through
+     * {@code 0xffffffff}, the result is a NaN.  No IEEE 754
+     * floating-point operation provided by Java can distinguish
+     * between two NaN values of the same type with different bit
+     * patterns.  Distinct values of NaN are only distinguishable by
+     * use of the {@code Float.floatToRawIntBits} method.
+     *
+     * <p>In all other cases, let <i>s</i>, <i>e</i>, and <i>m</i> be three
+     * values that can be computed from the argument:
+     *
+     * <blockquote><pre>
+     * int s = ((bits &gt;&gt; 31) == 0) ? 1 : -1;
+     * int e = ((bits &gt;&gt; 23) & 0xff);
+     * int m = (e == 0) ?
+     *                 (bits & 0x7fffff) &lt;&lt; 1 :
+     *                 (bits & 0x7fffff) | 0x800000;
+     * </pre></blockquote>
+     *
+     * Then the floating-point result equals the value of the mathematical
+     * expression <i>s</i>&middot;<i>m</i>&middot;2<sup><i>e</i>-150</sup>.
+     *
+     * <p>Note that this method may not be able to return a
+     * {@code float} NaN with exactly same bit pattern as the
+     * {@code int} argument.  IEEE 754 distinguishes between two
+     * kinds of NaNs, quiet NaNs and <i>signaling NaNs</i>.  The
+     * differences between the two kinds of NaN are generally not
+     * visible in Java.  Arithmetic operations on signaling NaNs turn
+     * them into quiet NaNs with a different, but often similar, bit
+     * pattern.  However, on some processors merely copying a
+     * signaling NaN also performs that conversion.  In particular,
+     * copying a signaling NaN to return it to the calling method may
+     * perform this conversion.  So {@code intBitsToFloat} may
+     * not be able to return a {@code float} with a signaling NaN
+     * bit pattern.  Consequently, for some {@code int} values,
+     * {@code floatToRawIntBits(intBitsToFloat(start))} may
+     * <i>not</i> equal {@code start}.  Moreover, which
+     * particular bit patterns represent signaling NaNs is platform
+     * dependent; although all NaN bit patterns, quiet or signaling,
+     * must be in the NaN range identified above.
+     *
+     * @param   bits   an integer.
+     * @return  the {@code float} floating-point value with the same bit
+     *          pattern.
+     */
+    @JavaScriptBody(args = "bits",
+        body = 
+          "var s = ((bits >> 31) == 0) ? 1 : -1;\n"
+        + "var e = ((bits >> 23) & 0xff);\n"
+        + "if (e === 0xff) {\n"
+        + "  if ((bits & 0x7fffff) === 0) {\n"
+        + "    return (s > 0) ? Number.POSITIVE_INFINITY"
+                          + " : Number.NEGATIVE_INFINITY;\n"
+        + "  }\n"
+        + "  return Number.NaN;\n"
+        + "}\n"
+        + "var m = (e === 0) ?\n"
+        + "  (bits & 0x7fffff) << 1 :\n"
+        + "  (bits & 0x7fffff) | 0x800000;\n"
+        + "return s * m * Math.pow(2.0, e - 150);\n"
+    )
+    public static native float intBitsToFloat(int bits);
+
+    /**
+     * Compares two {@code Float} objects numerically.  There are
+     * two ways in which comparisons performed by this method differ
+     * from those performed by the Java language numerical comparison
+     * operators ({@code <, <=, ==, >=, >}) when
+     * applied to primitive {@code float} values:
+     *
+     * <ul><li>
+     *          {@code Float.NaN} is considered by this method to
+     *          be equal to itself and greater than all other
+     *          {@code float} values
+     *          (including {@code Float.POSITIVE_INFINITY}).
+     * <li>
+     *          {@code 0.0f} is considered by this method to be greater
+     *          than {@code -0.0f}.
+     * </ul>
+     *
+     * This ensures that the <i>natural ordering</i> of {@code Float}
+     * objects imposed by this method is <i>consistent with equals</i>.
+     *
+     * @param   anotherFloat   the {@code Float} to be compared.
+     * @return  the value {@code 0} if {@code anotherFloat} is
+     *          numerically equal to this {@code Float}; a value
+     *          less than {@code 0} if this {@code Float}
+     *          is numerically less than {@code anotherFloat};
+     *          and a value greater than {@code 0} if this
+     *          {@code Float} is numerically greater than
+     *          {@code anotherFloat}.
+     *
+     * @since   1.2
+     * @see Comparable#compareTo(Object)
+     */
+    public int compareTo(Float anotherFloat) {
+        return Float.compare(value, anotherFloat.value);
+    }
+
+    /**
+     * Compares the two specified {@code float} values. The sign
+     * of the integer value returned is the same as that of the
+     * integer that would be returned by the call:
+     * <pre>
+     *    new Float(f1).compareTo(new Float(f2))
+     * </pre>
+     *
+     * @param   f1        the first {@code float} to compare.
+     * @param   f2        the second {@code float} to compare.
+     * @return  the value {@code 0} if {@code f1} is
+     *          numerically equal to {@code f2}; a value less than
+     *          {@code 0} if {@code f1} is numerically less than
+     *          {@code f2}; and a value greater than {@code 0}
+     *          if {@code f1} is numerically greater than
+     *          {@code f2}.
+     * @since 1.4
+     */
+    public static int compare(float f1, float f2) {
+        if (f1 < f2)
+            return -1;           // Neither val is NaN, thisVal is smaller
+        if (f1 > f2)
+            return 1;            // Neither val is NaN, thisVal is larger
+
+        // Cannot use floatToRawIntBits because of possibility of NaNs.
+        int thisBits    = Float.floatToIntBits(f1);
+        int anotherBits = Float.floatToIntBits(f2);
+
+        return (thisBits == anotherBits ?  0 : // Values are equal
+                (thisBits < anotherBits ? -1 : // (-0.0, 0.0) or (!NaN, NaN)
+                 1));                          // (0.0, -0.0) or (NaN, !NaN)
+    }
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = -2671257302660747028L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/IllegalAccessError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/IllegalAccessError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown if an application attempts to access or modify a field, or
+ * to call a method that it does not have access to.
+ * <p>
+ * Normally, this error is caught by the compiler; this error can
+ * only occur at run time if the definition of a class has
+ * incompatibly changed.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public class IllegalAccessError extends IncompatibleClassChangeError {
+    private static final long serialVersionUID = -8988904074992417891L;
+
+    /**
+     * Constructs an <code>IllegalAccessError</code> with no detail message.
+     */
+    public IllegalAccessError() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>IllegalAccessError</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public IllegalAccessError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/IllegalAccessException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/IllegalAccessException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * An IllegalAccessException is thrown when an application tries
+ * to reflectively create an instance (other than an array),
+ * set or get a field, or invoke a method, but the currently
+ * executing method does not have access to the definition of
+ * the specified class, field, method or constructor.
+ *
+ * @author  unascribed
+ * @see     Class#newInstance()
+ * @see     java.lang.reflect.Field#set(Object, Object)
+ * @see     java.lang.reflect.Field#setBoolean(Object, boolean)
+ * @see     java.lang.reflect.Field#setByte(Object, byte)
+ * @see     java.lang.reflect.Field#setShort(Object, short)
+ * @see     java.lang.reflect.Field#setChar(Object, char)
+ * @see     java.lang.reflect.Field#setInt(Object, int)
+ * @see     java.lang.reflect.Field#setLong(Object, long)
+ * @see     java.lang.reflect.Field#setFloat(Object, float)
+ * @see     java.lang.reflect.Field#setDouble(Object, double)
+ * @see     java.lang.reflect.Field#get(Object)
+ * @see     java.lang.reflect.Field#getBoolean(Object)
+ * @see     java.lang.reflect.Field#getByte(Object)
+ * @see     java.lang.reflect.Field#getShort(Object)
+ * @see     java.lang.reflect.Field#getChar(Object)
+ * @see     java.lang.reflect.Field#getInt(Object)
+ * @see     java.lang.reflect.Field#getLong(Object)
+ * @see     java.lang.reflect.Field#getFloat(Object)
+ * @see     java.lang.reflect.Field#getDouble(Object)
+ * @see     java.lang.reflect.Method#invoke(Object, Object[])
+ * @see     java.lang.reflect.Constructor#newInstance(Object[])
+ * @since   JDK1.0
+ */
+public class IllegalAccessException extends ReflectiveOperationException {
+    private static final long serialVersionUID = 6616958222490762034L;
+
+    /**
+     * Constructs an <code>IllegalAccessException</code> without a
+     * detail message.
+     */
+    public IllegalAccessException() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>IllegalAccessException</code> with a detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public IllegalAccessException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/IllegalArgumentException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/IllegalArgumentException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that a method has been passed an illegal or
+ * inappropriate argument.
+ *
+ * @author  unascribed
+ * @see     java.lang.Thread#setPriority(int)
+ * @since   JDK1.0
+ */
+public
+class IllegalArgumentException extends RuntimeException {
+    /**
+     * Constructs an <code>IllegalArgumentException</code> with no
+     * detail message.
+     */
+    public IllegalArgumentException() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>IllegalArgumentException</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public IllegalArgumentException(String s) {
+        super(s);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message and
+     * cause.
+     *
+     * <p>Note that the detail message associated with <code>cause</code> is
+     * <i>not</i> automatically incorporated in this exception's detail
+     * message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link Throwable#getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value
+     *         is permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since 1.5
+     */
+    public IllegalArgumentException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail
+     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
+     * typically contains the class and detail message of <tt>cause</tt>).
+     * This constructor is useful for exceptions that are little more than
+     * wrappers for other throwables (for example, {@link
+     * java.security.PrivilegedActionException}).
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.5
+     */
+    public IllegalArgumentException(Throwable cause) {
+        super(cause);
+    }
+
+    private static final long serialVersionUID = -5365630128856068164L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/IllegalStateException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/IllegalStateException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Signals that a method has been invoked at an illegal or
+ * inappropriate time.  In other words, the Java environment or
+ * Java application is not in an appropriate state for the requested
+ * operation.
+ *
+ * @author  Jonni Kanerva
+ * @since   JDK1.1
+ */
+public
+class IllegalStateException extends RuntimeException {
+    /**
+     * Constructs an IllegalStateException with no detail message.
+     * A detail message is a String that describes this particular exception.
+     */
+    public IllegalStateException() {
+        super();
+    }
+
+    /**
+     * Constructs an IllegalStateException with the specified detail
+     * message.  A detail message is a String that describes this particular
+     * exception.
+     *
+     * @param s the String that contains a detailed message
+     */
+    public IllegalStateException(String s) {
+        super(s);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message and
+     * cause.
+     *
+     * <p>Note that the detail message associated with <code>cause</code> is
+     * <i>not</i> automatically incorporated in this exception's detail
+     * message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link Throwable#getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value
+     *         is permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since 1.5
+     */
+    public IllegalStateException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail
+     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
+     * typically contains the class and detail message of <tt>cause</tt>).
+     * This constructor is useful for exceptions that are little more than
+     * wrappers for other throwables (for example, {@link
+     * java.security.PrivilegedActionException}).
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.5
+     */
+    public IllegalStateException(Throwable cause) {
+        super(cause);
+    }
+
+    static final long serialVersionUID = -1848914673093119416L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/IncompatibleClassChangeError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/IncompatibleClassChangeError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when an incompatible class change has occurred to some class
+ * definition. The definition of some class, on which the currently
+ * executing method depends, has since changed.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class IncompatibleClassChangeError extends LinkageError {
+    private static final long serialVersionUID = -4914975503642802119L;
+
+    /**
+     * Constructs an <code>IncompatibleClassChangeError</code> with no
+     * detail message.
+     */
+    public IncompatibleClassChangeError () {
+        super();
+    }
+
+    /**
+     * Constructs an <code>IncompatibleClassChangeError</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public IncompatibleClassChangeError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/IndexOutOfBoundsException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/IndexOutOfBoundsException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that an index of some sort (such as to an array, to a
+ * string, or to a vector) is out of range.
+ * <p>
+ * Applications can subclass this class to indicate similar exceptions.
+ *
+ * @author  Frank Yellin
+ * @since   JDK1.0
+ */
+public
+class IndexOutOfBoundsException extends RuntimeException {
+    private static final long serialVersionUID = 234122996006267687L;
+
+    /**
+     * Constructs an <code>IndexOutOfBoundsException</code> with no
+     * detail message.
+     */
+    public IndexOutOfBoundsException() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>IndexOutOfBoundsException</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public IndexOutOfBoundsException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/InstantiationException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/InstantiationException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when an application tries to create an instance of a class
+ * using the {@code newInstance} method in class
+ * {@code Class}, but the specified class object cannot be
+ * instantiated.  The instantiation can fail for a variety of
+ * reasons including but not limited to:
+ *
+ * <ul>
+ * <li> the class object represents an abstract class, an interface,
+ *      an array class, a primitive type, or {@code void}
+ * <li> the class has no nullary constructor
+ *</ul>
+ *
+ * @author  unascribed
+ * @see     java.lang.Class#newInstance()
+ * @since   JDK1.0
+ */
+public
+class InstantiationException extends ReflectiveOperationException {
+    private static final long serialVersionUID = -8441929162975509110L;
+
+    /**
+     * Constructs an {@code InstantiationException} with no detail message.
+     */
+    public InstantiationException() {
+        super();
+    }
+
+    /**
+     * Constructs an {@code InstantiationException} with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public InstantiationException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Integer.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Integer.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1246 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ * The {@code Integer} class wraps a value of the primitive type
+ * {@code int} in an object. An object of type {@code Integer}
+ * contains a single field whose type is {@code int}.
+ *
+ * <p>In addition, this class provides several methods for converting
+ * an {@code int} to a {@code String} and a {@code String} to an
+ * {@code int}, as well as other constants and methods useful when
+ * dealing with an {@code int}.
+ *
+ * <p>Implementation note: The implementations of the "bit twiddling"
+ * methods (such as {@link #highestOneBit(int) highestOneBit} and
+ * {@link #numberOfTrailingZeros(int) numberOfTrailingZeros}) are
+ * based on material from Henry S. Warren, Jr.'s <i>Hacker's
+ * Delight</i>, (Addison Wesley, 2002).
+ *
+ * @author  Lee Boynton
+ * @author  Arthur van Hoff
+ * @author  Josh Bloch
+ * @author  Joseph D. Darcy
+ * @since JDK1.0
+ */
+public final class Integer extends Number implements Comparable<Integer> {
+    /**
+     * A constant holding the minimum value an {@code int} can
+     * have, -2<sup>31</sup>.
+     */
+    public static final int   MIN_VALUE = 0x80000000;
+
+    /**
+     * A constant holding the maximum value an {@code int} can
+     * have, 2<sup>31</sup>-1.
+     */
+    public static final int   MAX_VALUE = 0x7fffffff;
+
+    /**
+     * The {@code Class} instance representing the primitive type
+     * {@code int}.
+     *
+     * @since   JDK1.1
+     */
+    public static final Class<Integer>  TYPE = (Class<Integer>) Class.getPrimitiveClass("int");
+
+    /**
+     * All possible chars for representing a number as a String
+     */
+    final static char[] digits = {
+        '0' , '1' , '2' , '3' , '4' , '5' ,
+        '6' , '7' , '8' , '9' , 'a' , 'b' ,
+        'c' , 'd' , 'e' , 'f' , 'g' , 'h' ,
+        'i' , 'j' , 'k' , 'l' , 'm' , 'n' ,
+        'o' , 'p' , 'q' , 'r' , 's' , 't' ,
+        'u' , 'v' , 'w' , 'x' , 'y' , 'z'
+    };
+
+    /**
+     * Returns a string representation of the first argument in the
+     * radix specified by the second argument.
+     *
+     * <p>If the radix is smaller than {@code Character.MIN_RADIX}
+     * or larger than {@code Character.MAX_RADIX}, then the radix
+     * {@code 10} is used instead.
+     *
+     * <p>If the first argument is negative, the first element of the
+     * result is the ASCII minus character {@code '-'}
+     * (<code>'&#92;u002D'</code>). If the first argument is not
+     * negative, no sign character appears in the result.
+     *
+     * <p>The remaining characters of the result represent the magnitude
+     * of the first argument. If the magnitude is zero, it is
+     * represented by a single zero character {@code '0'}
+     * (<code>'&#92;u0030'</code>); otherwise, the first character of
+     * the representation of the magnitude will not be the zero
+     * character.  The following ASCII characters are used as digits:
+     *
+     * <blockquote>
+     *   {@code 0123456789abcdefghijklmnopqrstuvwxyz}
+     * </blockquote>
+     *
+     * These are <code>'&#92;u0030'</code> through
+     * <code>'&#92;u0039'</code> and <code>'&#92;u0061'</code> through
+     * <code>'&#92;u007A'</code>. If {@code radix} is
+     * <var>N</var>, then the first <var>N</var> of these characters
+     * are used as radix-<var>N</var> digits in the order shown. Thus,
+     * the digits for hexadecimal (radix 16) are
+     * {@code 0123456789abcdef}. If uppercase letters are
+     * desired, the {@link java.lang.String#toUpperCase()} method may
+     * be called on the result:
+     *
+     * <blockquote>
+     *  {@code Integer.toString(n, 16).toUpperCase()}
+     * </blockquote>
+     *
+     * @param   i       an integer to be converted to a string.
+     * @param   radix   the radix to use in the string representation.
+     * @return  a string representation of the argument in the specified radix.
+     * @see     java.lang.Character#MAX_RADIX
+     * @see     java.lang.Character#MIN_RADIX
+     */
+    public static String toString(int i, int radix) {
+
+        if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX)
+            radix = 10;
+
+        /* Use the faster version */
+        if (radix == 10) {
+            return toString(i);
+        }
+
+        char buf[] = new char[33];
+        boolean negative = (i < 0);
+        int charPos = 32;
+
+        if (!negative) {
+            i = -i;
+        }
+
+        while (i <= -radix) {
+            buf[charPos--] = digits[-(i % radix)];
+            i = i / radix;
+        }
+        buf[charPos] = digits[-i];
+
+        if (negative) {
+            buf[--charPos] = '-';
+        }
+
+        return new String(buf, charPos, (33 - charPos));
+    }
+
+    /**
+     * Returns a string representation of the integer argument as an
+     * unsigned integer in base&nbsp;16.
+     *
+     * <p>The unsigned integer value is the argument plus 2<sup>32</sup>
+     * if the argument is negative; otherwise, it is equal to the
+     * argument.  This value is converted to a string of ASCII digits
+     * in hexadecimal (base&nbsp;16) with no extra leading
+     * {@code 0}s. If the unsigned magnitude is zero, it is
+     * represented by a single zero character {@code '0'}
+     * (<code>'&#92;u0030'</code>); otherwise, the first character of
+     * the representation of the unsigned magnitude will not be the
+     * zero character. The following characters are used as
+     * hexadecimal digits:
+     *
+     * <blockquote>
+     *  {@code 0123456789abcdef}
+     * </blockquote>
+     *
+     * These are the characters <code>'&#92;u0030'</code> through
+     * <code>'&#92;u0039'</code> and <code>'&#92;u0061'</code> through
+     * <code>'&#92;u0066'</code>. If uppercase letters are
+     * desired, the {@link java.lang.String#toUpperCase()} method may
+     * be called on the result:
+     *
+     * <blockquote>
+     *  {@code Integer.toHexString(n).toUpperCase()}
+     * </blockquote>
+     *
+     * @param   i   an integer to be converted to a string.
+     * @return  the string representation of the unsigned integer value
+     *          represented by the argument in hexadecimal (base&nbsp;16).
+     * @since   JDK1.0.2
+     */
+    public static String toHexString(int i) {
+        return toUnsignedString(i, 4);
+    }
+
+    /**
+     * Returns a string representation of the integer argument as an
+     * unsigned integer in base&nbsp;8.
+     *
+     * <p>The unsigned integer value is the argument plus 2<sup>32</sup>
+     * if the argument is negative; otherwise, it is equal to the
+     * argument.  This value is converted to a string of ASCII digits
+     * in octal (base&nbsp;8) with no extra leading {@code 0}s.
+     *
+     * <p>If the unsigned magnitude is zero, it is represented by a
+     * single zero character {@code '0'}
+     * (<code>'&#92;u0030'</code>); otherwise, the first character of
+     * the representation of the unsigned magnitude will not be the
+     * zero character. The following characters are used as octal
+     * digits:
+     *
+     * <blockquote>
+     * {@code 01234567}
+     * </blockquote>
+     *
+     * These are the characters <code>'&#92;u0030'</code> through
+     * <code>'&#92;u0037'</code>.
+     *
+     * @param   i   an integer to be converted to a string.
+     * @return  the string representation of the unsigned integer value
+     *          represented by the argument in octal (base&nbsp;8).
+     * @since   JDK1.0.2
+     */
+    public static String toOctalString(int i) {
+        return toUnsignedString(i, 3);
+    }
+
+    /**
+     * Returns a string representation of the integer argument as an
+     * unsigned integer in base&nbsp;2.
+     *
+     * <p>The unsigned integer value is the argument plus 2<sup>32</sup>
+     * if the argument is negative; otherwise it is equal to the
+     * argument.  This value is converted to a string of ASCII digits
+     * in binary (base&nbsp;2) with no extra leading {@code 0}s.
+     * If the unsigned magnitude is zero, it is represented by a
+     * single zero character {@code '0'}
+     * (<code>'&#92;u0030'</code>); otherwise, the first character of
+     * the representation of the unsigned magnitude will not be the
+     * zero character. The characters {@code '0'}
+     * (<code>'&#92;u0030'</code>) and {@code '1'}
+     * (<code>'&#92;u0031'</code>) are used as binary digits.
+     *
+     * @param   i   an integer to be converted to a string.
+     * @return  the string representation of the unsigned integer value
+     *          represented by the argument in binary (base&nbsp;2).
+     * @since   JDK1.0.2
+     */
+    public static String toBinaryString(int i) {
+        return toUnsignedString(i, 1);
+    }
+
+    /**
+     * Convert the integer to an unsigned number.
+     */
+    private static String toUnsignedString(int i, int shift) {
+        char[] buf = new char[32];
+        int charPos = 32;
+        int radix = 1 << shift;
+        int mask = radix - 1;
+        do {
+            buf[--charPos] = digits[i & mask];
+            i >>>= shift;
+        } while (i != 0);
+
+        return new String(buf, charPos, (32 - charPos));
+    }
+
+
+    final static char [] DigitTens = {
+        '0', '0', '0', '0', '0', '0', '0', '0', '0', '0',
+        '1', '1', '1', '1', '1', '1', '1', '1', '1', '1',
+        '2', '2', '2', '2', '2', '2', '2', '2', '2', '2',
+        '3', '3', '3', '3', '3', '3', '3', '3', '3', '3',
+        '4', '4', '4', '4', '4', '4', '4', '4', '4', '4',
+        '5', '5', '5', '5', '5', '5', '5', '5', '5', '5',
+        '6', '6', '6', '6', '6', '6', '6', '6', '6', '6',
+        '7', '7', '7', '7', '7', '7', '7', '7', '7', '7',
+        '8', '8', '8', '8', '8', '8', '8', '8', '8', '8',
+        '9', '9', '9', '9', '9', '9', '9', '9', '9', '9',
+        } ;
+
+    final static char [] DigitOnes = {
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        } ;
+
+        // I use the "invariant division by multiplication" trick to
+        // accelerate Integer.toString.  In particular we want to
+        // avoid division by 10.
+        //
+        // The "trick" has roughly the same performance characteristics
+        // as the "classic" Integer.toString code on a non-JIT VM.
+        // The trick avoids .rem and .div calls but has a longer code
+        // path and is thus dominated by dispatch overhead.  In the
+        // JIT case the dispatch overhead doesn't exist and the
+        // "trick" is considerably faster than the classic code.
+        //
+        // TODO-FIXME: convert (x * 52429) into the equiv shift-add
+        // sequence.
+        //
+        // RE:  Division by Invariant Integers using Multiplication
+        //      T Gralund, P Montgomery
+        //      ACM PLDI 1994
+        //
+
+    /**
+     * Returns a {@code String} object representing the
+     * specified integer. The argument is converted to signed decimal
+     * representation and returned as a string, exactly as if the
+     * argument and radix 10 were given as arguments to the {@link
+     * #toString(int, int)} method.
+     *
+     * @param   i   an integer to be converted.
+     * @return  a string representation of the argument in base&nbsp;10.
+     */
+    @JavaScriptBody(args = "i", body = "return i.toString();")
+    public static String toString(int i) {
+        if (i == Integer.MIN_VALUE)
+            return "-2147483648";
+        int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i);
+        char[] buf = new char[size];
+        getChars(i, size, buf);
+        return new String(buf, 0, size);
+    }
+
+    /**
+     * Places characters representing the integer i into the
+     * character array buf. The characters are placed into
+     * the buffer backwards starting with the least significant
+     * digit at the specified index (exclusive), and working
+     * backwards from there.
+     *
+     * Will fail if i == Integer.MIN_VALUE
+     */
+    static void getChars(int i, int index, char[] buf) {
+        int q, r;
+        int charPos = index;
+        char sign = 0;
+
+        if (i < 0) {
+            sign = '-';
+            i = -i;
+        }
+
+        // Generate two digits per iteration
+        while (i >= 65536) {
+            q = i / 100;
+        // really: r = i - (q * 100);
+            r = i - ((q << 6) + (q << 5) + (q << 2));
+            i = q;
+            buf [--charPos] = DigitOnes[r];
+            buf [--charPos] = DigitTens[r];
+        }
+
+        // Fall thru to fast mode for smaller numbers
+        // assert(i <= 65536, i);
+        for (;;) {
+            q = (i * 52429) >>> (16+3);
+            r = i - ((q << 3) + (q << 1));  // r = i-(q*10) ...
+            buf [--charPos] = digits [r];
+            i = q;
+            if (i == 0) break;
+        }
+        if (sign != 0) {
+            buf [--charPos] = sign;
+        }
+    }
+
+    final static int [] sizeTable = { 9, 99, 999, 9999, 99999, 999999, 9999999,
+                                      99999999, 999999999, Integer.MAX_VALUE };
+
+    // Requires positive x
+    static int stringSize(int x) {
+        for (int i=0; ; i++)
+            if (x <= sizeTable[i])
+                return i+1;
+    }
+
+    /**
+     * Parses the string argument as a signed integer in the radix
+     * specified by the second argument. The characters in the string
+     * must all be digits of the specified radix (as determined by
+     * whether {@link java.lang.Character#digit(char, int)} returns a
+     * nonnegative value), except that the first character may be an
+     * ASCII minus sign {@code '-'} (<code>'&#92;u002D'</code>) to
+     * indicate a negative value or an ASCII plus sign {@code '+'}
+     * (<code>'&#92;u002B'</code>) to indicate a positive value. The
+     * resulting integer value is returned.
+     *
+     * <p>An exception of type {@code NumberFormatException} is
+     * thrown if any of the following situations occurs:
+     * <ul>
+     * <li>The first argument is {@code null} or is a string of
+     * length zero.
+     *
+     * <li>The radix is either smaller than
+     * {@link java.lang.Character#MIN_RADIX} or
+     * larger than {@link java.lang.Character#MAX_RADIX}.
+     *
+     * <li>Any character of the string is not a digit of the specified
+     * radix, except that the first character may be a minus sign
+     * {@code '-'} (<code>'&#92;u002D'</code>) or plus sign
+     * {@code '+'} (<code>'&#92;u002B'</code>) provided that the
+     * string is longer than length 1.
+     *
+     * <li>The value represented by the string is not a value of type
+     * {@code int}.
+     * </ul>
+     *
+     * <p>Examples:
+     * <blockquote><pre>
+     * parseInt("0", 10) returns 0
+     * parseInt("473", 10) returns 473
+     * parseInt("+42", 10) returns 42
+     * parseInt("-0", 10) returns 0
+     * parseInt("-FF", 16) returns -255
+     * parseInt("1100110", 2) returns 102
+     * parseInt("2147483647", 10) returns 2147483647
+     * parseInt("-2147483648", 10) returns -2147483648
+     * parseInt("2147483648", 10) throws a NumberFormatException
+     * parseInt("99", 8) throws a NumberFormatException
+     * parseInt("Kona", 10) throws a NumberFormatException
+     * parseInt("Kona", 27) returns 411787
+     * </pre></blockquote>
+     *
+     * @param      s   the {@code String} containing the integer
+     *                  representation to be parsed
+     * @param      radix   the radix to be used while parsing {@code s}.
+     * @return     the integer represented by the string argument in the
+     *             specified radix.
+     * @exception  NumberFormatException if the {@code String}
+     *             does not contain a parsable {@code int}.
+     */
+    @JavaScriptBody(args={"s", "radix"}, body="return parseInt(s,radix);")
+    public static int parseInt(String s, int radix)
+                throws NumberFormatException
+    {
+        /*
+         * WARNING: This method may be invoked early during VM initialization
+         * before IntegerCache is initialized. Care must be taken to not use
+         * the valueOf method.
+         */
+
+        if (s == null) {
+            throw new NumberFormatException("null");
+        }
+
+        if (radix < Character.MIN_RADIX) {
+            throw new NumberFormatException("radix " + radix +
+                                            " less than Character.MIN_RADIX");
+        }
+
+        if (radix > Character.MAX_RADIX) {
+            throw new NumberFormatException("radix " + radix +
+                                            " greater than Character.MAX_RADIX");
+        }
+
+        int result = 0;
+        boolean negative = false;
+        int i = 0, len = s.length();
+        int limit = -Integer.MAX_VALUE;
+        int multmin;
+        int digit;
+
+        if (len > 0) {
+            char firstChar = s.charAt(0);
+            if (firstChar < '0') { // Possible leading "+" or "-"
+                if (firstChar == '-') {
+                    negative = true;
+                    limit = Integer.MIN_VALUE;
+                } else if (firstChar != '+')
+                    throw NumberFormatException.forInputString(s);
+
+                if (len == 1) // Cannot have lone "+" or "-"
+                    throw NumberFormatException.forInputString(s);
+                i++;
+            }
+            multmin = limit / radix;
+            while (i < len) {
+                // Accumulating negatively avoids surprises near MAX_VALUE
+                digit = Character.digit(s.charAt(i++),radix);
+                if (digit < 0) {
+                    throw NumberFormatException.forInputString(s);
+                }
+                if (result < multmin) {
+                    throw NumberFormatException.forInputString(s);
+                }
+                result *= radix;
+                if (result < limit + digit) {
+                    throw NumberFormatException.forInputString(s);
+                }
+                result -= digit;
+            }
+        } else {
+            throw NumberFormatException.forInputString(s);
+        }
+        return negative ? result : -result;
+    }
+
+    /**
+     * Parses the string argument as a signed decimal integer. The
+     * characters in the string must all be decimal digits, except
+     * that the first character may be an ASCII minus sign {@code '-'}
+     * (<code>'&#92;u002D'</code>) to indicate a negative value or an
+     * ASCII plus sign {@code '+'} (<code>'&#92;u002B'</code>) to
+     * indicate a positive value. The resulting integer value is
+     * returned, exactly as if the argument and the radix 10 were
+     * given as arguments to the {@link #parseInt(java.lang.String,
+     * int)} method.
+     *
+     * @param s    a {@code String} containing the {@code int}
+     *             representation to be parsed
+     * @return     the integer value represented by the argument in decimal.
+     * @exception  NumberFormatException  if the string does not contain a
+     *               parsable integer.
+     */
+    public static int parseInt(String s) throws NumberFormatException {
+        return parseInt(s,10);
+    }
+
+    /**
+     * Returns an {@code Integer} object holding the value
+     * extracted from the specified {@code String} when parsed
+     * with the radix given by the second argument. The first argument
+     * is interpreted as representing a signed integer in the radix
+     * specified by the second argument, exactly as if the arguments
+     * were given to the {@link #parseInt(java.lang.String, int)}
+     * method. The result is an {@code Integer} object that
+     * represents the integer value specified by the string.
+     *
+     * <p>In other words, this method returns an {@code Integer}
+     * object equal to the value of:
+     *
+     * <blockquote>
+     *  {@code new Integer(Integer.parseInt(s, radix))}
+     * </blockquote>
+     *
+     * @param      s   the string to be parsed.
+     * @param      radix the radix to be used in interpreting {@code s}
+     * @return     an {@code Integer} object holding the value
+     *             represented by the string argument in the specified
+     *             radix.
+     * @exception NumberFormatException if the {@code String}
+     *            does not contain a parsable {@code int}.
+     */
+    public static Integer valueOf(String s, int radix) throws NumberFormatException {
+        return Integer.valueOf(parseInt(s,radix));
+    }
+
+    /**
+     * Returns an {@code Integer} object holding the
+     * value of the specified {@code String}. The argument is
+     * interpreted as representing a signed decimal integer, exactly
+     * as if the argument were given to the {@link
+     * #parseInt(java.lang.String)} method. The result is an
+     * {@code Integer} object that represents the integer value
+     * specified by the string.
+     *
+     * <p>In other words, this method returns an {@code Integer}
+     * object equal to the value of:
+     *
+     * <blockquote>
+     *  {@code new Integer(Integer.parseInt(s))}
+     * </blockquote>
+     *
+     * @param      s   the string to be parsed.
+     * @return     an {@code Integer} object holding the value
+     *             represented by the string argument.
+     * @exception  NumberFormatException  if the string cannot be parsed
+     *             as an integer.
+     */
+    public static Integer valueOf(String s) throws NumberFormatException {
+        return Integer.valueOf(parseInt(s, 10));
+    }
+
+    /**
+     * Cache to support the object identity semantics of autoboxing for values between
+     * -128 and 127 (inclusive) as required by JLS.
+     *
+     * The cache is initialized on first usage.  The size of the cache
+     * may be controlled by the -XX:AutoBoxCacheMax=<size> option.
+     * During VM initialization, java.lang.Integer.IntegerCache.high property
+     * may be set and saved in the private system properties in the
+     * sun.misc.VM class.
+     */
+
+    private static class IntegerCache {
+        static final int low = -128;
+        static final int high;
+        static final Integer cache[];
+
+        static {
+            // high value may be configured by property
+            int h = 127;
+            String integerCacheHighPropValue =
+                AbstractStringBuilder.getProperty("java.lang.Integer.IntegerCache.high");
+            if (integerCacheHighPropValue != null) {
+                int i = parseInt(integerCacheHighPropValue);
+                i = Math.max(i, 127);
+                // Maximum array size is Integer.MAX_VALUE
+                h = Math.min(i, Integer.MAX_VALUE - (-low));
+            }
+            high = h;
+
+            cache = new Integer[(high - low) + 1];
+            int j = low;
+            for(int k = 0; k < cache.length; k++)
+                cache[k] = new Integer(j++);
+        }
+
+        private IntegerCache() {}
+    }
+
+    /**
+     * Returns an {@code Integer} instance representing the specified
+     * {@code int} value.  If a new {@code Integer} instance is not
+     * required, this method should generally be used in preference to
+     * the constructor {@link #Integer(int)}, as this method is likely
+     * to yield significantly better space and time performance by
+     * caching frequently requested values.
+     *
+     * This method will always cache values in the range -128 to 127,
+     * inclusive, and may cache other values outside of this range.
+     *
+     * @param  i an {@code int} value.
+     * @return an {@code Integer} instance representing {@code i}.
+     * @since  1.5
+     */
+    public static Integer valueOf(int i) {
+        //assert IntegerCache.high >= 127;
+        if (i >= IntegerCache.low && i <= IntegerCache.high)
+            return IntegerCache.cache[i + (-IntegerCache.low)];
+        return new Integer(i);
+    }
+
+    /**
+     * The value of the {@code Integer}.
+     *
+     * @serial
+     */
+    private final int value;
+
+    /**
+     * Constructs a newly allocated {@code Integer} object that
+     * represents the specified {@code int} value.
+     *
+     * @param   value   the value to be represented by the
+     *                  {@code Integer} object.
+     */
+    public Integer(int value) {
+        this.value = value;
+    }
+
+    /**
+     * Constructs a newly allocated {@code Integer} object that
+     * represents the {@code int} value indicated by the
+     * {@code String} parameter. The string is converted to an
+     * {@code int} value in exactly the manner used by the
+     * {@code parseInt} method for radix 10.
+     *
+     * @param      s   the {@code String} to be converted to an
+     *                 {@code Integer}.
+     * @exception  NumberFormatException  if the {@code String} does not
+     *               contain a parsable integer.
+     * @see        java.lang.Integer#parseInt(java.lang.String, int)
+     */
+    public Integer(String s) throws NumberFormatException {
+        this.value = parseInt(s, 10);
+    }
+
+    /**
+     * Returns the value of this {@code Integer} as a
+     * {@code byte}.
+     */
+    public byte byteValue() {
+        return (byte)value;
+    }
+
+    /**
+     * Returns the value of this {@code Integer} as a
+     * {@code short}.
+     */
+    public short shortValue() {
+        return (short)value;
+    }
+
+    /**
+     * Returns the value of this {@code Integer} as an
+     * {@code int}.
+     */
+    public int intValue() {
+        return value;
+    }
+
+    /**
+     * Returns the value of this {@code Integer} as a
+     * {@code long}.
+     */
+    public long longValue() {
+        return (long)value;
+    }
+
+    /**
+     * Returns the value of this {@code Integer} as a
+     * {@code float}.
+     */
+    public float floatValue() {
+        return (float)value;
+    }
+
+    /**
+     * Returns the value of this {@code Integer} as a
+     * {@code double}.
+     */
+    public double doubleValue() {
+        return (double)value;
+    }
+
+    /**
+     * Returns a {@code String} object representing this
+     * {@code Integer}'s value. The value is converted to signed
+     * decimal representation and returned as a string, exactly as if
+     * the integer value were given as an argument to the {@link
+     * java.lang.Integer#toString(int)} method.
+     *
+     * @return  a string representation of the value of this object in
+     *          base&nbsp;10.
+     */
+    public String toString() {
+        return toString(value);
+    }
+
+    /**
+     * Returns a hash code for this {@code Integer}.
+     *
+     * @return  a hash code value for this object, equal to the
+     *          primitive {@code int} value represented by this
+     *          {@code Integer} object.
+     */
+    public int hashCode() {
+        return value;
+    }
+
+    /**
+     * Compares this object to the specified object.  The result is
+     * {@code true} if and only if the argument is not
+     * {@code null} and is an {@code Integer} object that
+     * contains the same {@code int} value as this object.
+     *
+     * @param   obj   the object to compare with.
+     * @return  {@code true} if the objects are the same;
+     *          {@code false} otherwise.
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof Integer) {
+            return value == ((Integer)obj).intValue();
+        }
+        return false;
+    }
+
+    /**
+     * Determines the integer value of the system property with the
+     * specified name.
+     *
+     * <p>The first argument is treated as the name of a system property.
+     * System properties are accessible through the
+     * {@link java.lang.System#getProperty(java.lang.String)} method. The
+     * string value of this property is then interpreted as an integer
+     * value and an {@code Integer} object representing this value is
+     * returned. Details of possible numeric formats can be found with
+     * the definition of {@code getProperty}.
+     *
+     * <p>If there is no property with the specified name, if the specified name
+     * is empty or {@code null}, or if the property does not have
+     * the correct numeric format, then {@code null} is returned.
+     *
+     * <p>In other words, this method returns an {@code Integer}
+     * object equal to the value of:
+     *
+     * <blockquote>
+     *  {@code getInteger(nm, null)}
+     * </blockquote>
+     *
+     * @param   nm   property name.
+     * @return  the {@code Integer} value of the property.
+     * @see     java.lang.System#getProperty(java.lang.String)
+     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
+     */
+    public static Integer getInteger(String nm) {
+        return getInteger(nm, null);
+    }
+
+    /**
+     * Determines the integer value of the system property with the
+     * specified name.
+     *
+     * <p>The first argument is treated as the name of a system property.
+     * System properties are accessible through the {@link
+     * java.lang.System#getProperty(java.lang.String)} method. The
+     * string value of this property is then interpreted as an integer
+     * value and an {@code Integer} object representing this value is
+     * returned. Details of possible numeric formats can be found with
+     * the definition of {@code getProperty}.
+     *
+     * <p>The second argument is the default value. An {@code Integer} object
+     * that represents the value of the second argument is returned if there
+     * is no property of the specified name, if the property does not have
+     * the correct numeric format, or if the specified name is empty or
+     * {@code null}.
+     *
+     * <p>In other words, this method returns an {@code Integer} object
+     * equal to the value of:
+     *
+     * <blockquote>
+     *  {@code getInteger(nm, new Integer(val))}
+     * </blockquote>
+     *
+     * but in practice it may be implemented in a manner such as:
+     *
+     * <blockquote><pre>
+     * Integer result = getInteger(nm, null);
+     * return (result == null) ? new Integer(val) : result;
+     * </pre></blockquote>
+     *
+     * to avoid the unnecessary allocation of an {@code Integer}
+     * object when the default value is not needed.
+     *
+     * @param   nm   property name.
+     * @param   val   default value.
+     * @return  the {@code Integer} value of the property.
+     * @see     java.lang.System#getProperty(java.lang.String)
+     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
+     */
+    public static Integer getInteger(String nm, int val) {
+        Integer result = getInteger(nm, null);
+        return (result == null) ? Integer.valueOf(val) : result;
+    }
+
+    /**
+     * Returns the integer value of the system property with the
+     * specified name.  The first argument is treated as the name of a
+     * system property.  System properties are accessible through the
+     * {@link java.lang.System#getProperty(java.lang.String)} method.
+     * The string value of this property is then interpreted as an
+     * integer value, as per the {@code Integer.decode} method,
+     * and an {@code Integer} object representing this value is
+     * returned.
+     *
+     * <ul><li>If the property value begins with the two ASCII characters
+     *         {@code 0x} or the ASCII character {@code #}, not
+     *      followed by a minus sign, then the rest of it is parsed as a
+     *      hexadecimal integer exactly as by the method
+     *      {@link #valueOf(java.lang.String, int)} with radix 16.
+     * <li>If the property value begins with the ASCII character
+     *     {@code 0} followed by another character, it is parsed as an
+     *     octal integer exactly as by the method
+     *     {@link #valueOf(java.lang.String, int)} with radix 8.
+     * <li>Otherwise, the property value is parsed as a decimal integer
+     * exactly as by the method {@link #valueOf(java.lang.String, int)}
+     * with radix 10.
+     * </ul>
+     *
+     * <p>The second argument is the default value. The default value is
+     * returned if there is no property of the specified name, if the
+     * property does not have the correct numeric format, or if the
+     * specified name is empty or {@code null}.
+     *
+     * @param   nm   property name.
+     * @param   val   default value.
+     * @return  the {@code Integer} value of the property.
+     * @see     java.lang.System#getProperty(java.lang.String)
+     * @see java.lang.System#getProperty(java.lang.String, java.lang.String)
+     * @see java.lang.Integer#decode
+     */
+    public static Integer getInteger(String nm, Integer val) {
+        String v = null;
+        try {
+            v = AbstractStringBuilder.getProperty(nm);
+        } catch (IllegalArgumentException e) {
+        } catch (NullPointerException e) {
+        }
+        if (v != null) {
+            try {
+                return Integer.decode(v);
+            } catch (NumberFormatException e) {
+            }
+        }
+        return val;
+    }
+
+    /**
+     * Decodes a {@code String} into an {@code Integer}.
+     * Accepts decimal, hexadecimal, and octal numbers given
+     * by the following grammar:
+     *
+     * <blockquote>
+     * <dl>
+     * <dt><i>DecodableString:</i>
+     * <dd><i>Sign<sub>opt</sub> DecimalNumeral</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0x} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i>
+     * <p>
+     * <dt><i>Sign:</i>
+     * <dd>{@code -}
+     * <dd>{@code +}
+     * </dl>
+     * </blockquote>
+     *
+     * <i>DecimalNumeral</i>, <i>HexDigits</i>, and <i>OctalDigits</i>
+     * are as defined in section 3.10.1 of
+     * <cite>The Java&trade; Language Specification</cite>,
+     * except that underscores are not accepted between digits.
+     *
+     * <p>The sequence of characters following an optional
+     * sign and/or radix specifier ("{@code 0x}", "{@code 0X}",
+     * "{@code #}", or leading zero) is parsed as by the {@code
+     * Integer.parseInt} method with the indicated radix (10, 16, or
+     * 8).  This sequence of characters must represent a positive
+     * value or a {@link NumberFormatException} will be thrown.  The
+     * result is negated if first character of the specified {@code
+     * String} is the minus sign.  No whitespace characters are
+     * permitted in the {@code String}.
+     *
+     * @param     nm the {@code String} to decode.
+     * @return    an {@code Integer} object holding the {@code int}
+     *             value represented by {@code nm}
+     * @exception NumberFormatException  if the {@code String} does not
+     *            contain a parsable integer.
+     * @see java.lang.Integer#parseInt(java.lang.String, int)
+     */
+    public static Integer decode(String nm) throws NumberFormatException {
+        int radix = 10;
+        int index = 0;
+        boolean negative = false;
+        Integer result;
+
+        if (nm.length() == 0)
+            throw new NumberFormatException("Zero length string");
+        char firstChar = nm.charAt(0);
+        // Handle sign, if present
+        if (firstChar == '-') {
+            negative = true;
+            index++;
+        } else if (firstChar == '+')
+            index++;
+
+        // Handle radix specifier, if present
+        if (nm.startsWith("0x", index) || nm.startsWith("0X", index)) {
+            index += 2;
+            radix = 16;
+        }
+        else if (nm.startsWith("#", index)) {
+            index ++;
+            radix = 16;
+        }
+        else if (nm.startsWith("0", index) && nm.length() > 1 + index) {
+            index ++;
+            radix = 8;
+        }
+
+        if (nm.startsWith("-", index) || nm.startsWith("+", index))
+            throw new NumberFormatException("Sign character in wrong position");
+
+        try {
+            result = Integer.valueOf(nm.substring(index), radix);
+            result = negative ? Integer.valueOf(-result.intValue()) : result;
+        } catch (NumberFormatException e) {
+            // If number is Integer.MIN_VALUE, we'll end up here. The next line
+            // handles this case, and causes any genuine format error to be
+            // rethrown.
+            String constant = negative ? ("-" + nm.substring(index))
+                                       : nm.substring(index);
+            result = Integer.valueOf(constant, radix);
+        }
+        return result;
+    }
+
+    /**
+     * Compares two {@code Integer} objects numerically.
+     *
+     * @param   anotherInteger   the {@code Integer} to be compared.
+     * @return  the value {@code 0} if this {@code Integer} is
+     *          equal to the argument {@code Integer}; a value less than
+     *          {@code 0} if this {@code Integer} is numerically less
+     *          than the argument {@code Integer}; and a value greater
+     *          than {@code 0} if this {@code Integer} is numerically
+     *           greater than the argument {@code Integer} (signed
+     *           comparison).
+     * @since   1.2
+     */
+    public int compareTo(Integer anotherInteger) {
+        return compare(this.value, anotherInteger.value);
+    }
+
+    /**
+     * Compares two {@code int} values numerically.
+     * The value returned is identical to what would be returned by:
+     * <pre>
+     *    Integer.valueOf(x).compareTo(Integer.valueOf(y))
+     * </pre>
+     *
+     * @param  x the first {@code int} to compare
+     * @param  y the second {@code int} to compare
+     * @return the value {@code 0} if {@code x == y};
+     *         a value less than {@code 0} if {@code x < y}; and
+     *         a value greater than {@code 0} if {@code x > y}
+     * @since 1.7
+     */
+    public static int compare(int x, int y) {
+        return (x < y) ? -1 : ((x == y) ? 0 : 1);
+    }
+
+
+    // Bit twiddling
+
+    /**
+     * The number of bits used to represent an {@code int} value in two's
+     * complement binary form.
+     *
+     * @since 1.5
+     */
+    public static final int SIZE = 32;
+
+    /**
+     * Returns an {@code int} value with at most a single one-bit, in the
+     * position of the highest-order ("leftmost") one-bit in the specified
+     * {@code int} value.  Returns zero if the specified value has no
+     * one-bits in its two's complement binary representation, that is, if it
+     * is equal to zero.
+     *
+     * @return an {@code int} value with a single one-bit, in the position
+     *     of the highest-order one-bit in the specified value, or zero if
+     *     the specified value is itself equal to zero.
+     * @since 1.5
+     */
+    public static int highestOneBit(int i) {
+        // HD, Figure 3-1
+        i |= (i >>  1);
+        i |= (i >>  2);
+        i |= (i >>  4);
+        i |= (i >>  8);
+        i |= (i >> 16);
+        return i - (i >>> 1);
+    }
+
+    /**
+     * Returns an {@code int} value with at most a single one-bit, in the
+     * position of the lowest-order ("rightmost") one-bit in the specified
+     * {@code int} value.  Returns zero if the specified value has no
+     * one-bits in its two's complement binary representation, that is, if it
+     * is equal to zero.
+     *
+     * @return an {@code int} value with a single one-bit, in the position
+     *     of the lowest-order one-bit in the specified value, or zero if
+     *     the specified value is itself equal to zero.
+     * @since 1.5
+     */
+    public static int lowestOneBit(int i) {
+        // HD, Section 2-1
+        return i & -i;
+    }
+
+    /**
+     * Returns the number of zero bits preceding the highest-order
+     * ("leftmost") one-bit in the two's complement binary representation
+     * of the specified {@code int} value.  Returns 32 if the
+     * specified value has no one-bits in its two's complement representation,
+     * in other words if it is equal to zero.
+     *
+     * <p>Note that this method is closely related to the logarithm base 2.
+     * For all positive {@code int} values x:
+     * <ul>
+     * <li>floor(log<sub>2</sub>(x)) = {@code 31 - numberOfLeadingZeros(x)}
+     * <li>ceil(log<sub>2</sub>(x)) = {@code 32 - numberOfLeadingZeros(x - 1)}
+     * </ul>
+     *
+     * @return the number of zero bits preceding the highest-order
+     *     ("leftmost") one-bit in the two's complement binary representation
+     *     of the specified {@code int} value, or 32 if the value
+     *     is equal to zero.
+     * @since 1.5
+     */
+    public static int numberOfLeadingZeros(int i) {
+        // HD, Figure 5-6
+        if (i == 0)
+            return 32;
+        int n = 1;
+        if (i >>> 16 == 0) { n += 16; i <<= 16; }
+        if (i >>> 24 == 0) { n +=  8; i <<=  8; }
+        if (i >>> 28 == 0) { n +=  4; i <<=  4; }
+        if (i >>> 30 == 0) { n +=  2; i <<=  2; }
+        n -= i >>> 31;
+        return n;
+    }
+
+    /**
+     * Returns the number of zero bits following the lowest-order ("rightmost")
+     * one-bit in the two's complement binary representation of the specified
+     * {@code int} value.  Returns 32 if the specified value has no
+     * one-bits in its two's complement representation, in other words if it is
+     * equal to zero.
+     *
+     * @return the number of zero bits following the lowest-order ("rightmost")
+     *     one-bit in the two's complement binary representation of the
+     *     specified {@code int} value, or 32 if the value is equal
+     *     to zero.
+     * @since 1.5
+     */
+    public static int numberOfTrailingZeros(int i) {
+        // HD, Figure 5-14
+        int y;
+        if (i == 0) return 32;
+        int n = 31;
+        y = i <<16; if (y != 0) { n = n -16; i = y; }
+        y = i << 8; if (y != 0) { n = n - 8; i = y; }
+        y = i << 4; if (y != 0) { n = n - 4; i = y; }
+        y = i << 2; if (y != 0) { n = n - 2; i = y; }
+        return n - ((i << 1) >>> 31);
+    }
+
+    /**
+     * Returns the number of one-bits in the two's complement binary
+     * representation of the specified {@code int} value.  This function is
+     * sometimes referred to as the <i>population count</i>.
+     *
+     * @return the number of one-bits in the two's complement binary
+     *     representation of the specified {@code int} value.
+     * @since 1.5
+     */
+    public static int bitCount(int i) {
+        // HD, Figure 5-2
+        i = i - ((i >>> 1) & 0x55555555);
+        i = (i & 0x33333333) + ((i >>> 2) & 0x33333333);
+        i = (i + (i >>> 4)) & 0x0f0f0f0f;
+        i = i + (i >>> 8);
+        i = i + (i >>> 16);
+        return i & 0x3f;
+    }
+
+    /**
+     * Returns the value obtained by rotating the two's complement binary
+     * representation of the specified {@code int} value left by the
+     * specified number of bits.  (Bits shifted out of the left hand, or
+     * high-order, side reenter on the right, or low-order.)
+     *
+     * <p>Note that left rotation with a negative distance is equivalent to
+     * right rotation: {@code rotateLeft(val, -distance) == rotateRight(val,
+     * distance)}.  Note also that rotation by any multiple of 32 is a
+     * no-op, so all but the last five bits of the rotation distance can be
+     * ignored, even if the distance is negative: {@code rotateLeft(val,
+     * distance) == rotateLeft(val, distance & 0x1F)}.
+     *
+     * @return the value obtained by rotating the two's complement binary
+     *     representation of the specified {@code int} value left by the
+     *     specified number of bits.
+     * @since 1.5
+     */
+    public static int rotateLeft(int i, int distance) {
+        return (i << distance) | (i >>> -distance);
+    }
+
+    /**
+     * Returns the value obtained by rotating the two's complement binary
+     * representation of the specified {@code int} value right by the
+     * specified number of bits.  (Bits shifted out of the right hand, or
+     * low-order, side reenter on the left, or high-order.)
+     *
+     * <p>Note that right rotation with a negative distance is equivalent to
+     * left rotation: {@code rotateRight(val, -distance) == rotateLeft(val,
+     * distance)}.  Note also that rotation by any multiple of 32 is a
+     * no-op, so all but the last five bits of the rotation distance can be
+     * ignored, even if the distance is negative: {@code rotateRight(val,
+     * distance) == rotateRight(val, distance & 0x1F)}.
+     *
+     * @return the value obtained by rotating the two's complement binary
+     *     representation of the specified {@code int} value right by the
+     *     specified number of bits.
+     * @since 1.5
+     */
+    public static int rotateRight(int i, int distance) {
+        return (i >>> distance) | (i << -distance);
+    }
+
+    /**
+     * Returns the value obtained by reversing the order of the bits in the
+     * two's complement binary representation of the specified {@code int}
+     * value.
+     *
+     * @return the value obtained by reversing order of the bits in the
+     *     specified {@code int} value.
+     * @since 1.5
+     */
+    public static int reverse(int i) {
+        // HD, Figure 7-1
+        i = (i & 0x55555555) << 1 | (i >>> 1) & 0x55555555;
+        i = (i & 0x33333333) << 2 | (i >>> 2) & 0x33333333;
+        i = (i & 0x0f0f0f0f) << 4 | (i >>> 4) & 0x0f0f0f0f;
+        i = (i << 24) | ((i & 0xff00) << 8) |
+            ((i >>> 8) & 0xff00) | (i >>> 24);
+        return i;
+    }
+
+    /**
+     * Returns the signum function of the specified {@code int} value.  (The
+     * return value is -1 if the specified value is negative; 0 if the
+     * specified value is zero; and 1 if the specified value is positive.)
+     *
+     * @return the signum function of the specified {@code int} value.
+     * @since 1.5
+     */
+    public static int signum(int i) {
+        // HD, Section 2-7
+        return (i >> 31) | (-i >>> 31);
+    }
+
+    /**
+     * Returns the value obtained by reversing the order of the bytes in the
+     * two's complement representation of the specified {@code int} value.
+     *
+     * @return the value obtained by reversing the bytes in the specified
+     *     {@code int} value.
+     * @since 1.5
+     */
+    public static int reverseBytes(int i) {
+        return ((i >>> 24)           ) |
+               ((i >>   8) &   0xFF00) |
+               ((i <<   8) & 0xFF0000) |
+               ((i << 24));
+    }
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = 1360826667806852920L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/InterruptedException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/InterruptedException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when a thread is waiting, sleeping, or otherwise occupied,
+ * and the thread is interrupted, either before or during the activity.
+ * Occasionally a method may wish to test whether the current
+ * thread has been interrupted, and if so, to immediately throw
+ * this exception.  The following code can be used to achieve
+ * this effect:
+ * <pre>
+ *  if (Thread.interrupted())  // Clears interrupted status!
+ *      throw new InterruptedException();
+ * </pre>
+ *
+ * @author  Frank Yellin
+ * @see     java.lang.Object#wait()
+ * @see     java.lang.Object#wait(long)
+ * @see     java.lang.Object#wait(long, int)
+ * @see     java.lang.Thread#sleep(long)
+ * @see     java.lang.Thread#interrupt()
+ * @see     java.lang.Thread#interrupted()
+ * @since   JDK1.0
+ */
+public
+class InterruptedException extends Exception {
+    private static final long serialVersionUID = 6700697376100628473L;
+
+    /**
+     * Constructs an <code>InterruptedException</code> with no detail  message.
+     */
+    public InterruptedException() {
+        super();
+    }
+
+    /**
+     * Constructs an <code>InterruptedException</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public InterruptedException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/LinkageError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/LinkageError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Subclasses of {@code LinkageError} indicate that a class has
+ * some dependency on another class; however, the latter class has
+ * incompatibly changed after the compilation of the former class.
+ *
+ *
+ * @author  Frank Yellin
+ * @since   JDK1.0
+ */
+public
+class LinkageError extends Error {
+    private static final long serialVersionUID = 3579600108157160122L;
+
+    /**
+     * Constructs a {@code LinkageError} with no detail message.
+     */
+    public LinkageError() {
+        super();
+    }
+
+    /**
+     * Constructs a {@code LinkageError} with the specified detail
+     * message.
+     *
+     * @param   s   the detail message.
+     */
+    public LinkageError(String s) {
+        super(s);
+    }
+
+    /**
+     * Constructs a {@code LinkageError} with the specified detail
+     * message and cause.
+     *
+     * @param s     the detail message.
+     * @param cause the cause, may be {@code null}
+     * @since 1.7
+     */
+    public LinkageError(String s, Throwable cause) {
+        super(s, cause);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Long.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Long.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1202 @@
+/*
+ * Copyright (c) 1994, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ * The {@code Long} class wraps a value of the primitive type {@code
+ * long} in an object. An object of type {@code Long} contains a
+ * single field whose type is {@code long}.
+ *
+ * <p> In addition, this class provides several methods for converting
+ * a {@code long} to a {@code String} and a {@code String} to a {@code
+ * long}, as well as other constants and methods useful when dealing
+ * with a {@code long}.
+ *
+ * <p>Implementation note: The implementations of the "bit twiddling"
+ * methods (such as {@link #highestOneBit(long) highestOneBit} and
+ * {@link #numberOfTrailingZeros(long) numberOfTrailingZeros}) are
+ * based on material from Henry S. Warren, Jr.'s <i>Hacker's
+ * Delight</i>, (Addison Wesley, 2002).
+ *
+ * @author  Lee Boynton
+ * @author  Arthur van Hoff
+ * @author  Josh Bloch
+ * @author  Joseph D. Darcy
+ * @since   JDK1.0
+ */
+public final class Long extends Number implements Comparable<Long> {
+    /**
+     * A constant holding the minimum value a {@code long} can
+     * have, -2<sup>63</sup>.
+     */
+    public static final long MIN_VALUE = 0x8000000000000000L;
+
+    /**
+     * A constant holding the maximum value a {@code long} can
+     * have, 2<sup>63</sup>-1.
+     */
+    public static final long MAX_VALUE = 0x7fffffffffffffffL;
+
+    /**
+     * The {@code Class} instance representing the primitive type
+     * {@code long}.
+     *
+     * @since   JDK1.1
+     */
+    public static final Class<Long>     TYPE = (Class<Long>) Class.getPrimitiveClass("long");
+
+    /**
+     * Returns a string representation of the first argument in the
+     * radix specified by the second argument.
+     *
+     * <p>If the radix is smaller than {@code Character.MIN_RADIX}
+     * or larger than {@code Character.MAX_RADIX}, then the radix
+     * {@code 10} is used instead.
+     *
+     * <p>If the first argument is negative, the first element of the
+     * result is the ASCII minus sign {@code '-'}
+     * (<code>'&#92;u002d'</code>). If the first argument is not
+     * negative, no sign character appears in the result.
+     *
+     * <p>The remaining characters of the result represent the magnitude
+     * of the first argument. If the magnitude is zero, it is
+     * represented by a single zero character {@code '0'}
+     * (<code>'&#92;u0030'</code>); otherwise, the first character of
+     * the representation of the magnitude will not be the zero
+     * character.  The following ASCII characters are used as digits:
+     *
+     * <blockquote>
+     *   {@code 0123456789abcdefghijklmnopqrstuvwxyz}
+     * </blockquote>
+     *
+     * These are <code>'&#92;u0030'</code> through
+     * <code>'&#92;u0039'</code> and <code>'&#92;u0061'</code> through
+     * <code>'&#92;u007a'</code>. If {@code radix} is
+     * <var>N</var>, then the first <var>N</var> of these characters
+     * are used as radix-<var>N</var> digits in the order shown. Thus,
+     * the digits for hexadecimal (radix 16) are
+     * {@code 0123456789abcdef}. If uppercase letters are
+     * desired, the {@link java.lang.String#toUpperCase()} method may
+     * be called on the result:
+     *
+     * <blockquote>
+     *  {@code Long.toString(n, 16).toUpperCase()}
+     * </blockquote>
+     *
+     * @param   i       a {@code long} to be converted to a string.
+     * @param   radix   the radix to use in the string representation.
+     * @return  a string representation of the argument in the specified radix.
+     * @see     java.lang.Character#MAX_RADIX
+     * @see     java.lang.Character#MIN_RADIX
+     */
+    public static String toString(long i, int radix) {
+        if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX)
+            radix = 10;
+        if (radix == 10)
+            return toString(i);
+        char[] buf = new char[65];
+        int charPos = 64;
+        boolean negative = (i < 0);
+
+        if (!negative) {
+            i = -i;
+        }
+
+        while (i <= -radix) {
+            buf[charPos--] = Integer.digits[(int)(-(i % radix))];
+            i = i / radix;
+        }
+        buf[charPos] = Integer.digits[(int)(-i)];
+
+        if (negative) {
+            buf[--charPos] = '-';
+        }
+
+        return new String(buf, charPos, (65 - charPos));
+    }
+
+    /**
+     * Returns a string representation of the {@code long}
+     * argument as an unsigned integer in base&nbsp;16.
+     *
+     * <p>The unsigned {@code long} value is the argument plus
+     * 2<sup>64</sup> if the argument is negative; otherwise, it is
+     * equal to the argument.  This value is converted to a string of
+     * ASCII digits in hexadecimal (base&nbsp;16) with no extra
+     * leading {@code 0}s.  If the unsigned magnitude is zero, it
+     * is represented by a single zero character {@code '0'}
+     * (<code>'&#92;u0030'</code>); otherwise, the first character of
+     * the representation of the unsigned magnitude will not be the
+     * zero character. The following characters are used as
+     * hexadecimal digits:
+     *
+     * <blockquote>
+     *  {@code 0123456789abcdef}
+     * </blockquote>
+     *
+     * These are the characters <code>'&#92;u0030'</code> through
+     * <code>'&#92;u0039'</code> and  <code>'&#92;u0061'</code> through
+     * <code>'&#92;u0066'</code>.  If uppercase letters are desired,
+     * the {@link java.lang.String#toUpperCase()} method may be called
+     * on the result:
+     *
+     * <blockquote>
+     *  {@code Long.toHexString(n).toUpperCase()}
+     * </blockquote>
+     *
+     * @param   i   a {@code long} to be converted to a string.
+     * @return  the string representation of the unsigned {@code long}
+     *          value represented by the argument in hexadecimal
+     *          (base&nbsp;16).
+     * @since   JDK 1.0.2
+     */
+    public static String toHexString(long i) {
+        return toUnsignedString(i, 4);
+    }
+
+    /**
+     * Returns a string representation of the {@code long}
+     * argument as an unsigned integer in base&nbsp;8.
+     *
+     * <p>The unsigned {@code long} value is the argument plus
+     * 2<sup>64</sup> if the argument is negative; otherwise, it is
+     * equal to the argument.  This value is converted to a string of
+     * ASCII digits in octal (base&nbsp;8) with no extra leading
+     * {@code 0}s.
+     *
+     * <p>If the unsigned magnitude is zero, it is represented by a
+     * single zero character {@code '0'}
+     * (<code>'&#92;u0030'</code>); otherwise, the first character of
+     * the representation of the unsigned magnitude will not be the
+     * zero character. The following characters are used as octal
+     * digits:
+     *
+     * <blockquote>
+     *  {@code 01234567}
+     * </blockquote>
+     *
+     * These are the characters <code>'&#92;u0030'</code> through
+     * <code>'&#92;u0037'</code>.
+     *
+     * @param   i   a {@code long} to be converted to a string.
+     * @return  the string representation of the unsigned {@code long}
+     *          value represented by the argument in octal (base&nbsp;8).
+     * @since   JDK 1.0.2
+     */
+    public static String toOctalString(long i) {
+        return toUnsignedString(i, 3);
+    }
+
+    /**
+     * Returns a string representation of the {@code long}
+     * argument as an unsigned integer in base&nbsp;2.
+     *
+     * <p>The unsigned {@code long} value is the argument plus
+     * 2<sup>64</sup> if the argument is negative; otherwise, it is
+     * equal to the argument.  This value is converted to a string of
+     * ASCII digits in binary (base&nbsp;2) with no extra leading
+     * {@code 0}s.  If the unsigned magnitude is zero, it is
+     * represented by a single zero character {@code '0'}
+     * (<code>'&#92;u0030'</code>); otherwise, the first character of
+     * the representation of the unsigned magnitude will not be the
+     * zero character. The characters {@code '0'}
+     * (<code>'&#92;u0030'</code>) and {@code '1'}
+     * (<code>'&#92;u0031'</code>) are used as binary digits.
+     *
+     * @param   i   a {@code long} to be converted to a string.
+     * @return  the string representation of the unsigned {@code long}
+     *          value represented by the argument in binary (base&nbsp;2).
+     * @since   JDK 1.0.2
+     */
+    public static String toBinaryString(long i) {
+        return toUnsignedString(i, 1);
+    }
+
+    /**
+     * Convert the integer to an unsigned number.
+     */
+    private static String toUnsignedString(long i, int shift) {
+        char[] buf = new char[64];
+        int charPos = 64;
+        int radix = 1 << shift;
+        long mask = radix - 1;
+        do {
+            buf[--charPos] = Integer.digits[(int)(i & mask)];
+            i >>>= shift;
+        } while (i != 0);
+        return new String(buf, charPos, (64 - charPos));
+    }
+
+    /**
+     * Returns a {@code String} object representing the specified
+     * {@code long}.  The argument is converted to signed decimal
+     * representation and returned as a string, exactly as if the
+     * argument and the radix 10 were given as arguments to the {@link
+     * #toString(long, int)} method.
+     *
+     * @param   i   a {@code long} to be converted.
+     * @return  a string representation of the argument in base&nbsp;10.
+     */
+    @JavaScriptBody(args = "i", body = "return i.toExactString();")
+    public static String toString(long i) {
+        if (i == Long.MIN_VALUE)
+            return "-9223372036854775808";
+        int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i);
+        char[] buf = new char[size];
+        getChars(i, size, buf);
+        return new String(buf, 0, size);
+    }
+
+    /**
+     * Places characters representing the integer i into the
+     * character array buf. The characters are placed into
+     * the buffer backwards starting with the least significant
+     * digit at the specified index (exclusive), and working
+     * backwards from there.
+     *
+     * Will fail if i == Long.MIN_VALUE
+     */
+    static void getChars(long i, int index, char[] buf) {
+        long q;
+        int r;
+        int charPos = index;
+        char sign = 0;
+
+        if (i < 0) {
+            sign = '-';
+            i = -i;
+        }
+
+        // Get 2 digits/iteration using longs until quotient fits into an int
+        while (i > Integer.MAX_VALUE) {
+            q = i / 100;
+            // really: r = i - (q * 100);
+            r = (int)(i - ((q << 6) + (q << 5) + (q << 2)));
+            i = q;
+            buf[--charPos] = Integer.DigitOnes[r];
+            buf[--charPos] = Integer.DigitTens[r];
+        }
+
+        // Get 2 digits/iteration using ints
+        int q2;
+        int i2 = (int)i;
+        while (i2 >= 65536) {
+            q2 = i2 / 100;
+            // really: r = i2 - (q * 100);
+            r = i2 - ((q2 << 6) + (q2 << 5) + (q2 << 2));
+            i2 = q2;
+            buf[--charPos] = Integer.DigitOnes[r];
+            buf[--charPos] = Integer.DigitTens[r];
+        }
+
+        // Fall thru to fast mode for smaller numbers
+        // assert(i2 <= 65536, i2);
+        for (;;) {
+            q2 = (i2 * 52429) >>> (16+3);
+            r = i2 - ((q2 << 3) + (q2 << 1));  // r = i2-(q2*10) ...
+            buf[--charPos] = Integer.digits[r];
+            i2 = q2;
+            if (i2 == 0) break;
+        }
+        if (sign != 0) {
+            buf[--charPos] = sign;
+        }
+    }
+
+    // Requires positive x
+    static int stringSize(long x) {
+        long p = 10;
+        for (int i=1; i<19; i++) {
+            if (x < p)
+                return i;
+            p = 10*p;
+        }
+        return 19;
+    }
+
+    /**
+     * Parses the string argument as a signed {@code long} in the
+     * radix specified by the second argument. The characters in the
+     * string must all be digits of the specified radix (as determined
+     * by whether {@link java.lang.Character#digit(char, int)} returns
+     * a nonnegative value), except that the first character may be an
+     * ASCII minus sign {@code '-'} (<code>'&#92;u002D'</code>) to
+     * indicate a negative value or an ASCII plus sign {@code '+'}
+     * (<code>'&#92;u002B'</code>) to indicate a positive value. The
+     * resulting {@code long} value is returned.
+     *
+     * <p>Note that neither the character {@code L}
+     * (<code>'&#92;u004C'</code>) nor {@code l}
+     * (<code>'&#92;u006C'</code>) is permitted to appear at the end
+     * of the string as a type indicator, as would be permitted in
+     * Java programming language source code - except that either
+     * {@code L} or {@code l} may appear as a digit for a
+     * radix greater than 22.
+     *
+     * <p>An exception of type {@code NumberFormatException} is
+     * thrown if any of the following situations occurs:
+     * <ul>
+     *
+     * <li>The first argument is {@code null} or is a string of
+     * length zero.
+     *
+     * <li>The {@code radix} is either smaller than {@link
+     * java.lang.Character#MIN_RADIX} or larger than {@link
+     * java.lang.Character#MAX_RADIX}.
+     *
+     * <li>Any character of the string is not a digit of the specified
+     * radix, except that the first character may be a minus sign
+     * {@code '-'} (<code>'&#92;u002d'</code>) or plus sign {@code
+     * '+'} (<code>'&#92;u002B'</code>) provided that the string is
+     * longer than length 1.
+     *
+     * <li>The value represented by the string is not a value of type
+     *      {@code long}.
+     * </ul>
+     *
+     * <p>Examples:
+     * <blockquote><pre>
+     * parseLong("0", 10) returns 0L
+     * parseLong("473", 10) returns 473L
+     * parseLong("+42", 10) returns 42L
+     * parseLong("-0", 10) returns 0L
+     * parseLong("-FF", 16) returns -255L
+     * parseLong("1100110", 2) returns 102L
+     * parseLong("99", 8) throws a NumberFormatException
+     * parseLong("Hazelnut", 10) throws a NumberFormatException
+     * parseLong("Hazelnut", 36) returns 1356099454469L
+     * </pre></blockquote>
+     *
+     * @param      s       the {@code String} containing the
+     *                     {@code long} representation to be parsed.
+     * @param      radix   the radix to be used while parsing {@code s}.
+     * @return     the {@code long} represented by the string argument in
+     *             the specified radix.
+     * @throws     NumberFormatException  if the string does not contain a
+     *             parsable {@code long}.
+     */
+    public static long parseLong(String s, int radix)
+              throws NumberFormatException
+    {
+        if (s == null) {
+            throw new NumberFormatException("null");
+        }
+
+        if (radix < Character.MIN_RADIX) {
+            throw new NumberFormatException("radix " + radix +
+                                            " less than Character.MIN_RADIX");
+        }
+        if (radix > Character.MAX_RADIX) {
+            throw new NumberFormatException("radix " + radix +
+                                            " greater than Character.MAX_RADIX");
+        }
+
+        long result = 0;
+        boolean negative = false;
+        int i = 0, len = s.length();
+        long limit = -Long.MAX_VALUE;
+        long multmin;
+        int digit;
+
+        if (len > 0) {
+            char firstChar = s.charAt(0);
+            if (firstChar < '0') { // Possible leading "+" or "-"
+                if (firstChar == '-') {
+                    negative = true;
+                    limit = Long.MIN_VALUE;
+                } else if (firstChar != '+')
+                    throw NumberFormatException.forInputString(s);
+
+                if (len == 1) // Cannot have lone "+" or "-"
+                    throw NumberFormatException.forInputString(s);
+                i++;
+            }
+            multmin = limit / radix;
+            while (i < len) {
+                // Accumulating negatively avoids surprises near MAX_VALUE
+                digit = Character.digit(s.charAt(i++),radix);
+                if (digit < 0) {
+                    throw NumberFormatException.forInputString(s);
+                }
+                if (result < multmin) {
+                    throw NumberFormatException.forInputString(s);
+                }
+                result *= radix;
+                if (result < limit + digit) {
+                    throw NumberFormatException.forInputString(s);
+                }
+                result -= digit;
+            }
+        } else {
+            throw NumberFormatException.forInputString(s);
+        }
+        return negative ? result : -result;
+    }
+
+    /**
+     * Parses the string argument as a signed decimal {@code long}.
+     * The characters in the string must all be decimal digits, except
+     * that the first character may be an ASCII minus sign {@code '-'}
+     * (<code>&#92;u002D'</code>) to indicate a negative value or an
+     * ASCII plus sign {@code '+'} (<code>'&#92;u002B'</code>) to
+     * indicate a positive value. The resulting {@code long} value is
+     * returned, exactly as if the argument and the radix {@code 10}
+     * were given as arguments to the {@link
+     * #parseLong(java.lang.String, int)} method.
+     *
+     * <p>Note that neither the character {@code L}
+     * (<code>'&#92;u004C'</code>) nor {@code l}
+     * (<code>'&#92;u006C'</code>) is permitted to appear at the end
+     * of the string as a type indicator, as would be permitted in
+     * Java programming language source code.
+     *
+     * @param      s   a {@code String} containing the {@code long}
+     *             representation to be parsed
+     * @return     the {@code long} represented by the argument in
+     *             decimal.
+     * @throws     NumberFormatException  if the string does not contain a
+     *             parsable {@code long}.
+     */
+    public static long parseLong(String s) throws NumberFormatException {
+        return parseLong(s, 10);
+    }
+
+    /**
+     * Returns a {@code Long} object holding the value
+     * extracted from the specified {@code String} when parsed
+     * with the radix given by the second argument.  The first
+     * argument is interpreted as representing a signed
+     * {@code long} in the radix specified by the second
+     * argument, exactly as if the arguments were given to the {@link
+     * #parseLong(java.lang.String, int)} method. The result is a
+     * {@code Long} object that represents the {@code long}
+     * value specified by the string.
+     *
+     * <p>In other words, this method returns a {@code Long} object equal
+     * to the value of:
+     *
+     * <blockquote>
+     *  {@code new Long(Long.parseLong(s, radix))}
+     * </blockquote>
+     *
+     * @param      s       the string to be parsed
+     * @param      radix   the radix to be used in interpreting {@code s}
+     * @return     a {@code Long} object holding the value
+     *             represented by the string argument in the specified
+     *             radix.
+     * @throws     NumberFormatException  If the {@code String} does not
+     *             contain a parsable {@code long}.
+     */
+    public static Long valueOf(String s, int radix) throws NumberFormatException {
+        return Long.valueOf(parseLong(s, radix));
+    }
+
+    /**
+     * Returns a {@code Long} object holding the value
+     * of the specified {@code String}. The argument is
+     * interpreted as representing a signed decimal {@code long},
+     * exactly as if the argument were given to the {@link
+     * #parseLong(java.lang.String)} method. The result is a
+     * {@code Long} object that represents the integer value
+     * specified by the string.
+     *
+     * <p>In other words, this method returns a {@code Long} object
+     * equal to the value of:
+     *
+     * <blockquote>
+     *  {@code new Long(Long.parseLong(s))}
+     * </blockquote>
+     *
+     * @param      s   the string to be parsed.
+     * @return     a {@code Long} object holding the value
+     *             represented by the string argument.
+     * @throws     NumberFormatException  If the string cannot be parsed
+     *             as a {@code long}.
+     */
+    public static Long valueOf(String s) throws NumberFormatException
+    {
+        return Long.valueOf(parseLong(s, 10));
+    }
+
+    private static class LongCache {
+        private LongCache(){}
+
+        static final Long cache[] = new Long[-(-128) + 127 + 1];
+
+        static {
+            for(int i = 0; i < cache.length; i++)
+                cache[i] = new Long(i - 128);
+        }
+    }
+
+    /**
+     * Returns a {@code Long} instance representing the specified
+     * {@code long} value.
+     * If a new {@code Long} instance is not required, this method
+     * should generally be used in preference to the constructor
+     * {@link #Long(long)}, as this method is likely to yield
+     * significantly better space and time performance by caching
+     * frequently requested values.
+     *
+     * Note that unlike the {@linkplain Integer#valueOf(int)
+     * corresponding method} in the {@code Integer} class, this method
+     * is <em>not</em> required to cache values within a particular
+     * range.
+     *
+     * @param  l a long value.
+     * @return a {@code Long} instance representing {@code l}.
+     * @since  1.5
+     */
+    public static Long valueOf(long l) {
+        final int offset = 128;
+        if (l >= -128 && l <= 127) { // will cache
+            return LongCache.cache[(int)l + offset];
+        }
+        return new Long(l);
+    }
+
+    /**
+     * Decodes a {@code String} into a {@code Long}.
+     * Accepts decimal, hexadecimal, and octal numbers given by the
+     * following grammar:
+     *
+     * <blockquote>
+     * <dl>
+     * <dt><i>DecodableString:</i>
+     * <dd><i>Sign<sub>opt</sub> DecimalNumeral</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0x} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i>
+     * <p>
+     * <dt><i>Sign:</i>
+     * <dd>{@code -}
+     * <dd>{@code +}
+     * </dl>
+     * </blockquote>
+     *
+     * <i>DecimalNumeral</i>, <i>HexDigits</i>, and <i>OctalDigits</i>
+     * are as defined in section 3.10.1 of
+     * <cite>The Java&trade; Language Specification</cite>,
+     * except that underscores are not accepted between digits.
+     *
+     * <p>The sequence of characters following an optional
+     * sign and/or radix specifier ("{@code 0x}", "{@code 0X}",
+     * "{@code #}", or leading zero) is parsed as by the {@code
+     * Long.parseLong} method with the indicated radix (10, 16, or 8).
+     * This sequence of characters must represent a positive value or
+     * a {@link NumberFormatException} will be thrown.  The result is
+     * negated if first character of the specified {@code String} is
+     * the minus sign.  No whitespace characters are permitted in the
+     * {@code String}.
+     *
+     * @param     nm the {@code String} to decode.
+     * @return    a {@code Long} object holding the {@code long}
+     *            value represented by {@code nm}
+     * @throws    NumberFormatException  if the {@code String} does not
+     *            contain a parsable {@code long}.
+     * @see java.lang.Long#parseLong(String, int)
+     * @since 1.2
+     */
+    public static Long decode(String nm) throws NumberFormatException {
+        int radix = 10;
+        int index = 0;
+        boolean negative = false;
+        Long result;
+
+        if (nm.length() == 0)
+            throw new NumberFormatException("Zero length string");
+        char firstChar = nm.charAt(0);
+        // Handle sign, if present
+        if (firstChar == '-') {
+            negative = true;
+            index++;
+        } else if (firstChar == '+')
+            index++;
+
+        // Handle radix specifier, if present
+        if (nm.startsWith("0x", index) || nm.startsWith("0X", index)) {
+            index += 2;
+            radix = 16;
+        }
+        else if (nm.startsWith("#", index)) {
+            index ++;
+            radix = 16;
+        }
+        else if (nm.startsWith("0", index) && nm.length() > 1 + index) {
+            index ++;
+            radix = 8;
+        }
+
+        if (nm.startsWith("-", index) || nm.startsWith("+", index))
+            throw new NumberFormatException("Sign character in wrong position");
+
+        try {
+            result = Long.valueOf(nm.substring(index), radix);
+            result = negative ? Long.valueOf(-result.longValue()) : result;
+        } catch (NumberFormatException e) {
+            // If number is Long.MIN_VALUE, we'll end up here. The next line
+            // handles this case, and causes any genuine format error to be
+            // rethrown.
+            String constant = negative ? ("-" + nm.substring(index))
+                                       : nm.substring(index);
+            result = Long.valueOf(constant, radix);
+        }
+        return result;
+    }
+
+    /**
+     * The value of the {@code Long}.
+     *
+     * @serial
+     */
+    private final long value;
+
+    /**
+     * Constructs a newly allocated {@code Long} object that
+     * represents the specified {@code long} argument.
+     *
+     * @param   value   the value to be represented by the
+     *          {@code Long} object.
+     */
+    public Long(long value) {
+        this.value = value;
+    }
+
+    /**
+     * Constructs a newly allocated {@code Long} object that
+     * represents the {@code long} value indicated by the
+     * {@code String} parameter. The string is converted to a
+     * {@code long} value in exactly the manner used by the
+     * {@code parseLong} method for radix 10.
+     *
+     * @param      s   the {@code String} to be converted to a
+     *             {@code Long}.
+     * @throws     NumberFormatException  if the {@code String} does not
+     *             contain a parsable {@code long}.
+     * @see        java.lang.Long#parseLong(java.lang.String, int)
+     */
+    public Long(String s) throws NumberFormatException {
+        this.value = parseLong(s, 10);
+    }
+
+    /**
+     * Returns the value of this {@code Long} as a
+     * {@code byte}.
+     */
+    public byte byteValue() {
+        return (byte)value;
+    }
+
+    /**
+     * Returns the value of this {@code Long} as a
+     * {@code short}.
+     */
+    public short shortValue() {
+        return (short)value;
+    }
+
+    /**
+     * Returns the value of this {@code Long} as an
+     * {@code int}.
+     */
+    public int intValue() {
+        return (int)value;
+    }
+
+    /**
+     * Returns the value of this {@code Long} as a
+     * {@code long} value.
+     */
+    public long longValue() {
+        return (long)value;
+    }
+
+    /**
+     * Returns the value of this {@code Long} as a
+     * {@code float}.
+     */
+    public float floatValue() {
+        return (float)value;
+    }
+
+    /**
+     * Returns the value of this {@code Long} as a
+     * {@code double}.
+     */
+    public double doubleValue() {
+        return (double)value;
+    }
+
+    /**
+     * Returns a {@code String} object representing this
+     * {@code Long}'s value.  The value is converted to signed
+     * decimal representation and returned as a string, exactly as if
+     * the {@code long} value were given as an argument to the
+     * {@link java.lang.Long#toString(long)} method.
+     *
+     * @return  a string representation of the value of this object in
+     *          base&nbsp;10.
+     */
+    public String toString() {
+        return toString(value);
+    }
+
+    /**
+     * Returns a hash code for this {@code Long}. The result is
+     * the exclusive OR of the two halves of the primitive
+     * {@code long} value held by this {@code Long}
+     * object. That is, the hashcode is the value of the expression:
+     *
+     * <blockquote>
+     *  {@code (int)(this.longValue()^(this.longValue()>>>32))}
+     * </blockquote>
+     *
+     * @return  a hash code value for this object.
+     */
+    public int hashCode() {
+        return (int)(value ^ (value >>> 32));
+    }
+
+    /**
+     * Compares this object to the specified object.  The result is
+     * {@code true} if and only if the argument is not
+     * {@code null} and is a {@code Long} object that
+     * contains the same {@code long} value as this object.
+     *
+     * @param   obj   the object to compare with.
+     * @return  {@code true} if the objects are the same;
+     *          {@code false} otherwise.
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof Long) {
+            return value == ((Long)obj).longValue();
+        }
+        return false;
+    }
+
+    /**
+     * Determines the {@code long} value of the system property
+     * with the specified name.
+     *
+     * <p>The first argument is treated as the name of a system property.
+     * System properties are accessible through the {@link
+     * java.lang.System#getProperty(java.lang.String)} method. The
+     * string value of this property is then interpreted as a
+     * {@code long} value and a {@code Long} object
+     * representing this value is returned.  Details of possible
+     * numeric formats can be found with the definition of
+     * {@code getProperty}.
+     *
+     * <p>If there is no property with the specified name, if the
+     * specified name is empty or {@code null}, or if the
+     * property does not have the correct numeric format, then
+     * {@code null} is returned.
+     *
+     * <p>In other words, this method returns a {@code Long} object equal to
+     * the value of:
+     *
+     * <blockquote>
+     *  {@code getLong(nm, null)}
+     * </blockquote>
+     *
+     * @param   nm   property name.
+     * @return  the {@code Long} value of the property.
+     * @see     java.lang.System#getProperty(java.lang.String)
+     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
+     */
+    public static Long getLong(String nm) {
+        return getLong(nm, null);
+    }
+
+    /**
+     * Determines the {@code long} value of the system property
+     * with the specified name.
+     *
+     * <p>The first argument is treated as the name of a system property.
+     * System properties are accessible through the {@link
+     * java.lang.System#getProperty(java.lang.String)} method. The
+     * string value of this property is then interpreted as a
+     * {@code long} value and a {@code Long} object
+     * representing this value is returned.  Details of possible
+     * numeric formats can be found with the definition of
+     * {@code getProperty}.
+     *
+     * <p>The second argument is the default value. A {@code Long} object
+     * that represents the value of the second argument is returned if there
+     * is no property of the specified name, if the property does not have
+     * the correct numeric format, or if the specified name is empty or null.
+     *
+     * <p>In other words, this method returns a {@code Long} object equal
+     * to the value of:
+     *
+     * <blockquote>
+     *  {@code getLong(nm, new Long(val))}
+     * </blockquote>
+     *
+     * but in practice it may be implemented in a manner such as:
+     *
+     * <blockquote><pre>
+     * Long result = getLong(nm, null);
+     * return (result == null) ? new Long(val) : result;
+     * </pre></blockquote>
+     *
+     * to avoid the unnecessary allocation of a {@code Long} object when
+     * the default value is not needed.
+     *
+     * @param   nm    property name.
+     * @param   val   default value.
+     * @return  the {@code Long} value of the property.
+     * @see     java.lang.System#getProperty(java.lang.String)
+     * @see     java.lang.System#getProperty(java.lang.String, java.lang.String)
+     */
+    public static Long getLong(String nm, long val) {
+        Long result = Long.getLong(nm, null);
+        return (result == null) ? Long.valueOf(val) : result;
+    }
+
+    /**
+     * Returns the {@code long} value of the system property with
+     * the specified name.  The first argument is treated as the name
+     * of a system property.  System properties are accessible through
+     * the {@link java.lang.System#getProperty(java.lang.String)}
+     * method. The string value of this property is then interpreted
+     * as a {@code long} value, as per the
+     * {@code Long.decode} method, and a {@code Long} object
+     * representing this value is returned.
+     *
+     * <ul>
+     * <li>If the property value begins with the two ASCII characters
+     * {@code 0x} or the ASCII character {@code #}, not followed by
+     * a minus sign, then the rest of it is parsed as a hexadecimal integer
+     * exactly as for the method {@link #valueOf(java.lang.String, int)}
+     * with radix 16.
+     * <li>If the property value begins with the ASCII character
+     * {@code 0} followed by another character, it is parsed as
+     * an octal integer exactly as by the method {@link
+     * #valueOf(java.lang.String, int)} with radix 8.
+     * <li>Otherwise the property value is parsed as a decimal
+     * integer exactly as by the method
+     * {@link #valueOf(java.lang.String, int)} with radix 10.
+     * </ul>
+     *
+     * <p>Note that, in every case, neither {@code L}
+     * (<code>'&#92;u004C'</code>) nor {@code l}
+     * (<code>'&#92;u006C'</code>) is permitted to appear at the end
+     * of the property value as a type indicator, as would be
+     * permitted in Java programming language source code.
+     *
+     * <p>The second argument is the default value. The default value is
+     * returned if there is no property of the specified name, if the
+     * property does not have the correct numeric format, or if the
+     * specified name is empty or {@code null}.
+     *
+     * @param   nm   property name.
+     * @param   val   default value.
+     * @return  the {@code Long} value of the property.
+     * @see     java.lang.System#getProperty(java.lang.String)
+     * @see java.lang.System#getProperty(java.lang.String, java.lang.String)
+     * @see java.lang.Long#decode
+     */
+    public static Long getLong(String nm, Long val) {
+        String v = null;
+        try {
+            v = AbstractStringBuilder.getProperty(nm);
+        } catch (IllegalArgumentException e) {
+        } catch (NullPointerException e) {
+        }
+        if (v != null) {
+            try {
+                return Long.decode(v);
+            } catch (NumberFormatException e) {
+            }
+        }
+        return val;
+    }
+
+    /**
+     * Compares two {@code Long} objects numerically.
+     *
+     * @param   anotherLong   the {@code Long} to be compared.
+     * @return  the value {@code 0} if this {@code Long} is
+     *          equal to the argument {@code Long}; a value less than
+     *          {@code 0} if this {@code Long} is numerically less
+     *          than the argument {@code Long}; and a value greater
+     *          than {@code 0} if this {@code Long} is numerically
+     *           greater than the argument {@code Long} (signed
+     *           comparison).
+     * @since   1.2
+     */
+    public int compareTo(Long anotherLong) {
+        return compare(this.value, anotherLong.value);
+    }
+
+    /**
+     * Compares two {@code long} values numerically.
+     * The value returned is identical to what would be returned by:
+     * <pre>
+     *    Long.valueOf(x).compareTo(Long.valueOf(y))
+     * </pre>
+     *
+     * @param  x the first {@code long} to compare
+     * @param  y the second {@code long} to compare
+     * @return the value {@code 0} if {@code x == y};
+     *         a value less than {@code 0} if {@code x < y}; and
+     *         a value greater than {@code 0} if {@code x > y}
+     * @since 1.7
+     */
+    public static int compare(long x, long y) {
+        return (x < y) ? -1 : ((x == y) ? 0 : 1);
+    }
+
+
+    // Bit Twiddling
+
+    /**
+     * The number of bits used to represent a {@code long} value in two's
+     * complement binary form.
+     *
+     * @since 1.5
+     */
+    public static final int SIZE = 64;
+
+    /**
+     * Returns a {@code long} value with at most a single one-bit, in the
+     * position of the highest-order ("leftmost") one-bit in the specified
+     * {@code long} value.  Returns zero if the specified value has no
+     * one-bits in its two's complement binary representation, that is, if it
+     * is equal to zero.
+     *
+     * @return a {@code long} value with a single one-bit, in the position
+     *     of the highest-order one-bit in the specified value, or zero if
+     *     the specified value is itself equal to zero.
+     * @since 1.5
+     */
+    public static long highestOneBit(long i) {
+        // HD, Figure 3-1
+        i |= (i >>  1);
+        i |= (i >>  2);
+        i |= (i >>  4);
+        i |= (i >>  8);
+        i |= (i >> 16);
+        i |= (i >> 32);
+        return i - (i >>> 1);
+    }
+
+    /**
+     * Returns a {@code long} value with at most a single one-bit, in the
+     * position of the lowest-order ("rightmost") one-bit in the specified
+     * {@code long} value.  Returns zero if the specified value has no
+     * one-bits in its two's complement binary representation, that is, if it
+     * is equal to zero.
+     *
+     * @return a {@code long} value with a single one-bit, in the position
+     *     of the lowest-order one-bit in the specified value, or zero if
+     *     the specified value is itself equal to zero.
+     * @since 1.5
+     */
+    public static long lowestOneBit(long i) {
+        // HD, Section 2-1
+        return i & -i;
+    }
+
+    /**
+     * Returns the number of zero bits preceding the highest-order
+     * ("leftmost") one-bit in the two's complement binary representation
+     * of the specified {@code long} value.  Returns 64 if the
+     * specified value has no one-bits in its two's complement representation,
+     * in other words if it is equal to zero.
+     *
+     * <p>Note that this method is closely related to the logarithm base 2.
+     * For all positive {@code long} values x:
+     * <ul>
+     * <li>floor(log<sub>2</sub>(x)) = {@code 63 - numberOfLeadingZeros(x)}
+     * <li>ceil(log<sub>2</sub>(x)) = {@code 64 - numberOfLeadingZeros(x - 1)}
+     * </ul>
+     *
+     * @return the number of zero bits preceding the highest-order
+     *     ("leftmost") one-bit in the two's complement binary representation
+     *     of the specified {@code long} value, or 64 if the value
+     *     is equal to zero.
+     * @since 1.5
+     */
+    public static int numberOfLeadingZeros(long i) {
+        // HD, Figure 5-6
+         if (i == 0)
+            return 64;
+        int n = 1;
+        int x = (int)(i >>> 32);
+        if (x == 0) { n += 32; x = (int)i; }
+        if (x >>> 16 == 0) { n += 16; x <<= 16; }
+        if (x >>> 24 == 0) { n +=  8; x <<=  8; }
+        if (x >>> 28 == 0) { n +=  4; x <<=  4; }
+        if (x >>> 30 == 0) { n +=  2; x <<=  2; }
+        n -= x >>> 31;
+        return n;
+    }
+
+    /**
+     * Returns the number of zero bits following the lowest-order ("rightmost")
+     * one-bit in the two's complement binary representation of the specified
+     * {@code long} value.  Returns 64 if the specified value has no
+     * one-bits in its two's complement representation, in other words if it is
+     * equal to zero.
+     *
+     * @return the number of zero bits following the lowest-order ("rightmost")
+     *     one-bit in the two's complement binary representation of the
+     *     specified {@code long} value, or 64 if the value is equal
+     *     to zero.
+     * @since 1.5
+     */
+    public static int numberOfTrailingZeros(long i) {
+        // HD, Figure 5-14
+        int x, y;
+        if (i == 0) return 64;
+        int n = 63;
+        y = (int)i; if (y != 0) { n = n -32; x = y; } else x = (int)(i>>>32);
+        y = x <<16; if (y != 0) { n = n -16; x = y; }
+        y = x << 8; if (y != 0) { n = n - 8; x = y; }
+        y = x << 4; if (y != 0) { n = n - 4; x = y; }
+        y = x << 2; if (y != 0) { n = n - 2; x = y; }
+        return n - ((x << 1) >>> 31);
+    }
+
+    /**
+     * Returns the number of one-bits in the two's complement binary
+     * representation of the specified {@code long} value.  This function is
+     * sometimes referred to as the <i>population count</i>.
+     *
+     * @return the number of one-bits in the two's complement binary
+     *     representation of the specified {@code long} value.
+     * @since 1.5
+     */
+     public static int bitCount(long i) {
+        // HD, Figure 5-14
+        i = i - ((i >>> 1) & 0x5555555555555555L);
+        i = (i & 0x3333333333333333L) + ((i >>> 2) & 0x3333333333333333L);
+        i = (i + (i >>> 4)) & 0x0f0f0f0f0f0f0f0fL;
+        i = i + (i >>> 8);
+        i = i + (i >>> 16);
+        i = i + (i >>> 32);
+        return (int)i & 0x7f;
+     }
+
+    /**
+     * Returns the value obtained by rotating the two's complement binary
+     * representation of the specified {@code long} value left by the
+     * specified number of bits.  (Bits shifted out of the left hand, or
+     * high-order, side reenter on the right, or low-order.)
+     *
+     * <p>Note that left rotation with a negative distance is equivalent to
+     * right rotation: {@code rotateLeft(val, -distance) == rotateRight(val,
+     * distance)}.  Note also that rotation by any multiple of 64 is a
+     * no-op, so all but the last six bits of the rotation distance can be
+     * ignored, even if the distance is negative: {@code rotateLeft(val,
+     * distance) == rotateLeft(val, distance & 0x3F)}.
+     *
+     * @return the value obtained by rotating the two's complement binary
+     *     representation of the specified {@code long} value left by the
+     *     specified number of bits.
+     * @since 1.5
+     */
+    public static long rotateLeft(long i, int distance) {
+        return (i << distance) | (i >>> -distance);
+    }
+
+    /**
+     * Returns the value obtained by rotating the two's complement binary
+     * representation of the specified {@code long} value right by the
+     * specified number of bits.  (Bits shifted out of the right hand, or
+     * low-order, side reenter on the left, or high-order.)
+     *
+     * <p>Note that right rotation with a negative distance is equivalent to
+     * left rotation: {@code rotateRight(val, -distance) == rotateLeft(val,
+     * distance)}.  Note also that rotation by any multiple of 64 is a
+     * no-op, so all but the last six bits of the rotation distance can be
+     * ignored, even if the distance is negative: {@code rotateRight(val,
+     * distance) == rotateRight(val, distance & 0x3F)}.
+     *
+     * @return the value obtained by rotating the two's complement binary
+     *     representation of the specified {@code long} value right by the
+     *     specified number of bits.
+     * @since 1.5
+     */
+    public static long rotateRight(long i, int distance) {
+        return (i >>> distance) | (i << -distance);
+    }
+
+    /**
+     * Returns the value obtained by reversing the order of the bits in the
+     * two's complement binary representation of the specified {@code long}
+     * value.
+     *
+     * @return the value obtained by reversing order of the bits in the
+     *     specified {@code long} value.
+     * @since 1.5
+     */
+    public static long reverse(long i) {
+        // HD, Figure 7-1
+        i = (i & 0x5555555555555555L) << 1 | (i >>> 1) & 0x5555555555555555L;
+        i = (i & 0x3333333333333333L) << 2 | (i >>> 2) & 0x3333333333333333L;
+        i = (i & 0x0f0f0f0f0f0f0f0fL) << 4 | (i >>> 4) & 0x0f0f0f0f0f0f0f0fL;
+        i = (i & 0x00ff00ff00ff00ffL) << 8 | (i >>> 8) & 0x00ff00ff00ff00ffL;
+        i = (i << 48) | ((i & 0xffff0000L) << 16) |
+            ((i >>> 16) & 0xffff0000L) | (i >>> 48);
+        return i;
+    }
+
+    /**
+     * Returns the signum function of the specified {@code long} value.  (The
+     * return value is -1 if the specified value is negative; 0 if the
+     * specified value is zero; and 1 if the specified value is positive.)
+     *
+     * @return the signum function of the specified {@code long} value.
+     * @since 1.5
+     */
+    public static int signum(long i) {
+        // HD, Section 2-7
+        return (int) ((i >> 63) | (-i >>> 63));
+    }
+
+    /**
+     * Returns the value obtained by reversing the order of the bytes in the
+     * two's complement representation of the specified {@code long} value.
+     *
+     * @return the value obtained by reversing the bytes in the specified
+     *     {@code long} value.
+     * @since 1.5
+     */
+    public static long reverseBytes(long i) {
+        i = (i & 0x00ff00ff00ff00ffL) << 8 | (i >>> 8) & 0x00ff00ff00ff00ffL;
+        return (i << 48) | ((i & 0xffff0000L) << 16) |
+            ((i >>> 16) & 0xffff0000L) | (i >>> 48);
+    }
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = 4290774380558885855L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Math.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Math.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1311 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+
+/**
+ * The class {@code Math} contains methods for performing basic
+ * numeric operations such as the elementary exponential, logarithm,
+ * square root, and trigonometric functions.
+ *
+ * <p>Unlike some of the numeric methods of class
+ * {@code StrictMath}, all implementations of the equivalent
+ * functions of class {@code Math} are not defined to return the
+ * bit-for-bit same results.  This relaxation permits
+ * better-performing implementations where strict reproducibility is
+ * not required.
+ *
+ * <p>By default many of the {@code Math} methods simply call
+ * the equivalent method in {@code StrictMath} for their
+ * implementation.  Code generators are encouraged to use
+ * platform-specific native libraries or microprocessor instructions,
+ * where available, to provide higher-performance implementations of
+ * {@code Math} methods.  Such higher-performance
+ * implementations still must conform to the specification for
+ * {@code Math}.
+ *
+ * <p>The quality of implementation specifications concern two
+ * properties, accuracy of the returned result and monotonicity of the
+ * method.  Accuracy of the floating-point {@code Math} methods
+ * is measured in terms of <i>ulps</i>, units in the last place.  For
+ * a given floating-point format, an ulp of a specific real number
+ * value is the distance between the two floating-point values
+ * bracketing that numerical value.  When discussing the accuracy of a
+ * method as a whole rather than at a specific argument, the number of
+ * ulps cited is for the worst-case error at any argument.  If a
+ * method always has an error less than 0.5 ulps, the method always
+ * returns the floating-point number nearest the exact result; such a
+ * method is <i>correctly rounded</i>.  A correctly rounded method is
+ * generally the best a floating-point approximation can be; however,
+ * it is impractical for many floating-point methods to be correctly
+ * rounded.  Instead, for the {@code Math} class, a larger error
+ * bound of 1 or 2 ulps is allowed for certain methods.  Informally,
+ * with a 1 ulp error bound, when the exact result is a representable
+ * number, the exact result should be returned as the computed result;
+ * otherwise, either of the two floating-point values which bracket
+ * the exact result may be returned.  For exact results large in
+ * magnitude, one of the endpoints of the bracket may be infinite.
+ * Besides accuracy at individual arguments, maintaining proper
+ * relations between the method at different arguments is also
+ * important.  Therefore, most methods with more than 0.5 ulp errors
+ * are required to be <i>semi-monotonic</i>: whenever the mathematical
+ * function is non-decreasing, so is the floating-point approximation,
+ * likewise, whenever the mathematical function is non-increasing, so
+ * is the floating-point approximation.  Not all approximations that
+ * have 1 ulp accuracy will automatically meet the monotonicity
+ * requirements.
+ *
+ * @author  unascribed
+ * @author  Joseph D. Darcy
+ * @since   JDK1.0
+ */
+
+public final class Math {
+
+    /**
+     * Don't let anyone instantiate this class.
+     */
+    private Math() {}
+
+    /**
+     * The {@code double} value that is closer than any other to
+     * <i>e</i>, the base of the natural logarithms.
+     */
+    public static final double E = 2.7182818284590452354;
+
+    /**
+     * The {@code double} value that is closer than any other to
+     * <i>pi</i>, the ratio of the circumference of a circle to its
+     * diameter.
+     */
+    public static final double PI = 3.14159265358979323846;
+
+    /**
+     * Returns the trigonometric sine of an angle.  Special cases:
+     * <ul><li>If the argument is NaN or an infinity, then the
+     * result is NaN.
+     * <li>If the argument is zero, then the result is a zero with the
+     * same sign as the argument.</ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   an angle, in radians.
+     * @return  the sine of the argument.
+     */
+    @JavaScriptBody(args="a", body="return Math.sin(a);")
+    public static double sin(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the trigonometric cosine of an angle. Special cases:
+     * <ul><li>If the argument is NaN or an infinity, then the
+     * result is NaN.</ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   an angle, in radians.
+     * @return  the cosine of the argument.
+     */
+    @JavaScriptBody(args="a", body="return Math.cos(a);")
+    public static double cos(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the trigonometric tangent of an angle.  Special cases:
+     * <ul><li>If the argument is NaN or an infinity, then the result
+     * is NaN.
+     * <li>If the argument is zero, then the result is a zero with the
+     * same sign as the argument.</ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   an angle, in radians.
+     * @return  the tangent of the argument.
+     */
+    @JavaScriptBody(args="a", body="return Math.tan(a);")
+    public static double tan(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the arc sine of a value; the returned angle is in the
+     * range -<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
+     * <ul><li>If the argument is NaN or its absolute value is greater
+     * than 1, then the result is NaN.
+     * <li>If the argument is zero, then the result is a zero with the
+     * same sign as the argument.</ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   the value whose arc sine is to be returned.
+     * @return  the arc sine of the argument.
+     */
+    @JavaScriptBody(args="a", body="return Math.asin(a);")
+    public static double asin(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the arc cosine of a value; the returned angle is in the
+     * range 0.0 through <i>pi</i>.  Special case:
+     * <ul><li>If the argument is NaN or its absolute value is greater
+     * than 1, then the result is NaN.</ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   the value whose arc cosine is to be returned.
+     * @return  the arc cosine of the argument.
+     */
+    @JavaScriptBody(args="a", body="return Math.acos(a);")
+    public static double acos(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the arc tangent of a value; the returned angle is in the
+     * range -<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
+     * <ul><li>If the argument is NaN, then the result is NaN.
+     * <li>If the argument is zero, then the result is a zero with the
+     * same sign as the argument.</ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   the value whose arc tangent is to be returned.
+     * @return  the arc tangent of the argument.
+     */
+    @JavaScriptBody(args="a", body="return Math.atan(a);")
+    public static double atan(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Converts an angle measured in degrees to an approximately
+     * equivalent angle measured in radians.  The conversion from
+     * degrees to radians is generally inexact.
+     *
+     * @param   angdeg   an angle, in degrees
+     * @return  the measurement of the angle {@code angdeg}
+     *          in radians.
+     * @since   1.2
+     */
+    public static double toRadians(double angdeg) {
+        return angdeg / 180.0 * PI;
+    }
+
+    /**
+     * Converts an angle measured in radians to an approximately
+     * equivalent angle measured in degrees.  The conversion from
+     * radians to degrees is generally inexact; users should
+     * <i>not</i> expect {@code cos(toRadians(90.0))} to exactly
+     * equal {@code 0.0}.
+     *
+     * @param   angrad   an angle, in radians
+     * @return  the measurement of the angle {@code angrad}
+     *          in degrees.
+     * @since   1.2
+     */
+    public static double toDegrees(double angrad) {
+        return angrad * 180.0 / PI;
+    }
+
+    /**
+     * Returns Euler's number <i>e</i> raised to the power of a
+     * {@code double} value.  Special cases:
+     * <ul><li>If the argument is NaN, the result is NaN.
+     * <li>If the argument is positive infinity, then the result is
+     * positive infinity.
+     * <li>If the argument is negative infinity, then the result is
+     * positive zero.</ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   the exponent to raise <i>e</i> to.
+     * @return  the value <i>e</i><sup>{@code a}</sup>,
+     *          where <i>e</i> is the base of the natural logarithms.
+     */
+    @JavaScriptBody(args="a", body="return Math.exp(a);")
+    public static double exp(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the natural logarithm (base <i>e</i>) of a {@code double}
+     * value.  Special cases:
+     * <ul><li>If the argument is NaN or less than zero, then the result
+     * is NaN.
+     * <li>If the argument is positive infinity, then the result is
+     * positive infinity.
+     * <li>If the argument is positive zero or negative zero, then the
+     * result is negative infinity.</ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   a value
+     * @return  the value ln&nbsp;{@code a}, the natural logarithm of
+     *          {@code a}.
+     */
+    @JavaScriptBody(args="a", body="return Math.log(a);")
+    public static double log(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the base 10 logarithm of a {@code double} value.
+     * Special cases:
+     *
+     * <ul><li>If the argument is NaN or less than zero, then the result
+     * is NaN.
+     * <li>If the argument is positive infinity, then the result is
+     * positive infinity.
+     * <li>If the argument is positive zero or negative zero, then the
+     * result is negative infinity.
+     * <li> If the argument is equal to 10<sup><i>n</i></sup> for
+     * integer <i>n</i>, then the result is <i>n</i>.
+     * </ul>
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   a value
+     * @return  the base 10 logarithm of  {@code a}.
+     * @since 1.5
+     */
+    @JavaScriptBody(args="a", body="return Math.log(a) / Math.LN10;")
+    public static double log10(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the correctly rounded positive square root of a
+     * {@code double} value.
+     * Special cases:
+     * <ul><li>If the argument is NaN or less than zero, then the result
+     * is NaN.
+     * <li>If the argument is positive infinity, then the result is positive
+     * infinity.
+     * <li>If the argument is positive zero or negative zero, then the
+     * result is the same as the argument.</ul>
+     * Otherwise, the result is the {@code double} value closest to
+     * the true mathematical square root of the argument value.
+     *
+     * @param   a   a value.
+     * @return  the positive square root of {@code a}.
+     *          If the argument is NaN or less than zero, the result is NaN.
+     */
+    @JavaScriptBody(args="a", body="return Math.sqrt(a);")
+    public static double sqrt(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the smallest (closest to negative infinity)
+     * {@code double} value that is greater than or equal to the
+     * argument and is equal to a mathematical integer. Special cases:
+     * <ul><li>If the argument value is already equal to a
+     * mathematical integer, then the result is the same as the
+     * argument.  <li>If the argument is NaN or an infinity or
+     * positive zero or negative zero, then the result is the same as
+     * the argument.  <li>If the argument value is less than zero but
+     * greater than -1.0, then the result is negative zero.</ul> Note
+     * that the value of {@code Math.ceil(x)} is exactly the
+     * value of {@code -Math.floor(-x)}.
+     *
+     *
+     * @param   a   a value.
+     * @return  the smallest (closest to negative infinity)
+     *          floating-point value that is greater than or equal to
+     *          the argument and is equal to a mathematical integer.
+     */
+    @JavaScriptBody(args="a", body="return Math.ceil(a);")
+    public static double ceil(double a) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the largest (closest to positive infinity)
+     * {@code double} value that is less than or equal to the
+     * argument and is equal to a mathematical integer. Special cases:
+     * <ul><li>If the argument value is already equal to a
+     * mathematical integer, then the result is the same as the
+     * argument.  <li>If the argument is NaN or an infinity or
+     * positive zero or negative zero, then the result is the same as
+     * the argument.</ul>
+     *
+     * @param   a   a value.
+     * @return  the largest (closest to positive infinity)
+     *          floating-point value that less than or equal to the argument
+     *          and is equal to a mathematical integer.
+     */
+    @JavaScriptBody(args="a", body="return Math.floor(a);")
+    public static double floor(double a) {
+        throw new UnsupportedOperationException();
+    }
+    /**
+     * Computes the remainder operation on two arguments as prescribed
+     * by the IEEE 754 standard.
+     * The remainder value is mathematically equal to
+     * <code>f1&nbsp;-&nbsp;f2</code>&nbsp;&times;&nbsp;<i>n</i>,
+     * where <i>n</i> is the mathematical integer closest to the exact
+     * mathematical value of the quotient {@code f1/f2}, and if two
+     * mathematical integers are equally close to {@code f1/f2},
+     * then <i>n</i> is the integer that is even. If the remainder is
+     * zero, its sign is the same as the sign of the first argument.
+     * Special cases:
+     * <ul><li>If either argument is NaN, or the first argument is infinite,
+     * or the second argument is positive zero or negative zero, then the
+     * result is NaN.
+     * <li>If the first argument is finite and the second argument is
+     * infinite, then the result is the same as the first argument.</ul>
+     *
+     * @param   f1   the dividend.
+     * @param   f2   the divisor.
+     * @return  the remainder when {@code f1} is divided by
+     *          {@code f2}.
+     */
+    public static double IEEEremainder(double f1, double f2) {
+        return f1 - (f2 * Math.round(f1 / f2));
+    }
+
+    /**
+     * Returns the {@code double} value that is closest in value
+     * to the argument and is equal to a mathematical integer. If two
+     * {@code double} values that are mathematical integers are
+     * equally close, the result is the integer value that is
+     * even. Special cases:
+     * <ul><li>If the argument value is already equal to a mathematical
+     * integer, then the result is the same as the argument.
+     * <li>If the argument is NaN or an infinity or positive zero or negative
+     * zero, then the result is the same as the argument.</ul>
+     *
+     * @param   a   a {@code double} value.
+     * @return  the closest floating-point value to {@code a} that is
+     *          equal to a mathematical integer.
+     */
+    public static double rint(double a) {
+        double ceil = ceil(a);
+        double floor = floor(a);
+        
+        double dc = ceil - a;
+        double df = a - floor;
+        
+        if (dc < df) {
+            return ceil;
+        } else if (dc > df) {
+            return floor;
+        }
+        
+        int tenC = (int) (ceil % 10.0);
+        
+        if (tenC % 2 == 0) {
+            return ceil;
+        } else {
+            return floor;
+        }
+    }
+
+    /**
+     * Returns the angle <i>theta</i> from the conversion of rectangular
+     * coordinates ({@code x},&nbsp;{@code y}) to polar
+     * coordinates (r,&nbsp;<i>theta</i>).
+     * This method computes the phase <i>theta</i> by computing an arc tangent
+     * of {@code y/x} in the range of -<i>pi</i> to <i>pi</i>. Special
+     * cases:
+     * <ul><li>If either argument is NaN, then the result is NaN.
+     * <li>If the first argument is positive zero and the second argument
+     * is positive, or the first argument is positive and finite and the
+     * second argument is positive infinity, then the result is positive
+     * zero.
+     * <li>If the first argument is negative zero and the second argument
+     * is positive, or the first argument is negative and finite and the
+     * second argument is positive infinity, then the result is negative zero.
+     * <li>If the first argument is positive zero and the second argument
+     * is negative, or the first argument is positive and finite and the
+     * second argument is negative infinity, then the result is the
+     * {@code double} value closest to <i>pi</i>.
+     * <li>If the first argument is negative zero and the second argument
+     * is negative, or the first argument is negative and finite and the
+     * second argument is negative infinity, then the result is the
+     * {@code double} value closest to -<i>pi</i>.
+     * <li>If the first argument is positive and the second argument is
+     * positive zero or negative zero, or the first argument is positive
+     * infinity and the second argument is finite, then the result is the
+     * {@code double} value closest to <i>pi</i>/2.
+     * <li>If the first argument is negative and the second argument is
+     * positive zero or negative zero, or the first argument is negative
+     * infinity and the second argument is finite, then the result is the
+     * {@code double} value closest to -<i>pi</i>/2.
+     * <li>If both arguments are positive infinity, then the result is the
+     * {@code double} value closest to <i>pi</i>/4.
+     * <li>If the first argument is positive infinity and the second argument
+     * is negative infinity, then the result is the {@code double}
+     * value closest to 3*<i>pi</i>/4.
+     * <li>If the first argument is negative infinity and the second argument
+     * is positive infinity, then the result is the {@code double} value
+     * closest to -<i>pi</i>/4.
+     * <li>If both arguments are negative infinity, then the result is the
+     * {@code double} value closest to -3*<i>pi</i>/4.</ul>
+     *
+     * <p>The computed result must be within 2 ulps of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   y   the ordinate coordinate
+     * @param   x   the abscissa coordinate
+     * @return  the <i>theta</i> component of the point
+     *          (<i>r</i>,&nbsp;<i>theta</i>)
+     *          in polar coordinates that corresponds to the point
+     *          (<i>x</i>,&nbsp;<i>y</i>) in Cartesian coordinates.
+     */
+    @JavaScriptBody(args={"y", "x"}, body="return Math.atan2(y, x);")
+    public static double atan2(double y, double x) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the value of the first argument raised to the power of the
+     * second argument. Special cases:
+     *
+     * <ul><li>If the second argument is positive or negative zero, then the
+     * result is 1.0.
+     * <li>If the second argument is 1.0, then the result is the same as the
+     * first argument.
+     * <li>If the second argument is NaN, then the result is NaN.
+     * <li>If the first argument is NaN and the second argument is nonzero,
+     * then the result is NaN.
+     *
+     * <li>If
+     * <ul>
+     * <li>the absolute value of the first argument is greater than 1
+     * and the second argument is positive infinity, or
+     * <li>the absolute value of the first argument is less than 1 and
+     * the second argument is negative infinity,
+     * </ul>
+     * then the result is positive infinity.
+     *
+     * <li>If
+     * <ul>
+     * <li>the absolute value of the first argument is greater than 1 and
+     * the second argument is negative infinity, or
+     * <li>the absolute value of the
+     * first argument is less than 1 and the second argument is positive
+     * infinity,
+     * </ul>
+     * then the result is positive zero.
+     *
+     * <li>If the absolute value of the first argument equals 1 and the
+     * second argument is infinite, then the result is NaN.
+     *
+     * <li>If
+     * <ul>
+     * <li>the first argument is positive zero and the second argument
+     * is greater than zero, or
+     * <li>the first argument is positive infinity and the second
+     * argument is less than zero,
+     * </ul>
+     * then the result is positive zero.
+     *
+     * <li>If
+     * <ul>
+     * <li>the first argument is positive zero and the second argument
+     * is less than zero, or
+     * <li>the first argument is positive infinity and the second
+     * argument is greater than zero,
+     * </ul>
+     * then the result is positive infinity.
+     *
+     * <li>If
+     * <ul>
+     * <li>the first argument is negative zero and the second argument
+     * is greater than zero but not a finite odd integer, or
+     * <li>the first argument is negative infinity and the second
+     * argument is less than zero but not a finite odd integer,
+     * </ul>
+     * then the result is positive zero.
+     *
+     * <li>If
+     * <ul>
+     * <li>the first argument is negative zero and the second argument
+     * is a positive finite odd integer, or
+     * <li>the first argument is negative infinity and the second
+     * argument is a negative finite odd integer,
+     * </ul>
+     * then the result is negative zero.
+     *
+     * <li>If
+     * <ul>
+     * <li>the first argument is negative zero and the second argument
+     * is less than zero but not a finite odd integer, or
+     * <li>the first argument is negative infinity and the second
+     * argument is greater than zero but not a finite odd integer,
+     * </ul>
+     * then the result is positive infinity.
+     *
+     * <li>If
+     * <ul>
+     * <li>the first argument is negative zero and the second argument
+     * is a negative finite odd integer, or
+     * <li>the first argument is negative infinity and the second
+     * argument is a positive finite odd integer,
+     * </ul>
+     * then the result is negative infinity.
+     *
+     * <li>If the first argument is finite and less than zero
+     * <ul>
+     * <li> if the second argument is a finite even integer, the
+     * result is equal to the result of raising the absolute value of
+     * the first argument to the power of the second argument
+     *
+     * <li>if the second argument is a finite odd integer, the result
+     * is equal to the negative of the result of raising the absolute
+     * value of the first argument to the power of the second
+     * argument
+     *
+     * <li>if the second argument is finite and not an integer, then
+     * the result is NaN.
+     * </ul>
+     *
+     * <li>If both arguments are integers, then the result is exactly equal
+     * to the mathematical result of raising the first argument to the power
+     * of the second argument if that result can in fact be represented
+     * exactly as a {@code double} value.</ul>
+     *
+     * <p>(In the foregoing descriptions, a floating-point value is
+     * considered to be an integer if and only if it is finite and a
+     * fixed point of the method {@link #ceil ceil} or,
+     * equivalently, a fixed point of the method {@link #floor
+     * floor}. A value is a fixed point of a one-argument
+     * method if and only if the result of applying the method to the
+     * value is equal to the value.)
+     *
+     * <p>The computed result must be within 1 ulp of the exact result.
+     * Results must be semi-monotonic.
+     *
+     * @param   a   the base.
+     * @param   b   the exponent.
+     * @return  the value {@code a}<sup>{@code b}</sup>.
+     */
+    @JavaScriptBody(args={"a", "b"}, body="return Math.pow(a, b);")
+    public static double pow(double a, double b) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the closest {@code int} to the argument, with ties
+     * rounding up.
+     *
+     * <p>
+     * Special cases:
+     * <ul><li>If the argument is NaN, the result is 0.
+     * <li>If the argument is negative infinity or any value less than or
+     * equal to the value of {@code Integer.MIN_VALUE}, the result is
+     * equal to the value of {@code Integer.MIN_VALUE}.
+     * <li>If the argument is positive infinity or any value greater than or
+     * equal to the value of {@code Integer.MAX_VALUE}, the result is
+     * equal to the value of {@code Integer.MAX_VALUE}.</ul>
+     *
+     * @param   a   a floating-point value to be rounded to an integer.
+     * @return  the value of the argument rounded to the nearest
+     *          {@code int} value.
+     * @see     java.lang.Integer#MAX_VALUE
+     * @see     java.lang.Integer#MIN_VALUE
+     */
+    public static int round(float a) {
+        return (int)roundDbl(a);
+    }
+
+    /**
+     * Returns the closest {@code long} to the argument, with ties
+     * rounding up.
+     *
+     * <p>Special cases:
+     * <ul><li>If the argument is NaN, the result is 0.
+     * <li>If the argument is negative infinity or any value less than or
+     * equal to the value of {@code Long.MIN_VALUE}, the result is
+     * equal to the value of {@code Long.MIN_VALUE}.
+     * <li>If the argument is positive infinity or any value greater than or
+     * equal to the value of {@code Long.MAX_VALUE}, the result is
+     * equal to the value of {@code Long.MAX_VALUE}.</ul>
+     *
+     * @param   a   a floating-point value to be rounded to a
+     *          {@code long}.
+     * @return  the value of the argument rounded to the nearest
+     *          {@code long} value.
+     * @see     java.lang.Long#MAX_VALUE
+     * @see     java.lang.Long#MIN_VALUE
+     */
+    public static long round(double a) {
+        return (long)roundDbl(a);
+    }
+    
+    @JavaScriptBody(args="a", body="return Math.round(a);")
+    private static native double roundDbl(double d);
+
+//    private static Random randomNumberGenerator;
+//
+//    private static synchronized Random initRNG() {
+//        Random rnd = randomNumberGenerator;
+//        return (rnd == null) ? (randomNumberGenerator = new Random()) : rnd;
+//    }
+
+    /**
+     * Returns a {@code double} value with a positive sign, greater
+     * than or equal to {@code 0.0} and less than {@code 1.0}.
+     * Returned values are chosen pseudorandomly with (approximately)
+     * uniform distribution from that range.
+     *
+     * <p>When this method is first called, it creates a single new
+     * pseudorandom-number generator, exactly as if by the expression
+     *
+     * <blockquote>{@code new java.util.Random()}</blockquote>
+     *
+     * This new pseudorandom-number generator is used thereafter for
+     * all calls to this method and is used nowhere else.
+     *
+     * <p>This method is properly synchronized to allow correct use by
+     * more than one thread. However, if many threads need to generate
+     * pseudorandom numbers at a great rate, it may reduce contention
+     * for each thread to have its own pseudorandom-number generator.
+     *
+     * @return  a pseudorandom {@code double} greater than or equal
+     * to {@code 0.0} and less than {@code 1.0}.
+     * @see Random#nextDouble()
+     */
+    @JavaScriptBody(args={}, body="return Math.random();")
+    public static double random() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the absolute value of an {@code int} value.
+     * If the argument is not negative, the argument is returned.
+     * If the argument is negative, the negation of the argument is returned.
+     *
+     * <p>Note that if the argument is equal to the value of
+     * {@link Integer#MIN_VALUE}, the most negative representable
+     * {@code int} value, the result is that same value, which is
+     * negative.
+     *
+     * @param   a   the argument whose absolute value is to be determined
+     * @return  the absolute value of the argument.
+     */
+    public static int abs(int a) {
+        return (a < 0) ? -a : a;
+    }
+
+    /**
+     * Returns the absolute value of a {@code long} value.
+     * If the argument is not negative, the argument is returned.
+     * If the argument is negative, the negation of the argument is returned.
+     *
+     * <p>Note that if the argument is equal to the value of
+     * {@link Long#MIN_VALUE}, the most negative representable
+     * {@code long} value, the result is that same value, which
+     * is negative.
+     *
+     * @param   a   the argument whose absolute value is to be determined
+     * @return  the absolute value of the argument.
+     */
+    public static long abs(long a) {
+        return (a < 0) ? -a : a;
+    }
+
+    /**
+     * Returns the absolute value of a {@code float} value.
+     * If the argument is not negative, the argument is returned.
+     * If the argument is negative, the negation of the argument is returned.
+     * Special cases:
+     * <ul><li>If the argument is positive zero or negative zero, the
+     * result is positive zero.
+     * <li>If the argument is infinite, the result is positive infinity.
+     * <li>If the argument is NaN, the result is NaN.</ul>
+     * In other words, the result is the same as the value of the expression:
+     * <p>{@code Float.intBitsToFloat(0x7fffffff & Float.floatToIntBits(a))}
+     *
+     * @param   a   the argument whose absolute value is to be determined
+     * @return  the absolute value of the argument.
+     */
+    public static float abs(float a) {
+        return (a <= 0.0F) ? 0.0F - a : a;
+    }
+
+    /**
+     * Returns the absolute value of a {@code double} value.
+     * If the argument is not negative, the argument is returned.
+     * If the argument is negative, the negation of the argument is returned.
+     * Special cases:
+     * <ul><li>If the argument is positive zero or negative zero, the result
+     * is positive zero.
+     * <li>If the argument is infinite, the result is positive infinity.
+     * <li>If the argument is NaN, the result is NaN.</ul>
+     * In other words, the result is the same as the value of the expression:
+     * <p>{@code Double.longBitsToDouble((Double.doubleToLongBits(a)<<1)>>>1)}
+     *
+     * @param   a   the argument whose absolute value is to be determined
+     * @return  the absolute value of the argument.
+     */
+    public static double abs(double a) {
+        return (a <= 0.0D) ? 0.0D - a : a;
+    }
+
+    /**
+     * Returns the greater of two {@code int} values. That is, the
+     * result is the argument closer to the value of
+     * {@link Integer#MAX_VALUE}. If the arguments have the same value,
+     * the result is that same value.
+     *
+     * @param   a   an argument.
+     * @param   b   another argument.
+     * @return  the larger of {@code a} and {@code b}.
+     */
+    public static int max(int a, int b) {
+        return (a >= b) ? a : b;
+    }
+
+    /**
+     * Returns the greater of two {@code long} values. That is, the
+     * result is the argument closer to the value of
+     * {@link Long#MAX_VALUE}. If the arguments have the same value,
+     * the result is that same value.
+     *
+     * @param   a   an argument.
+     * @param   b   another argument.
+     * @return  the larger of {@code a} and {@code b}.
+     */
+    public static long max(long a, long b) {
+        return (a >= b) ? a : b;
+    }
+
+    /**
+     * Returns the greater of two {@code float} values.  That is,
+     * the result is the argument closer to positive infinity. If the
+     * arguments have the same value, the result is that same
+     * value. If either value is NaN, then the result is NaN.  Unlike
+     * the numerical comparison operators, this method considers
+     * negative zero to be strictly smaller than positive zero. If one
+     * argument is positive zero and the other negative zero, the
+     * result is positive zero.
+     *
+     * @param   a   an argument.
+     * @param   b   another argument.
+     * @return  the larger of {@code a} and {@code b}.
+     */
+    @JavaScriptBody(args={"a", "b"},
+        body="return Math.max(a,b);"
+    )
+    public static float max(float a, float b) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the greater of two {@code double} values.  That
+     * is, the result is the argument closer to positive infinity. If
+     * the arguments have the same value, the result is that same
+     * value. If either value is NaN, then the result is NaN.  Unlike
+     * the numerical comparison operators, this method considers
+     * negative zero to be strictly smaller than positive zero. If one
+     * argument is positive zero and the other negative zero, the
+     * result is positive zero.
+     *
+     * @param   a   an argument.
+     * @param   b   another argument.
+     * @return  the larger of {@code a} and {@code b}.
+     */
+    @JavaScriptBody(args={"a", "b"},
+        body="return Math.max(a,b);"
+    )
+    public static double max(double a, double b) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the smaller of two {@code int} values. That is,
+     * the result the argument closer to the value of
+     * {@link Integer#MIN_VALUE}.  If the arguments have the same
+     * value, the result is that same value.
+     *
+     * @param   a   an argument.
+     * @param   b   another argument.
+     * @return  the smaller of {@code a} and {@code b}.
+     */
+    public static int min(int a, int b) {
+        return (a <= b) ? a : b;
+    }
+
+    /**
+     * Returns the smaller of two {@code long} values. That is,
+     * the result is the argument closer to the value of
+     * {@link Long#MIN_VALUE}. If the arguments have the same
+     * value, the result is that same value.
+     *
+     * @param   a   an argument.
+     * @param   b   another argument.
+     * @return  the smaller of {@code a} and {@code b}.
+     */
+    public static long min(long a, long b) {
+        return (a <= b) ? a : b;
+    }
+
+    /**
+     * Returns the smaller of two {@code float} values.  That is,
+     * the result is the value closer to negative infinity. If the
+     * arguments have the same value, the result is that same
+     * value. If either value is NaN, then the result is NaN.  Unlike
+     * the numerical comparison operators, this method considers
+     * negative zero to be strictly smaller than positive zero.  If
+     * one argument is positive zero and the other is negative zero,
+     * the result is negative zero.
+     *
+     * @param   a   an argument.
+     * @param   b   another argument.
+     * @return  the smaller of {@code a} and {@code b}.
+     */
+    @JavaScriptBody(args={"a", "b"},
+        body="return Math.min(a,b);"
+    )
+    public static float min(float a, float b) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the smaller of two {@code double} values.  That
+     * is, the result is the value closer to negative infinity. If the
+     * arguments have the same value, the result is that same
+     * value. If either value is NaN, then the result is NaN.  Unlike
+     * the numerical comparison operators, this method considers
+     * negative zero to be strictly smaller than positive zero. If one
+     * argument is positive zero and the other is negative zero, the
+     * result is negative zero.
+     *
+     * @param   a   an argument.
+     * @param   b   another argument.
+     * @return  the smaller of {@code a} and {@code b}.
+     */
+    @JavaScriptBody(args={"a", "b"},
+        body="return Math.min(a,b);"
+    )
+    public static double min(double a, double b) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the size of an ulp of the argument.  An ulp of a
+     * {@code double} value is the positive distance between this
+     * floating-point value and the {@code double} value next
+     * larger in magnitude.  Note that for non-NaN <i>x</i>,
+     * <code>ulp(-<i>x</i>) == ulp(<i>x</i>)</code>.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, then the result is NaN.
+     * <li> If the argument is positive or negative infinity, then the
+     * result is positive infinity.
+     * <li> If the argument is positive or negative zero, then the result is
+     * {@code Double.MIN_VALUE}.
+     * <li> If the argument is &plusmn;{@code Double.MAX_VALUE}, then
+     * the result is equal to 2<sup>971</sup>.
+     * </ul>
+     *
+     * @param d the floating-point value whose ulp is to be returned
+     * @return the size of an ulp of the argument
+     * @author Joseph D. Darcy
+     * @since 1.5
+     */
+//    public static double ulp(double d) {
+//        return sun.misc.FpUtils.ulp(d);
+//    }
+
+    /**
+     * Returns the size of an ulp of the argument.  An ulp of a
+     * {@code float} value is the positive distance between this
+     * floating-point value and the {@code float} value next
+     * larger in magnitude.  Note that for non-NaN <i>x</i>,
+     * <code>ulp(-<i>x</i>) == ulp(<i>x</i>)</code>.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, then the result is NaN.
+     * <li> If the argument is positive or negative infinity, then the
+     * result is positive infinity.
+     * <li> If the argument is positive or negative zero, then the result is
+     * {@code Float.MIN_VALUE}.
+     * <li> If the argument is &plusmn;{@code Float.MAX_VALUE}, then
+     * the result is equal to 2<sup>104</sup>.
+     * </ul>
+     *
+     * @param f the floating-point value whose ulp is to be returned
+     * @return the size of an ulp of the argument
+     * @author Joseph D. Darcy
+     * @since 1.5
+     */
+//    public static float ulp(float f) {
+//        return sun.misc.FpUtils.ulp(f);
+//    }
+
+    /**
+     * Returns the signum function of the argument; zero if the argument
+     * is zero, 1.0 if the argument is greater than zero, -1.0 if the
+     * argument is less than zero.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, then the result is NaN.
+     * <li> If the argument is positive zero or negative zero, then the
+     *      result is the same as the argument.
+     * </ul>
+     *
+     * @param d the floating-point value whose signum is to be returned
+     * @return the signum function of the argument
+     * @author Joseph D. Darcy
+     * @since 1.5
+     */
+    public static double signum(double d) {
+        if (d < 0.0) { return -1.0; }
+        if (d > 0.0) { return 1.0; }
+        return d;
+    }
+
+    /**
+     * Returns the signum function of the argument; zero if the argument
+     * is zero, 1.0f if the argument is greater than zero, -1.0f if the
+     * argument is less than zero.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, then the result is NaN.
+     * <li> If the argument is positive zero or negative zero, then the
+     *      result is the same as the argument.
+     * </ul>
+     *
+     * @param f the floating-point value whose signum is to be returned
+     * @return the signum function of the argument
+     * @author Joseph D. Darcy
+     * @since 1.5
+     */
+    public static float signum(float f) {
+        if (f < 0.0f) { return -1.0f; }
+        if (f > 0.0f) { return 1.0f; }
+        return f;
+    }
+
+    /**
+     * Returns the first floating-point argument with the sign of the
+     * second floating-point argument.  Note that unlike the {@link
+     * StrictMath#copySign(double, double) StrictMath.copySign}
+     * method, this method does not require NaN {@code sign}
+     * arguments to be treated as positive values; implementations are
+     * permitted to treat some NaN arguments as positive and other NaN
+     * arguments as negative to allow greater performance.
+     *
+     * @param magnitude  the parameter providing the magnitude of the result
+     * @param sign   the parameter providing the sign of the result
+     * @return a value with the magnitude of {@code magnitude}
+     * and the sign of {@code sign}.
+     * @since 1.6
+     */
+//    public static double copySign(double magnitude, double sign) {
+//        return sun.misc.FpUtils.rawCopySign(magnitude, sign);
+//    }
+
+    /**
+     * Returns the first floating-point argument with the sign of the
+     * second floating-point argument.  Note that unlike the {@link
+     * StrictMath#copySign(float, float) StrictMath.copySign}
+     * method, this method does not require NaN {@code sign}
+     * arguments to be treated as positive values; implementations are
+     * permitted to treat some NaN arguments as positive and other NaN
+     * arguments as negative to allow greater performance.
+     *
+     * @param magnitude  the parameter providing the magnitude of the result
+     * @param sign   the parameter providing the sign of the result
+     * @return a value with the magnitude of {@code magnitude}
+     * and the sign of {@code sign}.
+     * @since 1.6
+     */
+//    public static float copySign(float magnitude, float sign) {
+//        return sun.misc.FpUtils.rawCopySign(magnitude, sign);
+//    }
+
+    /**
+     * Returns the unbiased exponent used in the representation of a
+     * {@code float}.  Special cases:
+     *
+     * <ul>
+     * <li>If the argument is NaN or infinite, then the result is
+     * {@link Float#MAX_EXPONENT} + 1.
+     * <li>If the argument is zero or subnormal, then the result is
+     * {@link Float#MIN_EXPONENT} -1.
+     * </ul>
+     * @param f a {@code float} value
+     * @return the unbiased exponent of the argument
+     * @since 1.6
+     */
+//    public static int getExponent(float f) {
+//        return sun.misc.FpUtils.getExponent(f);
+//    }
+
+    /**
+     * Returns the unbiased exponent used in the representation of a
+     * {@code double}.  Special cases:
+     *
+     * <ul>
+     * <li>If the argument is NaN or infinite, then the result is
+     * {@link Double#MAX_EXPONENT} + 1.
+     * <li>If the argument is zero or subnormal, then the result is
+     * {@link Double#MIN_EXPONENT} -1.
+     * </ul>
+     * @param d a {@code double} value
+     * @return the unbiased exponent of the argument
+     * @since 1.6
+     */
+//    public static int getExponent(double d) {
+//        return sun.misc.FpUtils.getExponent(d);
+//    }
+
+    /**
+     * Returns the floating-point number adjacent to the first
+     * argument in the direction of the second argument.  If both
+     * arguments compare as equal the second argument is returned.
+     *
+     * <p>
+     * Special cases:
+     * <ul>
+     * <li> If either argument is a NaN, then NaN is returned.
+     *
+     * <li> If both arguments are signed zeros, {@code direction}
+     * is returned unchanged (as implied by the requirement of
+     * returning the second argument if the arguments compare as
+     * equal).
+     *
+     * <li> If {@code start} is
+     * &plusmn;{@link Double#MIN_VALUE} and {@code direction}
+     * has a value such that the result should have a smaller
+     * magnitude, then a zero with the same sign as {@code start}
+     * is returned.
+     *
+     * <li> If {@code start} is infinite and
+     * {@code direction} has a value such that the result should
+     * have a smaller magnitude, {@link Double#MAX_VALUE} with the
+     * same sign as {@code start} is returned.
+     *
+     * <li> If {@code start} is equal to &plusmn;
+     * {@link Double#MAX_VALUE} and {@code direction} has a
+     * value such that the result should have a larger magnitude, an
+     * infinity with same sign as {@code start} is returned.
+     * </ul>
+     *
+     * @param start  starting floating-point value
+     * @param direction value indicating which of
+     * {@code start}'s neighbors or {@code start} should
+     * be returned
+     * @return The floating-point number adjacent to {@code start} in the
+     * direction of {@code direction}.
+     * @since 1.6
+     */
+//    public static double nextAfter(double start, double direction) {
+//        return sun.misc.FpUtils.nextAfter(start, direction);
+//    }
+
+    /**
+     * Returns the floating-point number adjacent to the first
+     * argument in the direction of the second argument.  If both
+     * arguments compare as equal a value equivalent to the second argument
+     * is returned.
+     *
+     * <p>
+     * Special cases:
+     * <ul>
+     * <li> If either argument is a NaN, then NaN is returned.
+     *
+     * <li> If both arguments are signed zeros, a value equivalent
+     * to {@code direction} is returned.
+     *
+     * <li> If {@code start} is
+     * &plusmn;{@link Float#MIN_VALUE} and {@code direction}
+     * has a value such that the result should have a smaller
+     * magnitude, then a zero with the same sign as {@code start}
+     * is returned.
+     *
+     * <li> If {@code start} is infinite and
+     * {@code direction} has a value such that the result should
+     * have a smaller magnitude, {@link Float#MAX_VALUE} with the
+     * same sign as {@code start} is returned.
+     *
+     * <li> If {@code start} is equal to &plusmn;
+     * {@link Float#MAX_VALUE} and {@code direction} has a
+     * value such that the result should have a larger magnitude, an
+     * infinity with same sign as {@code start} is returned.
+     * </ul>
+     *
+     * @param start  starting floating-point value
+     * @param direction value indicating which of
+     * {@code start}'s neighbors or {@code start} should
+     * be returned
+     * @return The floating-point number adjacent to {@code start} in the
+     * direction of {@code direction}.
+     * @since 1.6
+     */
+//    public static float nextAfter(float start, double direction) {
+//        return sun.misc.FpUtils.nextAfter(start, direction);
+//    }
+
+    /**
+     * Returns the floating-point value adjacent to {@code d} in
+     * the direction of positive infinity.  This method is
+     * semantically equivalent to {@code nextAfter(d,
+     * Double.POSITIVE_INFINITY)}; however, a {@code nextUp}
+     * implementation may run faster than its equivalent
+     * {@code nextAfter} call.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, the result is NaN.
+     *
+     * <li> If the argument is positive infinity, the result is
+     * positive infinity.
+     *
+     * <li> If the argument is zero, the result is
+     * {@link Double#MIN_VALUE}
+     *
+     * </ul>
+     *
+     * @param d starting floating-point value
+     * @return The adjacent floating-point value closer to positive
+     * infinity.
+     * @since 1.6
+     */
+//    public static double nextUp(double d) {
+//        return sun.misc.FpUtils.nextUp(d);
+//    }
+
+    /**
+     * Returns the floating-point value adjacent to {@code f} in
+     * the direction of positive infinity.  This method is
+     * semantically equivalent to {@code nextAfter(f,
+     * Float.POSITIVE_INFINITY)}; however, a {@code nextUp}
+     * implementation may run faster than its equivalent
+     * {@code nextAfter} call.
+     *
+     * <p>Special Cases:
+     * <ul>
+     * <li> If the argument is NaN, the result is NaN.
+     *
+     * <li> If the argument is positive infinity, the result is
+     * positive infinity.
+     *
+     * <li> If the argument is zero, the result is
+     * {@link Float#MIN_VALUE}
+     *
+     * </ul>
+     *
+     * @param f starting floating-point value
+     * @return The adjacent floating-point value closer to positive
+     * infinity.
+     * @since 1.6
+     */
+//    public static float nextUp(float f) {
+//        return sun.misc.FpUtils.nextUp(f);
+//    }
+
+
+    /**
+     * Return {@code d} &times;
+     * 2<sup>{@code scaleFactor}</sup> rounded as if performed
+     * by a single correctly rounded floating-point multiply to a
+     * member of the double value set.  See the Java
+     * Language Specification for a discussion of floating-point
+     * value sets.  If the exponent of the result is between {@link
+     * Double#MIN_EXPONENT} and {@link Double#MAX_EXPONENT}, the
+     * answer is calculated exactly.  If the exponent of the result
+     * would be larger than {@code Double.MAX_EXPONENT}, an
+     * infinity is returned.  Note that if the result is subnormal,
+     * precision may be lost; that is, when {@code scalb(x, n)}
+     * is subnormal, {@code scalb(scalb(x, n), -n)} may not equal
+     * <i>x</i>.  When the result is non-NaN, the result has the same
+     * sign as {@code d}.
+     *
+     * <p>Special cases:
+     * <ul>
+     * <li> If the first argument is NaN, NaN is returned.
+     * <li> If the first argument is infinite, then an infinity of the
+     * same sign is returned.
+     * <li> If the first argument is zero, then a zero of the same
+     * sign is returned.
+     * </ul>
+     *
+     * @param d number to be scaled by a power of two.
+     * @param scaleFactor power of 2 used to scale {@code d}
+     * @return {@code d} &times; 2<sup>{@code scaleFactor}</sup>
+     * @since 1.6
+     */
+//    public static double scalb(double d, int scaleFactor) {
+//        return sun.misc.FpUtils.scalb(d, scaleFactor);
+//    }
+
+    /**
+     * Return {@code f} &times;
+     * 2<sup>{@code scaleFactor}</sup> rounded as if performed
+     * by a single correctly rounded floating-point multiply to a
+     * member of the float value set.  See the Java
+     * Language Specification for a discussion of floating-point
+     * value sets.  If the exponent of the result is between {@link
+     * Float#MIN_EXPONENT} and {@link Float#MAX_EXPONENT}, the
+     * answer is calculated exactly.  If the exponent of the result
+     * would be larger than {@code Float.MAX_EXPONENT}, an
+     * infinity is returned.  Note that if the result is subnormal,
+     * precision may be lost; that is, when {@code scalb(x, n)}
+     * is subnormal, {@code scalb(scalb(x, n), -n)} may not equal
+     * <i>x</i>.  When the result is non-NaN, the result has the same
+     * sign as {@code f}.
+     *
+     * <p>Special cases:
+     * <ul>
+     * <li> If the first argument is NaN, NaN is returned.
+     * <li> If the first argument is infinite, then an infinity of the
+     * same sign is returned.
+     * <li> If the first argument is zero, then a zero of the same
+     * sign is returned.
+     * </ul>
+     *
+     * @param f number to be scaled by a power of two.
+     * @param scaleFactor power of 2 used to scale {@code f}
+     * @return {@code f} &times; 2<sup>{@code scaleFactor}</sup>
+     * @since 1.6
+     */
+//    public static float scalb(float f, int scaleFactor) {
+//        return sun.misc.FpUtils.scalb(f, scaleFactor);
+//    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/NegativeArraySizeException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/NegativeArraySizeException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown if an application tries to create an array with negative size.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class NegativeArraySizeException extends RuntimeException {
+    private static final long serialVersionUID = -8960118058596991861L;
+
+    /**
+     * Constructs a <code>NegativeArraySizeException</code> with no
+     * detail message.
+     */
+    public NegativeArraySizeException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>NegativeArraySizeException</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public NegativeArraySizeException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/NoSuchMethodException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/NoSuchMethodException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when a particular method cannot be found.
+ *
+ * @author     unascribed
+ * @since      JDK1.0
+ */
+public
+class NoSuchMethodException extends ReflectiveOperationException {
+    private static final long serialVersionUID = 5034388446362600923L;
+
+    /**
+     * Constructs a <code>NoSuchMethodException</code> without a detail message.
+     */
+    public NoSuchMethodException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>NoSuchMethodException</code> with a detail message.
+     *
+     * @param      s   the detail message.
+     */
+    public NoSuchMethodException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/NullPointerException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/NullPointerException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when an application attempts to use {@code null} in a
+ * case where an object is required. These include:
+ * <ul>
+ * <li>Calling the instance method of a {@code null} object.
+ * <li>Accessing or modifying the field of a {@code null} object.
+ * <li>Taking the length of {@code null} as if it were an array.
+ * <li>Accessing or modifying the slots of {@code null} as if it
+ *     were an array.
+ * <li>Throwing {@code null} as if it were a {@code Throwable}
+ *     value.
+ * </ul>
+ * <p>
+ * Applications should throw instances of this class to indicate
+ * other illegal uses of the {@code null} object.
+ *
+ * {@code NullPointerException} objects may be constructed by the
+ * virtual machine as if {@linkplain Throwable#Throwable(String,
+ * Throwable, boolean, boolean) suppression were disabled and/or the
+ * stack trace was not writable}.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public
+class NullPointerException extends RuntimeException {
+    private static final long serialVersionUID = 5162710183389028792L;
+
+    /**
+     * Constructs a {@code NullPointerException} with no detail message.
+     */
+    public NullPointerException() {
+        super();
+    }
+
+    /**
+     * Constructs a {@code NullPointerException} with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public NullPointerException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Number.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Number.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1994, 2001, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import org.apidesign.bck2brwsr.core.ExtraJavaScript;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
+
+/**
+ * The abstract class <code>Number</code> is the superclass of classes
+ * <code>BigDecimal</code>, <code>BigInteger</code>,
+ * <code>Byte</code>, <code>Double</code>, <code>Float</code>,
+ * <code>Integer</code>, <code>Long</code>, and <code>Short</code>.
+ * <p>
+ * Subclasses of <code>Number</code> must provide methods to convert
+ * the represented numeric value to <code>byte</code>, <code>double</code>,
+ * <code>float</code>, <code>int</code>, <code>long</code>, and
+ * <code>short</code>.
+ *
+ * @author      Lee Boynton
+ * @author      Arthur van Hoff
+ * @see     java.lang.Byte
+ * @see     java.lang.Double
+ * @see     java.lang.Float
+ * @see     java.lang.Integer
+ * @see     java.lang.Long
+ * @see     java.lang.Short
+ * @since   JDK1.0
+ */
+@ExtraJavaScript(
+    resource="/org/apidesign/vm4brwsr/emul/lang/java_lang_Number.js",
+    processByteCode=true
+)
+@JavaScriptPrototype(container = "Number.prototype", prototype = "new Number")
+public abstract class Number implements java.io.Serializable {
+    /**
+     * Returns the value of the specified number as an <code>int</code>.
+     * This may involve rounding or truncation.
+     *
+     * @return  the numeric value represented by this object after conversion
+     *          to type <code>int</code>.
+     */
+    @JavaScriptBody(args = {}, body = "return this | 0;")
+    public abstract int intValue();
+
+    /**
+     * Returns the value of the specified number as a <code>long</code>.
+     * This may involve rounding or truncation.
+     *
+     * @return  the numeric value represented by this object after conversion
+     *          to type <code>long</code>.
+     */
+    @JavaScriptBody(args = {}, body = "return this.toLong();")
+    public abstract long longValue();
+
+    /**
+     * Returns the value of the specified number as a <code>float</code>.
+     * This may involve rounding.
+     *
+     * @return  the numeric value represented by this object after conversion
+     *          to type <code>float</code>.
+     */
+    @JavaScriptBody(args = {}, body = "return this;")
+    public abstract float floatValue();
+
+    /**
+     * Returns the value of the specified number as a <code>double</code>.
+     * This may involve rounding.
+     *
+     * @return  the numeric value represented by this object after conversion
+     *          to type <code>double</code>.
+     */
+    @JavaScriptBody(args = {}, body = "return this;")
+    public abstract double doubleValue();
+
+    /**
+     * Returns the value of the specified number as a <code>byte</code>.
+     * This may involve rounding or truncation.
+     *
+     * @return  the numeric value represented by this object after conversion
+     *          to type <code>byte</code>.
+     * @since   JDK1.1
+     */
+    public byte byteValue() {
+        return (byte)intValue();
+    }
+
+    /**
+     * Returns the value of the specified number as a <code>short</code>.
+     * This may involve rounding or truncation.
+     *
+     * @return  the numeric value represented by this object after conversion
+     *          to type <code>short</code>.
+     * @since   JDK1.1
+     */
+    public short shortValue() {
+        return (short)intValue();
+    }
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = -8742448824652078965L;
+    
+    static {
+        // as last step of initialization, initialize valueOf method
+        initValueOf();
+    }
+    @JavaScriptBody(args = {  }, body = 
+        "var p = vm.java_lang_Number(false);\n" +
+        "p.valueOf = function() { return this.doubleValue__D(); };\n" +
+        "p.toString = function() { return this.toString__Ljava_lang_String_2(); };"
+    )
+    private native static void initValueOf();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/NumberFormatException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/NumberFormatException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1994, 2001, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that the application has attempted to convert
+ * a string to one of the numeric types, but that the string does not
+ * have the appropriate format.
+ *
+ * @author  unascribed
+ * @see     java.lang.Integer#toString()
+ * @since   JDK1.0
+ */
+public
+class NumberFormatException extends IllegalArgumentException {
+    static final long serialVersionUID = -2848938806368998894L;
+
+    /**
+     * Constructs a <code>NumberFormatException</code> with no detail message.
+     */
+    public NumberFormatException () {
+        super();
+    }
+
+    /**
+     * Constructs a <code>NumberFormatException</code> with the
+     * specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public NumberFormatException (String s) {
+        super (s);
+    }
+
+    /**
+     * Factory method for making a <code>NumberFormatException</code>
+     * given the specified input which caused the error.
+     *
+     * @param   s   the input causing the error
+     */
+    static NumberFormatException forInputString(String s) {
+        return new NumberFormatException("For input string: \"" + s + "\"");
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Object.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Object.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,602 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.lang.reflect.Array;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
+
+/**
+ * Class {@code Object} is the root of the class hierarchy.
+ * Every class has {@code Object} as a superclass. All objects,
+ * including arrays, implement the methods of this class.
+ *
+ * @author  unascribed
+ * @see     java.lang.Class
+ * @since   JDK1.0
+ */
+@JavaScriptPrototype(container = "Object.prototype", prototype = "new Object")
+public class Object {
+
+    private static void registerNatives() {
+        boolean assertsOn = false;
+        assert assertsOn = false;
+        if (assertsOn) try {
+            Array.get(null, 0);
+        } catch (Throwable ex) {
+            // ignore
+        }
+    }
+    @JavaScriptBody(args = {}, body = "var p = vm.java_lang_Object(false);" +
+        "p.toString = function() { return this.toString__Ljava_lang_String_2(); };"
+    )
+    private static native void registerToString();
+    static {
+        registerNatives();
+        registerToString();
+    }
+
+    /**
+     * Returns the runtime class of this {@code Object}. The returned
+     * {@code Class} object is the object that is locked by {@code
+     * static synchronized} methods of the represented class.
+     *
+     * <p><b>The actual result type is {@code Class<? extends |X|>}
+     * where {@code |X|} is the erasure of the static type of the
+     * expression on which {@code getClass} is called.</b> For
+     * example, no cast is required in this code fragment:</p>
+     *
+     * <p>
+     * {@code Number n = 0;                             }<br>
+     * {@code Class<? extends Number> c = n.getClass(); }
+     * </p>
+     *
+     * @return The {@code Class} object that represents the runtime
+     *         class of this object.
+     * @see    Class Literals, section 15.8.2 of
+     *         <cite>The Java&trade; Language Specification</cite>.
+     */
+    @JavaScriptBody(args={}, body="return this.constructor.$class;")
+    public final native Class<?> getClass();
+
+    /**
+     * Returns a hash code value for the object. This method is
+     * supported for the benefit of hash tables such as those provided by
+     * {@link java.util.HashMap}.
+     * <p>
+     * The general contract of {@code hashCode} is:
+     * <ul>
+     * <li>Whenever it is invoked on the same object more than once during
+     *     an execution of a Java application, the {@code hashCode} method
+     *     must consistently return the same integer, provided no information
+     *     used in {@code equals} comparisons on the object is modified.
+     *     This integer need not remain consistent from one execution of an
+     *     application to another execution of the same application.
+     * <li>If two objects are equal according to the {@code equals(Object)}
+     *     method, then calling the {@code hashCode} method on each of
+     *     the two objects must produce the same integer result.
+     * <li>It is <em>not</em> required that if two objects are unequal
+     *     according to the {@link java.lang.Object#equals(java.lang.Object)}
+     *     method, then calling the {@code hashCode} method on each of the
+     *     two objects must produce distinct integer results.  However, the
+     *     programmer should be aware that producing distinct integer results
+     *     for unequal objects may improve the performance of hash tables.
+     * </ul>
+     * <p>
+     * As much as is reasonably practical, the hashCode method defined by
+     * class {@code Object} does return distinct integers for distinct
+     * objects. (This is typically implemented by converting the internal
+     * address of the object into an integer, but this implementation
+     * technique is not required by the
+     * Java<font size="-2"><sup>TM</sup></font> programming language.)
+     *
+     * @return  a hash code value for this object.
+     * @see     java.lang.Object#equals(java.lang.Object)
+     * @see     java.lang.System#identityHashCode
+     */
+    @JavaScriptBody(args = {}, body = 
+        "if (this.$hashCode) return this.$hashCode;\n"
+        + "var h = this.computeHashCode__I();\n"
+        + "return this.$hashCode = h & h;"
+    )
+    public native int hashCode();
+
+    @JavaScriptBody(args = {}, body = "return Math.random() * Math.pow(2, 32);")
+    native int computeHashCode();
+    
+    /**
+     * Indicates whether some other object is "equal to" this one.
+     * <p>
+     * The {@code equals} method implements an equivalence relation
+     * on non-null object references:
+     * <ul>
+     * <li>It is <i>reflexive</i>: for any non-null reference value
+     *     {@code x}, {@code x.equals(x)} should return
+     *     {@code true}.
+     * <li>It is <i>symmetric</i>: for any non-null reference values
+     *     {@code x} and {@code y}, {@code x.equals(y)}
+     *     should return {@code true} if and only if
+     *     {@code y.equals(x)} returns {@code true}.
+     * <li>It is <i>transitive</i>: for any non-null reference values
+     *     {@code x}, {@code y}, and {@code z}, if
+     *     {@code x.equals(y)} returns {@code true} and
+     *     {@code y.equals(z)} returns {@code true}, then
+     *     {@code x.equals(z)} should return {@code true}.
+     * <li>It is <i>consistent</i>: for any non-null reference values
+     *     {@code x} and {@code y}, multiple invocations of
+     *     {@code x.equals(y)} consistently return {@code true}
+     *     or consistently return {@code false}, provided no
+     *     information used in {@code equals} comparisons on the
+     *     objects is modified.
+     * <li>For any non-null reference value {@code x},
+     *     {@code x.equals(null)} should return {@code false}.
+     * </ul>
+     * <p>
+     * The {@code equals} method for class {@code Object} implements
+     * the most discriminating possible equivalence relation on objects;
+     * that is, for any non-null reference values {@code x} and
+     * {@code y}, this method returns {@code true} if and only
+     * if {@code x} and {@code y} refer to the same object
+     * ({@code x == y} has the value {@code true}).
+     * <p>
+     * Note that it is generally necessary to override the {@code hashCode}
+     * method whenever this method is overridden, so as to maintain the
+     * general contract for the {@code hashCode} method, which states
+     * that equal objects must have equal hash codes.
+     *
+     * @param   obj   the reference object with which to compare.
+     * @return  {@code true} if this object is the same as the obj
+     *          argument; {@code false} otherwise.
+     * @see     #hashCode()
+     * @see     java.util.HashMap
+     */
+    public boolean equals(Object obj) {
+        return (this == obj);
+    }
+
+    /**
+     * Creates and returns a copy of this object.  The precise meaning
+     * of "copy" may depend on the class of the object. The general
+     * intent is that, for any object {@code x}, the expression:
+     * <blockquote>
+     * <pre>
+     * x.clone() != x</pre></blockquote>
+     * will be true, and that the expression:
+     * <blockquote>
+     * <pre>
+     * x.clone().getClass() == x.getClass()</pre></blockquote>
+     * will be {@code true}, but these are not absolute requirements.
+     * While it is typically the case that:
+     * <blockquote>
+     * <pre>
+     * x.clone().equals(x)</pre></blockquote>
+     * will be {@code true}, this is not an absolute requirement.
+     * <p>
+     * By convention, the returned object should be obtained by calling
+     * {@code super.clone}.  If a class and all of its superclasses (except
+     * {@code Object}) obey this convention, it will be the case that
+     * {@code x.clone().getClass() == x.getClass()}.
+     * <p>
+     * By convention, the object returned by this method should be independent
+     * of this object (which is being cloned).  To achieve this independence,
+     * it may be necessary to modify one or more fields of the object returned
+     * by {@code super.clone} before returning it.  Typically, this means
+     * copying any mutable objects that comprise the internal "deep structure"
+     * of the object being cloned and replacing the references to these
+     * objects with references to the copies.  If a class contains only
+     * primitive fields or references to immutable objects, then it is usually
+     * the case that no fields in the object returned by {@code super.clone}
+     * need to be modified.
+     * <p>
+     * The method {@code clone} for class {@code Object} performs a
+     * specific cloning operation. First, if the class of this object does
+     * not implement the interface {@code Cloneable}, then a
+     * {@code CloneNotSupportedException} is thrown. Note that all arrays
+     * are considered to implement the interface {@code Cloneable} and that
+     * the return type of the {@code clone} method of an array type {@code T[]}
+     * is {@code T[]} where T is any reference or primitive type.
+     * Otherwise, this method creates a new instance of the class of this
+     * object and initializes all its fields with exactly the contents of
+     * the corresponding fields of this object, as if by assignment; the
+     * contents of the fields are not themselves cloned. Thus, this method
+     * performs a "shallow copy" of this object, not a "deep copy" operation.
+     * <p>
+     * The class {@code Object} does not itself implement the interface
+     * {@code Cloneable}, so calling the {@code clone} method on an object
+     * whose class is {@code Object} will result in throwing an
+     * exception at run time.
+     *
+     * @return     a clone of this instance.
+     * @exception  CloneNotSupportedException  if the object's class does not
+     *               support the {@code Cloneable} interface. Subclasses
+     *               that override the {@code clone} method can also
+     *               throw this exception to indicate that an instance cannot
+     *               be cloned.
+     * @see java.lang.Cloneable
+     */
+    protected Object clone() throws CloneNotSupportedException {
+        Object ret = clone(this);
+        if (ret == null) {
+            throw new CloneNotSupportedException(getClass().getName());
+        }
+        return ret;
+    }
+
+    @JavaScriptBody(args = "self", body = 
+          "\nif (!self.$instOf_java_lang_Cloneable) {"
+        + "\n  return null;"
+        + "\n} else {"
+        + "\n  var clone = self.constructor(true);"
+        + "\n  var props = Object.getOwnPropertyNames(self);"
+        + "\n  for (var i = 0; i < props.length; i++) {"
+        + "\n    var p = props[i];"
+        + "\n    clone[p] = self[p];"
+        + "\n  };"
+        + "\n  return clone;"
+        + "\n}"
+    )
+    private static native Object clone(Object self) throws CloneNotSupportedException;
+
+    /**
+     * Returns a string representation of the object. In general, the
+     * {@code toString} method returns a string that
+     * "textually represents" this object. The result should
+     * be a concise but informative representation that is easy for a
+     * person to read.
+     * It is recommended that all subclasses override this method.
+     * <p>
+     * The {@code toString} method for class {@code Object}
+     * returns a string consisting of the name of the class of which the
+     * object is an instance, the at-sign character `{@code @}', and
+     * the unsigned hexadecimal representation of the hash code of the
+     * object. In other words, this method returns a string equal to the
+     * value of:
+     * <blockquote>
+     * <pre>
+     * getClass().getName() + '@' + Integer.toHexString(hashCode())
+     * </pre></blockquote>
+     *
+     * @return  a string representation of the object.
+     */
+    public String toString() {
+        return getClass().getName() + "@" + Integer.toHexString(hashCode());
+    }
+
+    /**
+     * Wakes up a single thread that is waiting on this object's
+     * monitor. If any threads are waiting on this object, one of them
+     * is chosen to be awakened. The choice is arbitrary and occurs at
+     * the discretion of the implementation. A thread waits on an object's
+     * monitor by calling one of the {@code wait} methods.
+     * <p>
+     * The awakened thread will not be able to proceed until the current
+     * thread relinquishes the lock on this object. The awakened thread will
+     * compete in the usual manner with any other threads that might be
+     * actively competing to synchronize on this object; for example, the
+     * awakened thread enjoys no reliable privilege or disadvantage in being
+     * the next thread to lock this object.
+     * <p>
+     * This method should only be called by a thread that is the owner
+     * of this object's monitor. A thread becomes the owner of the
+     * object's monitor in one of three ways:
+     * <ul>
+     * <li>By executing a synchronized instance method of that object.
+     * <li>By executing the body of a {@code synchronized} statement
+     *     that synchronizes on the object.
+     * <li>For objects of type {@code Class,} by executing a
+     *     synchronized static method of that class.
+     * </ul>
+     * <p>
+     * Only one thread at a time can own an object's monitor.
+     *
+     * @exception  IllegalMonitorStateException  if the current thread is not
+     *               the owner of this object's monitor.
+     * @see        java.lang.Object#notifyAll()
+     * @see        java.lang.Object#wait()
+     */
+    public final native void notify();
+
+    /**
+     * Wakes up all threads that are waiting on this object's monitor. A
+     * thread waits on an object's monitor by calling one of the
+     * {@code wait} methods.
+     * <p>
+     * The awakened threads will not be able to proceed until the current
+     * thread relinquishes the lock on this object. The awakened threads
+     * will compete in the usual manner with any other threads that might
+     * be actively competing to synchronize on this object; for example,
+     * the awakened threads enjoy no reliable privilege or disadvantage in
+     * being the next thread to lock this object.
+     * <p>
+     * This method should only be called by a thread that is the owner
+     * of this object's monitor. See the {@code notify} method for a
+     * description of the ways in which a thread can become the owner of
+     * a monitor.
+     *
+     * @exception  IllegalMonitorStateException  if the current thread is not
+     *               the owner of this object's monitor.
+     * @see        java.lang.Object#notify()
+     * @see        java.lang.Object#wait()
+     */
+    public final native void notifyAll();
+
+    /**
+     * Causes the current thread to wait until either another thread invokes the
+     * {@link java.lang.Object#notify()} method or the
+     * {@link java.lang.Object#notifyAll()} method for this object, or a
+     * specified amount of time has elapsed.
+     * <p>
+     * The current thread must own this object's monitor.
+     * <p>
+     * This method causes the current thread (call it <var>T</var>) to
+     * place itself in the wait set for this object and then to relinquish
+     * any and all synchronization claims on this object. Thread <var>T</var>
+     * becomes disabled for thread scheduling purposes and lies dormant
+     * until one of four things happens:
+     * <ul>
+     * <li>Some other thread invokes the {@code notify} method for this
+     * object and thread <var>T</var> happens to be arbitrarily chosen as
+     * the thread to be awakened.
+     * <li>Some other thread invokes the {@code notifyAll} method for this
+     * object.
+     * <li>Some other thread {@linkplain Thread#interrupt() interrupts}
+     * thread <var>T</var>.
+     * <li>The specified amount of real time has elapsed, more or less.  If
+     * {@code timeout} is zero, however, then real time is not taken into
+     * consideration and the thread simply waits until notified.
+     * </ul>
+     * The thread <var>T</var> is then removed from the wait set for this
+     * object and re-enabled for thread scheduling. It then competes in the
+     * usual manner with other threads for the right to synchronize on the
+     * object; once it has gained control of the object, all its
+     * synchronization claims on the object are restored to the status quo
+     * ante - that is, to the situation as of the time that the {@code wait}
+     * method was invoked. Thread <var>T</var> then returns from the
+     * invocation of the {@code wait} method. Thus, on return from the
+     * {@code wait} method, the synchronization state of the object and of
+     * thread {@code T} is exactly as it was when the {@code wait} method
+     * was invoked.
+     * <p>
+     * A thread can also wake up without being notified, interrupted, or
+     * timing out, a so-called <i>spurious wakeup</i>.  While this will rarely
+     * occur in practice, applications must guard against it by testing for
+     * the condition that should have caused the thread to be awakened, and
+     * continuing to wait if the condition is not satisfied.  In other words,
+     * waits should always occur in loops, like this one:
+     * <pre>
+     *     synchronized (obj) {
+     *         while (&lt;condition does not hold&gt;)
+     *             obj.wait(timeout);
+     *         ... // Perform action appropriate to condition
+     *     }
+     * </pre>
+     * (For more information on this topic, see Section 3.2.3 in Doug Lea's
+     * "Concurrent Programming in Java (Second Edition)" (Addison-Wesley,
+     * 2000), or Item 50 in Joshua Bloch's "Effective Java Programming
+     * Language Guide" (Addison-Wesley, 2001).
+     *
+     * <p>If the current thread is {@linkplain java.lang.Thread#interrupt()
+     * interrupted} by any thread before or while it is waiting, then an
+     * {@code InterruptedException} is thrown.  This exception is not
+     * thrown until the lock status of this object has been restored as
+     * described above.
+     *
+     * <p>
+     * Note that the {@code wait} method, as it places the current thread
+     * into the wait set for this object, unlocks only this object; any
+     * other objects on which the current thread may be synchronized remain
+     * locked while the thread waits.
+     * <p>
+     * This method should only be called by a thread that is the owner
+     * of this object's monitor. See the {@code notify} method for a
+     * description of the ways in which a thread can become the owner of
+     * a monitor.
+     *
+     * @param      timeout   the maximum time to wait in milliseconds.
+     * @exception  IllegalArgumentException      if the value of timeout is
+     *               negative.
+     * @exception  IllegalMonitorStateException  if the current thread is not
+     *               the owner of the object's monitor.
+     * @exception  InterruptedException if any thread interrupted the
+     *             current thread before or while the current thread
+     *             was waiting for a notification.  The <i>interrupted
+     *             status</i> of the current thread is cleared when
+     *             this exception is thrown.
+     * @see        java.lang.Object#notify()
+     * @see        java.lang.Object#notifyAll()
+     */
+    public final native void wait(long timeout) throws InterruptedException;
+
+    /**
+     * Causes the current thread to wait until another thread invokes the
+     * {@link java.lang.Object#notify()} method or the
+     * {@link java.lang.Object#notifyAll()} method for this object, or
+     * some other thread interrupts the current thread, or a certain
+     * amount of real time has elapsed.
+     * <p>
+     * This method is similar to the {@code wait} method of one
+     * argument, but it allows finer control over the amount of time to
+     * wait for a notification before giving up. The amount of real time,
+     * measured in nanoseconds, is given by:
+     * <blockquote>
+     * <pre>
+     * 1000000*timeout+nanos</pre></blockquote>
+     * <p>
+     * In all other respects, this method does the same thing as the
+     * method {@link #wait(long)} of one argument. In particular,
+     * {@code wait(0, 0)} means the same thing as {@code wait(0)}.
+     * <p>
+     * The current thread must own this object's monitor. The thread
+     * releases ownership of this monitor and waits until either of the
+     * following two conditions has occurred:
+     * <ul>
+     * <li>Another thread notifies threads waiting on this object's monitor
+     *     to wake up either through a call to the {@code notify} method
+     *     or the {@code notifyAll} method.
+     * <li>The timeout period, specified by {@code timeout}
+     *     milliseconds plus {@code nanos} nanoseconds arguments, has
+     *     elapsed.
+     * </ul>
+     * <p>
+     * The thread then waits until it can re-obtain ownership of the
+     * monitor and resumes execution.
+     * <p>
+     * As in the one argument version, interrupts and spurious wakeups are
+     * possible, and this method should always be used in a loop:
+     * <pre>
+     *     synchronized (obj) {
+     *         while (&lt;condition does not hold&gt;)
+     *             obj.wait(timeout, nanos);
+     *         ... // Perform action appropriate to condition
+     *     }
+     * </pre>
+     * This method should only be called by a thread that is the owner
+     * of this object's monitor. See the {@code notify} method for a
+     * description of the ways in which a thread can become the owner of
+     * a monitor.
+     *
+     * @param      timeout   the maximum time to wait in milliseconds.
+     * @param      nanos      additional time, in nanoseconds range
+     *                       0-999999.
+     * @exception  IllegalArgumentException      if the value of timeout is
+     *                      negative or the value of nanos is
+     *                      not in the range 0-999999.
+     * @exception  IllegalMonitorStateException  if the current thread is not
+     *               the owner of this object's monitor.
+     * @exception  InterruptedException if any thread interrupted the
+     *             current thread before or while the current thread
+     *             was waiting for a notification.  The <i>interrupted
+     *             status</i> of the current thread is cleared when
+     *             this exception is thrown.
+     */
+    public final void wait(long timeout, int nanos) throws InterruptedException {
+        if (timeout < 0) {
+            throw new IllegalArgumentException("timeout value is negative");
+        }
+
+        if (nanos < 0 || nanos > 999999) {
+            throw new IllegalArgumentException(
+                                "nanosecond timeout value out of range");
+        }
+
+        if (nanos >= 500000 || (nanos != 0 && timeout == 0)) {
+            timeout++;
+        }
+
+        wait(timeout);
+    }
+
+    /**
+     * Causes the current thread to wait until another thread invokes the
+     * {@link java.lang.Object#notify()} method or the
+     * {@link java.lang.Object#notifyAll()} method for this object.
+     * In other words, this method behaves exactly as if it simply
+     * performs the call {@code wait(0)}.
+     * <p>
+     * The current thread must own this object's monitor. The thread
+     * releases ownership of this monitor and waits until another thread
+     * notifies threads waiting on this object's monitor to wake up
+     * either through a call to the {@code notify} method or the
+     * {@code notifyAll} method. The thread then waits until it can
+     * re-obtain ownership of the monitor and resumes execution.
+     * <p>
+     * As in the one argument version, interrupts and spurious wakeups are
+     * possible, and this method should always be used in a loop:
+     * <pre>
+     *     synchronized (obj) {
+     *         while (&lt;condition does not hold&gt;)
+     *             obj.wait();
+     *         ... // Perform action appropriate to condition
+     *     }
+     * </pre>
+     * This method should only be called by a thread that is the owner
+     * of this object's monitor. See the {@code notify} method for a
+     * description of the ways in which a thread can become the owner of
+     * a monitor.
+     *
+     * @exception  IllegalMonitorStateException  if the current thread is not
+     *               the owner of the object's monitor.
+     * @exception  InterruptedException if any thread interrupted the
+     *             current thread before or while the current thread
+     *             was waiting for a notification.  The <i>interrupted
+     *             status</i> of the current thread is cleared when
+     *             this exception is thrown.
+     * @see        java.lang.Object#notify()
+     * @see        java.lang.Object#notifyAll()
+     */
+    public final void wait() throws InterruptedException {
+        wait(0);
+    }
+
+    /**
+     * Called by the garbage collector on an object when garbage collection
+     * determines that there are no more references to the object.
+     * A subclass overrides the {@code finalize} method to dispose of
+     * system resources or to perform other cleanup.
+     * <p>
+     * The general contract of {@code finalize} is that it is invoked
+     * if and when the Java<font size="-2"><sup>TM</sup></font> virtual
+     * machine has determined that there is no longer any
+     * means by which this object can be accessed by any thread that has
+     * not yet died, except as a result of an action taken by the
+     * finalization of some other object or class which is ready to be
+     * finalized. The {@code finalize} method may take any action, including
+     * making this object available again to other threads; the usual purpose
+     * of {@code finalize}, however, is to perform cleanup actions before
+     * the object is irrevocably discarded. For example, the finalize method
+     * for an object that represents an input/output connection might perform
+     * explicit I/O transactions to break the connection before the object is
+     * permanently discarded.
+     * <p>
+     * The {@code finalize} method of class {@code Object} performs no
+     * special action; it simply returns normally. Subclasses of
+     * {@code Object} may override this definition.
+     * <p>
+     * The Java programming language does not guarantee which thread will
+     * invoke the {@code finalize} method for any given object. It is
+     * guaranteed, however, that the thread that invokes finalize will not
+     * be holding any user-visible synchronization locks when finalize is
+     * invoked. If an uncaught exception is thrown by the finalize method,
+     * the exception is ignored and finalization of that object terminates.
+     * <p>
+     * After the {@code finalize} method has been invoked for an object, no
+     * further action is taken until the Java virtual machine has again
+     * determined that there is no longer any means by which this object can
+     * be accessed by any thread that has not yet died, including possible
+     * actions by other objects or classes which are ready to be finalized,
+     * at which point the object may be discarded.
+     * <p>
+     * The {@code finalize} method is never invoked more than once by a Java
+     * virtual machine for any given object.
+     * <p>
+     * Any exception thrown by the {@code finalize} method causes
+     * the finalization of this object to be halted, but is otherwise
+     * ignored.
+     *
+     * @throws Throwable the {@code Exception} raised by this method
+     */
+    protected void finalize() throws Throwable { }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/OutOfMemoryError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/OutOfMemoryError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown when the Java Virtual Machine cannot allocate an object
+ * because it is out of memory, and no more memory could be made
+ * available by the garbage collector.
+ *
+ * {@code OutOfMemoryError} objects may be constructed by the virtual
+ * machine as if {@linkplain Throwable#Throwable(String, Throwable,
+ * boolean, boolean) suppression were disabled and/or the stack trace was not
+ * writable}.
+ *
+ * @author  unascribed
+ * @since   JDK1.0
+ */
+public class OutOfMemoryError extends VirtualMachineError {
+    private static final long serialVersionUID = 8228564086184010517L;
+
+    /**
+     * Constructs an {@code OutOfMemoryError} with no detail message.
+     */
+    public OutOfMemoryError() {
+        super();
+    }
+
+    /**
+     * Constructs an {@code OutOfMemoryError} with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public OutOfMemoryError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Override.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Override.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.lang.annotation.*;
+
+/**
+ * Indicates that a method declaration is intended to override a
+ * method declaration in a supertype. If a method is annotated with
+ * this annotation type compilers are required to generate an error
+ * message unless at least one of the following conditions hold:
+ *
+ * <ul><li>
+ * The method does override or implement a method declared in a
+ * supertype.
+ * </li><li>
+ * The method has a signature that is override-equivalent to that of
+ * any public method declared in {@linkplain Object}.
+ * </li></ul>
+ *
+ * @author  Peter von der Ah&eacute;
+ * @author  Joshua Bloch
+ * @jls 9.6.1.4 Override
+ * @since 1.5
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.SOURCE)
+public @interface Override {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/ReflectiveOperationException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/ReflectiveOperationException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Common superclass of exceptions thrown by reflective operations in
+ * core reflection.
+ *
+ * @see LinkageError
+ * @since 1.7
+ */
+public class ReflectiveOperationException extends Exception {
+    static final long serialVersionUID = 123456789L;
+
+    /**
+     * Constructs a new exception with {@code null} as its detail
+     * message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public ReflectiveOperationException() {
+        super();
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message.
+     * The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     *
+     * @param   message   the detail message. The detail message is saved for
+     *          later retrieval by the {@link #getMessage()} method.
+     */
+    public ReflectiveOperationException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message
+     * and cause.
+     *
+     * <p>Note that the detail message associated with
+     * {@code cause} is <em>not</em> automatically incorporated in
+     * this exception's detail message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link #getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     */
+    public ReflectiveOperationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail
+     * message of {@code (cause==null ? null : cause.toString())} (which
+     * typically contains the class and detail message of {@code cause}).
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     */
+    public ReflectiveOperationException(Throwable cause) {
+        super(cause);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Runnable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Runnable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1994, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * The <code>Runnable</code> interface should be implemented by any
+ * class whose instances are intended to be executed by a thread. The
+ * class must define a method of no arguments called <code>run</code>.
+ * <p>
+ * This interface is designed to provide a common protocol for objects that
+ * wish to execute code while they are active. For example,
+ * <code>Runnable</code> is implemented by class <code>Thread</code>.
+ * Being active simply means that a thread has been started and has not
+ * yet been stopped.
+ * <p>
+ * In addition, <code>Runnable</code> provides the means for a class to be
+ * active while not subclassing <code>Thread</code>. A class that implements
+ * <code>Runnable</code> can run without subclassing <code>Thread</code>
+ * by instantiating a <code>Thread</code> instance and passing itself in
+ * as the target.  In most cases, the <code>Runnable</code> interface should
+ * be used if you are only planning to override the <code>run()</code>
+ * method and no other <code>Thread</code> methods.
+ * This is important because classes should not be subclassed
+ * unless the programmer intends on modifying or enhancing the fundamental
+ * behavior of the class.
+ *
+ * @author  Arthur van Hoff
+ * @see     java.lang.Thread
+ * @see     java.util.concurrent.Callable
+ * @since   JDK1.0
+ */
+public
+interface Runnable {
+    /**
+     * When an object implementing interface <code>Runnable</code> is used
+     * to create a thread, starting the thread causes the object's
+     * <code>run</code> method to be called in that separately executing
+     * thread.
+     * <p>
+     * The general contract of the method <code>run</code> is that it may
+     * take any action whatsoever.
+     *
+     * @see     java.lang.Thread#run()
+     */
+    public abstract void run();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/RuntimeException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/RuntimeException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * {@code RuntimeException} is the superclass of those
+ * exceptions that can be thrown during the normal operation of the
+ * Java Virtual Machine.
+ *
+ * <p>{@code RuntimeException} and its subclasses are <em>unchecked
+ * exceptions</em>.  Unchecked exceptions do <em>not</em> need to be
+ * declared in a method or constructor's {@code throws} clause if they
+ * can be thrown by the execution of the method or constructor and
+ * propagate outside the method or constructor boundary.
+ *
+ * @author  Frank Yellin
+ * @jls 11.2 Compile-Time Checking of Exceptions
+ * @since   JDK1.0
+ */
+public class RuntimeException extends Exception {
+    static final long serialVersionUID = -7034897190745766939L;
+
+    /** Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public RuntimeException() {
+        super();
+    }
+
+    /** Constructs a new runtime exception with the specified detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     *
+     * @param   message   the detail message. The detail message is saved for
+     *          later retrieval by the {@link #getMessage()} method.
+     */
+    public RuntimeException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message and
+     * cause.  <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this runtime exception's detail message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link #getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A <tt>null</tt> value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.4
+     */
+    public RuntimeException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /** Constructs a new runtime exception with the specified cause and a
+     * detail message of <tt>(cause==null ? null : cause.toString())</tt>
+     * (which typically contains the class and detail message of
+     * <tt>cause</tt>).  This constructor is useful for runtime exceptions
+     * that are little more than wrappers for other throwables.
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A <tt>null</tt> value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.4
+     */
+    public RuntimeException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail
+     * message, cause, suppression enabled or disabled, and writable
+     * stack trace enabled or disabled.
+     *
+     * @param  message the detail message.
+     * @param cause the cause.  (A {@code null} value is permitted,
+     * and indicates that the cause is nonexistent or unknown.)
+     * @param enableSuppression whether or not suppression is enabled
+     *                          or disabled
+     * @param writableStackTrace whether or not the stack trace should
+     *                           be writable
+     *
+     * @since 1.7
+     */
+    protected RuntimeException(String message, Throwable cause,
+                               boolean enableSuppression,
+                               boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/SecurityException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/SecurityException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.lang;
+
+/**
+ * Thrown by the security manager to indicate a security violation.
+ *
+ * @author  unascribed
+ * @see     java.lang.SecurityManager
+ * @since   JDK1.0
+ */
+public class SecurityException extends RuntimeException {
+
+    private static final long serialVersionUID = 6878364983674394167L;
+
+    /**
+     * Constructs a <code>SecurityException</code> with no detail  message.
+     */
+    public SecurityException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>SecurityException</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public SecurityException(String s) {
+        super(s);
+    }
+
+    /**
+     * Creates a <code>SecurityException</code> with the specified
+     * detail message and cause.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *        by the {@link #getMessage()} method).
+     * @param cause the cause (which is saved for later retrieval by the
+     *        {@link #getCause()} method).  (A <tt>null</tt> value is permitted,
+     *        and indicates that the cause is nonexistent or unknown.)
+     * @since 1.5
+     */
+    public SecurityException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Creates a <code>SecurityException</code> with the specified cause
+     * and a detail message of <tt>(cause==null ? null : cause.toString())</tt>
+     * (which typically contains the class and detail message of
+     * <tt>cause</tt>).
+     *
+     * @param cause the cause (which is saved for later retrieval by the
+     *        {@link #getCause()} method).  (A <tt>null</tt> value is permitted,
+     *        and indicates that the cause is nonexistent or unknown.)
+     * @since 1.5
+     */
+    public SecurityException(Throwable cause) {
+        super(cause);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Short.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Short.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,468 @@
+/*
+ * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * The {@code Short} class wraps a value of primitive type {@code
+ * short} in an object.  An object of type {@code Short} contains a
+ * single field whose type is {@code short}.
+ *
+ * <p>In addition, this class provides several methods for converting
+ * a {@code short} to a {@code String} and a {@code String} to a
+ * {@code short}, as well as other constants and methods useful when
+ * dealing with a {@code short}.
+ *
+ * @author  Nakul Saraiya
+ * @author  Joseph D. Darcy
+ * @see     java.lang.Number
+ * @since   JDK1.1
+ */
+public final class Short extends Number implements Comparable<Short> {
+
+    /**
+     * A constant holding the minimum value a {@code short} can
+     * have, -2<sup>15</sup>.
+     */
+    public static final short   MIN_VALUE = -32768;
+
+    /**
+     * A constant holding the maximum value a {@code short} can
+     * have, 2<sup>15</sup>-1.
+     */
+    public static final short   MAX_VALUE = 32767;
+
+    /**
+     * The {@code Class} instance representing the primitive type
+     * {@code short}.
+     */
+    public static final Class<Short>    TYPE = (Class<Short>) Class.getPrimitiveClass("short");
+
+    /**
+     * Returns a new {@code String} object representing the
+     * specified {@code short}. The radix is assumed to be 10.
+     *
+     * @param s the {@code short} to be converted
+     * @return the string representation of the specified {@code short}
+     * @see java.lang.Integer#toString(int)
+     */
+    public static String toString(short s) {
+        return Integer.toString((int)s, 10);
+    }
+
+    /**
+     * Parses the string argument as a signed {@code short} in the
+     * radix specified by the second argument. The characters in the
+     * string must all be digits, of the specified radix (as
+     * determined by whether {@link java.lang.Character#digit(char,
+     * int)} returns a nonnegative value) except that the first
+     * character may be an ASCII minus sign {@code '-'}
+     * (<code>'&#92;u002D'</code>) to indicate a negative value or an
+     * ASCII plus sign {@code '+'} (<code>'&#92;u002B'</code>) to
+     * indicate a positive value.  The resulting {@code short} value
+     * is returned.
+     *
+     * <p>An exception of type {@code NumberFormatException} is
+     * thrown if any of the following situations occurs:
+     * <ul>
+     * <li> The first argument is {@code null} or is a string of
+     * length zero.
+     *
+     * <li> The radix is either smaller than {@link
+     * java.lang.Character#MIN_RADIX} or larger than {@link
+     * java.lang.Character#MAX_RADIX}.
+     *
+     * <li> Any character of the string is not a digit of the
+     * specified radix, except that the first character may be a minus
+     * sign {@code '-'} (<code>'&#92;u002D'</code>) or plus sign
+     * {@code '+'} (<code>'&#92;u002B'</code>) provided that the
+     * string is longer than length 1.
+     *
+     * <li> The value represented by the string is not a value of type
+     * {@code short}.
+     * </ul>
+     *
+     * @param s         the {@code String} containing the
+     *                  {@code short} representation to be parsed
+     * @param radix     the radix to be used while parsing {@code s}
+     * @return          the {@code short} represented by the string
+     *                  argument in the specified radix.
+     * @throws          NumberFormatException If the {@code String}
+     *                  does not contain a parsable {@code short}.
+     */
+    public static short parseShort(String s, int radix)
+        throws NumberFormatException {
+        int i = Integer.parseInt(s, radix);
+        if (i < MIN_VALUE || i > MAX_VALUE)
+            throw new NumberFormatException(
+                "Value out of range. Value:\"" + s + "\" Radix:" + radix);
+        return (short)i;
+    }
+
+    /**
+     * Parses the string argument as a signed decimal {@code
+     * short}. The characters in the string must all be decimal
+     * digits, except that the first character may be an ASCII minus
+     * sign {@code '-'} (<code>'&#92;u002D'</code>) to indicate a
+     * negative value or an ASCII plus sign {@code '+'}
+     * (<code>'&#92;u002B'</code>) to indicate a positive value.  The
+     * resulting {@code short} value is returned, exactly as if the
+     * argument and the radix 10 were given as arguments to the {@link
+     * #parseShort(java.lang.String, int)} method.
+     *
+     * @param s a {@code String} containing the {@code short}
+     *          representation to be parsed
+     * @return  the {@code short} value represented by the
+     *          argument in decimal.
+     * @throws  NumberFormatException If the string does not
+     *          contain a parsable {@code short}.
+     */
+    public static short parseShort(String s) throws NumberFormatException {
+        return parseShort(s, 10);
+    }
+
+    /**
+     * Returns a {@code Short} object holding the value
+     * extracted from the specified {@code String} when parsed
+     * with the radix given by the second argument. The first argument
+     * is interpreted as representing a signed {@code short} in
+     * the radix specified by the second argument, exactly as if the
+     * argument were given to the {@link #parseShort(java.lang.String,
+     * int)} method. The result is a {@code Short} object that
+     * represents the {@code short} value specified by the string.
+     *
+     * <p>In other words, this method returns a {@code Short} object
+     * equal to the value of:
+     *
+     * <blockquote>
+     *  {@code new Short(Short.parseShort(s, radix))}
+     * </blockquote>
+     *
+     * @param s         the string to be parsed
+     * @param radix     the radix to be used in interpreting {@code s}
+     * @return          a {@code Short} object holding the value
+     *                  represented by the string argument in the
+     *                  specified radix.
+     * @throws          NumberFormatException If the {@code String} does
+     *                  not contain a parsable {@code short}.
+     */
+    public static Short valueOf(String s, int radix)
+        throws NumberFormatException {
+        return valueOf(parseShort(s, radix));
+    }
+
+    /**
+     * Returns a {@code Short} object holding the
+     * value given by the specified {@code String}. The argument
+     * is interpreted as representing a signed decimal
+     * {@code short}, exactly as if the argument were given to
+     * the {@link #parseShort(java.lang.String)} method. The result is
+     * a {@code Short} object that represents the
+     * {@code short} value specified by the string.
+     *
+     * <p>In other words, this method returns a {@code Short} object
+     * equal to the value of:
+     *
+     * <blockquote>
+     *  {@code new Short(Short.parseShort(s))}
+     * </blockquote>
+     *
+     * @param s the string to be parsed
+     * @return  a {@code Short} object holding the value
+     *          represented by the string argument
+     * @throws  NumberFormatException If the {@code String} does
+     *          not contain a parsable {@code short}.
+     */
+    public static Short valueOf(String s) throws NumberFormatException {
+        return valueOf(s, 10);
+    }
+
+    private static class ShortCache {
+        private ShortCache(){}
+
+        static final Short cache[] = new Short[-(-128) + 127 + 1];
+
+        static {
+            for(int i = 0; i < cache.length; i++)
+                cache[i] = new Short((short)(i - 128));
+        }
+    }
+
+    /**
+     * Returns a {@code Short} instance representing the specified
+     * {@code short} value.
+     * If a new {@code Short} instance is not required, this method
+     * should generally be used in preference to the constructor
+     * {@link #Short(short)}, as this method is likely to yield
+     * significantly better space and time performance by caching
+     * frequently requested values.
+     *
+     * This method will always cache values in the range -128 to 127,
+     * inclusive, and may cache other values outside of this range.
+     *
+     * @param  s a short value.
+     * @return a {@code Short} instance representing {@code s}.
+     * @since  1.5
+     */
+    public static Short valueOf(short s) {
+        final int offset = 128;
+        int sAsInt = s;
+        if (sAsInt >= -128 && sAsInt <= 127) { // must cache
+            return ShortCache.cache[sAsInt + offset];
+        }
+        return new Short(s);
+    }
+
+    /**
+     * Decodes a {@code String} into a {@code Short}.
+     * Accepts decimal, hexadecimal, and octal numbers given by
+     * the following grammar:
+     *
+     * <blockquote>
+     * <dl>
+     * <dt><i>DecodableString:</i>
+     * <dd><i>Sign<sub>opt</sub> DecimalNumeral</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0x} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0X} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code #} <i>HexDigits</i>
+     * <dd><i>Sign<sub>opt</sub></i> {@code 0} <i>OctalDigits</i>
+     * <p>
+     * <dt><i>Sign:</i>
+     * <dd>{@code -}
+     * <dd>{@code +}
+     * </dl>
+     * </blockquote>
+     *
+     * <i>DecimalNumeral</i>, <i>HexDigits</i>, and <i>OctalDigits</i>
+     * are as defined in section 3.10.1 of
+     * <cite>The Java&trade; Language Specification</cite>,
+     * except that underscores are not accepted between digits.
+     *
+     * <p>The sequence of characters following an optional
+     * sign and/or radix specifier ("{@code 0x}", "{@code 0X}",
+     * "{@code #}", or leading zero) is parsed as by the {@code
+     * Short.parseShort} method with the indicated radix (10, 16, or
+     * 8).  This sequence of characters must represent a positive
+     * value or a {@link NumberFormatException} will be thrown.  The
+     * result is negated if first character of the specified {@code
+     * String} is the minus sign.  No whitespace characters are
+     * permitted in the {@code String}.
+     *
+     * @param     nm the {@code String} to decode.
+     * @return    a {@code Short} object holding the {@code short}
+     *            value represented by {@code nm}
+     * @throws    NumberFormatException  if the {@code String} does not
+     *            contain a parsable {@code short}.
+     * @see java.lang.Short#parseShort(java.lang.String, int)
+     */
+    public static Short decode(String nm) throws NumberFormatException {
+        int i = Integer.decode(nm);
+        if (i < MIN_VALUE || i > MAX_VALUE)
+            throw new NumberFormatException(
+                    "Value " + i + " out of range from input " + nm);
+        return valueOf((short)i);
+    }
+
+    /**
+     * The value of the {@code Short}.
+     *
+     * @serial
+     */
+    private final short value;
+
+    /**
+     * Constructs a newly allocated {@code Short} object that
+     * represents the specified {@code short} value.
+     *
+     * @param value     the value to be represented by the
+     *                  {@code Short}.
+     */
+    public Short(short value) {
+        this.value = value;
+    }
+
+    /**
+     * Constructs a newly allocated {@code Short} object that
+     * represents the {@code short} value indicated by the
+     * {@code String} parameter. The string is converted to a
+     * {@code short} value in exactly the manner used by the
+     * {@code parseShort} method for radix 10.
+     *
+     * @param s the {@code String} to be converted to a
+     *          {@code Short}
+     * @throws  NumberFormatException If the {@code String}
+     *          does not contain a parsable {@code short}.
+     * @see     java.lang.Short#parseShort(java.lang.String, int)
+     */
+    public Short(String s) throws NumberFormatException {
+        this.value = parseShort(s, 10);
+    }
+
+    /**
+     * Returns the value of this {@code Short} as a
+     * {@code byte}.
+     */
+    public byte byteValue() {
+        return (byte)value;
+    }
+
+    /**
+     * Returns the value of this {@code Short} as a
+     * {@code short}.
+     */
+    public short shortValue() {
+        return value;
+    }
+
+    /**
+     * Returns the value of this {@code Short} as an
+     * {@code int}.
+     */
+    public int intValue() {
+        return (int)value;
+    }
+
+    /**
+     * Returns the value of this {@code Short} as a
+     * {@code long}.
+     */
+    public long longValue() {
+        return (long)value;
+    }
+
+    /**
+     * Returns the value of this {@code Short} as a
+     * {@code float}.
+     */
+    public float floatValue() {
+        return (float)value;
+    }
+
+    /**
+     * Returns the value of this {@code Short} as a
+     * {@code double}.
+     */
+    public double doubleValue() {
+        return (double)value;
+    }
+
+    /**
+     * Returns a {@code String} object representing this
+     * {@code Short}'s value.  The value is converted to signed
+     * decimal representation and returned as a string, exactly as if
+     * the {@code short} value were given as an argument to the
+     * {@link java.lang.Short#toString(short)} method.
+     *
+     * @return  a string representation of the value of this object in
+     *          base&nbsp;10.
+     */
+    public String toString() {
+        return Integer.toString((int)value);
+    }
+
+    /**
+     * Returns a hash code for this {@code Short}; equal to the result
+     * of invoking {@code intValue()}.
+     *
+     * @return a hash code value for this {@code Short}
+     */
+    public int hashCode() {
+        return (int)value;
+    }
+
+    /**
+     * Compares this object to the specified object.  The result is
+     * {@code true} if and only if the argument is not
+     * {@code null} and is a {@code Short} object that
+     * contains the same {@code short} value as this object.
+     *
+     * @param obj       the object to compare with
+     * @return          {@code true} if the objects are the same;
+     *                  {@code false} otherwise.
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof Short) {
+            return value == ((Short)obj).shortValue();
+        }
+        return false;
+    }
+
+    /**
+     * Compares two {@code Short} objects numerically.
+     *
+     * @param   anotherShort   the {@code Short} to be compared.
+     * @return  the value {@code 0} if this {@code Short} is
+     *          equal to the argument {@code Short}; a value less than
+     *          {@code 0} if this {@code Short} is numerically less
+     *          than the argument {@code Short}; and a value greater than
+     *           {@code 0} if this {@code Short} is numerically
+     *           greater than the argument {@code Short} (signed
+     *           comparison).
+     * @since   1.2
+     */
+    public int compareTo(Short anotherShort) {
+        return compare(this.value, anotherShort.value);
+    }
+
+    /**
+     * Compares two {@code short} values numerically.
+     * The value returned is identical to what would be returned by:
+     * <pre>
+     *    Short.valueOf(x).compareTo(Short.valueOf(y))
+     * </pre>
+     *
+     * @param  x the first {@code short} to compare
+     * @param  y the second {@code short} to compare
+     * @return the value {@code 0} if {@code x == y};
+     *         a value less than {@code 0} if {@code x < y}; and
+     *         a value greater than {@code 0} if {@code x > y}
+     * @since 1.7
+     */
+    public static int compare(short x, short y) {
+        return x - y;
+    }
+
+    /**
+     * The number of bits used to represent a {@code short} value in two's
+     * complement binary form.
+     * @since 1.5
+     */
+    public static final int SIZE = 16;
+
+    /**
+     * Returns the value obtained by reversing the order of the bytes in the
+     * two's complement representation of the specified {@code short} value.
+     *
+     * @return the value obtained by reversing (or, equivalently, swapping)
+     *     the bytes in the specified {@code short} value.
+     * @since 1.5
+     */
+    public static short reverseBytes(short i) {
+        return (short) (((i & 0xFF00) >> 8) | (i << 8));
+    }
+
+    /** use serialVersionUID from JDK 1.1. for interoperability */
+    private static final long serialVersionUID = 7515723908773894738L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/StackTraceElement.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/StackTraceElement.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * An element in a stack trace, as returned by {@link
+ * Throwable#getStackTrace()}.  Each element represents a single stack frame.
+ * All stack frames except for the one at the top of the stack represent
+ * a method invocation.  The frame at the top of the stack represents the
+ * execution point at which the stack trace was generated.  Typically,
+ * this is the point at which the throwable corresponding to the stack trace
+ * was created.
+ *
+ * @since  1.4
+ * @author Josh Bloch
+ */
+public final class StackTraceElement implements java.io.Serializable {
+    // Normally initialized by VM (public constructor added in 1.5)
+    private String declaringClass;
+    private String methodName;
+    private String fileName;
+    private int    lineNumber;
+
+    /**
+     * Creates a stack trace element representing the specified execution
+     * point.
+     *
+     * @param declaringClass the fully qualified name of the class containing
+     *        the execution point represented by the stack trace element
+     * @param methodName the name of the method containing the execution point
+     *        represented by the stack trace element
+     * @param fileName the name of the file containing the execution point
+     *         represented by the stack trace element, or {@code null} if
+     *         this information is unavailable
+     * @param lineNumber the line number of the source line containing the
+     *         execution point represented by this stack trace element, or
+     *         a negative number if this information is unavailable. A value
+     *         of -2 indicates that the method containing the execution point
+     *         is a native method
+     * @throws NullPointerException if {@code declaringClass} or
+     *         {@code methodName} is null
+     * @since 1.5
+     */
+    public StackTraceElement(String declaringClass, String methodName,
+                             String fileName, int lineNumber) {
+        this.declaringClass = declaringClass;
+        this.methodName     = methodName;
+        this.fileName       = fileName;
+        this.lineNumber     = lineNumber;
+    }
+
+    /**
+     * Returns the name of the source file containing the execution point
+     * represented by this stack trace element.  Generally, this corresponds
+     * to the {@code SourceFile} attribute of the relevant {@code class}
+     * file (as per <i>The Java Virtual Machine Specification</i>, Section
+     * 4.7.7).  In some systems, the name may refer to some source code unit
+     * other than a file, such as an entry in source repository.
+     *
+     * @return the name of the file containing the execution point
+     *         represented by this stack trace element, or {@code null} if
+     *         this information is unavailable.
+     */
+    public String getFileName() {
+        return fileName;
+    }
+
+    /**
+     * Returns the line number of the source line containing the execution
+     * point represented by this stack trace element.  Generally, this is
+     * derived from the {@code LineNumberTable} attribute of the relevant
+     * {@code class} file (as per <i>The Java Virtual Machine
+     * Specification</i>, Section 4.7.8).
+     *
+     * @return the line number of the source line containing the execution
+     *         point represented by this stack trace element, or a negative
+     *         number if this information is unavailable.
+     */
+    public int getLineNumber() {
+        return lineNumber;
+    }
+
+    /**
+     * Returns the fully qualified name of the class containing the
+     * execution point represented by this stack trace element.
+     *
+     * @return the fully qualified name of the {@code Class} containing
+     *         the execution point represented by this stack trace element.
+     */
+    public String getClassName() {
+        return declaringClass;
+    }
+
+    /**
+     * Returns the name of the method containing the execution point
+     * represented by this stack trace element.  If the execution point is
+     * contained in an instance or class initializer, this method will return
+     * the appropriate <i>special method name</i>, {@code <init>} or
+     * {@code <clinit>}, as per Section 3.9 of <i>The Java Virtual
+     * Machine Specification</i>.
+     *
+     * @return the name of the method containing the execution point
+     *         represented by this stack trace element.
+     */
+    public String getMethodName() {
+        return methodName;
+    }
+
+    /**
+     * Returns true if the method containing the execution point
+     * represented by this stack trace element is a native method.
+     *
+     * @return {@code true} if the method containing the execution point
+     *         represented by this stack trace element is a native method.
+     */
+    public boolean isNativeMethod() {
+        return lineNumber == -2;
+    }
+
+    /**
+     * Returns a string representation of this stack trace element.  The
+     * format of this string depends on the implementation, but the following
+     * examples may be regarded as typical:
+     * <ul>
+     * <li>
+     *   {@code "MyClass.mash(MyClass.java:9)"} - Here, {@code "MyClass"}
+     *   is the <i>fully-qualified name</i> of the class containing the
+     *   execution point represented by this stack trace element,
+     *   {@code "mash"} is the name of the method containing the execution
+     *   point, {@code "MyClass.java"} is the source file containing the
+     *   execution point, and {@code "9"} is the line number of the source
+     *   line containing the execution point.
+     * <li>
+     *   {@code "MyClass.mash(MyClass.java)"} - As above, but the line
+     *   number is unavailable.
+     * <li>
+     *   {@code "MyClass.mash(Unknown Source)"} - As above, but neither
+     *   the file name nor the line  number are available.
+     * <li>
+     *   {@code "MyClass.mash(Native Method)"} - As above, but neither
+     *   the file name nor the line  number are available, and the method
+     *   containing the execution point is known to be a native method.
+     * </ul>
+     * @see    Throwable#printStackTrace()
+     */
+    public String toString() {
+        return getClassName() + "." + methodName +
+            (isNativeMethod() ? "(Native Method)" :
+             (fileName != null && lineNumber >= 0 ?
+              "(" + fileName + ":" + lineNumber + ")" :
+              (fileName != null ?  "("+fileName+")" : "(Unknown Source)")));
+    }
+
+    /**
+     * Returns true if the specified object is another
+     * {@code StackTraceElement} instance representing the same execution
+     * point as this instance.  Two stack trace elements {@code a} and
+     * {@code b} are equal if and only if:
+     * <pre>
+     *     equals(a.getFileName(), b.getFileName()) &&
+     *     a.getLineNumber() == b.getLineNumber()) &&
+     *     equals(a.getClassName(), b.getClassName()) &&
+     *     equals(a.getMethodName(), b.getMethodName())
+     * </pre>
+     * where {@code equals} has the semantics of {@link
+     * java.util.Objects#equals(Object, Object) Objects.equals}.
+     *
+     * @param  obj the object to be compared with this stack trace element.
+     * @return true if the specified object is another
+     *         {@code StackTraceElement} instance representing the same
+     *         execution point as this instance.
+     */
+    public boolean equals(Object obj) {
+        if (obj==this)
+            return true;
+        if (!(obj instanceof StackTraceElement))
+            return false;
+        StackTraceElement e = (StackTraceElement)obj;
+        return e.declaringClass.equals(declaringClass) &&
+            e.lineNumber == lineNumber &&
+            equals(methodName, e.methodName) &&
+            equals(fileName, e.fileName);
+    }
+
+    /**
+     * Returns a hash code value for this stack trace element.
+     */
+    public int hashCode() {
+        int result = 31*declaringClass.hashCode() + methodName.hashCode();
+        result = 31*result + (fileName == null ? 0 : fileName.hashCode());
+        result = 31*result + lineNumber;
+        return result;
+    }
+    
+    private static boolean equals(Object a, Object b) {
+        return (a == b) || (a != null && a.equals(b));
+    }
+
+    private static final long serialVersionUID = 6992337162326171013L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/String.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/String.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,3081 @@
+/*
+ * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Comparator;
+import org.apidesign.bck2brwsr.core.ExtraJavaScript;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.core.JavaScriptOnly;
+import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * The <code>String</code> class represents character strings. All
+ * string literals in Java programs, such as <code>"abc"</code>, are
+ * implemented as instances of this class.
+ * <p>
+ * Strings are constant; their values cannot be changed after they
+ * are created. String buffers support mutable strings.
+ * Because String objects are immutable they can be shared. For example:
+ * <p><blockquote><pre>
+ *     String str = "abc";
+ * </pre></blockquote><p>
+ * is equivalent to:
+ * <p><blockquote><pre>
+ *     char data[] = {'a', 'b', 'c'};
+ *     String str = new String(data);
+ * </pre></blockquote><p>
+ * Here are some more examples of how strings can be used:
+ * <p><blockquote><pre>
+ *     System.out.println("abc");
+ *     String cde = "cde";
+ *     System.out.println("abc" + cde);
+ *     String c = "abc".substring(2,3);
+ *     String d = cde.substring(1, 2);
+ * </pre></blockquote>
+ * <p>
+ * The class <code>String</code> includes methods for examining
+ * individual characters of the sequence, for comparing strings, for
+ * searching strings, for extracting substrings, and for creating a
+ * copy of a string with all characters translated to uppercase or to
+ * lowercase. Case mapping is based on the Unicode Standard version
+ * specified by the {@link java.lang.Character Character} class.
+ * <p>
+ * The Java language provides special support for the string
+ * concatenation operator (&nbsp;+&nbsp;), and for conversion of
+ * other objects to strings. String concatenation is implemented
+ * through the <code>StringBuilder</code>(or <code>StringBuffer</code>)
+ * class and its <code>append</code> method.
+ * String conversions are implemented through the method
+ * <code>toString</code>, defined by <code>Object</code> and
+ * inherited by all classes in Java. For additional information on
+ * string concatenation and conversion, see Gosling, Joy, and Steele,
+ * <i>The Java Language Specification</i>.
+ *
+ * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a constructor
+ * or method in this class will cause a {@link NullPointerException} to be
+ * thrown.
+ *
+ * <p>A <code>String</code> represents a string in the UTF-16 format
+ * in which <em>supplementary characters</em> are represented by <em>surrogate
+ * pairs</em> (see the section <a href="Character.html#unicode">Unicode
+ * Character Representations</a> in the <code>Character</code> class for
+ * more information).
+ * Index values refer to <code>char</code> code units, so a supplementary
+ * character uses two positions in a <code>String</code>.
+ * <p>The <code>String</code> class provides methods for dealing with
+ * Unicode code points (i.e., characters), in addition to those for
+ * dealing with Unicode code units (i.e., <code>char</code> values).
+ *
+ * @author  Lee Boynton
+ * @author  Arthur van Hoff
+ * @author  Martin Buchholz
+ * @author  Ulf Zibis
+ * @see     java.lang.Object#toString()
+ * @see     java.lang.StringBuffer
+ * @see     java.lang.StringBuilder
+ * @see     java.nio.charset.Charset
+ * @since   JDK1.0
+ */
+
+@ExtraJavaScript(
+    resource="/org/apidesign/vm4brwsr/emul/lang/java_lang_String.js",
+    processByteCode=true
+)
+@JavaScriptPrototype(container = "String.prototype", prototype = "new String")
+public final class String
+    implements java.io.Serializable, Comparable<String>, CharSequence
+{
+    /** real string to delegate to */
+    private Object r;
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = -6849794470754667710L;
+
+    static {
+        registerToString();
+    }
+    @JavaScriptBody(args = {}, body = 
+          "var p = vm.java_lang_String(false);\n"
+        + "p.toString = function() {\nreturn this._r().toString();\n};\n"
+        + "p.valueOf = function() {\nreturn this._r().valueOf();\n}\n"
+    )
+    private static native void registerToString();
+    
+    /**
+     * Class String is special cased within the Serialization Stream Protocol.
+     *
+     * A String instance is written initially into an ObjectOutputStream in the
+     * following format:
+     * <pre>
+     *      <code>TC_STRING</code> (utf String)
+     * </pre>
+     * The String is written by method <code>DataOutput.writeUTF</code>.
+     * A new handle is generated to  refer to all future references to the
+     * string instance within the stream.
+     */
+//    private static final ObjectStreamField[] serialPersistentFields =
+//        new ObjectStreamField[0];
+
+    /**
+     * Initializes a newly created {@code String} object so that it represents
+     * an empty character sequence.  Note that use of this constructor is
+     * unnecessary since Strings are immutable.
+     */
+    public String() {
+        this.r = "";
+    }
+
+    /**
+     * Initializes a newly created {@code String} object so that it represents
+     * the same sequence of characters as the argument; in other words, the
+     * newly created string is a copy of the argument string. Unless an
+     * explicit copy of {@code original} is needed, use of this constructor is
+     * unnecessary since Strings are immutable.
+     *
+     * @param  original
+     *         A {@code String}
+     */
+    public String(String original) {
+        this.r = original.toString();
+    }
+
+    /**
+     * Allocates a new {@code String} so that it represents the sequence of
+     * characters currently contained in the character array argument. The
+     * contents of the character array are copied; subsequent modification of
+     * the character array does not affect the newly created string.
+     *
+     * @param  value
+     *         The initial value of the string
+     */
+    @JavaScriptBody(args = { "charArr" }, body=
+        "for (var i = 0; i < charArr.length; i++) {\n"
+      + "  if (typeof charArr[i] === 'number') charArr[i] = String.fromCharCode(charArr[i]);\n"
+      + "}\n"
+      + "this._r(charArr.join(''));\n"
+    )
+    public String(char value[]) {
+    }
+
+    /**
+     * Allocates a new {@code String} that contains characters from a subarray
+     * of the character array argument. The {@code offset} argument is the
+     * index of the first character of the subarray and the {@code count}
+     * argument specifies the length of the subarray. The contents of the
+     * subarray are copied; subsequent modification of the character array does
+     * not affect the newly created string.
+     *
+     * @param  value
+     *         Array that is the source of characters
+     *
+     * @param  offset
+     *         The initial offset
+     *
+     * @param  count
+     *         The length
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the {@code offset} and {@code count} arguments index
+     *          characters outside the bounds of the {@code value} array
+     */
+    public String(char value[], int offset, int count) {
+        initFromCharArray(value, offset, count);
+    }
+    
+    @JavaScriptBody(args = { "charArr", "off", "cnt" }, body =
+        "var up = off + cnt;\n" +
+        "for (var i = off; i < up; i++) {\n" +
+        "  if (typeof charArr[i] === 'number') charArr[i] = String.fromCharCode(charArr[i]);\n" +
+        "}\n" +
+        "this._r(charArr.slice(off, up).join(\"\"));\n"
+    )
+    private native void initFromCharArray(char value[], int offset, int count);
+
+    /**
+     * Allocates a new {@code String} that contains characters from a subarray
+     * of the <a href="Character.html#unicode">Unicode code point</a> array
+     * argument.  The {@code offset} argument is the index of the first code
+     * point of the subarray and the {@code count} argument specifies the
+     * length of the subarray.  The contents of the subarray are converted to
+     * {@code char}s; subsequent modification of the {@code int} array does not
+     * affect the newly created string.
+     *
+     * @param  codePoints
+     *         Array that is the source of Unicode code points
+     *
+     * @param  offset
+     *         The initial offset
+     *
+     * @param  count
+     *         The length
+     *
+     * @throws  IllegalArgumentException
+     *          If any invalid Unicode code point is found in {@code
+     *          codePoints}
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the {@code offset} and {@code count} arguments index
+     *          characters outside the bounds of the {@code codePoints} array
+     *
+     * @since  1.5
+     */
+    public String(int[] codePoints, int offset, int count) {
+        if (offset < 0) {
+            throw new StringIndexOutOfBoundsException(offset);
+        }
+        if (count < 0) {
+            throw new StringIndexOutOfBoundsException(count);
+        }
+        // Note: offset or count might be near -1>>>1.
+        if (offset > codePoints.length - count) {
+            throw new StringIndexOutOfBoundsException(offset + count);
+        }
+
+        final int end = offset + count;
+
+        // Pass 1: Compute precise size of char[]
+        int n = count;
+        for (int i = offset; i < end; i++) {
+            int c = codePoints[i];
+            if (Character.isBmpCodePoint(c))
+                continue;
+            else if (Character.isValidCodePoint(c))
+                n++;
+            else throw new IllegalArgumentException(Integer.toString(c));
+        }
+
+        // Pass 2: Allocate and fill in char[]
+        final char[] v = new char[n];
+
+        for (int i = offset, j = 0; i < end; i++, j++) {
+            int c = codePoints[i];
+            if (Character.isBmpCodePoint(c))
+                v[j] = (char) c;
+            else
+                Character.toSurrogates(c, v, j++);
+        }
+
+        this.r = new String(v, 0, n);
+    }
+
+    /**
+     * Allocates a new {@code String} constructed from a subarray of an array
+     * of 8-bit integer values.
+     *
+     * <p> The {@code offset} argument is the index of the first byte of the
+     * subarray, and the {@code count} argument specifies the length of the
+     * subarray.
+     *
+     * <p> Each {@code byte} in the subarray is converted to a {@code char} as
+     * specified in the method above.
+     *
+     * @deprecated This method does not properly convert bytes into characters.
+     * As of JDK&nbsp;1.1, the preferred way to do this is via the
+     * {@code String} constructors that take a {@link
+     * java.nio.charset.Charset}, charset name, or that use the platform's
+     * default charset.
+     *
+     * @param  ascii
+     *         The bytes to be converted to characters
+     *
+     * @param  hibyte
+     *         The top 8 bits of each 16-bit Unicode code unit
+     *
+     * @param  offset
+     *         The initial offset
+     * @param  count
+     *         The length
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the {@code offset} or {@code count} argument is invalid
+     *
+     * @see  #String(byte[], int)
+     * @see  #String(byte[], int, int, java.lang.String)
+     * @see  #String(byte[], int, int, java.nio.charset.Charset)
+     * @see  #String(byte[], int, int)
+     * @see  #String(byte[], java.lang.String)
+     * @see  #String(byte[], java.nio.charset.Charset)
+     * @see  #String(byte[])
+     */
+    @Deprecated
+    public String(byte ascii[], int hibyte, int offset, int count) {
+        checkBounds(ascii, offset, count);
+        char value[] = new char[count];
+
+        if (hibyte == 0) {
+            for (int i = count ; i-- > 0 ;) {
+                value[i] = (char) (ascii[i + offset] & 0xff);
+            }
+        } else {
+            hibyte <<= 8;
+            for (int i = count ; i-- > 0 ;) {
+                value[i] = (char) (hibyte | (ascii[i + offset] & 0xff));
+            }
+        }
+        initFromCharArray(value, offset, count);
+    }
+
+    /**
+     * Allocates a new {@code String} containing characters constructed from
+     * an array of 8-bit integer values. Each character <i>c</i>in the
+     * resulting string is constructed from the corresponding component
+     * <i>b</i> in the byte array such that:
+     *
+     * <blockquote><pre>
+     *     <b><i>c</i></b> == (char)(((hibyte &amp; 0xff) &lt;&lt; 8)
+     *                         | (<b><i>b</i></b> &amp; 0xff))
+     * </pre></blockquote>
+     *
+     * @deprecated  This method does not properly convert bytes into
+     * characters.  As of JDK&nbsp;1.1, the preferred way to do this is via the
+     * {@code String} constructors that take a {@link
+     * java.nio.charset.Charset}, charset name, or that use the platform's
+     * default charset.
+     *
+     * @param  ascii
+     *         The bytes to be converted to characters
+     *
+     * @param  hibyte
+     *         The top 8 bits of each 16-bit Unicode code unit
+     *
+     * @see  #String(byte[], int, int, java.lang.String)
+     * @see  #String(byte[], int, int, java.nio.charset.Charset)
+     * @see  #String(byte[], int, int)
+     * @see  #String(byte[], java.lang.String)
+     * @see  #String(byte[], java.nio.charset.Charset)
+     * @see  #String(byte[])
+     */
+    @Deprecated
+    public String(byte ascii[], int hibyte) {
+        this(ascii, hibyte, 0, ascii.length);
+    }
+
+    /* Common private utility method used to bounds check the byte array
+     * and requested offset & length values used by the String(byte[],..)
+     * constructors.
+     */
+    private static void checkBounds(byte[] bytes, int offset, int length) {
+        if (length < 0)
+            throw new StringIndexOutOfBoundsException(length);
+        if (offset < 0)
+            throw new StringIndexOutOfBoundsException(offset);
+        if (offset > bytes.length - length)
+            throw new StringIndexOutOfBoundsException(offset + length);
+    }
+
+    /**
+     * Constructs a new {@code String} by decoding the specified subarray of
+     * bytes using the specified charset.  The length of the new {@code String}
+     * is a function of the charset, and hence may not be equal to the length
+     * of the subarray.
+     *
+     * <p> The behavior of this constructor when the given bytes are not valid
+     * in the given charset is unspecified.  The {@link
+     * java.nio.charset.CharsetDecoder} class should be used when more control
+     * over the decoding process is required.
+     *
+     * @param  bytes
+     *         The bytes to be decoded into characters
+     *
+     * @param  offset
+     *         The index of the first byte to decode
+     *
+     * @param  length
+     *         The number of bytes to decode
+
+     * @param  charsetName
+     *         The name of a supported {@linkplain java.nio.charset.Charset
+     *         charset}
+     *
+     * @throws  UnsupportedEncodingException
+     *          If the named charset is not supported
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the {@code offset} and {@code length} arguments index
+     *          characters outside the bounds of the {@code bytes} array
+     *
+     * @since  JDK1.1
+     */
+    public String(byte bytes[], int offset, int length, String charsetName)
+        throws UnsupportedEncodingException
+    {
+        this(checkUTF8(bytes, charsetName), offset, length);
+    }
+
+    /**
+     * Constructs a new {@code String} by decoding the specified subarray of
+     * bytes using the specified {@linkplain java.nio.charset.Charset charset}.
+     * The length of the new {@code String} is a function of the charset, and
+     * hence may not be equal to the length of the subarray.
+     *
+     * <p> This method always replaces malformed-input and unmappable-character
+     * sequences with this charset's default replacement string.  The {@link
+     * java.nio.charset.CharsetDecoder} class should be used when more control
+     * over the decoding process is required.
+     *
+     * @param  bytes
+     *         The bytes to be decoded into characters
+     *
+     * @param  offset
+     *         The index of the first byte to decode
+     *
+     * @param  length
+     *         The number of bytes to decode
+     *
+     * @param  charset
+     *         The {@linkplain java.nio.charset.Charset charset} to be used to
+     *         decode the {@code bytes}
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the {@code offset} and {@code length} arguments index
+     *          characters outside the bounds of the {@code bytes} array
+     *
+     * @since  1.6
+     */
+    /* don't want dependnecy on Charset
+    public String(byte bytes[], int offset, int length, Charset charset) {
+        if (charset == null)
+            throw new NullPointerException("charset");
+        checkBounds(bytes, offset, length);
+        char[] v = StringCoding.decode(charset, bytes, offset, length);
+        this.offset = 0;
+        this.count = v.length;
+        this.value = v;
+    }
+    */
+
+    /**
+     * Constructs a new {@code String} by decoding the specified array of bytes
+     * using the specified {@linkplain java.nio.charset.Charset charset}.  The
+     * length of the new {@code String} is a function of the charset, and hence
+     * may not be equal to the length of the byte array.
+     *
+     * <p> The behavior of this constructor when the given bytes are not valid
+     * in the given charset is unspecified.  The {@link
+     * java.nio.charset.CharsetDecoder} class should be used when more control
+     * over the decoding process is required.
+     *
+     * @param  bytes
+     *         The bytes to be decoded into characters
+     *
+     * @param  charsetName
+     *         The name of a supported {@linkplain java.nio.charset.Charset
+     *         charset}
+     *
+     * @throws  UnsupportedEncodingException
+     *          If the named charset is not supported
+     *
+     * @since  JDK1.1
+     */
+    public String(byte bytes[], String charsetName)
+        throws UnsupportedEncodingException
+    {
+        this(bytes, 0, bytes.length, charsetName);
+    }
+
+    /**
+     * Constructs a new {@code String} by decoding the specified array of
+     * bytes using the specified {@linkplain java.nio.charset.Charset charset}.
+     * The length of the new {@code String} is a function of the charset, and
+     * hence may not be equal to the length of the byte array.
+     *
+     * <p> This method always replaces malformed-input and unmappable-character
+     * sequences with this charset's default replacement string.  The {@link
+     * java.nio.charset.CharsetDecoder} class should be used when more control
+     * over the decoding process is required.
+     *
+     * @param  bytes
+     *         The bytes to be decoded into characters
+     *
+     * @param  charset
+     *         The {@linkplain java.nio.charset.Charset charset} to be used to
+     *         decode the {@code bytes}
+     *
+     * @since  1.6
+     */
+    /* don't want dep on Charset
+    public String(byte bytes[], Charset charset) {
+        this(bytes, 0, bytes.length, charset);
+    }
+    */
+
+    /**
+     * Constructs a new {@code String} by decoding the specified subarray of
+     * bytes using the platform's default charset.  The length of the new
+     * {@code String} is a function of the charset, and hence may not be equal
+     * to the length of the subarray.
+     *
+     * <p> The behavior of this constructor when the given bytes are not valid
+     * in the default charset is unspecified.  The {@link
+     * java.nio.charset.CharsetDecoder} class should be used when more control
+     * over the decoding process is required.
+     *
+     * @param  bytes
+     *         The bytes to be decoded into characters
+     *
+     * @param  offset
+     *         The index of the first byte to decode
+     *
+     * @param  length
+     *         The number of bytes to decode
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the {@code offset} and the {@code length} arguments index
+     *          characters outside the bounds of the {@code bytes} array
+     *
+     * @since  JDK1.1
+     */
+    public String(byte bytes[], int offset, int length) {
+        checkBounds(bytes, offset, length);
+        char[] v  = new char[length];
+        int[] at = { offset };
+        int end = offset + length;
+        int chlen = 0;
+        while (at[0] < end) {
+            int ch = nextChar(bytes, at);
+            v[chlen++] = (char)ch;
+        }
+        initFromCharArray(v, 0, chlen);
+    }
+
+    /**
+     * Constructs a new {@code String} by decoding the specified array of bytes
+     * using the platform's default charset.  The length of the new {@code
+     * String} is a function of the charset, and hence may not be equal to the
+     * length of the byte array.
+     *
+     * <p> The behavior of this constructor when the given bytes are not valid
+     * in the default charset is unspecified.  The {@link
+     * java.nio.charset.CharsetDecoder} class should be used when more control
+     * over the decoding process is required.
+     *
+     * @param  bytes
+     *         The bytes to be decoded into characters
+     *
+     * @since  JDK1.1
+     */
+    public String(byte bytes[]) {
+        this(bytes, 0, bytes.length);
+    }
+
+    /**
+     * Allocates a new string that contains the sequence of characters
+     * currently contained in the string buffer argument. The contents of the
+     * string buffer are copied; subsequent modification of the string buffer
+     * does not affect the newly created string.
+     *
+     * @param  buffer
+     *         A {@code StringBuffer}
+     */
+    public String(StringBuffer buffer) {
+        this.r = buffer.toString();
+    }
+
+    /**
+     * Allocates a new string that contains the sequence of characters
+     * currently contained in the string builder argument. The contents of the
+     * string builder are copied; subsequent modification of the string builder
+     * does not affect the newly created string.
+     *
+     * <p> This constructor is provided to ease migration to {@code
+     * StringBuilder}. Obtaining a string from a string builder via the {@code
+     * toString} method is likely to run faster and is generally preferred.
+     *
+     * @param   builder
+     *          A {@code StringBuilder}
+     *
+     * @since  1.5
+     */
+    public String(StringBuilder builder) {
+        this.r = builder.toString();
+    }
+
+    /**
+     * Returns the length of this string.
+     * The length is equal to the number of <a href="Character.html#unicode">Unicode
+     * code units</a> in the string.
+     *
+     * @return  the length of the sequence of characters represented by this
+     *          object.
+     */
+    @JavaScriptBody(args = {}, body = "return this.toString().length;")
+    public int length() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns <tt>true</tt> if, and only if, {@link #length()} is <tt>0</tt>.
+     *
+     * @return <tt>true</tt> if {@link #length()} is <tt>0</tt>, otherwise
+     * <tt>false</tt>
+     *
+     * @since 1.6
+     */
+    @JavaScriptBody(args = {}, body="return this.toString().length === 0;")
+    public boolean isEmpty() {
+        return length() == 0;
+    }
+
+    /**
+     * Returns the <code>char</code> value at the
+     * specified index. An index ranges from <code>0</code> to
+     * <code>length() - 1</code>. The first <code>char</code> value of the sequence
+     * is at index <code>0</code>, the next at index <code>1</code>,
+     * and so on, as for array indexing.
+     *
+     * <p>If the <code>char</code> value specified by the index is a
+     * <a href="Character.html#unicode">surrogate</a>, the surrogate
+     * value is returned.
+     *
+     * @param      index   the index of the <code>char</code> value.
+     * @return     the <code>char</code> value at the specified index of this string.
+     *             The first <code>char</code> value is at index <code>0</code>.
+     * @exception  IndexOutOfBoundsException  if the <code>index</code>
+     *             argument is negative or not less than the length of this
+     *             string.
+     */
+    @JavaScriptBody(args = { "index" }, 
+        body = "return this.toString().charCodeAt(index);"
+    )
+    public char charAt(int index) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the character (Unicode code point) at the specified
+     * index. The index refers to <code>char</code> values
+     * (Unicode code units) and ranges from <code>0</code> to
+     * {@link #length()}<code> - 1</code>.
+     *
+     * <p> If the <code>char</code> value specified at the given index
+     * is in the high-surrogate range, the following index is less
+     * than the length of this <code>String</code>, and the
+     * <code>char</code> value at the following index is in the
+     * low-surrogate range, then the supplementary code point
+     * corresponding to this surrogate pair is returned. Otherwise,
+     * the <code>char</code> value at the given index is returned.
+     *
+     * @param      index the index to the <code>char</code> values
+     * @return     the code point value of the character at the
+     *             <code>index</code>
+     * @exception  IndexOutOfBoundsException  if the <code>index</code>
+     *             argument is negative or not less than the length of this
+     *             string.
+     * @since      1.5
+     */
+    public int codePointAt(int index) {
+        if ((index < 0) || (index >= length())) {
+            throw new StringIndexOutOfBoundsException(index);
+        }
+        return Character.codePointAtImpl(toCharArray(), offset() + index, offset() + length());
+    }
+
+    /**
+     * Returns the character (Unicode code point) before the specified
+     * index. The index refers to <code>char</code> values
+     * (Unicode code units) and ranges from <code>1</code> to {@link
+     * CharSequence#length() length}.
+     *
+     * <p> If the <code>char</code> value at <code>(index - 1)</code>
+     * is in the low-surrogate range, <code>(index - 2)</code> is not
+     * negative, and the <code>char</code> value at <code>(index -
+     * 2)</code> is in the high-surrogate range, then the
+     * supplementary code point value of the surrogate pair is
+     * returned. If the <code>char</code> value at <code>index -
+     * 1</code> is an unpaired low-surrogate or a high-surrogate, the
+     * surrogate value is returned.
+     *
+     * @param     index the index following the code point that should be returned
+     * @return    the Unicode code point value before the given index.
+     * @exception IndexOutOfBoundsException if the <code>index</code>
+     *            argument is less than 1 or greater than the length
+     *            of this string.
+     * @since     1.5
+     */
+    public int codePointBefore(int index) {
+        int i = index - 1;
+        if ((i < 0) || (i >= length())) {
+            throw new StringIndexOutOfBoundsException(index);
+        }
+        return Character.codePointBeforeImpl(toCharArray(), offset() + index, offset());
+    }
+
+    /**
+     * Returns the number of Unicode code points in the specified text
+     * range of this <code>String</code>. The text range begins at the
+     * specified <code>beginIndex</code> and extends to the
+     * <code>char</code> at index <code>endIndex - 1</code>. Thus the
+     * length (in <code>char</code>s) of the text range is
+     * <code>endIndex-beginIndex</code>. Unpaired surrogates within
+     * the text range count as one code point each.
+     *
+     * @param beginIndex the index to the first <code>char</code> of
+     * the text range.
+     * @param endIndex the index after the last <code>char</code> of
+     * the text range.
+     * @return the number of Unicode code points in the specified text
+     * range
+     * @exception IndexOutOfBoundsException if the
+     * <code>beginIndex</code> is negative, or <code>endIndex</code>
+     * is larger than the length of this <code>String</code>, or
+     * <code>beginIndex</code> is larger than <code>endIndex</code>.
+     * @since  1.5
+     */
+    public int codePointCount(int beginIndex, int endIndex) {
+        if (beginIndex < 0 || endIndex > length() || beginIndex > endIndex) {
+            throw new IndexOutOfBoundsException();
+        }
+        return Character.codePointCountImpl(toCharArray(), offset()+beginIndex, endIndex-beginIndex);
+    }
+
+    /**
+     * Returns the index within this <code>String</code> that is
+     * offset from the given <code>index</code> by
+     * <code>codePointOffset</code> code points. Unpaired surrogates
+     * within the text range given by <code>index</code> and
+     * <code>codePointOffset</code> count as one code point each.
+     *
+     * @param index the index to be offset
+     * @param codePointOffset the offset in code points
+     * @return the index within this <code>String</code>
+     * @exception IndexOutOfBoundsException if <code>index</code>
+     *   is negative or larger then the length of this
+     *   <code>String</code>, or if <code>codePointOffset</code> is positive
+     *   and the substring starting with <code>index</code> has fewer
+     *   than <code>codePointOffset</code> code points,
+     *   or if <code>codePointOffset</code> is negative and the substring
+     *   before <code>index</code> has fewer than the absolute value
+     *   of <code>codePointOffset</code> code points.
+     * @since 1.5
+     */
+    public int offsetByCodePoints(int index, int codePointOffset) {
+        if (index < 0 || index > length()) {
+            throw new IndexOutOfBoundsException();
+        }
+        return Character.offsetByCodePointsImpl(toCharArray(), offset(), length(),
+                                                offset()+index, codePointOffset) - offset();
+    }
+
+    /**
+     * Copy characters from this string into dst starting at dstBegin.
+     * This method doesn't perform any range checking.
+     */
+    @JavaScriptBody(args = { "arr", "to" }, body = 
+        "var s = this.toString();\n" +
+        "for (var i = 0; i < s.length; i++) {\n" +
+        "   arr[to++] = s[i];\n" +
+        "}"
+    )
+    void getChars(char dst[], int dstBegin) {
+        System.arraycopy(toCharArray(), offset(), dst, dstBegin, length());
+    }
+
+    /**
+     * Copies characters from this string into the destination character
+     * array.
+     * <p>
+     * The first character to be copied is at index <code>srcBegin</code>;
+     * the last character to be copied is at index <code>srcEnd-1</code>
+     * (thus the total number of characters to be copied is
+     * <code>srcEnd-srcBegin</code>). The characters are copied into the
+     * subarray of <code>dst</code> starting at index <code>dstBegin</code>
+     * and ending at index:
+     * <p><blockquote><pre>
+     *     dstbegin + (srcEnd-srcBegin) - 1
+     * </pre></blockquote>
+     *
+     * @param      srcBegin   index of the first character in the string
+     *                        to copy.
+     * @param      srcEnd     index after the last character in the string
+     *                        to copy.
+     * @param      dst        the destination array.
+     * @param      dstBegin   the start offset in the destination array.
+     * @exception IndexOutOfBoundsException If any of the following
+     *            is true:
+     *            <ul><li><code>srcBegin</code> is negative.
+     *            <li><code>srcBegin</code> is greater than <code>srcEnd</code>
+     *            <li><code>srcEnd</code> is greater than the length of this
+     *                string
+     *            <li><code>dstBegin</code> is negative
+     *            <li><code>dstBegin+(srcEnd-srcBegin)</code> is larger than
+     *                <code>dst.length</code></ul>
+     */
+    @JavaScriptBody(args = { "beg", "end", "arr", "dst" }, body=
+        "var s = this.toString();\n" +
+        "while (beg < end) {\n" +
+        "  arr[dst++] = s.charCodeAt(beg++);\n" +
+        "}\n"
+    )
+    public void getChars(int srcBegin, int srcEnd, char dst[], int dstBegin) {
+        if (srcBegin < 0) {
+            throw new StringIndexOutOfBoundsException(srcBegin);
+        }
+        if (srcEnd > length()) {
+            throw new StringIndexOutOfBoundsException(srcEnd);
+        }
+        if (srcBegin > srcEnd) {
+            throw new StringIndexOutOfBoundsException(srcEnd - srcBegin);
+        }
+        System.arraycopy(toCharArray(), offset() + srcBegin, dst, dstBegin,
+             srcEnd - srcBegin);
+    }
+
+    /**
+     * Copies characters from this string into the destination byte array. Each
+     * byte receives the 8 low-order bits of the corresponding character. The
+     * eight high-order bits of each character are not copied and do not
+     * participate in the transfer in any way.
+     *
+     * <p> The first character to be copied is at index {@code srcBegin}; the
+     * last character to be copied is at index {@code srcEnd-1}.  The total
+     * number of characters to be copied is {@code srcEnd-srcBegin}. The
+     * characters, converted to bytes, are copied into the subarray of {@code
+     * dst} starting at index {@code dstBegin} and ending at index:
+     *
+     * <blockquote><pre>
+     *     dstbegin + (srcEnd-srcBegin) - 1
+     * </pre></blockquote>
+     *
+     * @deprecated  This method does not properly convert characters into
+     * bytes.  As of JDK&nbsp;1.1, the preferred way to do this is via the
+     * {@link #getBytes()} method, which uses the platform's default charset.
+     *
+     * @param  srcBegin
+     *         Index of the first character in the string to copy
+     *
+     * @param  srcEnd
+     *         Index after the last character in the string to copy
+     *
+     * @param  dst
+     *         The destination array
+     *
+     * @param  dstBegin
+     *         The start offset in the destination array
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If any of the following is true:
+     *          <ul>
+     *            <li> {@code srcBegin} is negative
+     *            <li> {@code srcBegin} is greater than {@code srcEnd}
+     *            <li> {@code srcEnd} is greater than the length of this String
+     *            <li> {@code dstBegin} is negative
+     *            <li> {@code dstBegin+(srcEnd-srcBegin)} is larger than {@code
+     *                 dst.length}
+     *          </ul>
+     */
+    @Deprecated
+    public void getBytes(int srcBegin, int srcEnd, byte dst[], int dstBegin) {
+        if (srcBegin < 0) {
+            throw new StringIndexOutOfBoundsException(srcBegin);
+        }
+        if (srcEnd > length()) {
+            throw new StringIndexOutOfBoundsException(srcEnd);
+        }
+        if (srcBegin > srcEnd) {
+            throw new StringIndexOutOfBoundsException(srcEnd - srcBegin);
+        }
+        int j = dstBegin;
+        int n = offset() + srcEnd;
+        int i = offset() + srcBegin;
+        char[] val = toCharArray();   /* avoid getfield opcode */
+
+        while (i < n) {
+            dst[j++] = (byte)val[i++];
+        }
+    }
+
+    /**
+     * Encodes this {@code String} into a sequence of bytes using the named
+     * charset, storing the result into a new byte array.
+     *
+     * <p> The behavior of this method when this string cannot be encoded in
+     * the given charset is unspecified.  The {@link
+     * java.nio.charset.CharsetEncoder} class should be used when more control
+     * over the encoding process is required.
+     *
+     * @param  charsetName
+     *         The name of a supported {@linkplain java.nio.charset.Charset
+     *         charset}
+     *
+     * @return  The resultant byte array
+     *
+     * @throws  UnsupportedEncodingException
+     *          If the named charset is not supported
+     *
+     * @since  JDK1.1
+     */
+    public byte[] getBytes(String charsetName)
+        throws UnsupportedEncodingException
+    {
+        checkUTF8(null, charsetName);
+        return getBytes();
+    }
+
+    /**
+     * Encodes this {@code String} into a sequence of bytes using the given
+     * {@linkplain java.nio.charset.Charset charset}, storing the result into a
+     * new byte array.
+     *
+     * <p> This method always replaces malformed-input and unmappable-character
+     * sequences with this charset's default replacement byte array.  The
+     * {@link java.nio.charset.CharsetEncoder} class should be used when more
+     * control over the encoding process is required.
+     *
+     * @param  charset
+     *         The {@linkplain java.nio.charset.Charset} to be used to encode
+     *         the {@code String}
+     *
+     * @return  The resultant byte array
+     *
+     * @since  1.6
+     */
+    /* don't want dep on Charset
+    public byte[] getBytes(Charset charset) {
+        if (charset == null) throw new NullPointerException();
+        return StringCoding.encode(charset, value, offset, count);
+    }
+    */
+
+    /**
+     * Encodes this {@code String} into a sequence of bytes using the
+     * platform's default charset, storing the result into a new byte array.
+     *
+     * <p> The behavior of this method when this string cannot be encoded in
+     * the default charset is unspecified.  The {@link
+     * java.nio.charset.CharsetEncoder} class should be used when more control
+     * over the encoding process is required.
+     *
+     * @return  The resultant byte array
+     *
+     * @since      JDK1.1
+     */
+    public byte[] getBytes() {
+        int len = length();
+        byte[] arr = new byte[len];
+        for (int i = 0, j = 0; j < len; j++) {
+            final int v = charAt(j);
+            if (v < 128) {
+                arr[i++] = (byte) v;
+                continue;
+            }
+            if (v < 0x0800) {
+                arr = System.expandArray(arr, i + 1);
+                arr[i++] = (byte) (0xC0 | (v >> 6));
+                arr[i++] = (byte) (0x80 | (0x3F & v));
+                continue;
+            }
+            arr = System.expandArray(arr, i + 2);
+            arr[i++] = (byte) (0xE0 | (v >> 12));
+            arr[i++] = (byte) (0x80 | ((v >> 6) & 0x7F));
+            arr[i++] = (byte) (0x80 | (0x3F & v));
+        }
+        return arr;
+    }
+
+    /**
+     * Compares this string to the specified object.  The result is {@code
+     * true} if and only if the argument is not {@code null} and is a {@code
+     * String} object that represents the same sequence of characters as this
+     * object.
+     *
+     * @param  anObject
+     *         The object to compare this {@code String} against
+     *
+     * @return  {@code true} if the given object represents a {@code String}
+     *          equivalent to this string, {@code false} otherwise
+     *
+     * @see  #compareTo(String)
+     * @see  #equalsIgnoreCase(String)
+     */
+    @JavaScriptBody(args = { "obj" }, body = 
+        "return obj != null && obj.$instOf_java_lang_String && "
+        + "this.toString() === obj.toString();"
+    )
+    public boolean equals(Object anObject) {
+        if (this == anObject) {
+            return true;
+        }
+        if (anObject instanceof String) {
+            String anotherString = (String)anObject;
+            int n = length();
+            if (n == anotherString.length()) {
+                char v1[] = toCharArray();
+                char v2[] = anotherString.toCharArray();
+                int i = offset();
+                int j = anotherString.offset();
+                while (n-- != 0) {
+                    if (v1[i++] != v2[j++])
+                        return false;
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Compares this string to the specified {@code StringBuffer}.  The result
+     * is {@code true} if and only if this {@code String} represents the same
+     * sequence of characters as the specified {@code StringBuffer}.
+     *
+     * @param  sb
+     *         The {@code StringBuffer} to compare this {@code String} against
+     *
+     * @return  {@code true} if this {@code String} represents the same
+     *          sequence of characters as the specified {@code StringBuffer},
+     *          {@code false} otherwise
+     *
+     * @since  1.4
+     */
+    public boolean contentEquals(StringBuffer sb) {
+        synchronized(sb) {
+            return contentEquals((CharSequence)sb);
+        }
+    }
+
+    /**
+     * Compares this string to the specified {@code CharSequence}.  The result
+     * is {@code true} if and only if this {@code String} represents the same
+     * sequence of char values as the specified sequence.
+     *
+     * @param  cs
+     *         The sequence to compare this {@code String} against
+     *
+     * @return  {@code true} if this {@code String} represents the same
+     *          sequence of char values as the specified sequence, {@code
+     *          false} otherwise
+     *
+     * @since  1.5
+     */
+    public boolean contentEquals(CharSequence cs) {
+        if (length() != cs.length())
+            return false;
+        // Argument is a StringBuffer, StringBuilder
+        if (cs instanceof AbstractStringBuilder) {
+            char v1[] = toCharArray();
+            char v2[] = ((AbstractStringBuilder)cs).getValue();
+            int i = offset();
+            int j = 0;
+            int n = length();
+            while (n-- != 0) {
+                if (v1[i++] != v2[j++])
+                    return false;
+            }
+            return true;
+        }
+        // Argument is a String
+        if (cs.equals(this))
+            return true;
+        // Argument is a generic CharSequence
+        char v1[] = toCharArray();
+        int i = offset();
+        int j = 0;
+        int n = length();
+        while (n-- != 0) {
+            if (v1[i++] != cs.charAt(j++))
+                return false;
+        }
+        return true;
+    }
+
+    /**
+     * Compares this {@code String} to another {@code String}, ignoring case
+     * considerations.  Two strings are considered equal ignoring case if they
+     * are of the same length and corresponding characters in the two strings
+     * are equal ignoring case.
+     *
+     * <p> Two characters {@code c1} and {@code c2} are considered the same
+     * ignoring case if at least one of the following is true:
+     * <ul>
+     *   <li> The two characters are the same (as compared by the
+     *        {@code ==} operator)
+     *   <li> Applying the method {@link
+     *        java.lang.Character#toUpperCase(char)} to each character
+     *        produces the same result
+     *   <li> Applying the method {@link
+     *        java.lang.Character#toLowerCase(char)} to each character
+     *        produces the same result
+     * </ul>
+     *
+     * @param  anotherString
+     *         The {@code String} to compare this {@code String} against
+     *
+     * @return  {@code true} if the argument is not {@code null} and it
+     *          represents an equivalent {@code String} ignoring case; {@code
+     *          false} otherwise
+     *
+     * @see  #equals(Object)
+     */
+    public boolean equalsIgnoreCase(String anotherString) {
+        return (this == anotherString) ? true :
+               (anotherString != null) && (anotherString.length() == length()) &&
+               regionMatches(true, 0, anotherString, 0, length());
+    }
+
+    /**
+     * Compares two strings lexicographically.
+     * The comparison is based on the Unicode value of each character in
+     * the strings. The character sequence represented by this
+     * <code>String</code> object is compared lexicographically to the
+     * character sequence represented by the argument string. The result is
+     * a negative integer if this <code>String</code> object
+     * lexicographically precedes the argument string. The result is a
+     * positive integer if this <code>String</code> object lexicographically
+     * follows the argument string. The result is zero if the strings
+     * are equal; <code>compareTo</code> returns <code>0</code> exactly when
+     * the {@link #equals(Object)} method would return <code>true</code>.
+     * <p>
+     * This is the definition of lexicographic ordering. If two strings are
+     * different, then either they have different characters at some index
+     * that is a valid index for both strings, or their lengths are different,
+     * or both. If they have different characters at one or more index
+     * positions, let <i>k</i> be the smallest such index; then the string
+     * whose character at position <i>k</i> has the smaller value, as
+     * determined by using the &lt; operator, lexicographically precedes the
+     * other string. In this case, <code>compareTo</code> returns the
+     * difference of the two character values at position <code>k</code> in
+     * the two string -- that is, the value:
+     * <blockquote><pre>
+     * this.charAt(k)-anotherString.charAt(k)
+     * </pre></blockquote>
+     * If there is no index position at which they differ, then the shorter
+     * string lexicographically precedes the longer string. In this case,
+     * <code>compareTo</code> returns the difference of the lengths of the
+     * strings -- that is, the value:
+     * <blockquote><pre>
+     * this.length()-anotherString.length()
+     * </pre></blockquote>
+     *
+     * @param   anotherString   the <code>String</code> to be compared.
+     * @return  the value <code>0</code> if the argument string is equal to
+     *          this string; a value less than <code>0</code> if this string
+     *          is lexicographically less than the string argument; and a
+     *          value greater than <code>0</code> if this string is
+     *          lexicographically greater than the string argument.
+     */
+    public int compareTo(String anotherString) {
+        int len1 = length();
+        int len2 = anotherString.length();
+        int n = Math.min(len1, len2);
+        char v1[] = toCharArray();
+        char v2[] = anotherString.toCharArray();
+        int i = offset();
+        int j = anotherString.offset();
+
+        if (i == j) {
+            int k = i;
+            int lim = n + i;
+            while (k < lim) {
+                char c1 = v1[k];
+                char c2 = v2[k];
+                if (c1 != c2) {
+                    return c1 - c2;
+                }
+                k++;
+            }
+        } else {
+            while (n-- != 0) {
+                char c1 = v1[i++];
+                char c2 = v2[j++];
+                if (c1 != c2) {
+                    return c1 - c2;
+                }
+            }
+        }
+        return len1 - len2;
+    }
+
+    /**
+     * A Comparator that orders <code>String</code> objects as by
+     * <code>compareToIgnoreCase</code>. This comparator is serializable.
+     * <p>
+     * Note that this Comparator does <em>not</em> take locale into account,
+     * and will result in an unsatisfactory ordering for certain locales.
+     * The java.text package provides <em>Collators</em> to allow
+     * locale-sensitive ordering.
+     *
+     * @see     java.text.Collator#compare(String, String)
+     * @since   1.2
+     */
+    public static final Comparator<String> CASE_INSENSITIVE_ORDER
+                                         = new CaseInsensitiveComparator();
+
+    private static int offset() {
+        return 0;
+    }
+
+    private static class CaseInsensitiveComparator
+                         implements Comparator<String>, java.io.Serializable {
+        // use serialVersionUID from JDK 1.2.2 for interoperability
+        private static final long serialVersionUID = 8575799808933029326L;
+
+        public int compare(String s1, String s2) {
+            int n1 = s1.length();
+            int n2 = s2.length();
+            int min = Math.min(n1, n2);
+            for (int i = 0; i < min; i++) {
+                char c1 = s1.charAt(i);
+                char c2 = s2.charAt(i);
+                if (c1 != c2) {
+                    c1 = Character.toUpperCase(c1);
+                    c2 = Character.toUpperCase(c2);
+                    if (c1 != c2) {
+                        c1 = Character.toLowerCase(c1);
+                        c2 = Character.toLowerCase(c2);
+                        if (c1 != c2) {
+                            // No overflow because of numeric promotion
+                            return c1 - c2;
+                        }
+                    }
+                }
+            }
+            return n1 - n2;
+        }
+    }
+
+    /**
+     * Compares two strings lexicographically, ignoring case
+     * differences. This method returns an integer whose sign is that of
+     * calling <code>compareTo</code> with normalized versions of the strings
+     * where case differences have been eliminated by calling
+     * <code>Character.toLowerCase(Character.toUpperCase(character))</code> on
+     * each character.
+     * <p>
+     * Note that this method does <em>not</em> take locale into account,
+     * and will result in an unsatisfactory ordering for certain locales.
+     * The java.text package provides <em>collators</em> to allow
+     * locale-sensitive ordering.
+     *
+     * @param   str   the <code>String</code> to be compared.
+     * @return  a negative integer, zero, or a positive integer as the
+     *          specified String is greater than, equal to, or less
+     *          than this String, ignoring case considerations.
+     * @see     java.text.Collator#compare(String, String)
+     * @since   1.2
+     */
+    public int compareToIgnoreCase(String str) {
+        return CASE_INSENSITIVE_ORDER.compare(this, str);
+    }
+
+    /**
+     * Tests if two string regions are equal.
+     * <p>
+     * A substring of this <tt>String</tt> object is compared to a substring
+     * of the argument other. The result is true if these substrings
+     * represent identical character sequences. The substring of this
+     * <tt>String</tt> object to be compared begins at index <tt>toffset</tt>
+     * and has length <tt>len</tt>. The substring of other to be compared
+     * begins at index <tt>ooffset</tt> and has length <tt>len</tt>. The
+     * result is <tt>false</tt> if and only if at least one of the following
+     * is true:
+     * <ul><li><tt>toffset</tt> is negative.
+     * <li><tt>ooffset</tt> is negative.
+     * <li><tt>toffset+len</tt> is greater than the length of this
+     * <tt>String</tt> object.
+     * <li><tt>ooffset+len</tt> is greater than the length of the other
+     * argument.
+     * <li>There is some nonnegative integer <i>k</i> less than <tt>len</tt>
+     * such that:
+     * <tt>this.charAt(toffset+<i>k</i>)&nbsp;!=&nbsp;other.charAt(ooffset+<i>k</i>)</tt>
+     * </ul>
+     *
+     * @param   toffset   the starting offset of the subregion in this string.
+     * @param   other     the string argument.
+     * @param   ooffset   the starting offset of the subregion in the string
+     *                    argument.
+     * @param   len       the number of characters to compare.
+     * @return  <code>true</code> if the specified subregion of this string
+     *          exactly matches the specified subregion of the string argument;
+     *          <code>false</code> otherwise.
+     */
+    public boolean regionMatches(int toffset, String other, int ooffset,
+                                 int len) {
+        char ta[] = toCharArray();
+        int to = offset() + toffset;
+        char pa[] = other.toCharArray();
+        int po = other.offset() + ooffset;
+        // Note: toffset, ooffset, or len might be near -1>>>1.
+        if ((ooffset < 0) || (toffset < 0) || (toffset > (long)length() - len)
+            || (ooffset > (long)other.length() - len)) {
+            return false;
+        }
+        while (len-- > 0) {
+            if (ta[to++] != pa[po++]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Tests if two string regions are equal.
+     * <p>
+     * A substring of this <tt>String</tt> object is compared to a substring
+     * of the argument <tt>other</tt>. The result is <tt>true</tt> if these
+     * substrings represent character sequences that are the same, ignoring
+     * case if and only if <tt>ignoreCase</tt> is true. The substring of
+     * this <tt>String</tt> object to be compared begins at index
+     * <tt>toffset</tt> and has length <tt>len</tt>. The substring of
+     * <tt>other</tt> to be compared begins at index <tt>ooffset</tt> and
+     * has length <tt>len</tt>. The result is <tt>false</tt> if and only if
+     * at least one of the following is true:
+     * <ul><li><tt>toffset</tt> is negative.
+     * <li><tt>ooffset</tt> is negative.
+     * <li><tt>toffset+len</tt> is greater than the length of this
+     * <tt>String</tt> object.
+     * <li><tt>ooffset+len</tt> is greater than the length of the other
+     * argument.
+     * <li><tt>ignoreCase</tt> is <tt>false</tt> and there is some nonnegative
+     * integer <i>k</i> less than <tt>len</tt> such that:
+     * <blockquote><pre>
+     * this.charAt(toffset+k) != other.charAt(ooffset+k)
+     * </pre></blockquote>
+     * <li><tt>ignoreCase</tt> is <tt>true</tt> and there is some nonnegative
+     * integer <i>k</i> less than <tt>len</tt> such that:
+     * <blockquote><pre>
+     * Character.toLowerCase(this.charAt(toffset+k)) !=
+               Character.toLowerCase(other.charAt(ooffset+k))
+     * </pre></blockquote>
+     * and:
+     * <blockquote><pre>
+     * Character.toUpperCase(this.charAt(toffset+k)) !=
+     *         Character.toUpperCase(other.charAt(ooffset+k))
+     * </pre></blockquote>
+     * </ul>
+     *
+     * @param   ignoreCase   if <code>true</code>, ignore case when comparing
+     *                       characters.
+     * @param   toffset      the starting offset of the subregion in this
+     *                       string.
+     * @param   other        the string argument.
+     * @param   ooffset      the starting offset of the subregion in the string
+     *                       argument.
+     * @param   len          the number of characters to compare.
+     * @return  <code>true</code> if the specified subregion of this string
+     *          matches the specified subregion of the string argument;
+     *          <code>false</code> otherwise. Whether the matching is exact
+     *          or case insensitive depends on the <code>ignoreCase</code>
+     *          argument.
+     */
+    public boolean regionMatches(boolean ignoreCase, int toffset,
+                           String other, int ooffset, int len) {
+        char ta[] = toCharArray();
+        int to = offset() + toffset;
+        char pa[] = other.toCharArray();
+        int po = other.offset() + ooffset;
+        // Note: toffset, ooffset, or len might be near -1>>>1.
+        if ((ooffset < 0) || (toffset < 0) || (toffset > (long)length() - len) ||
+                (ooffset > (long)other.length() - len)) {
+            return false;
+        }
+        while (len-- > 0) {
+            char c1 = ta[to++];
+            char c2 = pa[po++];
+            if (c1 == c2) {
+                continue;
+            }
+            if (ignoreCase) {
+                // If characters don't match but case may be ignored,
+                // try converting both characters to uppercase.
+                // If the results match, then the comparison scan should
+                // continue.
+                char u1 = Character.toUpperCase(c1);
+                char u2 = Character.toUpperCase(c2);
+                if (u1 == u2) {
+                    continue;
+                }
+                // Unfortunately, conversion to uppercase does not work properly
+                // for the Georgian alphabet, which has strange rules about case
+                // conversion.  So we need to make one last check before
+                // exiting.
+                if (Character.toLowerCase(u1) == Character.toLowerCase(u2)) {
+                    continue;
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Tests if the substring of this string beginning at the
+     * specified index starts with the specified prefix.
+     *
+     * @param   prefix    the prefix.
+     * @param   toffset   where to begin looking in this string.
+     * @return  <code>true</code> if the character sequence represented by the
+     *          argument is a prefix of the substring of this object starting
+     *          at index <code>toffset</code>; <code>false</code> otherwise.
+     *          The result is <code>false</code> if <code>toffset</code> is
+     *          negative or greater than the length of this
+     *          <code>String</code> object; otherwise the result is the same
+     *          as the result of the expression
+     *          <pre>
+     *          this.substring(toffset).startsWith(prefix)
+     *          </pre>
+     */
+    @JavaScriptBody(args = { "find", "from" }, body=
+        "find = find.toString();\n" +
+        "return this.toString().substring(from, from + find.length) === find;\n"
+    )
+    public boolean startsWith(String prefix, int toffset) {
+        char ta[] = toCharArray();
+        int to = offset() + toffset;
+        char pa[] = prefix.toCharArray();
+        int po = prefix.offset();
+        int pc = prefix.length();
+        // Note: toffset might be near -1>>>1.
+        if ((toffset < 0) || (toffset > length() - pc)) {
+            return false;
+        }
+        while (--pc >= 0) {
+            if (ta[to++] != pa[po++]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Tests if this string starts with the specified prefix.
+     *
+     * @param   prefix   the prefix.
+     * @return  <code>true</code> if the character sequence represented by the
+     *          argument is a prefix of the character sequence represented by
+     *          this string; <code>false</code> otherwise.
+     *          Note also that <code>true</code> will be returned if the
+     *          argument is an empty string or is equal to this
+     *          <code>String</code> object as determined by the
+     *          {@link #equals(Object)} method.
+     * @since   1. 0
+     */
+    public boolean startsWith(String prefix) {
+        return startsWith(prefix, 0);
+    }
+
+    /**
+     * Tests if this string ends with the specified suffix.
+     *
+     * @param   suffix   the suffix.
+     * @return  <code>true</code> if the character sequence represented by the
+     *          argument is a suffix of the character sequence represented by
+     *          this object; <code>false</code> otherwise. Note that the
+     *          result will be <code>true</code> if the argument is the
+     *          empty string or is equal to this <code>String</code> object
+     *          as determined by the {@link #equals(Object)} method.
+     */
+    public boolean endsWith(String suffix) {
+        return startsWith(suffix, length() - suffix.length());
+    }
+
+    /**
+     * Returns a hash code for this string. The hash code for a
+     * <code>String</code> object is computed as
+     * <blockquote><pre>
+     * s[0]*31^(n-1) + s[1]*31^(n-2) + ... + s[n-1]
+     * </pre></blockquote>
+     * using <code>int</code> arithmetic, where <code>s[i]</code> is the
+     * <i>i</i>th character of the string, <code>n</code> is the length of
+     * the string, and <code>^</code> indicates exponentiation.
+     * (The hash value of the empty string is zero.)
+     *
+     * @return  a hash code value for this object.
+     */
+    public int hashCode() {
+        return super.hashCode();
+    }
+    int computeHashCode() {
+        int h = 0;
+        if (h == 0 && length() > 0) {
+            int off = offset();
+            int len = length();
+
+            for (int i = 0; i < len; i++) {
+                h = 31*h + charAt(off++);
+            }
+        }
+        return h;
+    }
+
+    /**
+     * Returns the index within this string of the first occurrence of
+     * the specified character. If a character with value
+     * <code>ch</code> occurs in the character sequence represented by
+     * this <code>String</code> object, then the index (in Unicode
+     * code units) of the first such occurrence is returned. For
+     * values of <code>ch</code> in the range from 0 to 0xFFFF
+     * (inclusive), this is the smallest value <i>k</i> such that:
+     * <blockquote><pre>
+     * this.charAt(<i>k</i>) == ch
+     * </pre></blockquote>
+     * is true. For other values of <code>ch</code>, it is the
+     * smallest value <i>k</i> such that:
+     * <blockquote><pre>
+     * this.codePointAt(<i>k</i>) == ch
+     * </pre></blockquote>
+     * is true. In either case, if no such character occurs in this
+     * string, then <code>-1</code> is returned.
+     *
+     * @param   ch   a character (Unicode code point).
+     * @return  the index of the first occurrence of the character in the
+     *          character sequence represented by this object, or
+     *          <code>-1</code> if the character does not occur.
+     */
+    public int indexOf(int ch) {
+        return indexOf(ch, 0);
+    }
+
+    /**
+     * Returns the index within this string of the first occurrence of the
+     * specified character, starting the search at the specified index.
+     * <p>
+     * If a character with value <code>ch</code> occurs in the
+     * character sequence represented by this <code>String</code>
+     * object at an index no smaller than <code>fromIndex</code>, then
+     * the index of the first such occurrence is returned. For values
+     * of <code>ch</code> in the range from 0 to 0xFFFF (inclusive),
+     * this is the smallest value <i>k</i> such that:
+     * <blockquote><pre>
+     * (this.charAt(<i>k</i>) == ch) && (<i>k</i> &gt;= fromIndex)
+     * </pre></blockquote>
+     * is true. For other values of <code>ch</code>, it is the
+     * smallest value <i>k</i> such that:
+     * <blockquote><pre>
+     * (this.codePointAt(<i>k</i>) == ch) && (<i>k</i> &gt;= fromIndex)
+     * </pre></blockquote>
+     * is true. In either case, if no such character occurs in this
+     * string at or after position <code>fromIndex</code>, then
+     * <code>-1</code> is returned.
+     *
+     * <p>
+     * There is no restriction on the value of <code>fromIndex</code>. If it
+     * is negative, it has the same effect as if it were zero: this entire
+     * string may be searched. If it is greater than the length of this
+     * string, it has the same effect as if it were equal to the length of
+     * this string: <code>-1</code> is returned.
+     *
+     * <p>All indices are specified in <code>char</code> values
+     * (Unicode code units).
+     *
+     * @param   ch          a character (Unicode code point).
+     * @param   fromIndex   the index to start the search from.
+     * @return  the index of the first occurrence of the character in the
+     *          character sequence represented by this object that is greater
+     *          than or equal to <code>fromIndex</code>, or <code>-1</code>
+     *          if the character does not occur.
+     */
+    @JavaScriptBody(args = { "ch", "from" }, body = 
+        "if (typeof ch === 'number') ch = String.fromCharCode(ch);\n" +
+        "return this.toString().indexOf(ch, from);\n"
+    )
+    public int indexOf(int ch, int fromIndex) {
+        if (fromIndex < 0) {
+            fromIndex = 0;
+        } else if (fromIndex >= length()) {
+            // Note: fromIndex might be near -1>>>1.
+            return -1;
+        }
+
+        if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) {
+            // handle most cases here (ch is a BMP code point or a
+            // negative value (invalid code point))
+            final char[] value = this.toCharArray();
+            final int offset = this.offset();
+            final int max = offset + length();
+            for (int i = offset + fromIndex; i < max ; i++) {
+                if (value[i] == ch) {
+                    return i - offset;
+                }
+            }
+            return -1;
+        } else {
+            return indexOfSupplementary(ch, fromIndex);
+        }
+    }
+
+    /**
+     * Handles (rare) calls of indexOf with a supplementary character.
+     */
+    private int indexOfSupplementary(int ch, int fromIndex) {
+        if (Character.isValidCodePoint(ch)) {
+            final char[] value = this.toCharArray();
+            final int offset = this.offset();
+            final char hi = Character.highSurrogate(ch);
+            final char lo = Character.lowSurrogate(ch);
+            final int max = offset + length() - 1;
+            for (int i = offset + fromIndex; i < max; i++) {
+                if (value[i] == hi && value[i+1] == lo) {
+                    return i - offset;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Returns the index within this string of the last occurrence of
+     * the specified character. For values of <code>ch</code> in the
+     * range from 0 to 0xFFFF (inclusive), the index (in Unicode code
+     * units) returned is the largest value <i>k</i> such that:
+     * <blockquote><pre>
+     * this.charAt(<i>k</i>) == ch
+     * </pre></blockquote>
+     * is true. For other values of <code>ch</code>, it is the
+     * largest value <i>k</i> such that:
+     * <blockquote><pre>
+     * this.codePointAt(<i>k</i>) == ch
+     * </pre></blockquote>
+     * is true.  In either case, if no such character occurs in this
+     * string, then <code>-1</code> is returned.  The
+     * <code>String</code> is searched backwards starting at the last
+     * character.
+     *
+     * @param   ch   a character (Unicode code point).
+     * @return  the index of the last occurrence of the character in the
+     *          character sequence represented by this object, or
+     *          <code>-1</code> if the character does not occur.
+     */
+    public int lastIndexOf(int ch) {
+        return lastIndexOf(ch, length() - 1);
+    }
+
+    /**
+     * Returns the index within this string of the last occurrence of
+     * the specified character, searching backward starting at the
+     * specified index. For values of <code>ch</code> in the range
+     * from 0 to 0xFFFF (inclusive), the index returned is the largest
+     * value <i>k</i> such that:
+     * <blockquote><pre>
+     * (this.charAt(<i>k</i>) == ch) && (<i>k</i> &lt;= fromIndex)
+     * </pre></blockquote>
+     * is true. For other values of <code>ch</code>, it is the
+     * largest value <i>k</i> such that:
+     * <blockquote><pre>
+     * (this.codePointAt(<i>k</i>) == ch) && (<i>k</i> &lt;= fromIndex)
+     * </pre></blockquote>
+     * is true. In either case, if no such character occurs in this
+     * string at or before position <code>fromIndex</code>, then
+     * <code>-1</code> is returned.
+     *
+     * <p>All indices are specified in <code>char</code> values
+     * (Unicode code units).
+     *
+     * @param   ch          a character (Unicode code point).
+     * @param   fromIndex   the index to start the search from. There is no
+     *          restriction on the value of <code>fromIndex</code>. If it is
+     *          greater than or equal to the length of this string, it has
+     *          the same effect as if it were equal to one less than the
+     *          length of this string: this entire string may be searched.
+     *          If it is negative, it has the same effect as if it were -1:
+     *          -1 is returned.
+     * @return  the index of the last occurrence of the character in the
+     *          character sequence represented by this object that is less
+     *          than or equal to <code>fromIndex</code>, or <code>-1</code>
+     *          if the character does not occur before that point.
+     */
+    @JavaScriptBody(args = { "ch", "from" }, body = 
+        "if (typeof ch === 'number') ch = String.fromCharCode(ch);\n" +
+        "return this.toString().lastIndexOf(ch, from);"
+    )
+    public int lastIndexOf(int ch, int fromIndex) {
+        if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) {
+            // handle most cases here (ch is a BMP code point or a
+            // negative value (invalid code point))
+            final char[] value = this.toCharArray();
+            final int offset = this.offset();
+            int i = offset + Math.min(fromIndex, length() - 1);
+            for (; i >= offset ; i--) {
+                if (value[i] == ch) {
+                    return i - offset;
+                }
+            }
+            return -1;
+        } else {
+            return lastIndexOfSupplementary(ch, fromIndex);
+        }
+    }
+
+    /**
+     * Handles (rare) calls of lastIndexOf with a supplementary character.
+     */
+    private int lastIndexOfSupplementary(int ch, int fromIndex) {
+        if (Character.isValidCodePoint(ch)) {
+            final char[] value = this.toCharArray();
+            final int offset = this.offset();
+            char hi = Character.highSurrogate(ch);
+            char lo = Character.lowSurrogate(ch);
+            int i = offset + Math.min(fromIndex, length() - 2);
+            for (; i >= offset; i--) {
+                if (value[i] == hi && value[i+1] == lo) {
+                    return i - offset;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Returns the index within this string of the first occurrence of the
+     * specified substring.
+     *
+     * <p>The returned index is the smallest value <i>k</i> for which:
+     * <blockquote><pre>
+     * this.startsWith(str, <i>k</i>)
+     * </pre></blockquote>
+     * If no such value of <i>k</i> exists, then {@code -1} is returned.
+     *
+     * @param   str   the substring to search for.
+     * @return  the index of the first occurrence of the specified substring,
+     *          or {@code -1} if there is no such occurrence.
+     */
+    public int indexOf(String str) {
+        return indexOf(str, 0);
+    }
+
+    /**
+     * Returns the index within this string of the first occurrence of the
+     * specified substring, starting at the specified index.
+     *
+     * <p>The returned index is the smallest value <i>k</i> for which:
+     * <blockquote><pre>
+     * <i>k</i> &gt;= fromIndex && this.startsWith(str, <i>k</i>)
+     * </pre></blockquote>
+     * If no such value of <i>k</i> exists, then {@code -1} is returned.
+     *
+     * @param   str         the substring to search for.
+     * @param   fromIndex   the index from which to start the search.
+     * @return  the index of the first occurrence of the specified substring,
+     *          starting at the specified index,
+     *          or {@code -1} if there is no such occurrence.
+     */
+    @JavaScriptBody(args = { "str", "fromIndex" }, body =
+        "return this.toString().indexOf(str.toString(), fromIndex);"
+    )
+    public native int indexOf(String str, int fromIndex);
+
+    /**
+     * Returns the index within this string of the last occurrence of the
+     * specified substring.  The last occurrence of the empty string ""
+     * is considered to occur at the index value {@code this.length()}.
+     *
+     * <p>The returned index is the largest value <i>k</i> for which:
+     * <blockquote><pre>
+     * this.startsWith(str, <i>k</i>)
+     * </pre></blockquote>
+     * If no such value of <i>k</i> exists, then {@code -1} is returned.
+     *
+     * @param   str   the substring to search for.
+     * @return  the index of the last occurrence of the specified substring,
+     *          or {@code -1} if there is no such occurrence.
+     */
+    public int lastIndexOf(String str) {
+        return lastIndexOf(str, length());
+    }
+
+    /**
+     * Returns the index within this string of the last occurrence of the
+     * specified substring, searching backward starting at the specified index.
+     *
+     * <p>The returned index is the largest value <i>k</i> for which:
+     * <blockquote><pre>
+     * <i>k</i> &lt;= fromIndex && this.startsWith(str, <i>k</i>)
+     * </pre></blockquote>
+     * If no such value of <i>k</i> exists, then {@code -1} is returned.
+     *
+     * @param   str         the substring to search for.
+     * @param   fromIndex   the index to start the search from.
+     * @return  the index of the last occurrence of the specified substring,
+     *          searching backward from the specified index,
+     *          or {@code -1} if there is no such occurrence.
+     */
+    @JavaScriptBody(args = { "s", "from" }, body = 
+        "return this.toString().lastIndexOf(s.toString(), from);"
+    )
+    public int lastIndexOf(String str, int fromIndex) {
+        return lastIndexOf(toCharArray(), offset(), length(), str.toCharArray(), str.offset(), str.length(), fromIndex);
+    }
+
+    /**
+     * Code shared by String and StringBuffer to do searches. The
+     * source is the character array being searched, and the target
+     * is the string being searched for.
+     *
+     * @param   source       the characters being searched.
+     * @param   sourceOffset offset of the source string.
+     * @param   sourceCount  count of the source string.
+     * @param   target       the characters being searched for.
+     * @param   targetOffset offset of the target string.
+     * @param   targetCount  count of the target string.
+     * @param   fromIndex    the index to begin searching from.
+     */
+    static int lastIndexOf(char[] source, int sourceOffset, int sourceCount,
+                           char[] target, int targetOffset, int targetCount,
+                           int fromIndex) {
+        /*
+         * Check arguments; return immediately where possible. For
+         * consistency, don't check for null str.
+         */
+        int rightIndex = sourceCount - targetCount;
+        if (fromIndex < 0) {
+            return -1;
+        }
+        if (fromIndex > rightIndex) {
+            fromIndex = rightIndex;
+        }
+        /* Empty string always matches. */
+        if (targetCount == 0) {
+            return fromIndex;
+        }
+
+        int strLastIndex = targetOffset + targetCount - 1;
+        char strLastChar = target[strLastIndex];
+        int min = sourceOffset + targetCount - 1;
+        int i = min + fromIndex;
+
+    startSearchForLastChar:
+        while (true) {
+            while (i >= min && source[i] != strLastChar) {
+                i--;
+            }
+            if (i < min) {
+                return -1;
+            }
+            int j = i - 1;
+            int start = j - (targetCount - 1);
+            int k = strLastIndex - 1;
+
+            while (j > start) {
+                if (source[j--] != target[k--]) {
+                    i--;
+                    continue startSearchForLastChar;
+                }
+            }
+            return start - sourceOffset + 1;
+        }
+    }
+
+    /**
+     * Returns a new string that is a substring of this string. The
+     * substring begins with the character at the specified index and
+     * extends to the end of this string. <p>
+     * Examples:
+     * <blockquote><pre>
+     * "unhappy".substring(2) returns "happy"
+     * "Harbison".substring(3) returns "bison"
+     * "emptiness".substring(9) returns "" (an empty string)
+     * </pre></blockquote>
+     *
+     * @param      beginIndex   the beginning index, inclusive.
+     * @return     the specified substring.
+     * @exception  IndexOutOfBoundsException  if
+     *             <code>beginIndex</code> is negative or larger than the
+     *             length of this <code>String</code> object.
+     */
+    public String substring(int beginIndex) {
+        return substring(beginIndex, length());
+    }
+
+    /**
+     * Returns a new string that is a substring of this string. The
+     * substring begins at the specified <code>beginIndex</code> and
+     * extends to the character at index <code>endIndex - 1</code>.
+     * Thus the length of the substring is <code>endIndex-beginIndex</code>.
+     * <p>
+     * Examples:
+     * <blockquote><pre>
+     * "hamburger".substring(4, 8) returns "urge"
+     * "smiles".substring(1, 5) returns "mile"
+     * </pre></blockquote>
+     *
+     * @param      beginIndex   the beginning index, inclusive.
+     * @param      endIndex     the ending index, exclusive.
+     * @return     the specified substring.
+     * @exception  IndexOutOfBoundsException  if the
+     *             <code>beginIndex</code> is negative, or
+     *             <code>endIndex</code> is larger than the length of
+     *             this <code>String</code> object, or
+     *             <code>beginIndex</code> is larger than
+     *             <code>endIndex</code>.
+     */
+    @JavaScriptBody(args = { "beginIndex", "endIndex" }, body = 
+        "return this.toString().substring(beginIndex, endIndex);"
+    )
+    public String substring(int beginIndex, int endIndex) {
+        if (beginIndex < 0) {
+            throw new StringIndexOutOfBoundsException(beginIndex);
+        }
+        if (endIndex > length()) {
+            throw new StringIndexOutOfBoundsException(endIndex);
+        }
+        if (beginIndex > endIndex) {
+            throw new StringIndexOutOfBoundsException(endIndex - beginIndex);
+        }
+        return ((beginIndex == 0) && (endIndex == length())) ? this :
+            new String(toCharArray(), offset() + beginIndex, endIndex - beginIndex);
+    }
+
+    /**
+     * Returns a new character sequence that is a subsequence of this sequence.
+     *
+     * <p> An invocation of this method of the form
+     *
+     * <blockquote><pre>
+     * str.subSequence(begin,&nbsp;end)</pre></blockquote>
+     *
+     * behaves in exactly the same way as the invocation
+     *
+     * <blockquote><pre>
+     * str.substring(begin,&nbsp;end)</pre></blockquote>
+     *
+     * This method is defined so that the <tt>String</tt> class can implement
+     * the {@link CharSequence} interface. </p>
+     *
+     * @param      beginIndex   the begin index, inclusive.
+     * @param      endIndex     the end index, exclusive.
+     * @return     the specified subsequence.
+     *
+     * @throws  IndexOutOfBoundsException
+     *          if <tt>beginIndex</tt> or <tt>endIndex</tt> are negative,
+     *          if <tt>endIndex</tt> is greater than <tt>length()</tt>,
+     *          or if <tt>beginIndex</tt> is greater than <tt>startIndex</tt>
+     *
+     * @since 1.4
+     * @spec JSR-51
+     */
+    public CharSequence subSequence(int beginIndex, int endIndex) {
+        return this.substring(beginIndex, endIndex);
+    }
+
+    /**
+     * Concatenates the specified string to the end of this string.
+     * <p>
+     * If the length of the argument string is <code>0</code>, then this
+     * <code>String</code> object is returned. Otherwise, a new
+     * <code>String</code> object is created, representing a character
+     * sequence that is the concatenation of the character sequence
+     * represented by this <code>String</code> object and the character
+     * sequence represented by the argument string.<p>
+     * Examples:
+     * <blockquote><pre>
+     * "cares".concat("s") returns "caress"
+     * "to".concat("get").concat("her") returns "together"
+     * </pre></blockquote>
+     *
+     * @param   str   the <code>String</code> that is concatenated to the end
+     *                of this <code>String</code>.
+     * @return  a string that represents the concatenation of this object's
+     *          characters followed by the string argument's characters.
+     */
+    public String concat(String str) {
+        int otherLen = str.length();
+        if (otherLen == 0) {
+            return this;
+        }
+        char buf[] = new char[length() + otherLen];
+        getChars(0, length(), buf, 0);
+        str.getChars(0, otherLen, buf, length());
+        return new String(buf, 0, length() + otherLen);
+    }
+
+    /**
+     * Returns a new string resulting from replacing all occurrences of
+     * <code>oldChar</code> in this string with <code>newChar</code>.
+     * <p>
+     * If the character <code>oldChar</code> does not occur in the
+     * character sequence represented by this <code>String</code> object,
+     * then a reference to this <code>String</code> object is returned.
+     * Otherwise, a new <code>String</code> object is created that
+     * represents a character sequence identical to the character sequence
+     * represented by this <code>String</code> object, except that every
+     * occurrence of <code>oldChar</code> is replaced by an occurrence
+     * of <code>newChar</code>.
+     * <p>
+     * Examples:
+     * <blockquote><pre>
+     * "mesquite in your cellar".replace('e', 'o')
+     *         returns "mosquito in your collar"
+     * "the war of baronets".replace('r', 'y')
+     *         returns "the way of bayonets"
+     * "sparring with a purple porpoise".replace('p', 't')
+     *         returns "starring with a turtle tortoise"
+     * "JonL".replace('q', 'x') returns "JonL" (no change)
+     * </pre></blockquote>
+     *
+     * @param   oldChar   the old character.
+     * @param   newChar   the new character.
+     * @return  a string derived from this string by replacing every
+     *          occurrence of <code>oldChar</code> with <code>newChar</code>.
+     */
+    @JavaScriptBody(args = { "arg1", "arg2" }, body =
+        "if (typeof arg1 === 'number') arg1 = String.fromCharCode(arg1);\n" +
+        "if (typeof arg2 === 'number') arg2 = String.fromCharCode(arg2);\n" +
+        "var s = this.toString();\n" +
+        "for (;;) {\n" +
+        "  var ret = s.replace(arg1, arg2);\n" +
+        "  if (ret === s) {\n" +
+        "    return ret;\n" +
+        "  }\n" +
+        "  s = ret;\n" +
+        "}"
+    )
+    public String replace(char oldChar, char newChar) {
+        if (oldChar != newChar) {
+            int len = length();
+            int i = -1;
+            char[] val = toCharArray(); /* avoid getfield opcode */
+            int off = offset();   /* avoid getfield opcode */
+
+            while (++i < len) {
+                if (val[off + i] == oldChar) {
+                    break;
+                }
+            }
+            if (i < len) {
+                char buf[] = new char[len];
+                for (int j = 0 ; j < i ; j++) {
+                    buf[j] = val[off+j];
+                }
+                while (i < len) {
+                    char c = val[off + i];
+                    buf[i] = (c == oldChar) ? newChar : c;
+                    i++;
+                }
+                return new String(buf, 0, len);
+            }
+        }
+        return this;
+    }
+
+    /**
+     * Tells whether or not this string matches the given <a
+     * href="../util/regex/Pattern.html#sum">regular expression</a>.
+     *
+     * <p> An invocation of this method of the form
+     * <i>str</i><tt>.matches(</tt><i>regex</i><tt>)</tt> yields exactly the
+     * same result as the expression
+     *
+     * <blockquote><tt> {@link java.util.regex.Pattern}.{@link
+     * java.util.regex.Pattern#matches(String,CharSequence)
+     * matches}(</tt><i>regex</i><tt>,</tt> <i>str</i><tt>)</tt></blockquote>
+     *
+     * @param   regex
+     *          the regular expression to which this string is to be matched
+     *
+     * @return  <tt>true</tt> if, and only if, this string matches the
+     *          given regular expression
+     *
+     * @throws  PatternSyntaxException
+     *          if the regular expression's syntax is invalid
+     *
+     * @see java.util.regex.Pattern
+     *
+     * @since 1.4
+     * @spec JSR-51
+     */
+    @JavaScriptBody(args = { "regex" }, body = 
+          "var self = this.toString();\n"
+        + "var re = new RegExp(regex.toString());\n"
+        + "var r = re.exec(self);\n"
+        + "return r != null && r.length > 0 && self.length == r[0].length;"
+    )
+    public boolean matches(String regex) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns true if and only if this string contains the specified
+     * sequence of char values.
+     *
+     * @param s the sequence to search for
+     * @return true if this string contains <code>s</code>, false otherwise
+     * @throws NullPointerException if <code>s</code> is <code>null</code>
+     * @since 1.5
+     */
+    public boolean contains(CharSequence s) {
+        return indexOf(s.toString()) > -1;
+    }
+
+    /**
+     * Replaces the first substring of this string that matches the given <a
+     * href="../util/regex/Pattern.html#sum">regular expression</a> with the
+     * given replacement.
+     *
+     * <p> An invocation of this method of the form
+     * <i>str</i><tt>.replaceFirst(</tt><i>regex</i><tt>,</tt> <i>repl</i><tt>)</tt>
+     * yields exactly the same result as the expression
+     *
+     * <blockquote><tt>
+     * {@link java.util.regex.Pattern}.{@link java.util.regex.Pattern#compile
+     * compile}(</tt><i>regex</i><tt>).{@link
+     * java.util.regex.Pattern#matcher(java.lang.CharSequence)
+     * matcher}(</tt><i>str</i><tt>).{@link java.util.regex.Matcher#replaceFirst
+     * replaceFirst}(</tt><i>repl</i><tt>)</tt></blockquote>
+     *
+     *<p>
+     * Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in the
+     * replacement string may cause the results to be different than if it were
+     * being treated as a literal replacement string; see
+     * {@link java.util.regex.Matcher#replaceFirst}.
+     * Use {@link java.util.regex.Matcher#quoteReplacement} to suppress the special
+     * meaning of these characters, if desired.
+     *
+     * @param   regex
+     *          the regular expression to which this string is to be matched
+     * @param   replacement
+     *          the string to be substituted for the first match
+     *
+     * @return  The resulting <tt>String</tt>
+     *
+     * @throws  PatternSyntaxException
+     *          if the regular expression's syntax is invalid
+     *
+     * @see java.util.regex.Pattern
+     *
+     * @since 1.4
+     * @spec JSR-51
+     */
+    public String replaceFirst(String regex, String replacement) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Replaces each substring of this string that matches the given <a
+     * href="../util/regex/Pattern.html#sum">regular expression</a> with the
+     * given replacement.
+     *
+     * <p> An invocation of this method of the form
+     * <i>str</i><tt>.replaceAll(</tt><i>regex</i><tt>,</tt> <i>repl</i><tt>)</tt>
+     * yields exactly the same result as the expression
+     *
+     * <blockquote><tt>
+     * {@link java.util.regex.Pattern}.{@link java.util.regex.Pattern#compile
+     * compile}(</tt><i>regex</i><tt>).{@link
+     * java.util.regex.Pattern#matcher(java.lang.CharSequence)
+     * matcher}(</tt><i>str</i><tt>).{@link java.util.regex.Matcher#replaceAll
+     * replaceAll}(</tt><i>repl</i><tt>)</tt></blockquote>
+     *
+     *<p>
+     * Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in the
+     * replacement string may cause the results to be different than if it were
+     * being treated as a literal replacement string; see
+     * {@link java.util.regex.Matcher#replaceAll Matcher.replaceAll}.
+     * Use {@link java.util.regex.Matcher#quoteReplacement} to suppress the special
+     * meaning of these characters, if desired.
+     *
+     * @param   regex
+     *          the regular expression to which this string is to be matched
+     * @param   replacement
+     *          the string to be substituted for each match
+     *
+     * @return  The resulting <tt>String</tt>
+     *
+     * @throws  PatternSyntaxException
+     *          if the regular expression's syntax is invalid
+     *
+     * @see java.util.regex.Pattern
+     *
+     * @since 1.4
+     * @spec JSR-51
+     */
+    public String replaceAll(String regex, String replacement) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Replaces each substring of this string that matches the literal target
+     * sequence with the specified literal replacement sequence. The
+     * replacement proceeds from the beginning of the string to the end, for
+     * example, replacing "aa" with "b" in the string "aaa" will result in
+     * "ba" rather than "ab".
+     *
+     * @param  target The sequence of char values to be replaced
+     * @param  replacement The replacement sequence of char values
+     * @return  The resulting string
+     * @throws NullPointerException if <code>target</code> or
+     *         <code>replacement</code> is <code>null</code>.
+     * @since 1.5
+     */
+    public String replace(CharSequence target, CharSequence replacement) {
+        throw new UnsupportedOperationException("This one should be supported, but without dep on rest of regexp");
+    }
+
+    /**
+     * Splits this string around matches of the given
+     * <a href="../util/regex/Pattern.html#sum">regular expression</a>.
+     *
+     * <p> The array returned by this method contains each substring of this
+     * string that is terminated by another substring that matches the given
+     * expression or is terminated by the end of the string.  The substrings in
+     * the array are in the order in which they occur in this string.  If the
+     * expression does not match any part of the input then the resulting array
+     * has just one element, namely this string.
+     *
+     * <p> The <tt>limit</tt> parameter controls the number of times the
+     * pattern is applied and therefore affects the length of the resulting
+     * array.  If the limit <i>n</i> is greater than zero then the pattern
+     * will be applied at most <i>n</i>&nbsp;-&nbsp;1 times, the array's
+     * length will be no greater than <i>n</i>, and the array's last entry
+     * will contain all input beyond the last matched delimiter.  If <i>n</i>
+     * is non-positive then the pattern will be applied as many times as
+     * possible and the array can have any length.  If <i>n</i> is zero then
+     * the pattern will be applied as many times as possible, the array can
+     * have any length, and trailing empty strings will be discarded.
+     *
+     * <p> The string <tt>"boo:and:foo"</tt>, for example, yields the
+     * following results with these parameters:
+     *
+     * <blockquote><table cellpadding=1 cellspacing=0 summary="Split example showing regex, limit, and result">
+     * <tr>
+     *     <th>Regex</th>
+     *     <th>Limit</th>
+     *     <th>Result</th>
+     * </tr>
+     * <tr><td align=center>:</td>
+     *     <td align=center>2</td>
+     *     <td><tt>{ "boo", "and:foo" }</tt></td></tr>
+     * <tr><td align=center>:</td>
+     *     <td align=center>5</td>
+     *     <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
+     * <tr><td align=center>:</td>
+     *     <td align=center>-2</td>
+     *     <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
+     * <tr><td align=center>o</td>
+     *     <td align=center>5</td>
+     *     <td><tt>{ "b", "", ":and:f", "", "" }</tt></td></tr>
+     * <tr><td align=center>o</td>
+     *     <td align=center>-2</td>
+     *     <td><tt>{ "b", "", ":and:f", "", "" }</tt></td></tr>
+     * <tr><td align=center>o</td>
+     *     <td align=center>0</td>
+     *     <td><tt>{ "b", "", ":and:f" }</tt></td></tr>
+     * </table></blockquote>
+     *
+     * <p> An invocation of this method of the form
+     * <i>str.</i><tt>split(</tt><i>regex</i><tt>,</tt>&nbsp;<i>n</i><tt>)</tt>
+     * yields the same result as the expression
+     *
+     * <blockquote>
+     * {@link java.util.regex.Pattern}.{@link java.util.regex.Pattern#compile
+     * compile}<tt>(</tt><i>regex</i><tt>)</tt>.{@link
+     * java.util.regex.Pattern#split(java.lang.CharSequence,int)
+     * split}<tt>(</tt><i>str</i><tt>,</tt>&nbsp;<i>n</i><tt>)</tt>
+     * </blockquote>
+     *
+     *
+     * @param  regex
+     *         the delimiting regular expression
+     *
+     * @param  limit
+     *         the result threshold, as described above
+     *
+     * @return  the array of strings computed by splitting this string
+     *          around matches of the given regular expression
+     *
+     * @throws  PatternSyntaxException
+     *          if the regular expression's syntax is invalid
+     *
+     * @see java.util.regex.Pattern
+     *
+     * @since 1.4
+     * @spec JSR-51
+     */
+    public String[] split(String regex, int limit) {
+        throw new UnsupportedOperationException("Needs regexp");
+    }
+
+    /**
+     * Splits this string around matches of the given <a
+     * href="../util/regex/Pattern.html#sum">regular expression</a>.
+     *
+     * <p> This method works as if by invoking the two-argument {@link
+     * #split(String, int) split} method with the given expression and a limit
+     * argument of zero.  Trailing empty strings are therefore not included in
+     * the resulting array.
+     *
+     * <p> The string <tt>"boo:and:foo"</tt>, for example, yields the following
+     * results with these expressions:
+     *
+     * <blockquote><table cellpadding=1 cellspacing=0 summary="Split examples showing regex and result">
+     * <tr>
+     *  <th>Regex</th>
+     *  <th>Result</th>
+     * </tr>
+     * <tr><td align=center>:</td>
+     *     <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
+     * <tr><td align=center>o</td>
+     *     <td><tt>{ "b", "", ":and:f" }</tt></td></tr>
+     * </table></blockquote>
+     *
+     *
+     * @param  regex
+     *         the delimiting regular expression
+     *
+     * @return  the array of strings computed by splitting this string
+     *          around matches of the given regular expression
+     *
+     * @throws  PatternSyntaxException
+     *          if the regular expression's syntax is invalid
+     *
+     * @see java.util.regex.Pattern
+     *
+     * @since 1.4
+     * @spec JSR-51
+     */
+    public String[] split(String regex) {
+        return split(regex, 0);
+    }
+
+    /**
+     * Converts all of the characters in this <code>String</code> to lower
+     * case using the rules of the given <code>Locale</code>.  Case mapping is based
+     * on the Unicode Standard version specified by the {@link java.lang.Character Character}
+     * class. Since case mappings are not always 1:1 char mappings, the resulting
+     * <code>String</code> may be a different length than the original <code>String</code>.
+     * <p>
+     * Examples of lowercase  mappings are in the following table:
+     * <table border="1" summary="Lowercase mapping examples showing language code of locale, upper case, lower case, and description">
+     * <tr>
+     *   <th>Language Code of Locale</th>
+     *   <th>Upper Case</th>
+     *   <th>Lower Case</th>
+     *   <th>Description</th>
+     * </tr>
+     * <tr>
+     *   <td>tr (Turkish)</td>
+     *   <td>&#92;u0130</td>
+     *   <td>&#92;u0069</td>
+     *   <td>capital letter I with dot above -&gt; small letter i</td>
+     * </tr>
+     * <tr>
+     *   <td>tr (Turkish)</td>
+     *   <td>&#92;u0049</td>
+     *   <td>&#92;u0131</td>
+     *   <td>capital letter I -&gt; small letter dotless i </td>
+     * </tr>
+     * <tr>
+     *   <td>(all)</td>
+     *   <td>French Fries</td>
+     *   <td>french fries</td>
+     *   <td>lowercased all chars in String</td>
+     * </tr>
+     * <tr>
+     *   <td>(all)</td>
+     *   <td><img src="doc-files/capiota.gif" alt="capiota"><img src="doc-files/capchi.gif" alt="capchi">
+     *       <img src="doc-files/captheta.gif" alt="captheta"><img src="doc-files/capupsil.gif" alt="capupsil">
+     *       <img src="doc-files/capsigma.gif" alt="capsigma"></td>
+     *   <td><img src="doc-files/iota.gif" alt="iota"><img src="doc-files/chi.gif" alt="chi">
+     *       <img src="doc-files/theta.gif" alt="theta"><img src="doc-files/upsilon.gif" alt="upsilon">
+     *       <img src="doc-files/sigma1.gif" alt="sigma"></td>
+     *   <td>lowercased all chars in String</td>
+     * </tr>
+     * </table>
+     *
+     * @param locale use the case transformation rules for this locale
+     * @return the <code>String</code>, converted to lowercase.
+     * @see     java.lang.String#toLowerCase()
+     * @see     java.lang.String#toUpperCase()
+     * @see     java.lang.String#toUpperCase(Locale)
+     * @since   1.1
+     */
+//    public String toLowerCase(Locale locale) {
+//        if (locale == null) {
+//            throw new NullPointerException();
+//        }
+//
+//        int     firstUpper;
+//
+//        /* Now check if there are any characters that need to be changed. */
+//        scan: {
+//            for (firstUpper = 0 ; firstUpper < count; ) {
+//                char c = value[offset+firstUpper];
+//                if ((c >= Character.MIN_HIGH_SURROGATE) &&
+//                    (c <= Character.MAX_HIGH_SURROGATE)) {
+//                    int supplChar = codePointAt(firstUpper);
+//                    if (supplChar != Character.toLowerCase(supplChar)) {
+//                        break scan;
+//                    }
+//                    firstUpper += Character.charCount(supplChar);
+//                } else {
+//                    if (c != Character.toLowerCase(c)) {
+//                        break scan;
+//                    }
+//                    firstUpper++;
+//                }
+//            }
+//            return this;
+//        }
+//
+//        char[]  result = new char[count];
+//        int     resultOffset = 0;  /* result may grow, so i+resultOffset
+//                                    * is the write location in result */
+//
+//        /* Just copy the first few lowerCase characters. */
+//        System.arraycopy(value, offset, result, 0, firstUpper);
+//
+//        String lang = locale.getLanguage();
+//        boolean localeDependent =
+//            (lang == "tr" || lang == "az" || lang == "lt");
+//        char[] lowerCharArray;
+//        int lowerChar;
+//        int srcChar;
+//        int srcCount;
+//        for (int i = firstUpper; i < count; i += srcCount) {
+//            srcChar = (int)value[offset+i];
+//            if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
+//                (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
+//                srcChar = codePointAt(i);
+//                srcCount = Character.charCount(srcChar);
+//            } else {
+//                srcCount = 1;
+//            }
+//            if (localeDependent || srcChar == '\u03A3') { // GREEK CAPITAL LETTER SIGMA
+//                lowerChar = ConditionalSpecialCasing.toLowerCaseEx(this, i, locale);
+//            } else if (srcChar == '\u0130') { // LATIN CAPITAL LETTER I DOT
+//                lowerChar = Character.ERROR;
+//            } else {
+//                lowerChar = Character.toLowerCase(srcChar);
+//            }
+//            if ((lowerChar == Character.ERROR) ||
+//                (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
+//                if (lowerChar == Character.ERROR) {
+//                     if (!localeDependent && srcChar == '\u0130') {
+//                         lowerCharArray =
+//                             ConditionalSpecialCasing.toLowerCaseCharArray(this, i, Locale.ENGLISH);
+//                     } else {
+//                        lowerCharArray =
+//                            ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
+//                     }
+//                } else if (srcCount == 2) {
+//                    resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount;
+//                    continue;
+//                } else {
+//                    lowerCharArray = Character.toChars(lowerChar);
+//                }
+//
+//                /* Grow result if needed */
+//                int mapLen = lowerCharArray.length;
+//                if (mapLen > srcCount) {
+//                    char[] result2 = new char[result.length + mapLen - srcCount];
+//                    System.arraycopy(result, 0, result2, 0,
+//                        i + resultOffset);
+//                    result = result2;
+//                }
+//                for (int x=0; x<mapLen; ++x) {
+//                    result[i+resultOffset+x] = lowerCharArray[x];
+//                }
+//                resultOffset += (mapLen - srcCount);
+//            } else {
+//                result[i+resultOffset] = (char)lowerChar;
+//            }
+//        }
+//        return new String(0, count+resultOffset, result);
+//    }
+
+    /**
+     * Converts all of the characters in this <code>String</code> to lower
+     * case using the rules of the default locale. This is equivalent to calling
+     * <code>toLowerCase(Locale.getDefault())</code>.
+     * <p>
+     * <b>Note:</b> This method is locale sensitive, and may produce unexpected
+     * results if used for strings that are intended to be interpreted locale
+     * independently.
+     * Examples are programming language identifiers, protocol keys, and HTML
+     * tags.
+     * For instance, <code>"TITLE".toLowerCase()</code> in a Turkish locale
+     * returns <code>"t\u005Cu0131tle"</code>, where '\u005Cu0131' is the
+     * LATIN SMALL LETTER DOTLESS I character.
+     * To obtain correct results for locale insensitive strings, use
+     * <code>toLowerCase(Locale.ENGLISH)</code>.
+     * <p>
+     * @return  the <code>String</code>, converted to lowercase.
+     * @see     java.lang.String#toLowerCase(Locale)
+     */
+    @JavaScriptBody(args = {}, body = "return this.toLowerCase();")
+    public String toLowerCase() {
+        throw new UnsupportedOperationException("Should be supported but without connection to locale");
+    }
+
+    /**
+     * Converts all of the characters in this <code>String</code> to upper
+     * case using the rules of the given <code>Locale</code>. Case mapping is based
+     * on the Unicode Standard version specified by the {@link java.lang.Character Character}
+     * class. Since case mappings are not always 1:1 char mappings, the resulting
+     * <code>String</code> may be a different length than the original <code>String</code>.
+     * <p>
+     * Examples of locale-sensitive and 1:M case mappings are in the following table.
+     * <p>
+     * <table border="1" summary="Examples of locale-sensitive and 1:M case mappings. Shows Language code of locale, lower case, upper case, and description.">
+     * <tr>
+     *   <th>Language Code of Locale</th>
+     *   <th>Lower Case</th>
+     *   <th>Upper Case</th>
+     *   <th>Description</th>
+     * </tr>
+     * <tr>
+     *   <td>tr (Turkish)</td>
+     *   <td>&#92;u0069</td>
+     *   <td>&#92;u0130</td>
+     *   <td>small letter i -&gt; capital letter I with dot above</td>
+     * </tr>
+     * <tr>
+     *   <td>tr (Turkish)</td>
+     *   <td>&#92;u0131</td>
+     *   <td>&#92;u0049</td>
+     *   <td>small letter dotless i -&gt; capital letter I</td>
+     * </tr>
+     * <tr>
+     *   <td>(all)</td>
+     *   <td>&#92;u00df</td>
+     *   <td>&#92;u0053 &#92;u0053</td>
+     *   <td>small letter sharp s -&gt; two letters: SS</td>
+     * </tr>
+     * <tr>
+     *   <td>(all)</td>
+     *   <td>Fahrvergn&uuml;gen</td>
+     *   <td>FAHRVERGN&Uuml;GEN</td>
+     *   <td></td>
+     * </tr>
+     * </table>
+     * @param locale use the case transformation rules for this locale
+     * @return the <code>String</code>, converted to uppercase.
+     * @see     java.lang.String#toUpperCase()
+     * @see     java.lang.String#toLowerCase()
+     * @see     java.lang.String#toLowerCase(Locale)
+     * @since   1.1
+     */
+    /* not for javascript 
+    public String toUpperCase(Locale locale) {
+        if (locale == null) {
+            throw new NullPointerException();
+        }
+
+        int     firstLower;
+
+        // Now check if there are any characters that need to be changed. 
+        scan: {
+            for (firstLower = 0 ; firstLower < count; ) {
+                int c = (int)value[offset+firstLower];
+                int srcCount;
+                if ((c >= Character.MIN_HIGH_SURROGATE) &&
+                    (c <= Character.MAX_HIGH_SURROGATE)) {
+                    c = codePointAt(firstLower);
+                    srcCount = Character.charCount(c);
+                } else {
+                    srcCount = 1;
+                }
+                int upperCaseChar = Character.toUpperCaseEx(c);
+                if ((upperCaseChar == Character.ERROR) ||
+                    (c != upperCaseChar)) {
+                    break scan;
+                }
+                firstLower += srcCount;
+            }
+            return this;
+        }
+
+        char[]  result       = new char[count]; /* may grow *
+        int     resultOffset = 0;  /* result may grow, so i+resultOffset
+                                    * is the write location in result *
+
+        /* Just copy the first few upperCase characters. *
+        System.arraycopy(value, offset, result, 0, firstLower);
+
+        String lang = locale.getLanguage();
+        boolean localeDependent =
+            (lang == "tr" || lang == "az" || lang == "lt");
+        char[] upperCharArray;
+        int upperChar;
+        int srcChar;
+        int srcCount;
+        for (int i = firstLower; i < count; i += srcCount) {
+            srcChar = (int)value[offset+i];
+            if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
+                (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
+                srcChar = codePointAt(i);
+                srcCount = Character.charCount(srcChar);
+            } else {
+                srcCount = 1;
+            }
+            if (localeDependent) {
+                upperChar = ConditionalSpecialCasing.toUpperCaseEx(this, i, locale);
+            } else {
+                upperChar = Character.toUpperCaseEx(srcChar);
+            }
+            if ((upperChar == Character.ERROR) ||
+                (upperChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
+                if (upperChar == Character.ERROR) {
+                    if (localeDependent) {
+                        upperCharArray =
+                            ConditionalSpecialCasing.toUpperCaseCharArray(this, i, locale);
+                    } else {
+                        upperCharArray = Character.toUpperCaseCharArray(srcChar);
+                    }
+                } else if (srcCount == 2) {
+                    resultOffset += Character.toChars(upperChar, result, i + resultOffset) - srcCount;
+                    continue;
+                } else {
+                    upperCharArray = Character.toChars(upperChar);
+                }
+
+                /* Grow result if needed *
+                int mapLen = upperCharArray.length;
+                if (mapLen > srcCount) {
+                    char[] result2 = new char[result.length + mapLen - srcCount];
+                    System.arraycopy(result, 0, result2, 0,
+                        i + resultOffset);
+                    result = result2;
+                }
+                for (int x=0; x<mapLen; ++x) {
+                    result[i+resultOffset+x] = upperCharArray[x];
+                }
+                resultOffset += (mapLen - srcCount);
+            } else {
+                result[i+resultOffset] = (char)upperChar;
+            }
+        }
+        return new String(0, count+resultOffset, result);
+    }
+    */
+
+    /**
+     * Converts all of the characters in this <code>String</code> to upper
+     * case using the rules of the default locale. This method is equivalent to
+     * <code>toUpperCase(Locale.getDefault())</code>.
+     * <p>
+     * <b>Note:</b> This method is locale sensitive, and may produce unexpected
+     * results if used for strings that are intended to be interpreted locale
+     * independently.
+     * Examples are programming language identifiers, protocol keys, and HTML
+     * tags.
+     * For instance, <code>"title".toUpperCase()</code> in a Turkish locale
+     * returns <code>"T\u005Cu0130TLE"</code>, where '\u005Cu0130' is the
+     * LATIN CAPITAL LETTER I WITH DOT ABOVE character.
+     * To obtain correct results for locale insensitive strings, use
+     * <code>toUpperCase(Locale.ENGLISH)</code>.
+     * <p>
+     * @return  the <code>String</code>, converted to uppercase.
+     * @see     java.lang.String#toUpperCase(Locale)
+     */
+    @JavaScriptBody(args = {}, body = "return this.toUpperCase();")
+    public String toUpperCase() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns a copy of the string, with leading and trailing whitespace
+     * omitted.
+     * <p>
+     * If this <code>String</code> object represents an empty character
+     * sequence, or the first and last characters of character sequence
+     * represented by this <code>String</code> object both have codes
+     * greater than <code>'&#92;u0020'</code> (the space character), then a
+     * reference to this <code>String</code> object is returned.
+     * <p>
+     * Otherwise, if there is no character with a code greater than
+     * <code>'&#92;u0020'</code> in the string, then a new
+     * <code>String</code> object representing an empty string is created
+     * and returned.
+     * <p>
+     * Otherwise, let <i>k</i> be the index of the first character in the
+     * string whose code is greater than <code>'&#92;u0020'</code>, and let
+     * <i>m</i> be the index of the last character in the string whose code
+     * is greater than <code>'&#92;u0020'</code>. A new <code>String</code>
+     * object is created, representing the substring of this string that
+     * begins with the character at index <i>k</i> and ends with the
+     * character at index <i>m</i>-that is, the result of
+     * <code>this.substring(<i>k</i>,&nbsp;<i>m</i>+1)</code>.
+     * <p>
+     * This method may be used to trim whitespace (as defined above) from
+     * the beginning and end of a string.
+     *
+     * @return  A copy of this string with leading and trailing white
+     *          space removed, or this string if it has no leading or
+     *          trailing white space.
+     */
+    public String trim() {
+        int len = length();
+        int st = 0;
+        int off = offset();      /* avoid getfield opcode */
+        char[] val = toCharArray();    /* avoid getfield opcode */
+
+        while ((st < len) && (val[off + st] <= ' ')) {
+            st++;
+        }
+        while ((st < len) && (val[off + len - 1] <= ' ')) {
+            len--;
+        }
+        return ((st > 0) || (len < length())) ? substring(st, len) : this;
+    }
+
+    /**
+     * This object (which is already a string!) is itself returned.
+     *
+     * @return  the string itself.
+     */
+    @JavaScriptBody(args = {}, body = "return this.toString();")
+    public String toString() {
+        return this;
+    }
+
+    /**
+     * Converts this string to a new character array.
+     *
+     * @return  a newly allocated character array whose length is the length
+     *          of this string and whose contents are initialized to contain
+     *          the character sequence represented by this string.
+     */
+    public char[] toCharArray() {
+        char result[] = new char[length()];
+        getChars(0, length(), result, 0);
+        return result;
+    }
+
+    /**
+     * Returns a formatted string using the specified format string and
+     * arguments.
+     *
+     * <p> The locale always used is the one returned by {@link
+     * java.util.Locale#getDefault() Locale.getDefault()}.
+     *
+     * @param  format
+     *         A <a href="../util/Formatter.html#syntax">format string</a>
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
+     *         The behaviour on a
+     *         <tt>null</tt> argument depends on the <a
+     *         href="../util/Formatter.html#syntax">conversion</a>.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the <a
+     *          href="../util/Formatter.html#detail">Details</a> section of the
+     *          formatter class specification.
+     *
+     * @throws  NullPointerException
+     *          If the <tt>format</tt> is <tt>null</tt>
+     *
+     * @return  A formatted string
+     *
+     * @see  java.util.Formatter
+     * @since  1.5
+     */
+    public static String format(String format, Object ... args) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns a formatted string using the specified locale, format string,
+     * and arguments.
+     *
+     * @param  l
+     *         The {@linkplain java.util.Locale locale} to apply during
+     *         formatting.  If <tt>l</tt> is <tt>null</tt> then no localization
+     *         is applied.
+     *
+     * @param  format
+     *         A <a href="../util/Formatter.html#syntax">format string</a>
+     *
+     * @param  args
+     *         Arguments referenced by the format specifiers in the format
+     *         string.  If there are more arguments than format specifiers, the
+     *         extra arguments are ignored.  The number of arguments is
+     *         variable and may be zero.  The maximum number of arguments is
+     *         limited by the maximum dimension of a Java array as defined by
+     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
+     *         The behaviour on a
+     *         <tt>null</tt> argument depends on the <a
+     *         href="../util/Formatter.html#syntax">conversion</a>.
+     *
+     * @throws  IllegalFormatException
+     *          If a format string contains an illegal syntax, a format
+     *          specifier that is incompatible with the given arguments,
+     *          insufficient arguments given the format string, or other
+     *          illegal conditions.  For specification of all possible
+     *          formatting errors, see the <a
+     *          href="../util/Formatter.html#detail">Details</a> section of the
+     *          formatter class specification
+     *
+     * @throws  NullPointerException
+     *          If the <tt>format</tt> is <tt>null</tt>
+     *
+     * @return  A formatted string
+     *
+     * @see  java.util.Formatter
+     * @since  1.5
+     */
+//    public static String format(Locale l, String format, Object ... args) {
+//        return new Formatter(l).format(format, args).toString();
+//    }
+
+    /**
+     * Returns the string representation of the <code>Object</code> argument.
+     *
+     * @param   obj   an <code>Object</code>.
+     * @return  if the argument is <code>null</code>, then a string equal to
+     *          <code>"null"</code>; otherwise, the value of
+     *          <code>obj.toString()</code> is returned.
+     * @see     java.lang.Object#toString()
+     */
+    public static String valueOf(Object obj) {
+        return (obj == null) ? "null" : obj.toString();
+    }
+
+    /**
+     * Returns the string representation of the <code>char</code> array
+     * argument. The contents of the character array are copied; subsequent
+     * modification of the character array does not affect the newly
+     * created string.
+     *
+     * @param   data   a <code>char</code> array.
+     * @return  a newly allocated string representing the same sequence of
+     *          characters contained in the character array argument.
+     */
+    public static String valueOf(char data[]) {
+        return new String(data);
+    }
+
+    /**
+     * Returns the string representation of a specific subarray of the
+     * <code>char</code> array argument.
+     * <p>
+     * The <code>offset</code> argument is the index of the first
+     * character of the subarray. The <code>count</code> argument
+     * specifies the length of the subarray. The contents of the subarray
+     * are copied; subsequent modification of the character array does not
+     * affect the newly created string.
+     *
+     * @param   data     the character array.
+     * @param   offset   the initial offset into the value of the
+     *                  <code>String</code>.
+     * @param   count    the length of the value of the <code>String</code>.
+     * @return  a string representing the sequence of characters contained
+     *          in the subarray of the character array argument.
+     * @exception IndexOutOfBoundsException if <code>offset</code> is
+     *          negative, or <code>count</code> is negative, or
+     *          <code>offset+count</code> is larger than
+     *          <code>data.length</code>.
+     */
+    public static String valueOf(char data[], int offset, int count) {
+        return new String(data, offset, count);
+    }
+
+    /**
+     * Returns a String that represents the character sequence in the
+     * array specified.
+     *
+     * @param   data     the character array.
+     * @param   offset   initial offset of the subarray.
+     * @param   count    length of the subarray.
+     * @return  a <code>String</code> that contains the characters of the
+     *          specified subarray of the character array.
+     */
+    public static String copyValueOf(char data[], int offset, int count) {
+        // All public String constructors now copy the data.
+        return new String(data, offset, count);
+    }
+
+    /**
+     * Returns a String that represents the character sequence in the
+     * array specified.
+     *
+     * @param   data   the character array.
+     * @return  a <code>String</code> that contains the characters of the
+     *          character array.
+     */
+    public static String copyValueOf(char data[]) {
+        return copyValueOf(data, 0, data.length);
+    }
+
+    /**
+     * Returns the string representation of the <code>boolean</code> argument.
+     *
+     * @param   b   a <code>boolean</code>.
+     * @return  if the argument is <code>true</code>, a string equal to
+     *          <code>"true"</code> is returned; otherwise, a string equal to
+     *          <code>"false"</code> is returned.
+     */
+    public static String valueOf(boolean b) {
+        return b ? "true" : "false";
+    }
+
+    /**
+     * Returns the string representation of the <code>char</code>
+     * argument.
+     *
+     * @param   c   a <code>char</code>.
+     * @return  a string of length <code>1</code> containing
+     *          as its single character the argument <code>c</code>.
+     */
+    public static String valueOf(char c) {
+        char data[] = {c};
+        return new String(data, 0, 1);
+    }
+
+    /**
+     * Returns the string representation of the <code>int</code> argument.
+     * <p>
+     * The representation is exactly the one returned by the
+     * <code>Integer.toString</code> method of one argument.
+     *
+     * @param   i   an <code>int</code>.
+     * @return  a string representation of the <code>int</code> argument.
+     * @see     java.lang.Integer#toString(int, int)
+     */
+    public static String valueOf(int i) {
+        return Integer.toString(i);
+    }
+
+    /**
+     * Returns the string representation of the <code>long</code> argument.
+     * <p>
+     * The representation is exactly the one returned by the
+     * <code>Long.toString</code> method of one argument.
+     *
+     * @param   l   a <code>long</code>.
+     * @return  a string representation of the <code>long</code> argument.
+     * @see     java.lang.Long#toString(long)
+     */
+    public static String valueOf(long l) {
+        return Long.toString(l);
+    }
+
+    /**
+     * Returns the string representation of the <code>float</code> argument.
+     * <p>
+     * The representation is exactly the one returned by the
+     * <code>Float.toString</code> method of one argument.
+     *
+     * @param   f   a <code>float</code>.
+     * @return  a string representation of the <code>float</code> argument.
+     * @see     java.lang.Float#toString(float)
+     */
+    public static String valueOf(float f) {
+        return Float.toString(f);
+    }
+
+    /**
+     * Returns the string representation of the <code>double</code> argument.
+     * <p>
+     * The representation is exactly the one returned by the
+     * <code>Double.toString</code> method of one argument.
+     *
+     * @param   d   a <code>double</code>.
+     * @return  a  string representation of the <code>double</code> argument.
+     * @see     java.lang.Double#toString(double)
+     */
+    public static String valueOf(double d) {
+        return Double.toString(d);
+    }
+
+    /**
+     * Returns a canonical representation for the string object.
+     * <p>
+     * A pool of strings, initially empty, is maintained privately by the
+     * class <code>String</code>.
+     * <p>
+     * When the intern method is invoked, if the pool already contains a
+     * string equal to this <code>String</code> object as determined by
+     * the {@link #equals(Object)} method, then the string from the pool is
+     * returned. Otherwise, this <code>String</code> object is added to the
+     * pool and a reference to this <code>String</code> object is returned.
+     * <p>
+     * It follows that for any two strings <code>s</code> and <code>t</code>,
+     * <code>s.intern()&nbsp;==&nbsp;t.intern()</code> is <code>true</code>
+     * if and only if <code>s.equals(t)</code> is <code>true</code>.
+     * <p>
+     * All literal strings and string-valued constant expressions are
+     * interned. String literals are defined in section 3.10.5 of the
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * @return  a string that has the same contents as this string, but is
+     *          guaranteed to be from a pool of unique strings.
+     */
+    public native String intern();
+    
+    
+    private static <T> T checkUTF8(T data, String charsetName)
+        throws UnsupportedEncodingException {
+        if (charsetName == null) {
+            throw new NullPointerException("charsetName");
+        }
+        if (!charsetName.equalsIgnoreCase("UTF-8")
+            && !charsetName.equalsIgnoreCase("UTF8")) {
+            throw new UnsupportedEncodingException(charsetName);
+        }
+        return data;
+    }
+    
+    private static int nextChar(byte[] arr, int[] index) throws IndexOutOfBoundsException {
+        int c = arr[index[0]++] & 0xff;
+        switch (c >> 4) {
+            case 0:
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+            case 7:
+                /* 0xxxxxxx*/
+                return c;
+            case 12:
+            case 13: {
+                /* 110x xxxx   10xx xxxx*/
+                int char2 = (int) arr[index[0]++];
+                if ((char2 & 0xC0) != 0x80) {
+                    throw new IndexOutOfBoundsException("malformed input");
+                }
+                return (((c & 0x1F) << 6) | (char2 & 0x3F));
+            }
+            case 14: {
+                /* 1110 xxxx  10xx xxxx  10xx xxxx */
+                int char2 = arr[index[0]++];
+                int char3 = arr[index[0]++];
+                if (((char2 & 0xC0) != 0x80) || ((char3 & 0xC0) != 0x80)) {
+                    throw new IndexOutOfBoundsException("malformed input");
+                }
+                return (((c & 0x0F) << 12)
+                    | ((char2 & 0x3F) << 6)
+                    | ((char3 & 0x3F) << 0));
+            }
+            default:
+                /* 10xx xxxx,  1111 xxxx */
+                throw new IndexOutOfBoundsException("malformed input");
+        }
+        
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/StringBuffer.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/StringBuffer.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,604 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+
+/**
+ * A thread-safe, mutable sequence of characters.
+ * A string buffer is like a {@link String}, but can be modified. At any
+ * point in time it contains some particular sequence of characters, but
+ * the length and content of the sequence can be changed through certain
+ * method calls.
+ * <p>
+ * String buffers are safe for use by multiple threads. The methods
+ * are synchronized where necessary so that all the operations on any
+ * particular instance behave as if they occur in some serial order
+ * that is consistent with the order of the method calls made by each of
+ * the individual threads involved.
+ * <p>
+ * The principal operations on a <code>StringBuffer</code> are the
+ * <code>append</code> and <code>insert</code> methods, which are
+ * overloaded so as to accept data of any type. Each effectively
+ * converts a given datum to a string and then appends or inserts the
+ * characters of that string to the string buffer. The
+ * <code>append</code> method always adds these characters at the end
+ * of the buffer; the <code>insert</code> method adds the characters at
+ * a specified point.
+ * <p>
+ * For example, if <code>z</code> refers to a string buffer object
+ * whose current contents are "<code>start</code>", then
+ * the method call <code>z.append("le")</code> would cause the string
+ * buffer to contain "<code>startle</code>", whereas
+ * <code>z.insert(4, "le")</code> would alter the string buffer to
+ * contain "<code>starlet</code>".
+ * <p>
+ * In general, if sb refers to an instance of a <code>StringBuffer</code>,
+ * then <code>sb.append(x)</code> has the same effect as
+ * <code>sb.insert(sb.length(),&nbsp;x)</code>.
+ * <p>
+ * Whenever an operation occurs involving a source sequence (such as
+ * appending or inserting from a source sequence) this class synchronizes
+ * only on the string buffer performing the operation, not on the source.
+ * <p>
+ * Every string buffer has a capacity. As long as the length of the
+ * character sequence contained in the string buffer does not exceed
+ * the capacity, it is not necessary to allocate a new internal
+ * buffer array. If the internal buffer overflows, it is
+ * automatically made larger.
+ *
+ * As of  release JDK 5, this class has been supplemented with an equivalent
+ * class designed for use by a single thread, {@link StringBuilder}.  The
+ * <tt>StringBuilder</tt> class should generally be used in preference to
+ * this one, as it supports all of the same operations but it is faster, as
+ * it performs no synchronization.
+ *
+ * @author      Arthur van Hoff
+ * @see     java.lang.StringBuilder
+ * @see     java.lang.String
+ * @since   JDK1.0
+ */
+ public final class StringBuffer
+    extends AbstractStringBuilder
+    implements java.io.Serializable, CharSequence
+{
+
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    static final long serialVersionUID = 3388685877147921107L;
+
+    /**
+     * Constructs a string buffer with no characters in it and an
+     * initial capacity of 16 characters.
+     */
+    public StringBuffer() {
+        super(16);
+    }
+
+    /**
+     * Constructs a string buffer with no characters in it and
+     * the specified initial capacity.
+     *
+     * @param      capacity  the initial capacity.
+     * @exception  NegativeArraySizeException  if the <code>capacity</code>
+     *               argument is less than <code>0</code>.
+     */
+    public StringBuffer(int capacity) {
+        super(capacity);
+    }
+
+    /**
+     * Constructs a string buffer initialized to the contents of the
+     * specified string. The initial capacity of the string buffer is
+     * <code>16</code> plus the length of the string argument.
+     *
+     * @param   str   the initial contents of the buffer.
+     * @exception NullPointerException if <code>str</code> is <code>null</code>
+     */
+    public StringBuffer(String str) {
+        super(str.length() + 16);
+        append(str);
+    }
+
+    /**
+     * Constructs a string buffer that contains the same characters
+     * as the specified <code>CharSequence</code>. The initial capacity of
+     * the string buffer is <code>16</code> plus the length of the
+     * <code>CharSequence</code> argument.
+     * <p>
+     * If the length of the specified <code>CharSequence</code> is
+     * less than or equal to zero, then an empty buffer of capacity
+     * <code>16</code> is returned.
+     *
+     * @param      seq   the sequence to copy.
+     * @exception NullPointerException if <code>seq</code> is <code>null</code>
+     * @since 1.5
+     */
+    public StringBuffer(CharSequence seq) {
+        this(seq.length() + 16);
+        append(seq);
+    }
+
+    public synchronized int length() {
+        return count;
+    }
+
+    public synchronized int capacity() {
+        return value.length;
+    }
+
+
+    public synchronized void ensureCapacity(int minimumCapacity) {
+        if (minimumCapacity > value.length) {
+            expandCapacity(minimumCapacity);
+        }
+    }
+
+    /**
+     * @since      1.5
+     */
+    public synchronized void trimToSize() {
+        super.trimToSize();
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @see        #length()
+     */
+    public synchronized void setLength(int newLength) {
+        super.setLength(newLength);
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @see        #length()
+     */
+    public synchronized char charAt(int index) {
+        if ((index < 0) || (index >= count))
+            throw new StringIndexOutOfBoundsException(index);
+        return value[index];
+    }
+
+    /**
+     * @since      1.5
+     */
+    public synchronized int codePointAt(int index) {
+        return super.codePointAt(index);
+    }
+
+    /**
+     * @since     1.5
+     */
+    public synchronized int codePointBefore(int index) {
+        return super.codePointBefore(index);
+    }
+
+    /**
+     * @since     1.5
+     */
+    public synchronized int codePointCount(int beginIndex, int endIndex) {
+        return super.codePointCount(beginIndex, endIndex);
+    }
+
+    /**
+     * @since     1.5
+     */
+    public synchronized int offsetByCodePoints(int index, int codePointOffset) {
+        return super.offsetByCodePoints(index, codePointOffset);
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public synchronized void getChars(int srcBegin, int srcEnd, char[] dst,
+                                      int dstBegin)
+    {
+        super.getChars(srcBegin, srcEnd, dst, dstBegin);
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @see        #length()
+     */
+    public synchronized void setCharAt(int index, char ch) {
+        if ((index < 0) || (index >= count))
+            throw new StringIndexOutOfBoundsException(index);
+        value[index] = ch;
+    }
+
+    public synchronized StringBuffer append(Object obj) {
+        super.append(String.valueOf(obj));
+        return this;
+    }
+
+    public synchronized StringBuffer append(String str) {
+        super.append(str);
+        return this;
+    }
+
+    /**
+     * Appends the specified <tt>StringBuffer</tt> to this sequence.
+     * <p>
+     * The characters of the <tt>StringBuffer</tt> argument are appended,
+     * in order, to the contents of this <tt>StringBuffer</tt>, increasing the
+     * length of this <tt>StringBuffer</tt> by the length of the argument.
+     * If <tt>sb</tt> is <tt>null</tt>, then the four characters
+     * <tt>"null"</tt> are appended to this <tt>StringBuffer</tt>.
+     * <p>
+     * Let <i>n</i> be the length of the old character sequence, the one
+     * contained in the <tt>StringBuffer</tt> just prior to execution of the
+     * <tt>append</tt> method. Then the character at index <i>k</i> in
+     * the new character sequence is equal to the character at index <i>k</i>
+     * in the old character sequence, if <i>k</i> is less than <i>n</i>;
+     * otherwise, it is equal to the character at index <i>k-n</i> in the
+     * argument <code>sb</code>.
+     * <p>
+     * This method synchronizes on <code>this</code> (the destination)
+     * object but does not synchronize on the source (<code>sb</code>).
+     *
+     * @param   sb   the <tt>StringBuffer</tt> to append.
+     * @return  a reference to this object.
+     * @since 1.4
+     */
+    public synchronized StringBuffer append(StringBuffer sb) {
+        super.append(sb);
+        return this;
+    }
+
+
+    /**
+     * Appends the specified <code>CharSequence</code> to this
+     * sequence.
+     * <p>
+     * The characters of the <code>CharSequence</code> argument are appended,
+     * in order, increasing the length of this sequence by the length of the
+     * argument.
+     *
+     * <p>The result of this method is exactly the same as if it were an
+     * invocation of this.append(s, 0, s.length());
+     *
+     * <p>This method synchronizes on this (the destination)
+     * object but does not synchronize on the source (<code>s</code>).
+     *
+     * <p>If <code>s</code> is <code>null</code>, then the four characters
+     * <code>"null"</code> are appended.
+     *
+     * @param   s the <code>CharSequence</code> to append.
+     * @return  a reference to this object.
+     * @since 1.5
+     */
+    public StringBuffer append(CharSequence s) {
+        // Note, synchronization achieved via other invocations
+        if (s == null)
+            s = "null";
+        if (s instanceof String)
+            return this.append((String)s);
+        if (s instanceof StringBuffer)
+            return this.append((StringBuffer)s);
+        return this.append(s, 0, s.length());
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @since      1.5
+     */
+    public synchronized StringBuffer append(CharSequence s, int start, int end)
+    {
+        super.append(s, start, end);
+        return this;
+    }
+
+    public synchronized StringBuffer append(char[] str) {
+        super.append(str);
+        return this;
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public synchronized StringBuffer append(char[] str, int offset, int len) {
+        super.append(str, offset, len);
+        return this;
+    }
+
+    public synchronized StringBuffer append(boolean b) {
+        super.append(b);
+        return this;
+    }
+
+    public synchronized StringBuffer append(char c) {
+        super.append(c);
+        return this;
+    }
+
+    public synchronized StringBuffer append(int i) {
+        super.append(i);
+        return this;
+    }
+
+    /**
+     * @since 1.5
+     */
+    public synchronized StringBuffer appendCodePoint(int codePoint) {
+        super.appendCodePoint(codePoint);
+        return this;
+    }
+
+    public synchronized StringBuffer append(long lng) {
+        super.append(lng);
+        return this;
+    }
+
+    public synchronized StringBuffer append(float f) {
+        super.append(f);
+        return this;
+    }
+
+    public synchronized StringBuffer append(double d) {
+        super.append(d);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     * @since      1.2
+     */
+    public synchronized StringBuffer delete(int start, int end) {
+        super.delete(start, end);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     * @since      1.2
+     */
+    public synchronized StringBuffer deleteCharAt(int index) {
+        super.deleteCharAt(index);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     * @since      1.2
+     */
+    public synchronized StringBuffer replace(int start, int end, String str) {
+        super.replace(start, end, str);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     * @since      1.2
+     */
+    public synchronized String substring(int start) {
+        return substring(start, count);
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @since      1.4
+     */
+    public synchronized CharSequence subSequence(int start, int end) {
+        return super.substring(start, end);
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     * @since      1.2
+     */
+    public synchronized String substring(int start, int end) {
+        return super.substring(start, end);
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     * @since      1.2
+     */
+    public synchronized StringBuffer insert(int index, char[] str, int offset,
+                                            int len)
+    {
+        super.insert(index, str, offset, len);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public synchronized StringBuffer insert(int offset, Object obj) {
+        super.insert(offset, String.valueOf(obj));
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public synchronized StringBuffer insert(int offset, String str) {
+        super.insert(offset, str);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public synchronized StringBuffer insert(int offset, char[] str) {
+        super.insert(offset, str);
+        return this;
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @since      1.5
+     */
+    public StringBuffer insert(int dstOffset, CharSequence s) {
+        // Note, synchronization achieved via other invocations
+        if (s == null)
+            s = "null";
+        if (s instanceof String)
+            return this.insert(dstOffset, (String)s);
+        return this.insert(dstOffset, s, 0, s.length());
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     * @since      1.5
+     */
+    public synchronized StringBuffer insert(int dstOffset, CharSequence s,
+                                            int start, int end)
+    {
+        super.insert(dstOffset, s, start, end);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuffer insert(int offset, boolean b) {
+        return insert(offset, String.valueOf(b));
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public synchronized StringBuffer insert(int offset, char c) {
+        super.insert(offset, c);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuffer insert(int offset, int i) {
+        return insert(offset, String.valueOf(i));
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuffer insert(int offset, long l) {
+        return insert(offset, String.valueOf(l));
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuffer insert(int offset, float f) {
+        return insert(offset, String.valueOf(f));
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuffer insert(int offset, double d) {
+        return insert(offset, String.valueOf(d));
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since      1.4
+     */
+    public int indexOf(String str) {
+        return indexOf(str, 0);
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since      1.4
+     */
+    public synchronized int indexOf(String str, int fromIndex) {
+        return super.indexOf(str, fromIndex);
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since      1.4
+     */
+    public int lastIndexOf(String str) {
+        // Note, synchronization achieved via other invocations
+        return lastIndexOf(str, count);
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since      1.4
+     */
+    public synchronized int lastIndexOf(String str, int fromIndex) {
+        return String.lastIndexOf(value, 0, count,
+                              str.toCharArray(), 0, str.length(), fromIndex);
+    }
+
+    /**
+     * @since   JDK1.0.2
+     */
+    public synchronized StringBuffer reverse() {
+        super.reverse();
+        return this;
+    }
+
+    public synchronized String toString() {
+        return new String(value, 0, count);
+    }
+
+//    /**
+//     * Serializable fields for StringBuffer.
+//     *
+//     * @serialField value  char[]
+//     *              The backing character array of this StringBuffer.
+//     * @serialField count int
+//     *              The number of characters in this StringBuffer.
+//     * @serialField shared  boolean
+//     *              A flag indicating whether the backing array is shared.
+//     *              The value is ignored upon deserialization.
+//     */
+//    private static final java.io.ObjectStreamField[] serialPersistentFields =
+//    {
+//        new java.io.ObjectStreamField("value", char[].class),
+//        new java.io.ObjectStreamField("count", Integer.TYPE),
+//        new java.io.ObjectStreamField("shared", Boolean.TYPE),
+//    };
+//
+//    /**
+//     * readObject is called to restore the state of the StringBuffer from
+//     * a stream.
+//     */
+//    private synchronized void writeObject(java.io.ObjectOutputStream s)
+//        throws java.io.IOException {
+//        java.io.ObjectOutputStream.PutField fields = s.putFields();
+//        fields.put("value", value);
+//        fields.put("count", count);
+//        fields.put("shared", false);
+//        s.writeFields();
+//    }
+//
+//    /**
+//     * readObject is called to restore the state of the StringBuffer from
+//     * a stream.
+//     */
+//    private void readObject(java.io.ObjectInputStream s)
+//        throws java.io.IOException, ClassNotFoundException {
+//        java.io.ObjectInputStream.GetField fields = s.readFields();
+//        value = (char[])fields.get("value", null);
+//        count = fields.get("count", 0);
+//    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/StringBuilder.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/StringBuilder.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+
+/**
+ * A mutable sequence of characters.  This class provides an API compatible
+ * with <code>StringBuffer</code>, but with no guarantee of synchronization.
+ * This class is designed for use as a drop-in replacement for
+ * <code>StringBuffer</code> in places where the string buffer was being
+ * used by a single thread (as is generally the case).   Where possible,
+ * it is recommended that this class be used in preference to
+ * <code>StringBuffer</code> as it will be faster under most implementations.
+ *
+ * <p>The principal operations on a <code>StringBuilder</code> are the
+ * <code>append</code> and <code>insert</code> methods, which are
+ * overloaded so as to accept data of any type. Each effectively
+ * converts a given datum to a string and then appends or inserts the
+ * characters of that string to the string builder. The
+ * <code>append</code> method always adds these characters at the end
+ * of the builder; the <code>insert</code> method adds the characters at
+ * a specified point.
+ * <p>
+ * For example, if <code>z</code> refers to a string builder object
+ * whose current contents are "<code>start</code>", then
+ * the method call <code>z.append("le")</code> would cause the string
+ * builder to contain "<code>startle</code>", whereas
+ * <code>z.insert(4, "le")</code> would alter the string builder to
+ * contain "<code>starlet</code>".
+ * <p>
+ * In general, if sb refers to an instance of a <code>StringBuilder</code>,
+ * then <code>sb.append(x)</code> has the same effect as
+ * <code>sb.insert(sb.length(),&nbsp;x)</code>.
+ *
+ * Every string builder has a capacity. As long as the length of the
+ * character sequence contained in the string builder does not exceed
+ * the capacity, it is not necessary to allocate a new internal
+ * buffer. If the internal buffer overflows, it is automatically made larger.
+ *
+ * <p>Instances of <code>StringBuilder</code> are not safe for
+ * use by multiple threads. If such synchronization is required then it is
+ * recommended that {@link java.lang.StringBuffer} be used.
+ *
+ * @author      Michael McCloskey
+ * @see         java.lang.StringBuffer
+ * @see         java.lang.String
+ * @since       1.5
+ */
+public final class StringBuilder
+    extends AbstractStringBuilder
+    implements java.io.Serializable, CharSequence
+{
+
+    /** use serialVersionUID for interoperability */
+    static final long serialVersionUID = 4383685877147921099L;
+
+    /**
+     * Constructs a string builder with no characters in it and an
+     * initial capacity of 16 characters.
+     */
+    public StringBuilder() {
+        super(16);
+    }
+
+    /**
+     * Constructs a string builder with no characters in it and an
+     * initial capacity specified by the <code>capacity</code> argument.
+     *
+     * @param      capacity  the initial capacity.
+     * @throws     NegativeArraySizeException  if the <code>capacity</code>
+     *               argument is less than <code>0</code>.
+     */
+    public StringBuilder(int capacity) {
+        super(capacity);
+    }
+
+    /**
+     * Constructs a string builder initialized to the contents of the
+     * specified string. The initial capacity of the string builder is
+     * <code>16</code> plus the length of the string argument.
+     *
+     * @param   str   the initial contents of the buffer.
+     * @throws    NullPointerException if <code>str</code> is <code>null</code>
+     */
+    public StringBuilder(String str) {
+        super(str.length() + 16);
+        append(str);
+    }
+
+    /**
+     * Constructs a string builder that contains the same characters
+     * as the specified <code>CharSequence</code>. The initial capacity of
+     * the string builder is <code>16</code> plus the length of the
+     * <code>CharSequence</code> argument.
+     *
+     * @param      seq   the sequence to copy.
+     * @throws    NullPointerException if <code>seq</code> is <code>null</code>
+     */
+    public StringBuilder(CharSequence seq) {
+        this(seq.length() + 16);
+        append(seq);
+    }
+
+    public StringBuilder append(Object obj) {
+        return append(String.valueOf(obj));
+    }
+
+    public StringBuilder append(String str) {
+        super.append(str);
+        return this;
+    }
+
+    // Appends the specified string builder to this sequence.
+    private StringBuilder append(StringBuilder sb) {
+        if (sb == null)
+            return append("null");
+        int len = sb.length();
+        int newcount = count + len;
+        if (newcount > value.length)
+            expandCapacity(newcount);
+        sb.getChars(0, len, value, count);
+        count = newcount;
+        return this;
+    }
+
+    /**
+     * Appends the specified <tt>StringBuffer</tt> to this sequence.
+     * <p>
+     * The characters of the <tt>StringBuffer</tt> argument are appended,
+     * in order, to this sequence, increasing the
+     * length of this sequence by the length of the argument.
+     * If <tt>sb</tt> is <tt>null</tt>, then the four characters
+     * <tt>"null"</tt> are appended to this sequence.
+     * <p>
+     * Let <i>n</i> be the length of this character sequence just prior to
+     * execution of the <tt>append</tt> method. Then the character at index
+     * <i>k</i> in the new character sequence is equal to the character at
+     * index <i>k</i> in the old character sequence, if <i>k</i> is less than
+     * <i>n</i>; otherwise, it is equal to the character at index <i>k-n</i>
+     * in the argument <code>sb</code>.
+     *
+     * @param   sb   the <tt>StringBuffer</tt> to append.
+     * @return  a reference to this object.
+     */
+    public StringBuilder append(StringBuffer sb) {
+        super.append(sb);
+        return this;
+    }
+
+    /**
+     */
+    public StringBuilder append(CharSequence s) {
+        if (s == null)
+            s = "null";
+        if (s instanceof String)
+            return this.append((String)s);
+        if (s instanceof StringBuffer)
+            return this.append((StringBuffer)s);
+        if (s instanceof StringBuilder)
+            return this.append((StringBuilder)s);
+        return this.append(s, 0, s.length());
+    }
+
+    /**
+     * @throws     IndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder append(CharSequence s, int start, int end) {
+        super.append(s, start, end);
+        return this;
+    }
+
+    public StringBuilder append(char[] str) {
+        super.append(str);
+        return this;
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder append(char[] str, int offset, int len) {
+        super.append(str, offset, len);
+        return this;
+    }
+
+    public StringBuilder append(boolean b) {
+        super.append(b);
+        return this;
+    }
+
+    public StringBuilder append(char c) {
+        super.append(c);
+        return this;
+    }
+
+    public StringBuilder append(int i) {
+        super.append(i);
+        return this;
+    }
+
+    public StringBuilder append(long lng) {
+        super.append(lng);
+        return this;
+    }
+
+    public StringBuilder append(float f) {
+        super.append(f);
+        return this;
+    }
+
+    public StringBuilder append(double d) {
+        super.append(d);
+        return this;
+    }
+
+    /**
+     * @since 1.5
+     */
+    public StringBuilder appendCodePoint(int codePoint) {
+        super.appendCodePoint(codePoint);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder delete(int start, int end) {
+        super.delete(start, end);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder deleteCharAt(int index) {
+        super.deleteCharAt(index);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder replace(int start, int end, String str) {
+        super.replace(start, end, str);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int index, char[] str, int offset,
+                                int len)
+    {
+        super.insert(index, str, offset, len);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, Object obj) {
+        return insert(offset, String.valueOf(obj));
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, String str) {
+        super.insert(offset, str);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, char[] str) {
+        super.insert(offset, str);
+        return this;
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int dstOffset, CharSequence s) {
+        if (s == null)
+            s = "null";
+        if (s instanceof String)
+            return this.insert(dstOffset, (String)s);
+        return this.insert(dstOffset, s, 0, s.length());
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int dstOffset, CharSequence s,
+                                int start, int end)
+    {
+        super.insert(dstOffset, s, start, end);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, boolean b) {
+        super.insert(offset, b);
+        return this;
+    }
+
+    /**
+     * @throws IndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, char c) {
+        super.insert(offset, c);
+        return this;
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, int i) {
+        return insert(offset, String.valueOf(i));
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, long l) {
+        return insert(offset, String.valueOf(l));
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, float f) {
+        return insert(offset, String.valueOf(f));
+    }
+
+    /**
+     * @throws StringIndexOutOfBoundsException {@inheritDoc}
+     */
+    public StringBuilder insert(int offset, double d) {
+        return insert(offset, String.valueOf(d));
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public int indexOf(String str) {
+        return indexOf(str, 0);
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public int indexOf(String str, int fromIndex) {
+        return super.indexOf(str, fromIndex);
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public int lastIndexOf(String str) {
+        return lastIndexOf(str, count);
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     */
+    public int lastIndexOf(String str, int fromIndex) {
+        return String.lastIndexOf(value, 0, count,
+                              str.toCharArray(), 0, str.length(), fromIndex);
+    }
+
+    public StringBuilder reverse() {
+        super.reverse();
+        return this;
+    }
+
+    public String toString() {
+        // Create a copy, don't share the array
+        return new String(value, 0, count);
+    }
+
+    /**
+     * Save the state of the <tt>StringBuilder</tt> instance to a stream
+     * (that is, serialize it).
+     *
+     * @serialData the number of characters currently stored in the string
+     *             builder (<tt>int</tt>), followed by the characters in the
+     *             string builder (<tt>char[]</tt>).   The length of the
+     *             <tt>char</tt> array may be greater than the number of
+     *             characters currently stored in the string builder, in which
+     *             case extra characters are ignored.
+     */
+//    private void writeObject(java.io.ObjectOutputStream s)
+//        throws java.io.IOException {
+//        s.defaultWriteObject();
+//        s.writeInt(count);
+//        s.writeObject(value);
+//    }
+
+    /**
+     * readObject is called to restore the state of the StringBuffer from
+     * a stream.
+     */
+//    private void readObject(java.io.ObjectInputStream s)
+//        throws java.io.IOException, ClassNotFoundException {
+//        s.defaultReadObject();
+//        count = s.readInt();
+//        value = (char[]) s.readObject();
+//    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/StringIndexOutOfBoundsException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/StringIndexOutOfBoundsException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown by <code>String</code> methods to indicate that an index
+ * is either negative or greater than the size of the string.  For
+ * some methods such as the charAt method, this exception also is
+ * thrown when the index is equal to the size of the string.
+ *
+ * @author  unascribed
+ * @see     java.lang.String#charAt(int)
+ * @since   JDK1.0
+ */
+public
+class StringIndexOutOfBoundsException extends IndexOutOfBoundsException {
+    private static final long serialVersionUID = -6762910422159637258L;
+
+    /**
+     * Constructs a <code>StringIndexOutOfBoundsException</code> with no
+     * detail message.
+     *
+     * @since   JDK1.0.
+     */
+    public StringIndexOutOfBoundsException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>StringIndexOutOfBoundsException</code> with
+     * the specified detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public StringIndexOutOfBoundsException(String s) {
+        super(s);
+    }
+
+    /**
+     * Constructs a new <code>StringIndexOutOfBoundsException</code>
+     * class with an argument indicating the illegal index.
+     *
+     * @param   index   the illegal index.
+     */
+    public StringIndexOutOfBoundsException(int index) {
+        super("String index out of range: " + index);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Throwable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Throwable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1088 @@
+/*
+ * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+import  java.io.*;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.core.JavaScriptOnly;
+
+/**
+ * The {@code Throwable} class is the superclass of all errors and
+ * exceptions in the Java language. Only objects that are instances of this
+ * class (or one of its subclasses) are thrown by the Java Virtual Machine or
+ * can be thrown by the Java {@code throw} statement. Similarly, only
+ * this class or one of its subclasses can be the argument type in a
+ * {@code catch} clause.
+ *
+ * For the purposes of compile-time checking of exceptions, {@code
+ * Throwable} and any subclass of {@code Throwable} that is not also a
+ * subclass of either {@link RuntimeException} or {@link Error} are
+ * regarded as checked exceptions.
+ *
+ * <p>Instances of two subclasses, {@link java.lang.Error} and
+ * {@link java.lang.Exception}, are conventionally used to indicate
+ * that exceptional situations have occurred. Typically, these instances
+ * are freshly created in the context of the exceptional situation so
+ * as to include relevant information (such as stack trace data).
+ *
+ * <p>A throwable contains a snapshot of the execution stack of its
+ * thread at the time it was created. It can also contain a message
+ * string that gives more information about the error. Over time, a
+ * throwable can {@linkplain Throwable#addSuppressed suppress} other
+ * throwables from being propagated.  Finally, the throwable can also
+ * contain a <i>cause</i>: another throwable that caused this
+ * throwable to be constructed.  The recording of this causal information
+ * is referred to as the <i>chained exception</i> facility, as the
+ * cause can, itself, have a cause, and so on, leading to a "chain" of
+ * exceptions, each caused by another.
+ *
+ * <p>One reason that a throwable may have a cause is that the class that
+ * throws it is built atop a lower layered abstraction, and an operation on
+ * the upper layer fails due to a failure in the lower layer.  It would be bad
+ * design to let the throwable thrown by the lower layer propagate outward, as
+ * it is generally unrelated to the abstraction provided by the upper layer.
+ * Further, doing so would tie the API of the upper layer to the details of
+ * its implementation, assuming the lower layer's exception was a checked
+ * exception.  Throwing a "wrapped exception" (i.e., an exception containing a
+ * cause) allows the upper layer to communicate the details of the failure to
+ * its caller without incurring either of these shortcomings.  It preserves
+ * the flexibility to change the implementation of the upper layer without
+ * changing its API (in particular, the set of exceptions thrown by its
+ * methods).
+ *
+ * <p>A second reason that a throwable may have a cause is that the method
+ * that throws it must conform to a general-purpose interface that does not
+ * permit the method to throw the cause directly.  For example, suppose
+ * a persistent collection conforms to the {@link java.util.Collection
+ * Collection} interface, and that its persistence is implemented atop
+ * {@code java.io}.  Suppose the internals of the {@code add} method
+ * can throw an {@link java.io.IOException IOException}.  The implementation
+ * can communicate the details of the {@code IOException} to its caller
+ * while conforming to the {@code Collection} interface by wrapping the
+ * {@code IOException} in an appropriate unchecked exception.  (The
+ * specification for the persistent collection should indicate that it is
+ * capable of throwing such exceptions.)
+ *
+ * <p>A cause can be associated with a throwable in two ways: via a
+ * constructor that takes the cause as an argument, or via the
+ * {@link #initCause(Throwable)} method.  New throwable classes that
+ * wish to allow causes to be associated with them should provide constructors
+ * that take a cause and delegate (perhaps indirectly) to one of the
+ * {@code Throwable} constructors that takes a cause.
+ *
+ * Because the {@code initCause} method is public, it allows a cause to be
+ * associated with any throwable, even a "legacy throwable" whose
+ * implementation predates the addition of the exception chaining mechanism to
+ * {@code Throwable}.
+ *
+ * <p>By convention, class {@code Throwable} and its subclasses have two
+ * constructors, one that takes no arguments and one that takes a
+ * {@code String} argument that can be used to produce a detail message.
+ * Further, those subclasses that might likely have a cause associated with
+ * them should have two more constructors, one that takes a
+ * {@code Throwable} (the cause), and one that takes a
+ * {@code String} (the detail message) and a {@code Throwable} (the
+ * cause).
+ *
+ * @author  unascribed
+ * @author  Josh Bloch (Added exception chaining and programmatic access to
+ *          stack trace in 1.4.)
+ * @jls 11.2 Compile-Time Checking of Exceptions
+ * @since JDK1.0
+ */
+public class Throwable implements Serializable {
+    /** use serialVersionUID from JDK 1.0.2 for interoperability */
+    private static final long serialVersionUID = -3042686055658047285L;
+
+    /**
+     * Native code saves some indication of the stack backtrace in this slot.
+     */
+    private transient Object backtrace;
+
+    /**
+     * Specific details about the Throwable.  For example, for
+     * {@code FileNotFoundException}, this contains the name of
+     * the file that could not be found.
+     *
+     * @serial
+     */
+    private String detailMessage;
+
+
+    /**
+     * Holder class to defer initializing sentinel objects only used
+     * for serialization.
+     */
+    private static class SentinelHolder {
+        /**
+         * {@linkplain #setStackTrace(StackTraceElement[]) Setting the
+         * stack trace} to a one-element array containing this sentinel
+         * value indicates future attempts to set the stack trace will be
+         * ignored.  The sentinal is equal to the result of calling:<br>
+         * {@code new StackTraceElement("", "", null, Integer.MIN_VALUE)}
+         */
+        public static final StackTraceElement STACK_TRACE_ELEMENT_SENTINEL =
+            new StackTraceElement("", "", null, Integer.MIN_VALUE);
+
+        /**
+         * Sentinel value used in the serial form to indicate an immutable
+         * stack trace.
+         */
+        public static final StackTraceElement[] STACK_TRACE_SENTINEL =
+            new StackTraceElement[] {STACK_TRACE_ELEMENT_SENTINEL};
+    }
+
+    /**
+     * A shared value for an empty stack.
+     */
+    private static final StackTraceElement[] UNASSIGNED_STACK = new StackTraceElement[0];
+
+    /*
+     * To allow Throwable objects to be made immutable and safely
+     * reused by the JVM, such as OutOfMemoryErrors, fields of
+     * Throwable that are writable in response to user actions, cause,
+     * stackTrace, and suppressedExceptions obey the following
+     * protocol:
+     *
+     * 1) The fields are initialized to a non-null sentinel value
+     * which indicates the value has logically not been set.
+     *
+     * 2) Writing a null to the field indicates further writes
+     * are forbidden
+     *
+     * 3) The sentinel value may be replaced with another non-null
+     * value.
+     *
+     * For example, implementations of the HotSpot JVM have
+     * preallocated OutOfMemoryError objects to provide for better
+     * diagnosability of that situation.  These objects are created
+     * without calling the constructor for that class and the fields
+     * in question are initialized to null.  To support this
+     * capability, any new fields added to Throwable that require
+     * being initialized to a non-null value require a coordinated JVM
+     * change.
+     */
+
+    /**
+     * The throwable that caused this throwable to get thrown, or null if this
+     * throwable was not caused by another throwable, or if the causative
+     * throwable is unknown.  If this field is equal to this throwable itself,
+     * it indicates that the cause of this throwable has not yet been
+     * initialized.
+     *
+     * @serial
+     * @since 1.4
+     */
+    private Throwable cause = this;
+
+    /**
+     * The stack trace, as returned by {@link #getStackTrace()}.
+     *
+     * The field is initialized to a zero-length array.  A {@code
+     * null} value of this field indicates subsequent calls to {@link
+     * #setStackTrace(StackTraceElement[])} and {@link
+     * #fillInStackTrace()} will be be no-ops.
+     *
+     * @serial
+     * @since 1.4
+     */
+    private StackTraceElement[] stackTrace = UNASSIGNED_STACK;
+
+    // Setting this static field introduces an acceptable
+    // initialization dependency on a few java.util classes.
+// I don't think this dependency is acceptable
+//    private static final List<Throwable> SUPPRESSED_SENTINEL =
+//        Collections.unmodifiableList(new ArrayList<Throwable>(0));
+
+    /**
+     * The list of suppressed exceptions, as returned by {@link
+     * #getSuppressed()}.  The list is initialized to a zero-element
+     * unmodifiable sentinel list.  When a serialized Throwable is
+     * read in, if the {@code suppressedExceptions} field points to a
+     * zero-element list, the field is reset to the sentinel value.
+     *
+     * @serial
+     * @since 1.7
+     */
+//    private List<Throwable> suppressedExceptions = SUPPRESSED_SENTINEL;
+
+    /** Message for trying to suppress a null exception. */
+    private static final String NULL_CAUSE_MESSAGE = "Cannot suppress a null exception.";
+
+    /** Message for trying to suppress oneself. */
+    private static final String SELF_SUPPRESSION_MESSAGE = "Self-suppression not permitted";
+
+    /** Caption  for labeling causative exception stack traces */
+    @JavaScriptOnly(name="toString", value="function() { return this.toString__Ljava_lang_String_2().toString(); }")
+    private static void jsToString() {
+    }
+    
+    @JavaScriptOnly(name="valueOf", value="function() { return this.toString().valueOf(); }")
+    private static void jsValudOf() {
+    }
+    private static final String CAUSE_CAPTION = "Caused by: ";
+
+    /** Caption for labeling suppressed exception stack traces */
+    private static final String SUPPRESSED_CAPTION = "Suppressed: ";
+
+    /**
+     * Constructs a new throwable with {@code null} as its detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     *
+     * <p>The {@link #fillInStackTrace()} method is called to initialize
+     * the stack trace data in the newly created throwable.
+     */
+    public Throwable() {
+        fillInStackTrace();
+    }
+
+    /**
+     * Constructs a new throwable with the specified detail message.  The
+     * cause is not initialized, and may subsequently be initialized by
+     * a call to {@link #initCause}.
+     *
+     * <p>The {@link #fillInStackTrace()} method is called to initialize
+     * the stack trace data in the newly created throwable.
+     *
+     * @param   message   the detail message. The detail message is saved for
+     *          later retrieval by the {@link #getMessage()} method.
+     */
+    public Throwable(String message) {
+        fillInStackTrace();
+        detailMessage = message;
+    }
+
+    /**
+     * Constructs a new throwable with the specified detail message and
+     * cause.  <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this throwable's detail message.
+     *
+     * <p>The {@link #fillInStackTrace()} method is called to initialize
+     * the stack trace data in the newly created throwable.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link #getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.4
+     */
+    public Throwable(String message, Throwable cause) {
+        fillInStackTrace();
+        detailMessage = message;
+        this.cause = cause;
+    }
+
+    /**
+     * Constructs a new throwable with the specified cause and a detail
+     * message of {@code (cause==null ? null : cause.toString())} (which
+     * typically contains the class and detail message of {@code cause}).
+     * This constructor is useful for throwables that are little more than
+     * wrappers for other throwables (for example, {@link
+     * java.security.PrivilegedActionException}).
+     *
+     * <p>The {@link #fillInStackTrace()} method is called to initialize
+     * the stack trace data in the newly created throwable.
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.4
+     */
+    public Throwable(Throwable cause) {
+        fillInStackTrace();
+        detailMessage = (cause==null ? null : cause.toString());
+        this.cause = cause;
+    }
+
+    /**
+     * Constructs a new throwable with the specified detail message,
+     * cause, {@linkplain #addSuppressed suppression} enabled or
+     * disabled, and writable stack trace enabled or disabled.  If
+     * suppression is disabled, {@link #getSuppressed} for this object
+     * will return a zero-length array and calls to {@link
+     * #addSuppressed} that would otherwise append an exception to the
+     * suppressed list will have no effect.  If the writable stack
+     * trace is false, this constructor will not call {@link
+     * #fillInStackTrace()}, a {@code null} will be written to the
+     * {@code stackTrace} field, and subsequent calls to {@code
+     * fillInStackTrace} and {@link
+     * #setStackTrace(StackTraceElement[])} will not set the stack
+     * trace.  If the writable stack trace is false, {@link
+     * #getStackTrace} will return a zero length array.
+     *
+     * <p>Note that the other constructors of {@code Throwable} treat
+     * suppression as being enabled and the stack trace as being
+     * writable.  Subclasses of {@code Throwable} should document any
+     * conditions under which suppression is disabled and document
+     * conditions under which the stack trace is not writable.
+     * Disabling of suppression should only occur in exceptional
+     * circumstances where special requirements exist, such as a
+     * virtual machine reusing exception objects under low-memory
+     * situations.  Circumstances where a given exception object is
+     * repeatedly caught and rethrown, such as to implement control
+     * flow between two sub-systems, is another situation where
+     * immutable throwable objects would be appropriate.
+     *
+     * @param  message the detail message.
+     * @param cause the cause.  (A {@code null} value is permitted,
+     * and indicates that the cause is nonexistent or unknown.)
+     * @param enableSuppression whether or not suppression is enabled or disabled
+     * @param writableStackTrace whether or not the stack trace should be
+     *                           writable
+     *
+     * @see OutOfMemoryError
+     * @see NullPointerException
+     * @see ArithmeticException
+     * @since 1.7
+     */
+    protected Throwable(String message, Throwable cause,
+                        boolean enableSuppression,
+                        boolean writableStackTrace) {
+        if (writableStackTrace) {
+            fillInStackTrace();
+        } else {
+            stackTrace = null;
+        }
+        detailMessage = message;
+        this.cause = cause;
+//        if (!enableSuppression)
+//            suppressedExceptions = null;
+    }
+
+    /**
+     * Returns the detail message string of this throwable.
+     *
+     * @return  the detail message string of this {@code Throwable} instance
+     *          (which may be {@code null}).
+     */
+    public String getMessage() {
+        return detailMessage;
+    }
+
+    /**
+     * Creates a localized description of this throwable.
+     * Subclasses may override this method in order to produce a
+     * locale-specific message.  For subclasses that do not override this
+     * method, the default implementation returns the same result as
+     * {@code getMessage()}.
+     *
+     * @return  The localized description of this throwable.
+     * @since   JDK1.1
+     */
+    public String getLocalizedMessage() {
+        return getMessage();
+    }
+
+    /**
+     * Returns the cause of this throwable or {@code null} if the
+     * cause is nonexistent or unknown.  (The cause is the throwable that
+     * caused this throwable to get thrown.)
+     *
+     * <p>This implementation returns the cause that was supplied via one of
+     * the constructors requiring a {@code Throwable}, or that was set after
+     * creation with the {@link #initCause(Throwable)} method.  While it is
+     * typically unnecessary to override this method, a subclass can override
+     * it to return a cause set by some other means.  This is appropriate for
+     * a "legacy chained throwable" that predates the addition of chained
+     * exceptions to {@code Throwable}.  Note that it is <i>not</i>
+     * necessary to override any of the {@code PrintStackTrace} methods,
+     * all of which invoke the {@code getCause} method to determine the
+     * cause of a throwable.
+     *
+     * @return  the cause of this throwable or {@code null} if the
+     *          cause is nonexistent or unknown.
+     * @since 1.4
+     */
+    public synchronized Throwable getCause() {
+        return (cause==this ? null : cause);
+    }
+
+    /**
+     * Initializes the <i>cause</i> of this throwable to the specified value.
+     * (The cause is the throwable that caused this throwable to get thrown.)
+     *
+     * <p>This method can be called at most once.  It is generally called from
+     * within the constructor, or immediately after creating the
+     * throwable.  If this throwable was created
+     * with {@link #Throwable(Throwable)} or
+     * {@link #Throwable(String,Throwable)}, this method cannot be called
+     * even once.
+     *
+     * <p>An example of using this method on a legacy throwable type
+     * without other support for setting the cause is:
+     *
+     * <pre>
+     * try {
+     *     lowLevelOp();
+     * } catch (LowLevelException le) {
+     *     throw (HighLevelException)
+     *           new HighLevelException().initCause(le); // Legacy constructor
+     * }
+     * </pre>
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @return  a reference to this {@code Throwable} instance.
+     * @throws IllegalArgumentException if {@code cause} is this
+     *         throwable.  (A throwable cannot be its own cause.)
+     * @throws IllegalStateException if this throwable was
+     *         created with {@link #Throwable(Throwable)} or
+     *         {@link #Throwable(String,Throwable)}, or this method has already
+     *         been called on this throwable.
+     * @since  1.4
+     */
+    public synchronized Throwable initCause(Throwable cause) {
+        if (this.cause != this)
+            throw new IllegalStateException("Can't overwrite cause");
+        if (cause == this)
+            throw new IllegalArgumentException("Self-causation not permitted");
+        this.cause = cause;
+        return this;
+    }
+
+    /**
+     * Returns a short description of this throwable.
+     * The result is the concatenation of:
+     * <ul>
+     * <li> the {@linkplain Class#getName() name} of the class of this object
+     * <li> ": " (a colon and a space)
+     * <li> the result of invoking this object's {@link #getLocalizedMessage}
+     *      method
+     * </ul>
+     * If {@code getLocalizedMessage} returns {@code null}, then just
+     * the class name is returned.
+     *
+     * @return a string representation of this throwable.
+     */
+    public String toString() {
+        String s = getClass().getName();
+        String message = getLocalizedMessage();
+        return (message != null) ? (s + ": " + message) : s;
+    }
+
+    /**
+     * Prints this throwable and its backtrace to the
+     * standard error stream. This method prints a stack trace for this
+     * {@code Throwable} object on the error output stream that is
+     * the value of the field {@code System.err}. The first line of
+     * output contains the result of the {@link #toString()} method for
+     * this object.  Remaining lines represent data previously recorded by
+     * the method {@link #fillInStackTrace()}. The format of this
+     * information depends on the implementation, but the following
+     * example may be regarded as typical:
+     * <blockquote><pre>
+     * java.lang.NullPointerException
+     *         at MyClass.mash(MyClass.java:9)
+     *         at MyClass.crunch(MyClass.java:6)
+     *         at MyClass.main(MyClass.java:3)
+     * </pre></blockquote>
+     * This example was produced by running the program:
+     * <pre>
+     * class MyClass {
+     *     public static void main(String[] args) {
+     *         crunch(null);
+     *     }
+     *     static void crunch(int[] a) {
+     *         mash(a);
+     *     }
+     *     static void mash(int[] b) {
+     *         System.out.println(b[0]);
+     *     }
+     * }
+     * </pre>
+     * The backtrace for a throwable with an initialized, non-null cause
+     * should generally include the backtrace for the cause.  The format
+     * of this information depends on the implementation, but the following
+     * example may be regarded as typical:
+     * <pre>
+     * HighLevelException: MidLevelException: LowLevelException
+     *         at Junk.a(Junk.java:13)
+     *         at Junk.main(Junk.java:4)
+     * Caused by: MidLevelException: LowLevelException
+     *         at Junk.c(Junk.java:23)
+     *         at Junk.b(Junk.java:17)
+     *         at Junk.a(Junk.java:11)
+     *         ... 1 more
+     * Caused by: LowLevelException
+     *         at Junk.e(Junk.java:30)
+     *         at Junk.d(Junk.java:27)
+     *         at Junk.c(Junk.java:21)
+     *         ... 3 more
+     * </pre>
+     * Note the presence of lines containing the characters {@code "..."}.
+     * These lines indicate that the remainder of the stack trace for this
+     * exception matches the indicated number of frames from the bottom of the
+     * stack trace of the exception that was caused by this exception (the
+     * "enclosing" exception).  This shorthand can greatly reduce the length
+     * of the output in the common case where a wrapped exception is thrown
+     * from same method as the "causative exception" is caught.  The above
+     * example was produced by running the program:
+     * <pre>
+     * public class Junk {
+     *     public static void main(String args[]) {
+     *         try {
+     *             a();
+     *         } catch(HighLevelException e) {
+     *             e.printStackTrace();
+     *         }
+     *     }
+     *     static void a() throws HighLevelException {
+     *         try {
+     *             b();
+     *         } catch(MidLevelException e) {
+     *             throw new HighLevelException(e);
+     *         }
+     *     }
+     *     static void b() throws MidLevelException {
+     *         c();
+     *     }
+     *     static void c() throws MidLevelException {
+     *         try {
+     *             d();
+     *         } catch(LowLevelException e) {
+     *             throw new MidLevelException(e);
+     *         }
+     *     }
+     *     static void d() throws LowLevelException {
+     *        e();
+     *     }
+     *     static void e() throws LowLevelException {
+     *         throw new LowLevelException();
+     *     }
+     * }
+     *
+     * class HighLevelException extends Exception {
+     *     HighLevelException(Throwable cause) { super(cause); }
+     * }
+     *
+     * class MidLevelException extends Exception {
+     *     MidLevelException(Throwable cause)  { super(cause); }
+     * }
+     *
+     * class LowLevelException extends Exception {
+     * }
+     * </pre>
+     * As of release 7, the platform supports the notion of
+     * <i>suppressed exceptions</i> (in conjunction with the {@code
+     * try}-with-resources statement). Any exceptions that were
+     * suppressed in order to deliver an exception are printed out
+     * beneath the stack trace.  The format of this information
+     * depends on the implementation, but the following example may be
+     * regarded as typical:
+     *
+     * <pre>
+     * Exception in thread "main" java.lang.Exception: Something happened
+     *  at Foo.bar(Foo.java:10)
+     *  at Foo.main(Foo.java:5)
+     *  Suppressed: Resource$CloseFailException: Resource ID = 0
+     *          at Resource.close(Resource.java:26)
+     *          at Foo.bar(Foo.java:9)
+     *          ... 1 more
+     * </pre>
+     * Note that the "... n more" notation is used on suppressed exceptions
+     * just at it is used on causes. Unlike causes, suppressed exceptions are
+     * indented beyond their "containing exceptions."
+     *
+     * <p>An exception can have both a cause and one or more suppressed
+     * exceptions:
+     * <pre>
+     * Exception in thread "main" java.lang.Exception: Main block
+     *  at Foo3.main(Foo3.java:7)
+     *  Suppressed: Resource$CloseFailException: Resource ID = 2
+     *          at Resource.close(Resource.java:26)
+     *          at Foo3.main(Foo3.java:5)
+     *  Suppressed: Resource$CloseFailException: Resource ID = 1
+     *          at Resource.close(Resource.java:26)
+     *          at Foo3.main(Foo3.java:5)
+     * Caused by: java.lang.Exception: I did it
+     *  at Foo3.main(Foo3.java:8)
+     * </pre>
+     * Likewise, a suppressed exception can have a cause:
+     * <pre>
+     * Exception in thread "main" java.lang.Exception: Main block
+     *  at Foo4.main(Foo4.java:6)
+     *  Suppressed: Resource2$CloseFailException: Resource ID = 1
+     *          at Resource2.close(Resource2.java:20)
+     *          at Foo4.main(Foo4.java:5)
+     *  Caused by: java.lang.Exception: Rats, you caught me
+     *          at Resource2$CloseFailException.<init>(Resource2.java:45)
+     *          ... 2 more
+     * </pre>
+     */
+//    public void printStackTrace() {
+//        printStackTrace(System.err);
+//    }
+//
+//    /**
+//     * Prints this throwable and its backtrace to the specified print stream.
+//     *
+//     * @param s {@code PrintStream} to use for output
+//     */
+//    public void printStackTrace(PrintStream s) {
+//        printStackTrace(new WrappedPrintStream(s));
+//    }
+//
+//    private void printStackTrace(PrintStreamOrWriter s) {
+//        // Guard against malicious overrides of Throwable.equals by
+//        // using a Set with identity equality semantics.
+////        Set<Throwable> dejaVu =
+////            Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
+////        dejaVu.add(this);
+//
+//        synchronized (s.lock()) {
+//            // Print our stack trace
+//            s.println(this);
+//            StackTraceElement[] trace = getOurStackTrace();
+//            for (StackTraceElement traceElement : trace)
+//                s.println("\tat " + traceElement);
+//
+//            // Print suppressed exceptions, if any
+////            for (Throwable se : getSuppressed())
+////                se.printEnclosedStackTrace(s, trace, SUPPRESSED_CAPTION, "\t", dejaVu);
+//
+//            // Print cause, if any
+//            Throwable ourCause = getCause();
+////            if (ourCause != null)
+////                ourCause.printEnclosedStackTrace(s, trace, CAUSE_CAPTION, "", dejaVu);
+//        }
+//    }
+//
+//    /**
+//     * Print our stack trace as an enclosed exception for the specified
+//     * stack trace.
+//     */
+//    private void printEnclosedStackTrace(PrintStreamOrWriter s,
+//                                         StackTraceElement[] enclosingTrace,
+//                                         String caption,
+//                                         String prefix,
+//                                         Object dejaVu) {
+//        assert Thread.holdsLock(s.lock());
+//        {
+//            // Compute number of frames in common between this and enclosing trace
+//            StackTraceElement[] trace = getOurStackTrace();
+//            int m = trace.length - 1;
+//            int n = enclosingTrace.length - 1;
+//            while (m >= 0 && n >=0 && trace[m].equals(enclosingTrace[n])) {
+//                m--; n--;
+//            }
+//            int framesInCommon = trace.length - 1 - m;
+//
+//            // Print our stack trace
+//            s.println(prefix + caption + this);
+//            for (int i = 0; i <= m; i++)
+//                s.println(prefix + "\tat " + trace[i]);
+//            if (framesInCommon != 0)
+//                s.println(prefix + "\t... " + framesInCommon + " more");
+//
+//            // Print suppressed exceptions, if any
+//            for (Throwable se : getSuppressed())
+//                se.printEnclosedStackTrace(s, trace, SUPPRESSED_CAPTION,
+//                                           prefix +"\t", dejaVu);
+//
+//            // Print cause, if any
+//            Throwable ourCause = getCause();
+//            if (ourCause != null)
+//                ourCause.printEnclosedStackTrace(s, trace, CAUSE_CAPTION, prefix, dejaVu);
+//        }
+//    }
+//
+//    /**
+//     * Prints this throwable and its backtrace to the specified
+//     * print writer.
+//     *
+//     * @param s {@code PrintWriter} to use for output
+//     * @since   JDK1.1
+//     */
+//    public void printStackTrace(PrintWriter s) {
+//        printStackTrace(new WrappedPrintWriter(s));
+//    }
+//
+//    /**
+//     * Wrapper class for PrintStream and PrintWriter to enable a single
+//     * implementation of printStackTrace.
+//     */
+//    private abstract static class PrintStreamOrWriter {
+//        /** Returns the object to be locked when using this StreamOrWriter */
+//        abstract Object lock();
+//
+//        /** Prints the specified string as a line on this StreamOrWriter */
+//        abstract void println(Object o);
+//    }
+//
+//    private static class WrappedPrintStream extends PrintStreamOrWriter {
+//        private final PrintStream printStream;
+//
+//        WrappedPrintStream(PrintStream printStream) {
+//            this.printStream = printStream;
+//        }
+//
+//        Object lock() {
+//            return printStream;
+//        }
+//
+//        void println(Object o) {
+//            printStream.println(o);
+//        }
+//    }
+//
+//    private static class WrappedPrintWriter extends PrintStreamOrWriter {
+//        private final PrintWriter printWriter;
+//
+//        WrappedPrintWriter(PrintWriter printWriter) {
+//            this.printWriter = printWriter;
+//        }
+//
+//        Object lock() {
+//            return printWriter;
+//        }
+//
+//        void println(Object o) {
+//            printWriter.println(o);
+//        }
+//    }
+
+    /**
+     * Fills in the execution stack trace. This method records within this
+     * {@code Throwable} object information about the current state of
+     * the stack frames for the current thread.
+     *
+     * <p>If the stack trace of this {@code Throwable} {@linkplain
+     * Throwable#Throwable(String, Throwable, boolean, boolean) is not
+     * writable}, calling this method has no effect.
+     *
+     * @return  a reference to this {@code Throwable} instance.
+     * @see     java.lang.Throwable#printStackTrace()
+     */
+    public synchronized Throwable fillInStackTrace() {
+        if (stackTrace != null ||
+            backtrace != null /* Out of protocol state */ ) {
+            fillInStackTrace(0);
+            stackTrace = UNASSIGNED_STACK;
+        }
+        return this;
+    }
+
+    @JavaScriptBody(args = { "dummy" }, body = "")
+    private native Throwable fillInStackTrace(int dummy);
+
+    /**
+     * Provides programmatic access to the stack trace information printed by
+     * {@link #printStackTrace()}.  Returns an array of stack trace elements,
+     * each representing one stack frame.  The zeroth element of the array
+     * (assuming the array's length is non-zero) represents the top of the
+     * stack, which is the last method invocation in the sequence.  Typically,
+     * this is the point at which this throwable was created and thrown.
+     * The last element of the array (assuming the array's length is non-zero)
+     * represents the bottom of the stack, which is the first method invocation
+     * in the sequence.
+     *
+     * <p>Some virtual machines may, under some circumstances, omit one
+     * or more stack frames from the stack trace.  In the extreme case,
+     * a virtual machine that has no stack trace information concerning
+     * this throwable is permitted to return a zero-length array from this
+     * method.  Generally speaking, the array returned by this method will
+     * contain one element for every frame that would be printed by
+     * {@code printStackTrace}.  Writes to the returned array do not
+     * affect future calls to this method.
+     *
+     * @return an array of stack trace elements representing the stack trace
+     *         pertaining to this throwable.
+     * @since  1.4
+     */
+    public StackTraceElement[] getStackTrace() {
+        return getOurStackTrace().clone();
+    }
+
+    private synchronized StackTraceElement[] getOurStackTrace() {
+        // Initialize stack trace field with information from
+        // backtrace if this is the first call to this method
+        if (stackTrace == UNASSIGNED_STACK ||
+            (stackTrace == null && backtrace != null) /* Out of protocol state */) {
+            int depth = getStackTraceDepth();
+            stackTrace = new StackTraceElement[depth];
+            for (int i=0; i < depth; i++)
+                stackTrace[i] = getStackTraceElement(i);
+        } else if (stackTrace == null) {
+            return UNASSIGNED_STACK;
+        }
+        return stackTrace;
+    }
+
+    /**
+     * Sets the stack trace elements that will be returned by
+     * {@link #getStackTrace()} and printed by {@link #printStackTrace()}
+     * and related methods.
+     *
+     * This method, which is designed for use by RPC frameworks and other
+     * advanced systems, allows the client to override the default
+     * stack trace that is either generated by {@link #fillInStackTrace()}
+     * when a throwable is constructed or deserialized when a throwable is
+     * read from a serialization stream.
+     *
+     * <p>If the stack trace of this {@code Throwable} {@linkplain
+     * Throwable#Throwable(String, Throwable, boolean, boolean) is not
+     * writable}, calling this method has no effect other than
+     * validating its argument.
+     *
+     * @param   stackTrace the stack trace elements to be associated with
+     * this {@code Throwable}.  The specified array is copied by this
+     * call; changes in the specified array after the method invocation
+     * returns will have no affect on this {@code Throwable}'s stack
+     * trace.
+     *
+     * @throws NullPointerException if {@code stackTrace} is
+     *         {@code null} or if any of the elements of
+     *         {@code stackTrace} are {@code null}
+     *
+     * @since  1.4
+     */
+    public void setStackTrace(StackTraceElement[] stackTrace) {
+        // Validate argument
+        StackTraceElement[] defensiveCopy = stackTrace.clone();
+        for (int i = 0; i < defensiveCopy.length; i++) {
+            if (defensiveCopy[i] == null)
+                throw new NullPointerException("stackTrace[" + i + "]");
+        }
+
+        synchronized (this) {
+            if (this.stackTrace == null && // Immutable stack
+                backtrace == null) // Test for out of protocol state
+                return;
+            this.stackTrace = defensiveCopy;
+        }
+    }
+
+    /**
+     * Returns the number of elements in the stack trace (or 0 if the stack
+     * trace is unavailable).
+     *
+     * package-protection for use by SharedSecrets.
+     */
+    native int getStackTraceDepth();
+
+    /**
+     * Returns the specified element of the stack trace.
+     *
+     * package-protection for use by SharedSecrets.
+     *
+     * @param index index of the element to return.
+     * @throws IndexOutOfBoundsException if {@code index < 0 ||
+     *         index >= getStackTraceDepth() }
+     */
+    native StackTraceElement getStackTraceElement(int index);
+
+    /**
+     * Reads a {@code Throwable} from a stream, enforcing
+     * well-formedness constraints on fields.  Null entries and
+     * self-pointers are not allowed in the list of {@code
+     * suppressedExceptions}.  Null entries are not allowed for stack
+     * trace elements.  A null stack trace in the serial form results
+     * in a zero-length stack element array. A single-element stack
+     * trace whose entry is equal to {@code new StackTraceElement("",
+     * "", null, Integer.MIN_VALUE)} results in a {@code null} {@code
+     * stackTrace} field.
+     *
+     * Note that there are no constraints on the value the {@code
+     * cause} field can hold; both {@code null} and {@code this} are
+     * valid values for the field.
+     */
+//    private void readObject(ObjectInputStream s)
+//        throws IOException, ClassNotFoundException {
+//        s.defaultReadObject();     // read in all fields
+//        if (suppressedExceptions != null) {
+//            List<Throwable> suppressed = null;
+//            if (suppressedExceptions.isEmpty()) {
+//                // Use the sentinel for a zero-length list
+//                suppressed = SUPPRESSED_SENTINEL;
+//            } else { // Copy Throwables to new list
+//                suppressed = new ArrayList<Throwable>(1);
+//                for (Throwable t : suppressedExceptions) {
+//                    // Enforce constraints on suppressed exceptions in
+//                    // case of corrupt or malicious stream.
+//                    if (t == null)
+//                        throw new NullPointerException(NULL_CAUSE_MESSAGE);
+//                    if (t == this)
+//                        throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE);
+//                    suppressed.add(t);
+//                }
+//            }
+//            suppressedExceptions = suppressed;
+//        } // else a null suppressedExceptions field remains null
+//
+//        /*
+//         * For zero-length stack traces, use a clone of
+//         * UNASSIGNED_STACK rather than UNASSIGNED_STACK itself to
+//         * allow identity comparison against UNASSIGNED_STACK in
+//         * getOurStackTrace.  The identity of UNASSIGNED_STACK in
+//         * stackTrace indicates to the getOurStackTrace method that
+//         * the stackTrace needs to be constructed from the information
+//         * in backtrace.
+//         */
+//        if (stackTrace != null) {
+//            if (stackTrace.length == 0) {
+//                stackTrace = UNASSIGNED_STACK.clone();
+//            }  else if (stackTrace.length == 1 &&
+//                        // Check for the marker of an immutable stack trace
+//                        SentinelHolder.STACK_TRACE_ELEMENT_SENTINEL.equals(stackTrace[0])) {
+//                stackTrace = null;
+//            } else { // Verify stack trace elements are non-null.
+//                for(StackTraceElement ste : stackTrace) {
+//                    if (ste == null)
+//                        throw new NullPointerException("null StackTraceElement in serial stream. ");
+//                }
+//            }
+//        } else {
+//            // A null stackTrace field in the serial form can result
+//            // from an exception serialized without that field in
+//            // older JDK releases; treat such exceptions as having
+//            // empty stack traces.
+//            stackTrace = UNASSIGNED_STACK.clone();
+//        }
+//    }
+
+    /**
+     * Write a {@code Throwable} object to a stream.
+     *
+     * A {@code null} stack trace field is represented in the serial
+     * form as a one-element array whose element is equal to {@code
+     * new StackTraceElement("", "", null, Integer.MIN_VALUE)}.
+     */
+//    private synchronized void writeObject(ObjectOutputStream s)
+//        throws IOException {
+//        // Ensure that the stackTrace field is initialized to a
+//        // non-null value, if appropriate.  As of JDK 7, a null stack
+//        // trace field is a valid value indicating the stack trace
+//        // should not be set.
+//        getOurStackTrace();
+//
+//        StackTraceElement[] oldStackTrace = stackTrace;
+//        try {
+//            if (stackTrace == null)
+//                stackTrace = SentinelHolder.STACK_TRACE_SENTINEL;
+//            s.defaultWriteObject();
+//        } finally {
+//            stackTrace = oldStackTrace;
+//        }
+//    }
+
+    /**
+     * Appends the specified exception to the exceptions that were
+     * suppressed in order to deliver this exception. This method is
+     * thread-safe and typically called (automatically and implicitly)
+     * by the {@code try}-with-resources statement.
+     *
+     * <p>The suppression behavior is enabled <em>unless</em> disabled
+     * {@linkplain #Throwable(String, Throwable, boolean, boolean) via
+     * a constructor}.  When suppression is disabled, this method does
+     * nothing other than to validate its argument.
+     *
+     * <p>Note that when one exception {@linkplain
+     * #initCause(Throwable) causes} another exception, the first
+     * exception is usually caught and then the second exception is
+     * thrown in response.  In other words, there is a causal
+     * connection between the two exceptions.
+     *
+     * In contrast, there are situations where two independent
+     * exceptions can be thrown in sibling code blocks, in particular
+     * in the {@code try} block of a {@code try}-with-resources
+     * statement and the compiler-generated {@code finally} block
+     * which closes the resource.
+     *
+     * In these situations, only one of the thrown exceptions can be
+     * propagated.  In the {@code try}-with-resources statement, when
+     * there are two such exceptions, the exception originating from
+     * the {@code try} block is propagated and the exception from the
+     * {@code finally} block is added to the list of exceptions
+     * suppressed by the exception from the {@code try} block.  As an
+     * exception unwinds the stack, it can accumulate multiple
+     * suppressed exceptions.
+     *
+     * <p>An exception may have suppressed exceptions while also being
+     * caused by another exception.  Whether or not an exception has a
+     * cause is semantically known at the time of its creation, unlike
+     * whether or not an exception will suppress other exceptions
+     * which is typically only determined after an exception is
+     * thrown.
+     *
+     * <p>Note that programmer written code is also able to take
+     * advantage of calling this method in situations where there are
+     * multiple sibling exceptions and only one can be propagated.
+     *
+     * @param exception the exception to be added to the list of
+     *        suppressed exceptions
+     * @throws IllegalArgumentException if {@code exception} is this
+     *         throwable; a throwable cannot suppress itself.
+     * @throws NullPointerException if {@code exception} is {@code null}
+     * @since 1.7
+     */
+    public final synchronized void addSuppressed(Throwable exception) {
+        if (exception == this)
+            throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE);
+
+        if (exception == null)
+            throw new NullPointerException(NULL_CAUSE_MESSAGE);
+
+//        if (suppressedExceptions == null) // Suppressed exceptions not recorded
+//            return;
+//
+//        if (suppressedExceptions == SUPPRESSED_SENTINEL)
+//            suppressedExceptions = new ArrayList<Throwable>(1);
+//
+//        suppressedExceptions.add(exception);
+    }
+
+    private static final Throwable[] EMPTY_THROWABLE_ARRAY = new Throwable[0];
+
+    /**
+     * Returns an array containing all of the exceptions that were
+     * suppressed, typically by the {@code try}-with-resources
+     * statement, in order to deliver this exception.
+     *
+     * If no exceptions were suppressed or {@linkplain
+     * #Throwable(String, Throwable, boolean, boolean) suppression is
+     * disabled}, an empty array is returned.  This method is
+     * thread-safe.  Writes to the returned array do not affect future
+     * calls to this method.
+     *
+     * @return an array containing all of the exceptions that were
+     *         suppressed to deliver this exception.
+     * @since 1.7
+     */
+    public final synchronized Throwable[] getSuppressed() {
+        return new Throwable[0];
+//        if (suppressedExceptions == SUPPRESSED_SENTINEL ||
+//            suppressedExceptions == null)
+//            return EMPTY_THROWABLE_ARRAY;
+//        else
+//            return suppressedExceptions.toArray(EMPTY_THROWABLE_ARRAY);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/VirtualMachineError.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/VirtualMachineError.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that the Java Virtual Machine is broken or has
+ * run out of resources necessary for it to continue operating.
+ *
+ *
+ * @author  Frank Yellin
+ * @since   JDK1.0
+ */
+abstract public
+class VirtualMachineError extends Error {
+    /**
+     * Constructs a <code>VirtualMachineError</code> with no detail message.
+     */
+    public VirtualMachineError() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>VirtualMachineError</code> with the specified
+     * detail message.
+     *
+     * @param   s   the detail message.
+     */
+    public VirtualMachineError(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/Void.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/Void.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * The {@code Void} class is an uninstantiable placeholder class to hold a
+ * reference to the {@code Class} object representing the Java keyword
+ * void.
+ *
+ * @author  unascribed
+ * @since   JDK1.1
+ */
+public final
+class Void {
+
+    /**
+     * The {@code Class} object representing the pseudo-type corresponding to
+     * the keyword {@code void}.
+     */
+    public static final Class<Void> TYPE = Class.getPrimitiveClass("void");
+
+    /*
+     * The Void class cannot be instantiated.
+     */
+    private Void() {}
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/annotation/Annotation.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/annotation/Annotation.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.annotation;
+
+/**
+ * The common interface extended by all annotation types.  Note that an
+ * interface that manually extends this one does <i>not</i> define
+ * an annotation type.  Also note that this interface does not itself
+ * define an annotation type.
+ *
+ * More information about annotation types can be found in section 9.6 of
+ * <cite>The Java&trade; Language Specification</cite>.
+ *
+ * @author  Josh Bloch
+ * @since   1.5
+ */
+public interface Annotation {
+    /**
+     * Returns true if the specified object represents an annotation
+     * that is logically equivalent to this one.  In other words,
+     * returns true if the specified object is an instance of the same
+     * annotation type as this instance, all of whose members are equal
+     * to the corresponding member of this annotation, as defined below:
+     * <ul>
+     *    <li>Two corresponding primitive typed members whose values are
+     *    <tt>x</tt> and <tt>y</tt> are considered equal if <tt>x == y</tt>,
+     *    unless their type is <tt>float</tt> or <tt>double</tt>.
+     *
+     *    <li>Two corresponding <tt>float</tt> members whose values
+     *    are <tt>x</tt> and <tt>y</tt> are considered equal if
+     *    <tt>Float.valueOf(x).equals(Float.valueOf(y))</tt>.
+     *    (Unlike the <tt>==</tt> operator, NaN is considered equal
+     *    to itself, and <tt>0.0f</tt> unequal to <tt>-0.0f</tt>.)
+     *
+     *    <li>Two corresponding <tt>double</tt> members whose values
+     *    are <tt>x</tt> and <tt>y</tt> are considered equal if
+     *    <tt>Double.valueOf(x).equals(Double.valueOf(y))</tt>.
+     *    (Unlike the <tt>==</tt> operator, NaN is considered equal
+     *    to itself, and <tt>0.0</tt> unequal to <tt>-0.0</tt>.)
+     *
+     *    <li>Two corresponding <tt>String</tt>, <tt>Class</tt>, enum, or
+     *    annotation typed members whose values are <tt>x</tt> and <tt>y</tt>
+     *    are considered equal if <tt>x.equals(y)</tt>.  (Note that this
+     *    definition is recursive for annotation typed members.)
+     *
+     *    <li>Two corresponding array typed members <tt>x</tt> and <tt>y</tt>
+     *    are considered equal if <tt>Arrays.equals(x, y)</tt>, for the
+     *    appropriate overloading of {@link java.util.Arrays#equals}.
+     * </ul>
+     *
+     * @return true if the specified object represents an annotation
+     *     that is logically equivalent to this one, otherwise false
+     */
+    boolean equals(Object obj);
+
+    /**
+     * Returns the hash code of this annotation, as defined below:
+     *
+     * <p>The hash code of an annotation is the sum of the hash codes
+     * of its members (including those with default values), as defined
+     * below:
+     *
+     * The hash code of an annotation member is (127 times the hash code
+     * of the member-name as computed by {@link String#hashCode()}) XOR
+     * the hash code of the member-value, as defined below:
+     *
+     * <p>The hash code of a member-value depends on its type:
+     * <ul>
+     * <li>The hash code of a primitive value <tt><i>v</i></tt> is equal to
+     *     <tt><i>WrapperType</i>.valueOf(<i>v</i>).hashCode()</tt>, where
+     *     <tt><i>WrapperType</i></tt> is the wrapper type corresponding
+     *     to the primitive type of <tt><i>v</i></tt> ({@link Byte},
+     *     {@link Character}, {@link Double}, {@link Float}, {@link Integer},
+     *     {@link Long}, {@link Short}, or {@link Boolean}).
+     *
+     * <li>The hash code of a string, enum, class, or annotation member-value
+     I     <tt><i>v</i></tt> is computed as by calling
+     *     <tt><i>v</i>.hashCode()</tt>.  (In the case of annotation
+     *     member values, this is a recursive definition.)
+     *
+     * <li>The hash code of an array member-value is computed by calling
+     *     the appropriate overloading of
+     *     {@link java.util.Arrays#hashCode(long[]) Arrays.hashCode}
+     *     on the value.  (There is one overloading for each primitive
+     *     type, and one for object reference types.)
+     * </ul>
+     *
+     * @return the hash code of this annotation
+     */
+    int hashCode();
+
+    /**
+     * Returns a string representation of this annotation.  The details
+     * of the representation are implementation-dependent, but the following
+     * may be regarded as typical:
+     * <pre>
+     *   &#064;com.acme.util.Name(first=Alfred, middle=E., last=Neuman)
+     * </pre>
+     *
+     * @return a string representation of this annotation
+     */
+    String toString();
+
+    /**
+     * Returns the annotation type of this annotation.
+     */
+    Class<? extends Annotation> annotationType();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/annotation/Documented.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/annotation/Documented.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.annotation;
+
+/**
+ * Indicates that annotations with a type are to be documented by javadoc
+ * and similar tools by default.  This type should be used to annotate the
+ * declarations of types whose annotations affect the use of annotated
+ * elements by their clients.  If a type declaration is annotated with
+ * Documented, its annotations become part of the public API
+ * of the annotated elements.
+ *
+ * @author  Joshua Bloch
+ * @since 1.5
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.ANNOTATION_TYPE)
+public @interface Documented {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/annotation/ElementType.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/annotation/ElementType.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.annotation;
+
+/**
+ * A program element type.  The constants of this enumerated type
+ * provide a simple classification of the declared elements in a
+ * Java program.
+ *
+ * <p>These constants are used with the {@link Target} meta-annotation type
+ * to specify where it is legal to use an annotation type.
+ *
+ * @author  Joshua Bloch
+ * @since 1.5
+ */
+public enum ElementType {
+    /** Class, interface (including annotation type), or enum declaration */
+    TYPE,
+
+    /** Field declaration (includes enum constants) */
+    FIELD,
+
+    /** Method declaration */
+    METHOD,
+
+    /** Parameter declaration */
+    PARAMETER,
+
+    /** Constructor declaration */
+    CONSTRUCTOR,
+
+    /** Local variable declaration */
+    LOCAL_VARIABLE,
+
+    /** Annotation type declaration */
+    ANNOTATION_TYPE,
+
+    /** Package declaration */
+    PACKAGE
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/annotation/Retention.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/annotation/Retention.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.annotation;
+
+/**
+ * Indicates how long annotations with the annotated type are to
+ * be retained.  If no Retention annotation is present on
+ * an annotation type declaration, the retention policy defaults to
+ * {@code RetentionPolicy.CLASS}.
+ *
+ * <p>A Retention meta-annotation has effect only if the
+ * meta-annotated type is used directly for annotation.  It has no
+ * effect if the meta-annotated type is used as a member type in
+ * another annotation type.
+ *
+ * @author  Joshua Bloch
+ * @since 1.5
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.ANNOTATION_TYPE)
+public @interface Retention {
+    RetentionPolicy value();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/annotation/RetentionPolicy.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/annotation/RetentionPolicy.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.annotation;
+
+/**
+ * Annotation retention policy.  The constants of this enumerated type
+ * describe the various policies for retaining annotations.  They are used
+ * in conjunction with the {@link Retention} meta-annotation type to specify
+ * how long annotations are to be retained.
+ *
+ * @author  Joshua Bloch
+ * @since 1.5
+ */
+public enum RetentionPolicy {
+    /**
+     * Annotations are to be discarded by the compiler.
+     */
+    SOURCE,
+
+    /**
+     * Annotations are to be recorded in the class file by the compiler
+     * but need not be retained by the VM at run time.  This is the default
+     * behavior.
+     */
+    CLASS,
+
+    /**
+     * Annotations are to be recorded in the class file by the compiler and
+     * retained by the VM at run time, so they may be read reflectively.
+     *
+     * @see java.lang.reflect.AnnotatedElement
+     */
+    RUNTIME
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/annotation/Target.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/annotation/Target.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.annotation;
+
+/**
+ * Indicates the kinds of program element to which an annotation type
+ * is applicable.  If a Target meta-annotation is not present on an
+ * annotation type declaration, the declared type may be used on any
+ * program element.  If such a meta-annotation is present, the compiler
+ * will enforce the specified usage restriction.
+ *
+ * For example, this meta-annotation indicates that the declared type is
+ * itself a meta-annotation type.  It can only be used on annotation type
+ * declarations:
+ * <pre>
+ *    &#064;Target(ElementType.ANNOTATION_TYPE)
+ *    public &#064;interface MetaAnnotationType {
+ *        ...
+ *    }
+ * </pre>
+ * This meta-annotation indicates that the declared type is intended solely
+ * for use as a member type in complex annotation type declarations.  It
+ * cannot be used to annotate anything directly:
+ * <pre>
+ *    &#064;Target({})
+ *    public &#064;interface MemberType {
+ *        ...
+ *    }
+ * </pre>
+ * It is a compile-time error for a single ElementType constant to
+ * appear more than once in a Target annotation.  For example, the
+ * following meta-annotation is illegal:
+ * <pre>
+ *    &#064;Target({ElementType.FIELD, ElementType.METHOD, ElementType.FIELD})
+ *    public &#064;interface Bogus {
+ *        ...
+ *    }
+ * </pre>
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.ANNOTATION_TYPE)
+public @interface Target {
+    ElementType[] value();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/annotation/UnsupportedOperationException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/annotation/UnsupportedOperationException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Thrown to indicate that the requested operation is not supported.<p>
+ *
+ * This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author  Josh Bloch
+ * @since   1.2
+ */
+public class UnsupportedOperationException extends RuntimeException {
+    /**
+     * Constructs an UnsupportedOperationException with no detail message.
+     */
+    public UnsupportedOperationException() {
+    }
+
+    /**
+     * Constructs an UnsupportedOperationException with the specified
+     * detail message.
+     *
+     * @param message the detail message
+     */
+    public UnsupportedOperationException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message and
+     * cause.
+     *
+     * <p>Note that the detail message associated with <code>cause</code> is
+     * <i>not</i> automatically incorporated in this exception's detail
+     * message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link Throwable#getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value
+     *         is permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since 1.5
+     */
+    public UnsupportedOperationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail
+     * message of <tt>(cause==null ? null : cause.toString())</tt> (which
+     * typically contains the class and detail message of <tt>cause</tt>).
+     * This constructor is useful for exceptions that are little more than
+     * wrappers for other throwables (for example, {@link
+     * java.security.PrivilegedActionException}).
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link Throwable#getCause()} method).  (A <tt>null</tt> value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     * @since  1.5
+     */
+    public UnsupportedOperationException(Throwable cause) {
+        super(cause);
+    }
+
+    static final long serialVersionUID = -1242599979055084673L;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/AccessibleObject.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/AccessibleObject.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * The AccessibleObject class is the base class for Field, Method and
+ * Constructor objects.  It provides the ability to flag a reflected
+ * object as suppressing default Java language access control checks
+ * when it is used.  The access checks--for public, default (package)
+ * access, protected, and private members--are performed when Fields,
+ * Methods or Constructors are used to set or get fields, to invoke
+ * methods, or to create and initialize new instances of classes,
+ * respectively.
+ *
+ * <p>Setting the {@code accessible} flag in a reflected object
+ * permits sophisticated applications with sufficient privilege, such
+ * as Java Object Serialization or other persistence mechanisms, to
+ * manipulate objects in a manner that would normally be prohibited.
+ *
+ * <p>By default, a reflected object is <em>not</em> accessible.
+ *
+ * @see Field
+ * @see Method
+ * @see Constructor
+ * @see ReflectPermission
+ *
+ * @since 1.2
+ */
+public class AccessibleObject implements AnnotatedElement {
+
+    /**
+     * Convenience method to set the {@code accessible} flag for an
+     * array of objects with a single security check (for efficiency).
+     *
+     * <p>First, if there is a security manager, its
+     * {@code checkPermission} method is called with a
+     * {@code ReflectPermission("suppressAccessChecks")} permission.
+     *
+     * <p>A {@code SecurityException} is raised if {@code flag} is
+     * {@code true} but accessibility of any of the elements of the input
+     * {@code array} may not be changed (for example, if the element
+     * object is a {@link Constructor} object for the class {@link
+     * java.lang.Class}).  In the event of such a SecurityException, the
+     * accessibility of objects is set to {@code flag} for array elements
+     * upto (and excluding) the element for which the exception occurred; the
+     * accessibility of elements beyond (and including) the element for which
+     * the exception occurred is unchanged.
+     *
+     * @param array the array of AccessibleObjects
+     * @param flag  the new value for the {@code accessible} flag
+     *              in each object
+     * @throws SecurityException if the request is denied.
+     * @see SecurityManager#checkPermission
+     * @see java.lang.RuntimePermission
+     */
+    public static void setAccessible(AccessibleObject[] array, boolean flag)
+        throws SecurityException {
+        throw new SecurityException();
+    }
+
+    /**
+     * Set the {@code accessible} flag for this object to
+     * the indicated boolean value.  A value of {@code true} indicates that
+     * the reflected object should suppress Java language access
+     * checking when it is used.  A value of {@code false} indicates
+     * that the reflected object should enforce Java language access checks.
+     *
+     * <p>First, if there is a security manager, its
+     * {@code checkPermission} method is called with a
+     * {@code ReflectPermission("suppressAccessChecks")} permission.
+     *
+     * <p>A {@code SecurityException} is raised if {@code flag} is
+     * {@code true} but accessibility of this object may not be changed
+     * (for example, if this element object is a {@link Constructor} object for
+     * the class {@link java.lang.Class}).
+     *
+     * <p>A {@code SecurityException} is raised if this object is a {@link
+     * java.lang.reflect.Constructor} object for the class
+     * {@code java.lang.Class}, and {@code flag} is true.
+     *
+     * @param flag the new value for the {@code accessible} flag
+     * @throws SecurityException if the request is denied.
+     * @see SecurityManager#checkPermission
+     * @see java.lang.RuntimePermission
+     */
+    public void setAccessible(boolean flag) throws SecurityException {
+        throw new SecurityException();
+    }
+
+    /**
+     * Get the value of the {@code accessible} flag for this object.
+     *
+     * @return the value of the object's {@code accessible} flag
+     */
+    public boolean isAccessible() {
+        return override;
+    }
+
+    /**
+     * Constructor: only used by the Java Virtual Machine.
+     */
+    protected AccessibleObject() {}
+
+    // Indicates whether language-level access checks are overridden
+    // by this object. Initializes to "false". This field is used by
+    // Field, Method, and Constructor.
+    //
+    // NOTE: for security purposes, this field must not be visible
+    // outside this package.
+    boolean override;
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        throw new AssertionError("All subclasses should override this method");
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    public boolean isAnnotationPresent(
+        Class<? extends Annotation> annotationClass) {
+        return getAnnotation(annotationClass) != null;
+    }
+
+    /**
+     * @since 1.5
+     */
+    public Annotation[] getAnnotations() {
+        return getDeclaredAnnotations();
+    }
+
+    /**
+     * @since 1.5
+     */
+    public Annotation[] getDeclaredAnnotations()  {
+        throw new AssertionError("All subclasses should override this method");
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/AnnotatedElement.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/AnnotatedElement.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Represents an annotated element of the program currently running in this
+ * VM.  This interface allows annotations to be read reflectively.  All
+ * annotations returned by methods in this interface are immutable and
+ * serializable.  It is permissible for the caller to modify the
+ * arrays returned by accessors for array-valued enum members; it will
+ * have no affect on the arrays returned to other callers.
+ *
+ * <p>If an annotation returned by a method in this interface contains
+ * (directly or indirectly) a {@link Class}-valued member referring to
+ * a class that is not accessible in this VM, attempting to read the class
+ * by calling the relevant Class-returning method on the returned annotation
+ * will result in a {@link TypeNotPresentException}.
+ *
+ * <p>Similarly, attempting to read an enum-valued member will result in
+ * a {@link EnumConstantNotPresentException} if the enum constant in the
+ * annotation is no longer present in the enum type.
+ *
+ * <p>Finally, Attempting to read a member whose definition has evolved
+ * incompatibly will result in a {@link
+ * java.lang.annotation.AnnotationTypeMismatchException} or an
+ * {@link java.lang.annotation.IncompleteAnnotationException}.
+ *
+ * @see java.lang.EnumConstantNotPresentException
+ * @see java.lang.TypeNotPresentException
+ * @see java.lang.annotation.AnnotationFormatError
+ * @see java.lang.annotation.AnnotationTypeMismatchException
+ * @see java.lang.annotation.IncompleteAnnotationException
+ * @since 1.5
+ * @author Josh Bloch
+ */
+public interface AnnotatedElement {
+    /**
+     * Returns true if an annotation for the specified type
+     * is present on this element, else false.  This method
+     * is designed primarily for convenient access to marker annotations.
+     *
+     * @param annotationClass the Class object corresponding to the
+     *        annotation type
+     * @return true if an annotation for the specified annotation
+     *     type is present on this element, else false
+     * @throws NullPointerException if the given annotation class is null
+     * @since 1.5
+     */
+     boolean isAnnotationPresent(Class<? extends Annotation> annotationClass);
+
+   /**
+     * Returns this element's annotation for the specified type if
+     * such an annotation is present, else null.
+     *
+     * @param annotationClass the Class object corresponding to the
+     *        annotation type
+     * @return this element's annotation for the specified annotation type if
+     *     present on this element, else null
+     * @throws NullPointerException if the given annotation class is null
+     * @since 1.5
+     */
+    <T extends Annotation> T getAnnotation(Class<T> annotationClass);
+
+    /**
+     * Returns all annotations present on this element.  (Returns an array
+     * of length zero if this element has no annotations.)  The caller of
+     * this method is free to modify the returned array; it will have no
+     * effect on the arrays returned to other callers.
+     *
+     * @return all annotations present on this element
+     * @since 1.5
+     */
+    Annotation[] getAnnotations();
+
+    /**
+     * Returns all annotations that are directly present on this
+     * element.  Unlike the other methods in this interface, this method
+     * ignores inherited annotations.  (Returns an array of length zero if
+     * no annotations are directly present on this element.)  The caller of
+     * this method is free to modify the returned array; it will have no
+     * effect on the arrays returned to other callers.
+     *
+     * @return All annotations directly present on this element
+     * @since 1.5
+     */
+    Annotation[] getDeclaredAnnotations();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/Array.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/Array.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,663 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
+
+/**
+ * The {@code Array} class provides static methods to dynamically create and
+ * access Java arrays.
+ *
+ * <p>{@code Array} permits widening conversions to occur during a get or set
+ * operation, but throws an {@code IllegalArgumentException} if a narrowing
+ * conversion would occur.
+ *
+ * @author Nakul Saraiya
+ */
+@JavaScriptPrototype(prototype = "new Array", container = "Array.prototype")
+public final
+class Array {
+
+    /**
+     * Constructor.  Class Array is not instantiable.
+     */
+    private Array() {}
+
+    /**
+     * Creates a new array with the specified component type and
+     * length.
+     * Invoking this method is equivalent to creating an array
+     * as follows:
+     * <blockquote>
+     * <pre>
+     * int[] x = {length};
+     * Array.newInstance(componentType, x);
+     * </pre>
+     * </blockquote>
+     *
+     * @param componentType the {@code Class} object representing the
+     * component type of the new array
+     * @param length the length of the new array
+     * @return the new array
+     * @exception NullPointerException if the specified
+     * {@code componentType} parameter is null
+     * @exception IllegalArgumentException if componentType is {@link Void#TYPE}
+     * @exception NegativeArraySizeException if the specified {@code length}
+     * is negative
+     */
+    public static Object newInstance(Class<?> componentType, int length)
+    throws NegativeArraySizeException {
+        if (length < 0) {
+            throw new NegativeArraySizeException();
+        }
+        String sig = findSignature(componentType);
+        return newArray(componentType.isPrimitive(), sig, length);
+    }
+    
+    private static String findSignature(Class<?> type) {
+        if (type == Integer.TYPE) {
+            return "[I";
+        }
+        if (type == Long.TYPE) {
+            return "[J";
+        }
+        if (type == Double.TYPE) {
+            return "[D";
+        }
+        if (type == Float.TYPE) {
+            return "[F";
+        }
+        if (type == Byte.TYPE) {
+            return "[B";
+        }
+        if (type == Boolean.TYPE) {
+            return "[Z";
+        }
+        if (type == Short.TYPE) {
+            return "[S";
+        }
+        if (type == Character.TYPE) {
+            return "[C";
+        }
+        if (type.getName().equals("void")) {
+            throw new IllegalStateException("Can't create array for " + type);
+        }
+        return "[L" + type.getName() + ";";
+    }
+    /**
+     * Creates a new array
+     * with the specified component type and dimensions.
+     * If {@code componentType}
+     * represents a non-array class or interface, the new array
+     * has {@code dimensions.length} dimensions and
+     * {@code componentType} as its component type. If
+     * {@code componentType} represents an array class, the
+     * number of dimensions of the new array is equal to the sum
+     * of {@code dimensions.length} and the number of
+     * dimensions of {@code componentType}. In this case, the
+     * component type of the new array is the component type of
+     * {@code componentType}.
+     *
+     * <p>The number of dimensions of the new array must not
+     * exceed the number of array dimensions supported by the
+     * implementation (typically 255).
+     *
+     * @param componentType the {@code Class} object representing the component
+     * type of the new array
+     * @param dimensions an array of {@code int} representing the dimensions of
+     * the new array
+     * @return the new array
+     * @exception NullPointerException if the specified
+     * {@code componentType} argument is null
+     * @exception IllegalArgumentException if the specified {@code dimensions}
+     * argument is a zero-dimensional array, or if the number of
+     * requested dimensions exceeds the limit on the number of array dimensions
+     * supported by the implementation (typically 255), or if componentType
+     * is {@link Void#TYPE}.
+     * @exception NegativeArraySizeException if any of the components in
+     * the specified {@code dimensions} argument is negative.
+     */
+    public static Object newInstance(Class<?> componentType, int... dimensions)
+        throws IllegalArgumentException, NegativeArraySizeException {
+        StringBuilder sig = new StringBuilder();
+        for (int i = 1; i < dimensions.length; i++) {
+            sig.append('[');
+        }
+        sig.append(findSignature(componentType));
+        return multiNewArray(sig.toString(), dimensions, 0);
+    }
+
+    /**
+     * Returns the length of the specified array object, as an {@code int}.
+     *
+     * @param array the array
+     * @return the length of the array
+     * @exception IllegalArgumentException if the object argument is not
+     * an array
+     */
+    public static int getLength(Object array)
+    throws IllegalArgumentException {
+        if (!array.getClass().isArray()) {
+            throw new IllegalArgumentException("Argument is not an array");
+        }
+        return length(array);
+    }
+    
+    @JavaScriptBody(args = { "arr" }, body = "return arr.length;")
+    private static native int length(Object arr);
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object.  The value is automatically wrapped in an object
+     * if it has a primitive type.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the (possibly wrapped) value of the indexed component in
+     * the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     */
+    public static Object get(Object array, int index)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        final Class<?> t = array.getClass().getComponentType();
+        if (t.isPrimitive()) {
+            return fromPrimitive(t, array, index);
+        } else {
+            return ((Object[])array)[index];
+        }
+    }
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object, as a {@code boolean}.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the value of the indexed component in the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array, or if the indexed element cannot be converted to the
+     * return type by an identity or widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     * @see Array#get
+     */
+    public static native boolean getBoolean(Object array, int index)
+        throws IllegalArgumentException, ArrayIndexOutOfBoundsException;
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object, as a {@code byte}.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the value of the indexed component in the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array, or if the indexed element cannot be converted to the
+     * return type by an identity or widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     * @see Array#get
+     */
+    public static byte getByte(Object array, int index)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        if (array.getClass().getComponentType() != Byte.TYPE) {
+            throw new IllegalArgumentException();
+        }
+        byte[] arr = (byte[]) array;
+        return arr[index];
+    }
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object, as a {@code char}.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the value of the indexed component in the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array, or if the indexed element cannot be converted to the
+     * return type by an identity or widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     * @see Array#get
+     */
+    public static native char getChar(Object array, int index)
+        throws IllegalArgumentException, ArrayIndexOutOfBoundsException;
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object, as a {@code short}.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the value of the indexed component in the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array, or if the indexed element cannot be converted to the
+     * return type by an identity or widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     * @see Array#get
+     */
+    public static short getShort(Object array, int index)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        final Class<?> t = array.getClass().getComponentType();
+        if (t == Short.TYPE) {
+            short[] arr = (short[]) array;
+            return arr[index];
+        }
+        return getByte(array, index);
+    }
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object, as an {@code int}.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the value of the indexed component in the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array, or if the indexed element cannot be converted to the
+     * return type by an identity or widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     * @see Array#get
+     */
+    public static int getInt(Object array, int index) 
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        final Class<?> t = array.getClass().getComponentType();
+        if (t == Integer.TYPE) {
+            int[] arr = (int[]) array;
+            return arr[index];
+        }
+        return getShort(array, index);
+    }
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object, as a {@code long}.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the value of the indexed component in the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array, or if the indexed element cannot be converted to the
+     * return type by an identity or widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     * @see Array#get
+     */
+    public static long getLong(Object array, int index)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        final Class<?> t = array.getClass().getComponentType();
+        if (t == Long.TYPE) {
+            long[] arr = (long[]) array;
+            return arr[index];
+        }
+        return getInt(array, index);
+    }
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object, as a {@code float}.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the value of the indexed component in the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array, or if the indexed element cannot be converted to the
+     * return type by an identity or widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     * @see Array#get
+     */
+    public static float getFloat(Object array, int index)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        final Class<?> t = array.getClass().getComponentType();
+        if (t == Float.TYPE) {
+            float[] arr = (float[]) array;
+            return arr[index];
+        }
+        return getLong(array, index);
+    }
+
+    /**
+     * Returns the value of the indexed component in the specified
+     * array object, as a {@code double}.
+     *
+     * @param array the array
+     * @param index the index
+     * @return the value of the indexed component in the specified array
+     * @exception NullPointerException If the specified object is null
+     * @exception IllegalArgumentException If the specified object is not
+     * an array, or if the indexed element cannot be converted to the
+     * return type by an identity or widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to the
+     * length of the specified array
+     * @see Array#get
+     */
+    public static double getDouble(Object array, int index)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        final Class<?> t = array.getClass().getComponentType();
+        if (t == Double.TYPE) {
+            double[] arr = (double[]) array;
+            return arr[index];
+        }
+        return getFloat(array, index);
+    }
+
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified new value.  The new value is first
+     * automatically unwrapped if the array has a primitive component
+     * type.
+     * @param array the array
+     * @param index the index into the array
+     * @param value the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the array component type is primitive and
+     * an unwrapping conversion fails
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     */
+    public static void set(Object array, int index, Object value)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        if (array.getClass().getComponentType().isPrimitive()) {
+            throw new IllegalArgumentException();
+        } else {
+            Object[] arr = (Object[])array;
+            arr[index] = value;
+        }
+    }
+
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified {@code boolean} value.
+     * @param array the array
+     * @param index the index into the array
+     * @param z the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the specified value cannot be converted
+     * to the underlying array's component type by an identity or a
+     * primitive widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     * @see Array#set
+     */
+    public static native void setBoolean(Object array, int index, boolean z)
+        throws IllegalArgumentException, ArrayIndexOutOfBoundsException;
+
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified {@code byte} value.
+     * @param array the array
+     * @param index the index into the array
+     * @param b the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the specified value cannot be converted
+     * to the underlying array's component type by an identity or a
+     * primitive widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     * @see Array#set
+     */
+    public static void setByte(Object array, int index, byte b)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        Class<?> t = array.getClass().getComponentType();
+        if (t == Byte.TYPE) {
+            byte[] arr = (byte[]) array;
+            arr[index] = b;
+        } else {
+            setShort(array, index, b);
+        }
+    }
+
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified {@code char} value.
+     * @param array the array
+     * @param index the index into the array
+     * @param c the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the specified value cannot be converted
+     * to the underlying array's component type by an identity or a
+     * primitive widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     * @see Array#set
+     */
+    public static native void setChar(Object array, int index, char c)
+        throws IllegalArgumentException, ArrayIndexOutOfBoundsException;
+
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified {@code short} value.
+     * @param array the array
+     * @param index the index into the array
+     * @param s the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the specified value cannot be converted
+     * to the underlying array's component type by an identity or a
+     * primitive widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     * @see Array#set
+     */
+    public static void setShort(Object array, int index, short s)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        Class<?> t = array.getClass().getComponentType();
+        if (t == Short.TYPE) {
+            short[] arr = (short[]) array;
+            arr[index] = s;
+        } else {
+            setInt(array, index, s);
+        }
+        
+    }
+    
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified {@code int} value.
+     * @param array the array
+     * @param index the index into the array
+     * @param i the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the specified value cannot be converted
+     * to the underlying array's component type by an identity or a
+     * primitive widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     * @see Array#set
+     */
+    public static void setInt(Object array, int index, int i)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        Class<?> t = array.getClass().getComponentType();
+        if (t == Integer.TYPE) {
+            int[] arr = (int[]) array;
+            arr[index] = i;
+        } else {
+            setLong(array, index, i);
+        }
+    }
+
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified {@code long} value.
+     * @param array the array
+     * @param index the index into the array
+     * @param l the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the specified value cannot be converted
+     * to the underlying array's component type by an identity or a
+     * primitive widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     * @see Array#set
+     */
+    public static void setLong(Object array, int index, long l)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        Class<?> t = array.getClass().getComponentType();
+        if (t == Long.TYPE) {
+            long[] arr = (long[]) array;
+            arr[index] = l;
+        } else {
+            setFloat(array, index, l);
+        }
+    }
+
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified {@code float} value.
+     * @param array the array
+     * @param index the index into the array
+     * @param f the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the specified value cannot be converted
+     * to the underlying array's component type by an identity or a
+     * primitive widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     * @see Array#set
+     */
+    public static void setFloat(Object array, int index, float f)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        Class<?> t = array.getClass().getComponentType();
+        if (t == Float.TYPE) {
+            float[] arr = (float[])array;
+            arr[index] = f;
+        } else {
+            setDouble(array, index, f);
+        }
+    }
+
+    /**
+     * Sets the value of the indexed component of the specified array
+     * object to the specified {@code double} value.
+     * @param array the array
+     * @param index the index into the array
+     * @param d the new value of the indexed component
+     * @exception NullPointerException If the specified object argument
+     * is null
+     * @exception IllegalArgumentException If the specified object argument
+     * is not an array, or if the specified value cannot be converted
+     * to the underlying array's component type by an identity or a
+     * primitive widening conversion
+     * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+     * argument is negative, or if it is greater than or equal to
+     * the length of the specified array
+     * @see Array#set
+     */
+    public static void setDouble(Object array, int index, double d)
+    throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
+        Class<?> t = array.getClass().getComponentType();
+        if (t == Double.TYPE) {
+            double[] arr = (double[])array;
+            arr[index] = d;
+        } else {
+            throw new IllegalArgumentException("argument type mismatch");
+        }
+    }
+
+    /*
+     * Private
+     */
+
+    @JavaScriptBody(args = { "primitive", "sig", "length" }, body =
+          "var arr = new Array(length);\n"
+        + "var value = primitive ? 0 : null;\n"
+        + "for(var i = 0; i < length; i++) arr[i] = value;\n"
+        + "arr.jvmName = sig;\n"
+        + "return arr;"
+    )
+    private static native Object newArray(boolean primitive, String sig, int length);
+
+    private static Object multiNewArray(String sig, int[] dims, int index)
+    throws IllegalArgumentException, NegativeArraySizeException {
+        if (dims.length == index + 1) {
+            return newArray(sig.length() == 2, sig, dims[index]);
+        }
+        Object arr = newArray(false, sig, dims[index]);
+        String compsig = sig.substring(1);
+        int len = getLength(arr);
+        for (int i = 0; i < len; i++) {
+            setArray(arr, i, multiNewArray(compsig, dims, index + 1));
+        }
+        return arr;
+    }
+    private static Object fromPrimitive(Class<?> t, Object array, int index) {
+        return Method.fromPrimitive(t, atArray(array, index));
+    }
+    
+    @JavaScriptBody(args = { "array", "index" }, body = "return array[index];")
+    private static native Object atArray(Object array, int index);
+
+    @JavaScriptBody(args = { "array", "index", "v" }, body = "array[index] = v;")
+    private static native Object setArray(Object array, int index, Object v);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/Constructor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/Constructor.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,567 @@
+/*
+ * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+import java.lang.annotation.Annotation;
+import org.apidesign.bck2brwsr.emul.reflect.TypeProvider;
+
+/**
+ * {@code Constructor} provides information about, and access to, a single
+ * constructor for a class.
+ *
+ * <p>{@code Constructor} permits widening conversions to occur when matching the
+ * actual parameters to newInstance() with the underlying
+ * constructor's formal parameters, but throws an
+ * {@code IllegalArgumentException} if a narrowing conversion would occur.
+ *
+ * @param <T> the class in which the constructor is declared
+ *
+ * @see Member
+ * @see java.lang.Class
+ * @see java.lang.Class#getConstructors()
+ * @see java.lang.Class#getConstructor(Class[])
+ * @see java.lang.Class#getDeclaredConstructors()
+ *
+ * @author      Kenneth Russell
+ * @author      Nakul Saraiya
+ */
+public final
+    class Constructor<T> extends AccessibleObject implements
+                                                    GenericDeclaration,
+                                                    Member {
+
+    private Class<T>            clazz;
+    private int                 slot;
+    private Class<?>[]          parameterTypes;
+    private Class<?>[]          exceptionTypes;
+    private int                 modifiers;
+    // Generics and annotations support
+    private transient String    signature;
+    private byte[]              annotations;
+    private byte[]              parameterAnnotations;
+
+
+    // For sharing of ConstructorAccessors. This branching structure
+    // is currently only two levels deep (i.e., one root Constructor
+    // and potentially many Constructor objects pointing to it.)
+    private Constructor<T>      root;
+
+    /**
+     * Package-private constructor used by ReflectAccess to enable
+     * instantiation of these objects in Java code from the java.lang
+     * package via sun.reflect.LangReflectAccess.
+     */
+    Constructor(Class<T> declaringClass,
+                Class<?>[] parameterTypes,
+                Class<?>[] checkedExceptions,
+                int modifiers,
+                int slot,
+                String signature,
+                byte[] annotations,
+                byte[] parameterAnnotations)
+    {
+        this.clazz = declaringClass;
+        this.parameterTypes = parameterTypes;
+        this.exceptionTypes = checkedExceptions;
+        this.modifiers = modifiers;
+        this.slot = slot;
+        this.signature = signature;
+        this.annotations = annotations;
+        this.parameterAnnotations = parameterAnnotations;
+    }
+
+    /**
+     * Package-private routine (exposed to java.lang.Class via
+     * ReflectAccess) which returns a copy of this Constructor. The copy's
+     * "root" field points to this Constructor.
+     */
+    Constructor<T> copy() {
+        return this;
+    }
+
+    /**
+     * Returns the {@code Class} object representing the class that declares
+     * the constructor represented by this {@code Constructor} object.
+     */
+    public Class<T> getDeclaringClass() {
+        return clazz;
+    }
+
+    /**
+     * Returns the name of this constructor, as a string.  This is
+     * the binary name of the constructor's declaring class.
+     */
+    public String getName() {
+        return getDeclaringClass().getName();
+    }
+
+    /**
+     * Returns the Java language modifiers for the constructor
+     * represented by this {@code Constructor} object, as an integer. The
+     * {@code Modifier} class should be used to decode the modifiers.
+     *
+     * @see Modifier
+     */
+    public int getModifiers() {
+        return modifiers;
+    }
+
+    /**
+     * Returns an array of {@code TypeVariable} objects that represent the
+     * type variables declared by the generic declaration represented by this
+     * {@code GenericDeclaration} object, in declaration order.  Returns an
+     * array of length 0 if the underlying generic declaration declares no type
+     * variables.
+     *
+     * @return an array of {@code TypeVariable} objects that represent
+     *     the type variables declared by this generic declaration
+     * @throws GenericSignatureFormatError if the generic
+     *     signature of this generic declaration does not conform to
+     *     the format specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @since 1.5
+     */
+    public TypeVariable<Constructor<T>>[] getTypeParameters() {
+        return TypeProvider.getDefault().getTypeParameters(this);
+    }
+
+
+    /**
+     * Returns an array of {@code Class} objects that represent the formal
+     * parameter types, in declaration order, of the constructor
+     * represented by this {@code Constructor} object.  Returns an array of
+     * length 0 if the underlying constructor takes no parameters.
+     *
+     * @return the parameter types for the constructor this object
+     * represents
+     */
+    public Class<?>[] getParameterTypes() {
+        return (Class<?>[]) parameterTypes.clone();
+    }
+
+
+    /**
+     * Returns an array of {@code Type} objects that represent the formal
+     * parameter types, in declaration order, of the method represented by
+     * this {@code Constructor} object. Returns an array of length 0 if the
+     * underlying method takes no parameters.
+     *
+     * <p>If a formal parameter type is a parameterized type,
+     * the {@code Type} object returned for it must accurately reflect
+     * the actual type parameters used in the source code.
+     *
+     * <p>If a formal parameter type is a type variable or a parameterized
+     * type, it is created. Otherwise, it is resolved.
+     *
+     * @return an array of {@code Type}s that represent the formal
+     *     parameter types of the underlying method, in declaration order
+     * @throws GenericSignatureFormatError
+     *     if the generic method signature does not conform to the format
+     *     specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @throws TypeNotPresentException if any of the parameter
+     *     types of the underlying method refers to a non-existent type
+     *     declaration
+     * @throws MalformedParameterizedTypeException if any of
+     *     the underlying method's parameter types refer to a parameterized
+     *     type that cannot be instantiated for any reason
+     * @since 1.5
+     */
+    public Type[] getGenericParameterTypes() {
+        return TypeProvider.getDefault().getGenericParameterTypes(this);
+    }
+
+
+    /**
+     * Returns an array of {@code Class} objects that represent the types
+     * of exceptions declared to be thrown by the underlying constructor
+     * represented by this {@code Constructor} object.  Returns an array of
+     * length 0 if the constructor declares no exceptions in its {@code throws} clause.
+     *
+     * @return the exception types declared as being thrown by the
+     * constructor this object represents
+     */
+    public Class<?>[] getExceptionTypes() {
+        return (Class<?>[])exceptionTypes.clone();
+    }
+
+
+    /**
+     * Returns an array of {@code Type} objects that represent the
+     * exceptions declared to be thrown by this {@code Constructor} object.
+     * Returns an array of length 0 if the underlying method declares
+     * no exceptions in its {@code throws} clause.
+     *
+     * <p>If an exception type is a type variable or a parameterized
+     * type, it is created. Otherwise, it is resolved.
+     *
+     * @return an array of Types that represent the exception types
+     *     thrown by the underlying method
+     * @throws GenericSignatureFormatError
+     *     if the generic method signature does not conform to the format
+     *     specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @throws TypeNotPresentException if the underlying method's
+     *     {@code throws} clause refers to a non-existent type declaration
+     * @throws MalformedParameterizedTypeException if
+     *     the underlying method's {@code throws} clause refers to a
+     *     parameterized type that cannot be instantiated for any reason
+     * @since 1.5
+     */
+      public Type[] getGenericExceptionTypes() {
+          return TypeProvider.getDefault().getGenericExceptionTypes(this);
+      }
+
+    /**
+     * Compares this {@code Constructor} against the specified object.
+     * Returns true if the objects are the same.  Two {@code Constructor} objects are
+     * the same if they were declared by the same class and have the
+     * same formal parameter types.
+     */
+    public boolean equals(Object obj) {
+        if (obj != null && obj instanceof Constructor) {
+            Constructor<?> other = (Constructor<?>)obj;
+            if (getDeclaringClass() == other.getDeclaringClass()) {
+                /* Avoid unnecessary cloning */
+                Class<?>[] params1 = parameterTypes;
+                Class<?>[] params2 = other.parameterTypes;
+                if (params1.length == params2.length) {
+                    for (int i = 0; i < params1.length; i++) {
+                        if (params1[i] != params2[i])
+                            return false;
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns a hashcode for this {@code Constructor}. The hashcode is
+     * the same as the hashcode for the underlying constructor's
+     * declaring class name.
+     */
+    public int hashCode() {
+        return getDeclaringClass().getName().hashCode();
+    }
+
+    /**
+     * Returns a string describing this {@code Constructor}.  The string is
+     * formatted as the constructor access modifiers, if any,
+     * followed by the fully-qualified name of the declaring class,
+     * followed by a parenthesized, comma-separated list of the
+     * constructor's formal parameter types.  For example:
+     * <pre>
+     *    public java.util.Hashtable(int,float)
+     * </pre>
+     *
+     * <p>The only possible modifiers for constructors are the access
+     * modifiers {@code public}, {@code protected} or
+     * {@code private}.  Only one of these may appear, or none if the
+     * constructor has default (package) access.
+     */
+    public String toString() {
+        try {
+            StringBuffer sb = new StringBuffer();
+            int mod = getModifiers() & Modifier.constructorModifiers();
+            if (mod != 0) {
+                sb.append(Modifier.toString(mod) + " ");
+            }
+            sb.append(Field.getTypeName(getDeclaringClass()));
+            sb.append("(");
+            Class<?>[] params = parameterTypes; // avoid clone
+            for (int j = 0; j < params.length; j++) {
+                sb.append(Field.getTypeName(params[j]));
+                if (j < (params.length - 1))
+                    sb.append(",");
+            }
+            sb.append(")");
+            Class<?>[] exceptions = exceptionTypes; // avoid clone
+            if (exceptions.length > 0) {
+                sb.append(" throws ");
+                for (int k = 0; k < exceptions.length; k++) {
+                    sb.append(exceptions[k].getName());
+                    if (k < (exceptions.length - 1))
+                        sb.append(",");
+                }
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            return "<" + e + ">";
+        }
+    }
+
+    /**
+     * Returns a string describing this {@code Constructor},
+     * including type parameters.  The string is formatted as the
+     * constructor access modifiers, if any, followed by an
+     * angle-bracketed comma separated list of the constructor's type
+     * parameters, if any, followed by the fully-qualified name of the
+     * declaring class, followed by a parenthesized, comma-separated
+     * list of the constructor's generic formal parameter types.
+     *
+     * If this constructor was declared to take a variable number of
+     * arguments, instead of denoting the last parameter as
+     * "<tt><i>Type</i>[]</tt>", it is denoted as
+     * "<tt><i>Type</i>...</tt>".
+     *
+     * A space is used to separate access modifiers from one another
+     * and from the type parameters or return type.  If there are no
+     * type parameters, the type parameter list is elided; if the type
+     * parameter list is present, a space separates the list from the
+     * class name.  If the constructor is declared to throw
+     * exceptions, the parameter list is followed by a space, followed
+     * by the word "{@code throws}" followed by a
+     * comma-separated list of the thrown exception types.
+     *
+     * <p>The only possible modifiers for constructors are the access
+     * modifiers {@code public}, {@code protected} or
+     * {@code private}.  Only one of these may appear, or none if the
+     * constructor has default (package) access.
+     *
+     * @return a string describing this {@code Constructor},
+     * include type parameters
+     *
+     * @since 1.5
+     */
+    public String toGenericString() {
+        try {
+            StringBuilder sb = new StringBuilder();
+            int mod = getModifiers() & Modifier.constructorModifiers();
+            if (mod != 0) {
+                sb.append(Modifier.toString(mod) + " ");
+            }
+            TypeVariable<?>[] typeparms = getTypeParameters();
+            if (typeparms.length > 0) {
+                boolean first = true;
+                sb.append("<");
+                for(TypeVariable<?> typeparm: typeparms) {
+                    if (!first)
+                        sb.append(",");
+                    // Class objects can't occur here; no need to test
+                    // and call Class.getName().
+                    sb.append(typeparm.toString());
+                    first = false;
+                }
+                sb.append("> ");
+            }
+            sb.append(Field.getTypeName(getDeclaringClass()));
+            sb.append("(");
+            Type[] params = getGenericParameterTypes();
+            for (int j = 0; j < params.length; j++) {
+                String param = (params[j] instanceof Class<?>)?
+                    Field.getTypeName((Class<?>)params[j]):
+                    (params[j].toString());
+                if (isVarArgs() && (j == params.length - 1)) // replace T[] with T...
+                    param = param.replaceFirst("\\[\\]$", "...");
+                sb.append(param);
+                if (j < (params.length - 1))
+                    sb.append(",");
+            }
+            sb.append(")");
+            Type[] exceptions = getGenericExceptionTypes();
+            if (exceptions.length > 0) {
+                sb.append(" throws ");
+                for (int k = 0; k < exceptions.length; k++) {
+                    sb.append((exceptions[k] instanceof Class)?
+                              ((Class<?>)exceptions[k]).getName():
+                              exceptions[k].toString());
+                    if (k < (exceptions.length - 1))
+                        sb.append(",");
+                }
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            return "<" + e + ">";
+        }
+    }
+
+    /**
+     * Uses the constructor represented by this {@code Constructor} object to
+     * create and initialize a new instance of the constructor's
+     * declaring class, with the specified initialization parameters.
+     * Individual parameters are automatically unwrapped to match
+     * primitive formal parameters, and both primitive and reference
+     * parameters are subject to method invocation conversions as necessary.
+     *
+     * <p>If the number of formal parameters required by the underlying constructor
+     * is 0, the supplied {@code initargs} array may be of length 0 or null.
+     *
+     * <p>If the constructor's declaring class is an inner class in a
+     * non-static context, the first argument to the constructor needs
+     * to be the enclosing instance; see section 15.9.3 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     *
+     * <p>If the required access and argument checks succeed and the
+     * instantiation will proceed, the constructor's declaring class
+     * is initialized if it has not already been initialized.
+     *
+     * <p>If the constructor completes normally, returns the newly
+     * created and initialized instance.
+     *
+     * @param initargs array of objects to be passed as arguments to
+     * the constructor call; values of primitive types are wrapped in
+     * a wrapper object of the appropriate type (e.g. a {@code float}
+     * in a {@link java.lang.Float Float})
+     *
+     * @return a new object created by calling the constructor
+     * this object represents
+     *
+     * @exception IllegalAccessException    if this {@code Constructor} object
+     *              is enforcing Java language access control and the underlying
+     *              constructor is inaccessible.
+     * @exception IllegalArgumentException  if the number of actual
+     *              and formal parameters differ; if an unwrapping
+     *              conversion for primitive arguments fails; or if,
+     *              after possible unwrapping, a parameter value
+     *              cannot be converted to the corresponding formal
+     *              parameter type by a method invocation conversion; if
+     *              this constructor pertains to an enum type.
+     * @exception InstantiationException    if the class that declares the
+     *              underlying constructor represents an abstract class.
+     * @exception InvocationTargetException if the underlying constructor
+     *              throws an exception.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     */
+    public T newInstance(Object ... initargs)
+        throws InstantiationException, IllegalAccessException,
+               IllegalArgumentException, InvocationTargetException
+    {
+        throw new SecurityException();
+    }
+
+    /**
+     * Returns {@code true} if this constructor was declared to take
+     * a variable number of arguments; returns {@code false}
+     * otherwise.
+     *
+     * @return {@code true} if an only if this constructor was declared to
+     * take a variable number of arguments.
+     * @since 1.5
+     */
+    public boolean isVarArgs() {
+        return (getModifiers() & Modifier.VARARGS) != 0;
+    }
+
+    /**
+     * Returns {@code true} if this constructor is a synthetic
+     * constructor; returns {@code false} otherwise.
+     *
+     * @return true if and only if this constructor is a synthetic
+     * constructor as defined by
+     * <cite>The Java&trade; Language Specification</cite>.
+     * @since 1.5
+     */
+    public boolean isSynthetic() {
+        return Modifier.isSynthetic(getModifiers());
+    }
+
+    int getSlot() {
+        return slot;
+    }
+
+   String getSignature() {
+            return signature;
+   }
+
+    byte[] getRawAnnotations() {
+        return annotations;
+    }
+
+    byte[] getRawParameterAnnotations() {
+        return parameterAnnotations;
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        if (annotationClass == null)
+            throw new NullPointerException();
+
+        return null; // XXX (T) declaredAnnotations().get(annotationClass);
+    }
+
+    /**
+     * @since 1.5
+     */
+    public Annotation[] getDeclaredAnnotations()  {
+        return new Annotation[0]; // XXX AnnotationParser.toArray(declaredAnnotations());
+    }
+
+    /**
+     * Returns an array of arrays that represent the annotations on the formal
+     * parameters, in declaration order, of the method represented by
+     * this {@code Constructor} object. (Returns an array of length zero if the
+     * underlying method is parameterless.  If the method has one or more
+     * parameters, a nested array of length zero is returned for each parameter
+     * with no annotations.) The annotation objects contained in the returned
+     * arrays are serializable.  The caller of this method is free to modify
+     * the returned arrays; it will have no effect on the arrays returned to
+     * other callers.
+     *
+     * @return an array of arrays that represent the annotations on the formal
+     *    parameters, in declaration order, of the method represented by this
+     *    Constructor object
+     * @since 1.5
+     */
+    public Annotation[][] getParameterAnnotations() {
+        int numParameters = parameterTypes.length;
+        if (parameterAnnotations == null)
+            return new Annotation[numParameters][0];
+        
+        return new Annotation[numParameters][0]; // XXX
+/*
+        Annotation[][] result = AnnotationParser.parseParameterAnnotations(
+            parameterAnnotations,
+            sun.misc.SharedSecrets.getJavaLangAccess().
+                getConstantPool(getDeclaringClass()),
+            getDeclaringClass());
+        if (result.length != numParameters) {
+            Class<?> declaringClass = getDeclaringClass();
+            if (declaringClass.isEnum() ||
+                declaringClass.isAnonymousClass() ||
+                declaringClass.isLocalClass() )
+                ; // Can't do reliable parameter counting
+            else {
+                if (!declaringClass.isMemberClass() || // top-level
+                    // Check for the enclosing instance parameter for
+                    // non-static member classes
+                    (declaringClass.isMemberClass() &&
+                     ((declaringClass.getModifiers() & Modifier.STATIC) == 0)  &&
+                     result.length + 1 != numParameters) ) {
+                    throw new AnnotationFormatError(
+                              "Parameter annotations don't match number of parameters");
+                }
+            }
+        }
+        return result;
+        */
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/Field.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/Field.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,953 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+import java.lang.annotation.Annotation;
+
+
+/**
+ * A {@code Field} provides information about, and dynamic access to, a
+ * single field of a class or an interface.  The reflected field may
+ * be a class (static) field or an instance field.
+ *
+ * <p>A {@code Field} permits widening conversions to occur during a get or
+ * set access operation, but throws an {@code IllegalArgumentException} if a
+ * narrowing conversion would occur.
+ *
+ * @see Member
+ * @see java.lang.Class
+ * @see java.lang.Class#getFields()
+ * @see java.lang.Class#getField(String)
+ * @see java.lang.Class#getDeclaredFields()
+ * @see java.lang.Class#getDeclaredField(String)
+ *
+ * @author Kenneth Russell
+ * @author Nakul Saraiya
+ */
+public final
+class Field extends AccessibleObject implements Member {
+
+    private Class<?>            clazz;
+    private int                 slot;
+    // This is guaranteed to be interned by the VM in the 1.4
+    // reflection implementation
+    private String              name;
+    private Class<?>            type;
+    private int                 modifiers;
+    // Generics and annotations support
+    private transient String    signature;
+    private byte[]              annotations;
+    // For sharing of FieldAccessors. This branching structure is
+    // currently only two levels deep (i.e., one root Field and
+    // potentially many Field objects pointing to it.)
+    private Field               root;
+
+    // Generics infrastructure
+
+    private String getGenericSignature() {return signature;}
+
+
+    /**
+     * Package-private constructor used by ReflectAccess to enable
+     * instantiation of these objects in Java code from the java.lang
+     * package via sun.reflect.LangReflectAccess.
+     */
+    Field(Class<?> declaringClass,
+          String name,
+          Class<?> type,
+          int modifiers,
+          int slot,
+          String signature,
+          byte[] annotations)
+    {
+        this.clazz = declaringClass;
+        this.name = name;
+        this.type = type;
+        this.modifiers = modifiers;
+        this.slot = slot;
+        this.signature = signature;
+        this.annotations = annotations;
+    }
+
+    /**
+     * Package-private routine (exposed to java.lang.Class via
+     * ReflectAccess) which returns a copy of this Field. The copy's
+     * "root" field points to this Field.
+     */
+    Field copy() {
+        // This routine enables sharing of FieldAccessor objects
+        // among Field objects which refer to the same underlying
+        // method in the VM. (All of this contortion is only necessary
+        // because of the "accessibility" bit in AccessibleObject,
+        // which implicitly requires that new java.lang.reflect
+        // objects be fabricated for each reflective call on Class
+        // objects.)
+        Field res = new Field(clazz, name, type, modifiers, slot, signature, annotations);
+        res.root = this;
+        return res;
+    }
+
+    /**
+     * Returns the {@code Class} object representing the class or interface
+     * that declares the field represented by this {@code Field} object.
+     */
+    public Class<?> getDeclaringClass() {
+        return clazz;
+    }
+
+    /**
+     * Returns the name of the field represented by this {@code Field} object.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the Java language modifiers for the field represented
+     * by this {@code Field} object, as an integer. The {@code Modifier} class should
+     * be used to decode the modifiers.
+     *
+     * @see Modifier
+     */
+    public int getModifiers() {
+        return modifiers;
+    }
+
+    /**
+     * Returns {@code true} if this field represents an element of
+     * an enumerated type; returns {@code false} otherwise.
+     *
+     * @return {@code true} if and only if this field represents an element of
+     * an enumerated type.
+     * @since 1.5
+     */
+    public boolean isEnumConstant() {
+        return (getModifiers() & Modifier.ENUM) != 0;
+    }
+
+    /**
+     * Returns {@code true} if this field is a synthetic
+     * field; returns {@code false} otherwise.
+     *
+     * @return true if and only if this field is a synthetic
+     * field as defined by the Java Language Specification.
+     * @since 1.5
+     */
+    public boolean isSynthetic() {
+        return Modifier.isSynthetic(getModifiers());
+    }
+
+    /**
+     * Returns a {@code Class} object that identifies the
+     * declared type for the field represented by this
+     * {@code Field} object.
+     *
+     * @return a {@code Class} object identifying the declared
+     * type of the field represented by this object
+     */
+    public Class<?> getType() {
+        return type;
+    }
+
+    /**
+     * Returns a {@code Type} object that represents the declared type for
+     * the field represented by this {@code Field} object.
+     *
+     * <p>If the {@code Type} is a parameterized type, the
+     * {@code Type} object returned must accurately reflect the
+     * actual type parameters used in the source code.
+     *
+     * <p>If the type of the underlying field is a type variable or a
+     * parameterized type, it is created. Otherwise, it is resolved.
+     *
+     * @return a {@code Type} object that represents the declared type for
+     *     the field represented by this {@code Field} object
+     * @throws GenericSignatureFormatError if the generic field
+     *     signature does not conform to the format specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @throws TypeNotPresentException if the generic type
+     *     signature of the underlying field refers to a non-existent
+     *     type declaration
+     * @throws MalformedParameterizedTypeException if the generic
+     *     signature of the underlying field refers to a parameterized type
+     *     that cannot be instantiated for any reason
+     * @since 1.5
+     */
+    public Type getGenericType() {
+        throw new UnsupportedOperationException();
+    }
+
+
+    /**
+     * Compares this {@code Field} against the specified object.  Returns
+     * true if the objects are the same.  Two {@code Field} objects are the same if
+     * they were declared by the same class and have the same name
+     * and type.
+     */
+    public boolean equals(Object obj) {
+        if (obj != null && obj instanceof Field) {
+            Field other = (Field)obj;
+            return (getDeclaringClass() == other.getDeclaringClass())
+                && (getName() == other.getName())
+                && (getType() == other.getType());
+        }
+        return false;
+    }
+
+    /**
+     * Returns a hashcode for this {@code Field}.  This is computed as the
+     * exclusive-or of the hashcodes for the underlying field's
+     * declaring class name and its name.
+     */
+    public int hashCode() {
+        return getDeclaringClass().getName().hashCode() ^ getName().hashCode();
+    }
+
+    /**
+     * Returns a string describing this {@code Field}.  The format is
+     * the access modifiers for the field, if any, followed
+     * by the field type, followed by a space, followed by
+     * the fully-qualified name of the class declaring the field,
+     * followed by a period, followed by the name of the field.
+     * For example:
+     * <pre>
+     *    public static final int java.lang.Thread.MIN_PRIORITY
+     *    private int java.io.FileDescriptor.fd
+     * </pre>
+     *
+     * <p>The modifiers are placed in canonical order as specified by
+     * "The Java Language Specification".  This is {@code public},
+     * {@code protected} or {@code private} first, and then other
+     * modifiers in the following order: {@code static}, {@code final},
+     * {@code transient}, {@code volatile}.
+     */
+    public String toString() {
+        int mod = getModifiers();
+        return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
+            + getTypeName(getType()) + " "
+            + getTypeName(getDeclaringClass()) + "."
+            + getName());
+    }
+
+    /**
+     * Returns a string describing this {@code Field}, including
+     * its generic type.  The format is the access modifiers for the
+     * field, if any, followed by the generic field type, followed by
+     * a space, followed by the fully-qualified name of the class
+     * declaring the field, followed by a period, followed by the name
+     * of the field.
+     *
+     * <p>The modifiers are placed in canonical order as specified by
+     * "The Java Language Specification".  This is {@code public},
+     * {@code protected} or {@code private} first, and then other
+     * modifiers in the following order: {@code static}, {@code final},
+     * {@code transient}, {@code volatile}.
+     *
+     * @return a string describing this {@code Field}, including
+     * its generic type
+     *
+     * @since 1.5
+     */
+    public String toGenericString() {
+        int mod = getModifiers();
+        Type fieldType = getGenericType();
+        return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
+            +  ((fieldType instanceof Class) ?
+                getTypeName((Class)fieldType): fieldType.toString())+ " "
+            + getTypeName(getDeclaringClass()) + "."
+            + getName());
+    }
+
+    /**
+     * Returns the value of the field represented by this {@code Field}, on
+     * the specified object. The value is automatically wrapped in an
+     * object if it has a primitive type.
+     *
+     * <p>The underlying field's value is obtained as follows:
+     *
+     * <p>If the underlying field is a static field, the {@code obj} argument
+     * is ignored; it may be null.
+     *
+     * <p>Otherwise, the underlying field is an instance field.  If the
+     * specified {@code obj} argument is null, the method throws a
+     * {@code NullPointerException}. If the specified object is not an
+     * instance of the class or interface declaring the underlying
+     * field, the method throws an {@code IllegalArgumentException}.
+     *
+     * <p>If this {@code Field} object is enforcing Java language access control, and
+     * the underlying field is inaccessible, the method throws an
+     * {@code IllegalAccessException}.
+     * If the underlying field is static, the class that declared the
+     * field is initialized if it has not already been initialized.
+     *
+     * <p>Otherwise, the value is retrieved from the underlying instance
+     * or static field.  If the field has a primitive type, the value
+     * is wrapped in an object before being returned, otherwise it is
+     * returned as is.
+     *
+     * <p>If the field is hidden in the type of {@code obj},
+     * the field's value is obtained according to the preceding rules.
+     *
+     * @param obj object from which the represented field's value is
+     * to be extracted
+     * @return the value of the represented field in object
+     * {@code obj}; primitive values are wrapped in an appropriate
+     * object before being returned
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof).
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     */
+    public Object get(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).get(obj);
+    }
+
+    /**
+     * Gets the value of a static or instance {@code boolean} field.
+     *
+     * @param obj the object to extract the {@code boolean} value
+     * from
+     * @return the value of the {@code boolean} field
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not
+     *              an instance of the class or interface declaring the
+     *              underlying field (or a subclass or implementor
+     *              thereof), or if the field value cannot be
+     *              converted to the type {@code boolean} by a
+     *              widening conversion.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#get
+     */
+    public boolean getBoolean(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).getBoolean(obj);
+    }
+
+    /**
+     * Gets the value of a static or instance {@code byte} field.
+     *
+     * @param obj the object to extract the {@code byte} value
+     * from
+     * @return the value of the {@code byte} field
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not
+     *              an instance of the class or interface declaring the
+     *              underlying field (or a subclass or implementor
+     *              thereof), or if the field value cannot be
+     *              converted to the type {@code byte} by a
+     *              widening conversion.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#get
+     */
+    public byte getByte(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).getByte(obj);
+    }
+
+    /**
+     * Gets the value of a static or instance field of type
+     * {@code char} or of another primitive type convertible to
+     * type {@code char} via a widening conversion.
+     *
+     * @param obj the object to extract the {@code char} value
+     * from
+     * @return the value of the field converted to type {@code char}
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not
+     *              an instance of the class or interface declaring the
+     *              underlying field (or a subclass or implementor
+     *              thereof), or if the field value cannot be
+     *              converted to the type {@code char} by a
+     *              widening conversion.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see Field#get
+     */
+    public char getChar(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).getChar(obj);
+    }
+
+    /**
+     * Gets the value of a static or instance field of type
+     * {@code short} or of another primitive type convertible to
+     * type {@code short} via a widening conversion.
+     *
+     * @param obj the object to extract the {@code short} value
+     * from
+     * @return the value of the field converted to type {@code short}
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not
+     *              an instance of the class or interface declaring the
+     *              underlying field (or a subclass or implementor
+     *              thereof), or if the field value cannot be
+     *              converted to the type {@code short} by a
+     *              widening conversion.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#get
+     */
+    public short getShort(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).getShort(obj);
+    }
+
+    /**
+     * Gets the value of a static or instance field of type
+     * {@code int} or of another primitive type convertible to
+     * type {@code int} via a widening conversion.
+     *
+     * @param obj the object to extract the {@code int} value
+     * from
+     * @return the value of the field converted to type {@code int}
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not
+     *              an instance of the class or interface declaring the
+     *              underlying field (or a subclass or implementor
+     *              thereof), or if the field value cannot be
+     *              converted to the type {@code int} by a
+     *              widening conversion.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#get
+     */
+    public int getInt(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).getInt(obj);
+    }
+
+    /**
+     * Gets the value of a static or instance field of type
+     * {@code long} or of another primitive type convertible to
+     * type {@code long} via a widening conversion.
+     *
+     * @param obj the object to extract the {@code long} value
+     * from
+     * @return the value of the field converted to type {@code long}
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not
+     *              an instance of the class or interface declaring the
+     *              underlying field (or a subclass or implementor
+     *              thereof), or if the field value cannot be
+     *              converted to the type {@code long} by a
+     *              widening conversion.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#get
+     */
+    public long getLong(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).getLong(obj);
+    }
+
+    /**
+     * Gets the value of a static or instance field of type
+     * {@code float} or of another primitive type convertible to
+     * type {@code float} via a widening conversion.
+     *
+     * @param obj the object to extract the {@code float} value
+     * from
+     * @return the value of the field converted to type {@code float}
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not
+     *              an instance of the class or interface declaring the
+     *              underlying field (or a subclass or implementor
+     *              thereof), or if the field value cannot be
+     *              converted to the type {@code float} by a
+     *              widening conversion.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see Field#get
+     */
+    public float getFloat(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).getFloat(obj);
+    }
+
+    /**
+     * Gets the value of a static or instance field of type
+     * {@code double} or of another primitive type convertible to
+     * type {@code double} via a widening conversion.
+     *
+     * @param obj the object to extract the {@code double} value
+     * from
+     * @return the value of the field converted to type {@code double}
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is inaccessible.
+     * @exception IllegalArgumentException  if the specified object is not
+     *              an instance of the class or interface declaring the
+     *              underlying field (or a subclass or implementor
+     *              thereof), or if the field value cannot be
+     *              converted to the type {@code double} by a
+     *              widening conversion.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#get
+     */
+    public double getDouble(Object obj)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        return getFieldAccessor(obj).getDouble(obj);
+    }
+
+    /**
+     * Sets the field represented by this {@code Field} object on the
+     * specified object argument to the specified new value. The new
+     * value is automatically unwrapped if the underlying field has a
+     * primitive type.
+     *
+     * <p>The operation proceeds as follows:
+     *
+     * <p>If the underlying field is static, the {@code obj} argument is
+     * ignored; it may be null.
+     *
+     * <p>Otherwise the underlying field is an instance field.  If the
+     * specified object argument is null, the method throws a
+     * {@code NullPointerException}.  If the specified object argument is not
+     * an instance of the class or interface declaring the underlying
+     * field, the method throws an {@code IllegalArgumentException}.
+     *
+     * <p>If this {@code Field} object is enforcing Java language access control, and
+     * the underlying field is inaccessible, the method throws an
+     * {@code IllegalAccessException}.
+     *
+     * <p>If the underlying field is final, the method throws an
+     * {@code IllegalAccessException} unless {@code setAccessible(true)}
+     * has succeeded for this {@code Field} object
+     * and the field is non-static. Setting a final field in this way
+     * is meaningful only during deserialization or reconstruction of
+     * instances of classes with blank final fields, before they are
+     * made available for access by other parts of a program. Use in
+     * any other context may have unpredictable effects, including cases
+     * in which other parts of a program continue to use the original
+     * value of this field.
+     *
+     * <p>If the underlying field is of a primitive type, an unwrapping
+     * conversion is attempted to convert the new value to a value of
+     * a primitive type.  If this attempt fails, the method throws an
+     * {@code IllegalArgumentException}.
+     *
+     * <p>If, after possible unwrapping, the new value cannot be
+     * converted to the type of the underlying field by an identity or
+     * widening conversion, the method throws an
+     * {@code IllegalArgumentException}.
+     *
+     * <p>If the underlying field is static, the class that declared the
+     * field is initialized if it has not already been initialized.
+     *
+     * <p>The field is set to the possibly unwrapped and widened new value.
+     *
+     * <p>If the field is hidden in the type of {@code obj},
+     * the field's value is set according to the preceding rules.
+     *
+     * @param obj the object whose field should be modified
+     * @param value the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     */
+    public void set(Object obj, Object value)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).set(obj, value);
+    }
+
+    /**
+     * Sets the value of a field as a {@code boolean} on the specified object.
+     * This method is equivalent to
+     * {@code set(obj, zObj)},
+     * where {@code zObj} is a {@code Boolean} object and
+     * {@code zObj.booleanValue() == z}.
+     *
+     * @param obj the object whose field should be modified
+     * @param z   the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#set
+     */
+    public void setBoolean(Object obj, boolean z)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).setBoolean(obj, z);
+    }
+
+    /**
+     * Sets the value of a field as a {@code byte} on the specified object.
+     * This method is equivalent to
+     * {@code set(obj, bObj)},
+     * where {@code bObj} is a {@code Byte} object and
+     * {@code bObj.byteValue() == b}.
+     *
+     * @param obj the object whose field should be modified
+     * @param b   the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#set
+     */
+    public void setByte(Object obj, byte b)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).setByte(obj, b);
+    }
+
+    /**
+     * Sets the value of a field as a {@code char} on the specified object.
+     * This method is equivalent to
+     * {@code set(obj, cObj)},
+     * where {@code cObj} is a {@code Character} object and
+     * {@code cObj.charValue() == c}.
+     *
+     * @param obj the object whose field should be modified
+     * @param c   the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#set
+     */
+    public void setChar(Object obj, char c)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).setChar(obj, c);
+    }
+
+    /**
+     * Sets the value of a field as a {@code short} on the specified object.
+     * This method is equivalent to
+     * {@code set(obj, sObj)},
+     * where {@code sObj} is a {@code Short} object and
+     * {@code sObj.shortValue() == s}.
+     *
+     * @param obj the object whose field should be modified
+     * @param s   the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#set
+     */
+    public void setShort(Object obj, short s)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).setShort(obj, s);
+    }
+
+    /**
+     * Sets the value of a field as an {@code int} on the specified object.
+     * This method is equivalent to
+     * {@code set(obj, iObj)},
+     * where {@code iObj} is a {@code Integer} object and
+     * {@code iObj.intValue() == i}.
+     *
+     * @param obj the object whose field should be modified
+     * @param i   the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#set
+     */
+    public void setInt(Object obj, int i)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).setInt(obj, i);
+    }
+
+    /**
+     * Sets the value of a field as a {@code long} on the specified object.
+     * This method is equivalent to
+     * {@code set(obj, lObj)},
+     * where {@code lObj} is a {@code Long} object and
+     * {@code lObj.longValue() == l}.
+     *
+     * @param obj the object whose field should be modified
+     * @param l   the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#set
+     */
+    public void setLong(Object obj, long l)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).setLong(obj, l);
+    }
+
+    /**
+     * Sets the value of a field as a {@code float} on the specified object.
+     * This method is equivalent to
+     * {@code set(obj, fObj)},
+     * where {@code fObj} is a {@code Float} object and
+     * {@code fObj.floatValue() == f}.
+     *
+     * @param obj the object whose field should be modified
+     * @param f   the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#set
+     */
+    public void setFloat(Object obj, float f)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).setFloat(obj, f);
+    }
+
+    /**
+     * Sets the value of a field as a {@code double} on the specified object.
+     * This method is equivalent to
+     * {@code set(obj, dObj)},
+     * where {@code dObj} is a {@code Double} object and
+     * {@code dObj.doubleValue() == d}.
+     *
+     * @param obj the object whose field should be modified
+     * @param d   the new value for the field of {@code obj}
+     * being modified
+     *
+     * @exception IllegalAccessException    if this {@code Field} object
+     *              is enforcing Java language access control and the underlying
+     *              field is either inaccessible or final.
+     * @exception IllegalArgumentException  if the specified object is not an
+     *              instance of the class or interface declaring the underlying
+     *              field (or a subclass or implementor thereof),
+     *              or if an unwrapping conversion fails.
+     * @exception NullPointerException      if the specified object is null
+     *              and the field is an instance field.
+     * @exception ExceptionInInitializerError if the initialization provoked
+     *              by this method fails.
+     * @see       Field#set
+     */
+    public void setDouble(Object obj, double d)
+        throws IllegalArgumentException, IllegalAccessException
+    {
+        getFieldAccessor(obj).setDouble(obj, d);
+    }
+
+    // Convenience routine which performs security checks
+    private FieldAccessor getFieldAccessor(Object obj)
+        throws IllegalAccessException
+    {
+        throw new SecurityException();
+    }
+    
+    private static abstract class FieldAccessor {
+        abstract void setShort(Object obj, short s);
+        abstract void setInt(Object obj, int i);
+        abstract void setChar(Object obj, char c);
+        abstract void setByte(Object obj, byte b);
+        abstract void setBoolean(Object obj, boolean z);
+        abstract void set(Object obj, Object value);
+        abstract double getDouble(Object obj);
+        abstract void setLong(Object obj, long l);
+        abstract void setFloat(Object obj, float f);
+        abstract void setDouble(Object obj, double d);
+        abstract long getLong(Object obj);
+        abstract int getInt(Object obj);
+        abstract short getShort(Object obj);
+        abstract char getChar(Object obj);
+        abstract byte getByte(Object obj);
+        abstract boolean getBoolean(Object obj);
+        abstract Object get(Object obj);
+        abstract float getFloat(Object obj);
+    }
+
+    /*
+     * Utility routine to paper over array type names
+     */
+    static String getTypeName(Class<?> type) {
+        if (type.isArray()) {
+            try {
+                Class<?> cl = type;
+                int dimensions = 0;
+                while (cl.isArray()) {
+                    dimensions++;
+                    cl = cl.getComponentType();
+                }
+                StringBuffer sb = new StringBuffer();
+                sb.append(cl.getName());
+                for (int i = 0; i < dimensions; i++) {
+                    sb.append("[]");
+                }
+                return sb.toString();
+            } catch (Throwable e) { /*FALLTHRU*/ }
+        }
+        return type.getName();
+    }
+
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        if (annotationClass == null)
+            throw new NullPointerException();
+
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @since 1.5
+     */
+    public Annotation[] getDeclaredAnnotations()  {
+        throw new UnsupportedOperationException();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/GenericDeclaration.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/GenericDeclaration.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+/**
+ * A common interface for all entities that declare type variables.
+ *
+ * @since 1.5
+ */
+public interface GenericDeclaration {
+    /**
+     * Returns an array of {@code TypeVariable} objects that
+     * represent the type variables declared by the generic
+     * declaration represented by this {@code GenericDeclaration}
+     * object, in declaration order.  Returns an array of length 0 if
+     * the underlying generic declaration declares no type variables.
+     *
+     * @return an array of {@code TypeVariable} objects that represent
+     *     the type variables declared by this generic declaration
+     * @throws GenericSignatureFormatError if the generic
+     *     signature of this generic declaration does not conform to
+     *     the format specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     */
+    public TypeVariable<?>[] getTypeParameters();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/InvocationHandler.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/InvocationHandler.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+/**
+ * {@code InvocationHandler} is the interface implemented by
+ * the <i>invocation handler</i> of a proxy instance.
+ *
+ * <p>Each proxy instance has an associated invocation handler.
+ * When a method is invoked on a proxy instance, the method
+ * invocation is encoded and dispatched to the {@code invoke}
+ * method of its invocation handler.
+ *
+ * @author      Peter Jones
+ * @see         Proxy
+ * @since       1.3
+ */
+public interface InvocationHandler {
+
+    /**
+     * Processes a method invocation on a proxy instance and returns
+     * the result.  This method will be invoked on an invocation handler
+     * when a method is invoked on a proxy instance that it is
+     * associated with.
+     *
+     * @param   proxy the proxy instance that the method was invoked on
+     *
+     * @param   method the {@code Method} instance corresponding to
+     * the interface method invoked on the proxy instance.  The declaring
+     * class of the {@code Method} object will be the interface that
+     * the method was declared in, which may be a superinterface of the
+     * proxy interface that the proxy class inherits the method through.
+     *
+     * @param   args an array of objects containing the values of the
+     * arguments passed in the method invocation on the proxy instance,
+     * or {@code null} if interface method takes no arguments.
+     * Arguments of primitive types are wrapped in instances of the
+     * appropriate primitive wrapper class, such as
+     * {@code java.lang.Integer} or {@code java.lang.Boolean}.
+     *
+     * @return  the value to return from the method invocation on the
+     * proxy instance.  If the declared return type of the interface
+     * method is a primitive type, then the value returned by
+     * this method must be an instance of the corresponding primitive
+     * wrapper class; otherwise, it must be a type assignable to the
+     * declared return type.  If the value returned by this method is
+     * {@code null} and the interface method's return type is
+     * primitive, then a {@code NullPointerException} will be
+     * thrown by the method invocation on the proxy instance.  If the
+     * value returned by this method is otherwise not compatible with
+     * the interface method's declared return type as described above,
+     * a {@code ClassCastException} will be thrown by the method
+     * invocation on the proxy instance.
+     *
+     * @throws  Throwable the exception to throw from the method
+     * invocation on the proxy instance.  The exception's type must be
+     * assignable either to any of the exception types declared in the
+     * {@code throws} clause of the interface method or to the
+     * unchecked exception types {@code java.lang.RuntimeException}
+     * or {@code java.lang.Error}.  If a checked exception is
+     * thrown by this method that is not assignable to any of the
+     * exception types declared in the {@code throws} clause of
+     * the interface method, then an
+     * {@link UndeclaredThrowableException} containing the
+     * exception that was thrown by this method will be thrown by the
+     * method invocation on the proxy instance.
+     *
+     * @see     UndeclaredThrowableException
+     */
+    public Object invoke(Object proxy, Method method, Object[] args)
+        throws Throwable;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/InvocationTargetException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/InvocationTargetException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+/**
+ * InvocationTargetException is a checked exception that wraps
+ * an exception thrown by an invoked method or constructor.
+ *
+ * <p>As of release 1.4, this exception has been retrofitted to conform to
+ * the general purpose exception-chaining mechanism.  The "target exception"
+ * that is provided at construction time and accessed via the
+ * {@link #getTargetException()} method is now known as the <i>cause</i>,
+ * and may be accessed via the {@link Throwable#getCause()} method,
+ * as well as the aforementioned "legacy method."
+ *
+ * @see Method
+ * @see Constructor
+ */
+public class InvocationTargetException extends ReflectiveOperationException {
+    /**
+     * Use serialVersionUID from JDK 1.1.X for interoperability
+     */
+    private static final long serialVersionUID = 4085088731926701167L;
+
+     /**
+     * This field holds the target if the
+     * InvocationTargetException(Throwable target) constructor was
+     * used to instantiate the object
+     *
+     * @serial
+     *
+     */
+    private Throwable target;
+
+    /**
+     * Constructs an {@code InvocationTargetException} with
+     * {@code null} as the target exception.
+     */
+    protected InvocationTargetException() {
+        super((Throwable)null);  // Disallow initCause
+    }
+
+    /**
+     * Constructs a InvocationTargetException with a target exception.
+     *
+     * @param target the target exception
+     */
+    public InvocationTargetException(Throwable target) {
+        super((Throwable)null);  // Disallow initCause
+        this.target = target;
+    }
+
+    /**
+     * Constructs a InvocationTargetException with a target exception
+     * and a detail message.
+     *
+     * @param target the target exception
+     * @param s      the detail message
+     */
+    public InvocationTargetException(Throwable target, String s) {
+        super(s, null);  // Disallow initCause
+        this.target = target;
+    }
+
+    /**
+     * Get the thrown target exception.
+     *
+     * <p>This method predates the general-purpose exception chaining facility.
+     * The {@link Throwable#getCause()} method is now the preferred means of
+     * obtaining this information.
+     *
+     * @return the thrown target exception (cause of this exception).
+     */
+    public Throwable getTargetException() {
+        return target;
+    }
+
+    /**
+     * Returns the cause of this exception (the thrown target exception,
+     * which may be {@code null}).
+     *
+     * @return  the cause of this exception.
+     * @since   1.4
+     */
+    public Throwable getCause() {
+        return target;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/Member.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/Member.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+/**
+ * Member is an interface that reflects identifying information about
+ * a single member (a field or a method) or a constructor.
+ *
+ * @see java.lang.Class
+ * @see Field
+ * @see Method
+ * @see Constructor
+ *
+ * @author Nakul Saraiya
+ */
+public
+interface Member {
+
+    /**
+     * Identifies the set of all public members of a class or interface,
+     * including inherited members.
+     * @see java.lang.SecurityManager#checkMemberAccess
+     */
+    public static final int PUBLIC = 0;
+
+    /**
+     * Identifies the set of declared members of a class or interface.
+     * Inherited members are not included.
+     * @see java.lang.SecurityManager#checkMemberAccess
+     */
+    public static final int DECLARED = 1;
+
+    /**
+     * Returns the Class object representing the class or interface
+     * that declares the member or constructor represented by this Member.
+     *
+     * @return an object representing the declaring class of the
+     * underlying member
+     */
+    public Class<?> getDeclaringClass();
+
+    /**
+     * Returns the simple name of the underlying member or constructor
+     * represented by this Member.
+     *
+     * @return the simple name of the underlying member
+     */
+    public String getName();
+
+    /**
+     * Returns the Java language modifiers for the member or
+     * constructor represented by this Member, as an integer.  The
+     * Modifier class should be used to decode the modifiers in
+     * the integer.
+     *
+     * @return the Java language modifiers for the underlying member
+     * @see Modifier
+     */
+    public int getModifiers();
+
+    /**
+     * Returns {@code true} if this member was introduced by
+     * the compiler; returns {@code false} otherwise.
+     *
+     * @return true if and only if this member was introduced by
+     * the compiler.
+     * @since 1.5
+     */
+    public boolean isSynthetic();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/Method.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/Method.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,688 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+import java.lang.annotation.Annotation;
+import java.util.Enumeration;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.emul.reflect.AnnotationImpl;
+import org.apidesign.bck2brwsr.emul.reflect.MethodImpl;
+
+/**
+ * A {@code Method} provides information about, and access to, a single method
+ * on a class or interface.  The reflected method may be a class method
+ * or an instance method (including an abstract method).
+ *
+ * <p>A {@code Method} permits widening conversions to occur when matching the
+ * actual parameters to invoke with the underlying method's formal
+ * parameters, but it throws an {@code IllegalArgumentException} if a
+ * narrowing conversion would occur.
+ *
+ * @see Member
+ * @see java.lang.Class
+ * @see java.lang.Class#getMethods()
+ * @see java.lang.Class#getMethod(String, Class[])
+ * @see java.lang.Class#getDeclaredMethods()
+ * @see java.lang.Class#getDeclaredMethod(String, Class[])
+ *
+ * @author Kenneth Russell
+ * @author Nakul Saraiya
+ */
+public final
+    class Method extends AccessibleObject implements GenericDeclaration,
+                                                     Member {
+    private final Class<?> clazz;
+    private final String name;
+    private final Object data;
+    private final String sig;
+
+   // Generics infrastructure
+
+    private String getGenericSignature() {return null;}
+
+    /**
+     * Package-private constructor used by ReflectAccess to enable
+     * instantiation of these objects in Java code from the java.lang
+     * package via sun.reflect.LangReflectAccess.
+     */
+    Method(Class<?> declaringClass, String name, Object data, String sig)
+    {
+        this.clazz = declaringClass;
+        this.name = name;
+        this.data = data;
+        this.sig = sig;
+    }
+
+    /**
+     * Package-private routine (exposed to java.lang.Class via
+     * ReflectAccess) which returns a copy of this Method. The copy's
+     * "root" field points to this Method.
+     */
+    Method copy() {
+        return this;
+    }
+
+    /**
+     * Returns the {@code Class} object representing the class or interface
+     * that declares the method represented by this {@code Method} object.
+     */
+    public Class<?> getDeclaringClass() {
+        return clazz;
+    }
+
+    /**
+     * Returns the name of the method represented by this {@code Method}
+     * object, as a {@code String}.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the Java language modifiers for the method represented
+     * by this {@code Method} object, as an integer. The {@code Modifier} class should
+     * be used to decode the modifiers.
+     *
+     * @see Modifier
+     */
+    public int getModifiers() {
+        return getAccess(data);
+    }
+    
+    @JavaScriptBody(args = "self", body = "return self.access;")
+    private static native int getAccess(Object self);
+    
+    /**
+     * Returns an array of {@code TypeVariable} objects that represent the
+     * type variables declared by the generic declaration represented by this
+     * {@code GenericDeclaration} object, in declaration order.  Returns an
+     * array of length 0 if the underlying generic declaration declares no type
+     * variables.
+     *
+     * @return an array of {@code TypeVariable} objects that represent
+     *     the type variables declared by this generic declaration
+     * @throws GenericSignatureFormatError if the generic
+     *     signature of this generic declaration does not conform to
+     *     the format specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @since 1.5
+     */
+    public TypeVariable<Method>[] getTypeParameters() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns a {@code Class} object that represents the formal return type
+     * of the method represented by this {@code Method} object.
+     *
+     * @return the return type for the method this object represents
+     */
+    public Class<?> getReturnType() {
+        return MethodImpl.signatureParser(sig).nextElement();
+    }
+
+    /**
+     * Returns a {@code Type} object that represents the formal return
+     * type of the method represented by this {@code Method} object.
+     *
+     * <p>If the return type is a parameterized type,
+     * the {@code Type} object returned must accurately reflect
+     * the actual type parameters used in the source code.
+     *
+     * <p>If the return type is a type variable or a parameterized type, it
+     * is created. Otherwise, it is resolved.
+     *
+     * @return  a {@code Type} object that represents the formal return
+     *     type of the underlying  method
+     * @throws GenericSignatureFormatError
+     *     if the generic method signature does not conform to the format
+     *     specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @throws TypeNotPresentException if the underlying method's
+     *     return type refers to a non-existent type declaration
+     * @throws MalformedParameterizedTypeException if the
+     *     underlying method's return typed refers to a parameterized
+     *     type that cannot be instantiated for any reason
+     * @since 1.5
+     */
+    public Type getGenericReturnType() {
+        throw new UnsupportedOperationException();
+    }
+
+
+    /**
+     * Returns an array of {@code Class} objects that represent the formal
+     * parameter types, in declaration order, of the method
+     * represented by this {@code Method} object.  Returns an array of length
+     * 0 if the underlying method takes no parameters.
+     *
+     * @return the parameter types for the method this object
+     * represents
+     */
+    public Class<?>[] getParameterTypes() {
+        Class[] arr = new Class[MethodImpl.signatureElements(sig) - 1];
+        Enumeration<Class> en = MethodImpl.signatureParser(sig);
+        en.nextElement(); // return type
+        for (int i = 0; i < arr.length; i++) {
+            arr[i] = en.nextElement();
+        }
+        return arr;
+    }
+
+    /**
+     * Returns an array of {@code Type} objects that represent the formal
+     * parameter types, in declaration order, of the method represented by
+     * this {@code Method} object. Returns an array of length 0 if the
+     * underlying method takes no parameters.
+     *
+     * <p>If a formal parameter type is a parameterized type,
+     * the {@code Type} object returned for it must accurately reflect
+     * the actual type parameters used in the source code.
+     *
+     * <p>If a formal parameter type is a type variable or a parameterized
+     * type, it is created. Otherwise, it is resolved.
+     *
+     * @return an array of Types that represent the formal
+     *     parameter types of the underlying method, in declaration order
+     * @throws GenericSignatureFormatError
+     *     if the generic method signature does not conform to the format
+     *     specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @throws TypeNotPresentException if any of the parameter
+     *     types of the underlying method refers to a non-existent type
+     *     declaration
+     * @throws MalformedParameterizedTypeException if any of
+     *     the underlying method's parameter types refer to a parameterized
+     *     type that cannot be instantiated for any reason
+     * @since 1.5
+     */
+    public Type[] getGenericParameterTypes() {
+        throw new UnsupportedOperationException();
+    }
+
+
+    /**
+     * Returns an array of {@code Class} objects that represent
+     * the types of the exceptions declared to be thrown
+     * by the underlying method
+     * represented by this {@code Method} object.  Returns an array of length
+     * 0 if the method declares no exceptions in its {@code throws} clause.
+     *
+     * @return the exception types declared as being thrown by the
+     * method this object represents
+     */
+    public Class<?>[] getExceptionTypes() {
+        throw new UnsupportedOperationException();
+        //return (Class<?>[]) exceptionTypes.clone();
+    }
+
+    /**
+     * Returns an array of {@code Type} objects that represent the
+     * exceptions declared to be thrown by this {@code Method} object.
+     * Returns an array of length 0 if the underlying method declares
+     * no exceptions in its {@code throws} clause.
+     *
+     * <p>If an exception type is a type variable or a parameterized
+     * type, it is created. Otherwise, it is resolved.
+     *
+     * @return an array of Types that represent the exception types
+     *     thrown by the underlying method
+     * @throws GenericSignatureFormatError
+     *     if the generic method signature does not conform to the format
+     *     specified in
+     *     <cite>The Java&trade; Virtual Machine Specification</cite>
+     * @throws TypeNotPresentException if the underlying method's
+     *     {@code throws} clause refers to a non-existent type declaration
+     * @throws MalformedParameterizedTypeException if
+     *     the underlying method's {@code throws} clause refers to a
+     *     parameterized type that cannot be instantiated for any reason
+     * @since 1.5
+     */
+      public Type[] getGenericExceptionTypes() {
+        throw new UnsupportedOperationException();
+      }
+
+    /**
+     * Compares this {@code Method} against the specified object.  Returns
+     * true if the objects are the same.  Two {@code Methods} are the same if
+     * they were declared by the same class and have the same name
+     * and formal parameter types and return type.
+     */
+    public boolean equals(Object obj) {
+        if (obj != null && obj instanceof Method) {
+            Method other = (Method)obj;
+            return data == other.data;
+        }
+        return false;
+    }
+
+    /**
+     * Returns a hashcode for this {@code Method}.  The hashcode is computed
+     * as the exclusive-or of the hashcodes for the underlying
+     * method's declaring class name and the method's name.
+     */
+    public int hashCode() {
+        return getDeclaringClass().getName().hashCode() ^ getName().hashCode();
+    }
+
+    /**
+     * Returns a string describing this {@code Method}.  The string is
+     * formatted as the method access modifiers, if any, followed by
+     * the method return type, followed by a space, followed by the
+     * class declaring the method, followed by a period, followed by
+     * the method name, followed by a parenthesized, comma-separated
+     * list of the method's formal parameter types. If the method
+     * throws checked exceptions, the parameter list is followed by a
+     * space, followed by the word throws followed by a
+     * comma-separated list of the thrown exception types.
+     * For example:
+     * <pre>
+     *    public boolean java.lang.Object.equals(java.lang.Object)
+     * </pre>
+     *
+     * <p>The access modifiers are placed in canonical order as
+     * specified by "The Java Language Specification".  This is
+     * {@code public}, {@code protected} or {@code private} first,
+     * and then other modifiers in the following order:
+     * {@code abstract}, {@code static}, {@code final},
+     * {@code synchronized}, {@code native}, {@code strictfp}.
+     */
+    public String toString() {
+        try {
+            StringBuilder sb = new StringBuilder();
+            int mod = getModifiers() & Modifier.methodModifiers();
+            if (mod != 0) {
+                sb.append(Modifier.toString(mod)).append(' ');
+            }
+            sb.append(Field.getTypeName(getReturnType())).append(' ');
+            sb.append(Field.getTypeName(getDeclaringClass())).append('.');
+            sb.append(getName()).append('(');
+            Class<?>[] params = getParameterTypes(); // avoid clone
+            for (int j = 0; j < params.length; j++) {
+                sb.append(Field.getTypeName(params[j]));
+                if (j < (params.length - 1))
+                    sb.append(',');
+            }
+            sb.append(')');
+            /*
+            Class<?>[] exceptions = exceptionTypes; // avoid clone
+            if (exceptions.length > 0) {
+                sb.append(" throws ");
+                for (int k = 0; k < exceptions.length; k++) {
+                    sb.append(exceptions[k].getName());
+                    if (k < (exceptions.length - 1))
+                        sb.append(',');
+                }
+            }
+            */
+            return sb.toString();
+        } catch (Exception e) {
+            return "<" + e + ">";
+        }
+    }
+
+    /**
+     * Returns a string describing this {@code Method}, including
+     * type parameters.  The string is formatted as the method access
+     * modifiers, if any, followed by an angle-bracketed
+     * comma-separated list of the method's type parameters, if any,
+     * followed by the method's generic return type, followed by a
+     * space, followed by the class declaring the method, followed by
+     * a period, followed by the method name, followed by a
+     * parenthesized, comma-separated list of the method's generic
+     * formal parameter types.
+     *
+     * If this method was declared to take a variable number of
+     * arguments, instead of denoting the last parameter as
+     * "<tt><i>Type</i>[]</tt>", it is denoted as
+     * "<tt><i>Type</i>...</tt>".
+     *
+     * A space is used to separate access modifiers from one another
+     * and from the type parameters or return type.  If there are no
+     * type parameters, the type parameter list is elided; if the type
+     * parameter list is present, a space separates the list from the
+     * class name.  If the method is declared to throw exceptions, the
+     * parameter list is followed by a space, followed by the word
+     * throws followed by a comma-separated list of the generic thrown
+     * exception types.  If there are no type parameters, the type
+     * parameter list is elided.
+     *
+     * <p>The access modifiers are placed in canonical order as
+     * specified by "The Java Language Specification".  This is
+     * {@code public}, {@code protected} or {@code private} first,
+     * and then other modifiers in the following order:
+     * {@code abstract}, {@code static}, {@code final},
+     * {@code synchronized}, {@code native}, {@code strictfp}.
+     *
+     * @return a string describing this {@code Method},
+     * include type parameters
+     *
+     * @since 1.5
+     */
+    public String toGenericString() {
+        try {
+            StringBuilder sb = new StringBuilder();
+            int mod = getModifiers() & Modifier.methodModifiers();
+            if (mod != 0) {
+                sb.append(Modifier.toString(mod)).append(' ');
+            }
+            TypeVariable<?>[] typeparms = getTypeParameters();
+            if (typeparms.length > 0) {
+                boolean first = true;
+                sb.append('<');
+                for(TypeVariable<?> typeparm: typeparms) {
+                    if (!first)
+                        sb.append(',');
+                    // Class objects can't occur here; no need to test
+                    // and call Class.getName().
+                    sb.append(typeparm.toString());
+                    first = false;
+                }
+                sb.append("> ");
+            }
+
+            Type genRetType = getGenericReturnType();
+            sb.append( ((genRetType instanceof Class<?>)?
+                        Field.getTypeName((Class<?>)genRetType):genRetType.toString()))
+                    .append(' ');
+
+            sb.append(Field.getTypeName(getDeclaringClass())).append('.');
+            sb.append(getName()).append('(');
+            Type[] params = getGenericParameterTypes();
+            for (int j = 0; j < params.length; j++) {
+                String param = (params[j] instanceof Class)?
+                    Field.getTypeName((Class)params[j]):
+                    (params[j].toString());
+                if (isVarArgs() && (j == params.length - 1)) // replace T[] with T...
+                    param = param.replaceFirst("\\[\\]$", "...");
+                sb.append(param);
+                if (j < (params.length - 1))
+                    sb.append(',');
+            }
+            sb.append(')');
+            Type[] exceptions = getGenericExceptionTypes();
+            if (exceptions.length > 0) {
+                sb.append(" throws ");
+                for (int k = 0; k < exceptions.length; k++) {
+                    sb.append((exceptions[k] instanceof Class)?
+                              ((Class)exceptions[k]).getName():
+                              exceptions[k].toString());
+                    if (k < (exceptions.length - 1))
+                        sb.append(',');
+                }
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            return "<" + e + ">";
+        }
+    }
+
+    /**
+     * Invokes the underlying method represented by this {@code Method}
+     * object, on the specified object with the specified parameters.
+     * Individual parameters are automatically unwrapped to match
+     * primitive formal parameters, and both primitive and reference
+     * parameters are subject to method invocation conversions as
+     * necessary.
+     *
+     * <p>If the underlying method is static, then the specified {@code obj}
+     * argument is ignored. It may be null.
+     *
+     * <p>If the number of formal parameters required by the underlying method is
+     * 0, the supplied {@code args} array may be of length 0 or null.
+     *
+     * <p>If the underlying method is an instance method, it is invoked
+     * using dynamic method lookup as documented in The Java Language
+     * Specification, Second Edition, section 15.12.4.4; in particular,
+     * overriding based on the runtime type of the target object will occur.
+     *
+     * <p>If the underlying method is static, the class that declared
+     * the method is initialized if it has not already been initialized.
+     *
+     * <p>If the method completes normally, the value it returns is
+     * returned to the caller of invoke; if the value has a primitive
+     * type, it is first appropriately wrapped in an object. However,
+     * if the value has the type of an array of a primitive type, the
+     * elements of the array are <i>not</i> wrapped in objects; in
+     * other words, an array of primitive type is returned.  If the
+     * underlying method return type is void, the invocation returns
+     * null.
+     *
+     * @param obj  the object the underlying method is invoked from
+     * @param args the arguments used for the method call
+     * @return the result of dispatching the method represented by
+     * this object on {@code obj} with parameters
+     * {@code args}
+     *
+     * @exception IllegalAccessException    if this {@code Method} object
+     *              is enforcing Java language access control and the underlying
+     *              method is inaccessible.
+     * @exception IllegalArgumentException  if the method is an
+     *              instance method and the specified object argument
+     *              is not an instance of the class or interface
+     *              declaring the underlying method (or of a subclass
+     *              or implementor thereof); if the number of actual
+     *              and formal parameters differ; if an unwrapping
+     *              conversion for primitive arguments fails; or if,
+     *              after possible unwrapping, a parameter value
+     *              cannot be converted to the corresponding formal
+     *              parameter type by a method invocation conversion.
+     * @exception InvocationTargetException if the underlying method
+     *              throws an exception.
+     * @exception NullPointerException      if the specified object is null
+     *              and the method is an instance method.
+     * @exception ExceptionInInitializerError if the initialization
+     * provoked by this method fails.
+     */
+    public Object invoke(Object obj, Object... args)
+        throws IllegalAccessException, IllegalArgumentException,
+           InvocationTargetException
+    {
+        final boolean isStatic = (getModifiers() & Modifier.STATIC) == 0;
+        if (isStatic && obj == null) {
+            throw new NullPointerException();
+        }
+        Class[] types = getParameterTypes();
+        if (types.length != args.length) {
+            throw new IllegalArgumentException("Types len " + types.length + " args: " + args.length);
+        } else {
+            args = args.clone();
+            for (int i = 0; i < types.length; i++) {
+                Class c = types[i];
+                if (c.isPrimitive() && args[i] != null) {
+                    args[i] = toPrimitive(args[i]);
+                }
+            }
+        }
+        Object res = invoke0(isStatic, this, obj, args);
+        if (getReturnType().isPrimitive()) {
+            res = fromPrimitive(getReturnType(), res);
+        }
+        return res;
+    }
+    
+    @JavaScriptBody(args = { "st", "method", "self", "args" }, body =
+          "var p;\n"
+        + "if (st) {\n"
+        + "  p = new Array(1);\n"
+        + "  p[0] = self;\n"
+        + "  p = p.concat(args);\n"
+        + "} else {\n"
+        + "  p = args;\n"
+        + "}\n"
+        + "return method._data().apply(self, p);\n"
+    )
+    private static native Object invoke0(boolean isStatic, Method m, Object self, Object[] args);
+
+    static Object fromPrimitive(Class<?> type, Object o) {
+        if (type == Integer.TYPE) {
+            return fromRaw(Integer.class, "valueOf__Ljava_lang_Integer_2I", o);
+        }
+        if (type == Long.TYPE) {
+            return fromRaw(Long.class, "valueOf__Ljava_lang_Long_2J", o);
+        }
+        if (type == Double.TYPE) {
+            return fromRaw(Double.class, "valueOf__Ljava_lang_Double_2D", o);
+        }
+        if (type == Float.TYPE) {
+            return fromRaw(Float.class, "valueOf__Ljava_lang_Float_2F", o);
+        }
+        if (type == Byte.TYPE) {
+            return fromRaw(Byte.class, "valueOf__Ljava_lang_Byte_2B", o);
+        }
+        if (type == Boolean.TYPE) {
+            return fromRaw(Boolean.class, "valueOf__Ljava_lang_Boolean_2Z", o);
+        }
+        if (type == Short.TYPE) {
+            return fromRaw(Short.class, "valueOf__Ljava_lang_Short_2S", o);
+        }
+        if (type == Character.TYPE) {
+            return fromRaw(Character.class, "valueOf__Ljava_lang_Character_2C", o);
+        }
+        if (type.getName().equals("void")) {
+            return null;
+        }
+        throw new IllegalStateException("Can't convert " + o);
+    }
+    
+    @JavaScriptBody(args = { "cls", "m", "o" }, 
+        body = "return cls.cnstr(false)[m](o);"
+    )
+    private static native Integer fromRaw(Class<?> cls, String m, Object o);
+
+    @JavaScriptBody(args = { "o" }, body = "return o.valueOf();")
+    private static native Object toPrimitive(Object o);
+    
+    /**
+     * Returns {@code true} if this method is a bridge
+     * method; returns {@code false} otherwise.
+     *
+     * @return true if and only if this method is a bridge
+     * method as defined by the Java Language Specification.
+     * @since 1.5
+     */
+    public boolean isBridge() {
+        return (getModifiers() & Modifier.BRIDGE) != 0;
+    }
+
+    /**
+     * Returns {@code true} if this method was declared to take
+     * a variable number of arguments; returns {@code false}
+     * otherwise.
+     *
+     * @return {@code true} if an only if this method was declared to
+     * take a variable number of arguments.
+     * @since 1.5
+     */
+    public boolean isVarArgs() {
+        return (getModifiers() & Modifier.VARARGS) != 0;
+    }
+
+    /**
+     * Returns {@code true} if this method is a synthetic
+     * method; returns {@code false} otherwise.
+     *
+     * @return true if and only if this method is a synthetic
+     * method as defined by the Java Language Specification.
+     * @since 1.5
+     */
+    public boolean isSynthetic() {
+        return Modifier.isSynthetic(getModifiers());
+    }
+
+    @JavaScriptBody(args = { "ac" }, 
+        body = 
+          "var a = this._data().anno;"
+        + "if (a) {"
+        + "  return a['L' + ac.jvmName + ';'];"
+        + "} else return null;"
+    )
+    private Object getAnnotationData(Class<?> annotationClass) {
+        throw new UnsupportedOperationException();
+    }
+    
+    /**
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        Object data = getAnnotationData(annotationClass);
+        return data == null ? null : AnnotationImpl.create(annotationClass, data);
+    }
+
+    /**
+     * @since 1.5
+     */
+    public Annotation[] getDeclaredAnnotations()  {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns the default value for the annotation member represented by
+     * this {@code Method} instance.  If the member is of a primitive type,
+     * an instance of the corresponding wrapper type is returned. Returns
+     * null if no default is associated with the member, or if the method
+     * instance does not represent a declared member of an annotation type.
+     *
+     * @return the default value for the annotation member represented
+     *     by this {@code Method} instance.
+     * @throws TypeNotPresentException if the annotation is of type
+     *     {@link Class} and no definition can be found for the
+     *     default class value.
+     * @since  1.5
+     */
+    public Object getDefaultValue() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Returns an array of arrays that represent the annotations on the formal
+     * parameters, in declaration order, of the method represented by
+     * this {@code Method} object. (Returns an array of length zero if the
+     * underlying method is parameterless.  If the method has one or more
+     * parameters, a nested array of length zero is returned for each parameter
+     * with no annotations.) The annotation objects contained in the returned
+     * arrays are serializable.  The caller of this method is free to modify
+     * the returned arrays; it will have no effect on the arrays returned to
+     * other callers.
+     *
+     * @return an array of arrays that represent the annotations on the formal
+     *    parameters, in declaration order, of the method represented by this
+     *    Method object
+     * @since 1.5
+     */
+    public Annotation[][] getParameterAnnotations() {
+        throw new UnsupportedOperationException();
+    }
+
+    static {
+        MethodImpl.INSTANCE = new MethodImpl() {
+            protected Method create(Class<?> declaringClass, String name, Object data, String sig) {
+                return new Method(declaringClass, name, data, sig);
+            }
+        };
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/Modifier.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/Modifier.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,437 @@
+/*
+ * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+/**
+ * The Modifier class provides {@code static} methods and
+ * constants to decode class and member access modifiers.  The sets of
+ * modifiers are represented as integers with distinct bit positions
+ * representing different modifiers.  The values for the constants
+ * representing the modifiers are taken from the tables in sections 4.1, 4.4, 4.5, and 4.7 of
+ * <cite>The Java&trade; Virtual Machine Specification</cite>.
+ *
+ * @see Class#getModifiers()
+ * @see Member#getModifiers()
+ *
+ * @author Nakul Saraiya
+ * @author Kenneth Russell
+ */
+public
+class Modifier {
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code public} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code public} modifier; {@code false} otherwise.
+     */
+    public static boolean isPublic(int mod) {
+        return (mod & PUBLIC) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code private} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code private} modifier; {@code false} otherwise.
+     */
+    public static boolean isPrivate(int mod) {
+        return (mod & PRIVATE) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code protected} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code protected} modifier; {@code false} otherwise.
+     */
+    public static boolean isProtected(int mod) {
+        return (mod & PROTECTED) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code static} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code static} modifier; {@code false} otherwise.
+     */
+    public static boolean isStatic(int mod) {
+        return (mod & STATIC) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code final} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code final} modifier; {@code false} otherwise.
+     */
+    public static boolean isFinal(int mod) {
+        return (mod & FINAL) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code synchronized} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code synchronized} modifier; {@code false} otherwise.
+     */
+    public static boolean isSynchronized(int mod) {
+        return (mod & SYNCHRONIZED) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code volatile} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code volatile} modifier; {@code false} otherwise.
+     */
+    public static boolean isVolatile(int mod) {
+        return (mod & VOLATILE) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code transient} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code transient} modifier; {@code false} otherwise.
+     */
+    public static boolean isTransient(int mod) {
+        return (mod & TRANSIENT) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code native} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code native} modifier; {@code false} otherwise.
+     */
+    public static boolean isNative(int mod) {
+        return (mod & NATIVE) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code interface} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code interface} modifier; {@code false} otherwise.
+     */
+    public static boolean isInterface(int mod) {
+        return (mod & INTERFACE) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code abstract} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code abstract} modifier; {@code false} otherwise.
+     */
+    public static boolean isAbstract(int mod) {
+        return (mod & ABSTRACT) != 0;
+    }
+
+    /**
+     * Return {@code true} if the integer argument includes the
+     * {@code strictfp} modifier, {@code false} otherwise.
+     *
+     * @param   mod a set of modifiers
+     * @return {@code true} if {@code mod} includes the
+     * {@code strictfp} modifier; {@code false} otherwise.
+     */
+    public static boolean isStrict(int mod) {
+        return (mod & STRICT) != 0;
+    }
+
+    /**
+     * Return a string describing the access modifier flags in
+     * the specified modifier. For example:
+     * <blockquote><pre>
+     *    public final synchronized strictfp
+     * </pre></blockquote>
+     * The modifier names are returned in an order consistent with the
+     * suggested modifier orderings given in sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1 of
+     * <cite>The Java&trade; Language Specification</cite>.
+     * The full modifier ordering used by this method is:
+     * <blockquote> {@code
+     * public protected private abstract static final transient
+     * volatile synchronized native strictfp
+     * interface } </blockquote>
+     * The {@code interface} modifier discussed in this class is
+     * not a true modifier in the Java language and it appears after
+     * all other modifiers listed by this method.  This method may
+     * return a string of modifiers that are not valid modifiers of a
+     * Java entity; in other words, no checking is done on the
+     * possible validity of the combination of modifiers represented
+     * by the input.
+     *
+     * Note that to perform such checking for a known kind of entity,
+     * such as a constructor or method, first AND the argument of
+     * {@code toString} with the appropriate mask from a method like
+     * {@link #constructorModifiers} or {@link #methodModifiers}.
+     *
+     * @param   mod a set of modifiers
+     * @return  a string representation of the set of modifiers
+     * represented by {@code mod}
+     */
+    public static String toString(int mod) {
+        StringBuffer sb = new StringBuffer();
+        int len;
+
+        if ((mod & PUBLIC) != 0)        sb.append("public ");
+        if ((mod & PROTECTED) != 0)     sb.append("protected ");
+        if ((mod & PRIVATE) != 0)       sb.append("private ");
+
+        /* Canonical order */
+        if ((mod & ABSTRACT) != 0)      sb.append("abstract ");
+        if ((mod & STATIC) != 0)        sb.append("static ");
+        if ((mod & FINAL) != 0)         sb.append("final ");
+        if ((mod & TRANSIENT) != 0)     sb.append("transient ");
+        if ((mod & VOLATILE) != 0)      sb.append("volatile ");
+        if ((mod & SYNCHRONIZED) != 0)  sb.append("synchronized ");
+        if ((mod & NATIVE) != 0)        sb.append("native ");
+        if ((mod & STRICT) != 0)        sb.append("strictfp ");
+        if ((mod & INTERFACE) != 0)     sb.append("interface ");
+
+        if ((len = sb.length()) > 0)    /* trim trailing space */
+            return sb.toString().substring(0, len-1);
+        return "";
+    }
+
+    /*
+     * Access modifier flag constants from tables 4.1, 4.4, 4.5, and 4.7 of
+     * <cite>The Java&trade; Virtual Machine Specification</cite>
+     */
+
+    /**
+     * The {@code int} value representing the {@code public}
+     * modifier.
+     */
+    public static final int PUBLIC           = 0x00000001;
+
+    /**
+     * The {@code int} value representing the {@code private}
+     * modifier.
+     */
+    public static final int PRIVATE          = 0x00000002;
+
+    /**
+     * The {@code int} value representing the {@code protected}
+     * modifier.
+     */
+    public static final int PROTECTED        = 0x00000004;
+
+    /**
+     * The {@code int} value representing the {@code static}
+     * modifier.
+     */
+    public static final int STATIC           = 0x00000008;
+
+    /**
+     * The {@code int} value representing the {@code final}
+     * modifier.
+     */
+    public static final int FINAL            = 0x00000010;
+
+    /**
+     * The {@code int} value representing the {@code synchronized}
+     * modifier.
+     */
+    public static final int SYNCHRONIZED     = 0x00000020;
+
+    /**
+     * The {@code int} value representing the {@code volatile}
+     * modifier.
+     */
+    public static final int VOLATILE         = 0x00000040;
+
+    /**
+     * The {@code int} value representing the {@code transient}
+     * modifier.
+     */
+    public static final int TRANSIENT        = 0x00000080;
+
+    /**
+     * The {@code int} value representing the {@code native}
+     * modifier.
+     */
+    public static final int NATIVE           = 0x00000100;
+
+    /**
+     * The {@code int} value representing the {@code interface}
+     * modifier.
+     */
+    public static final int INTERFACE        = 0x00000200;
+
+    /**
+     * The {@code int} value representing the {@code abstract}
+     * modifier.
+     */
+    public static final int ABSTRACT         = 0x00000400;
+
+    /**
+     * The {@code int} value representing the {@code strictfp}
+     * modifier.
+     */
+    public static final int STRICT           = 0x00000800;
+
+    // Bits not (yet) exposed in the public API either because they
+    // have different meanings for fields and methods and there is no
+    // way to distinguish between the two in this class, or because
+    // they are not Java programming language keywords
+    static final int BRIDGE    = 0x00000040;
+    static final int VARARGS   = 0x00000080;
+    static final int SYNTHETIC = 0x00001000;
+    static final int ANNOTATION= 0x00002000;
+    static final int ENUM      = 0x00004000;
+    static boolean isSynthetic(int mod) {
+      return (mod & SYNTHETIC) != 0;
+    }
+
+    /**
+     * See JLSv3 section 8.1.1.
+     */
+    private static final int CLASS_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
+        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.FINAL   |
+        Modifier.STRICT;
+
+    /**
+     * See JLSv3 section 9.1.1.
+     */
+    private static final int INTERFACE_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
+        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.STRICT;
+
+
+    /**
+     * See JLSv3 section 8.8.3.
+     */
+    private static final int CONSTRUCTOR_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE;
+
+    /**
+     * See JLSv3 section 8.4.3.
+     */
+    private static final int METHOD_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
+        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.FINAL   |
+        Modifier.SYNCHRONIZED   | Modifier.NATIVE       | Modifier.STRICT;
+
+    /**
+     * See JLSv3 section 8.3.1.
+     */
+    private static final int FIELD_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
+        Modifier.STATIC         | Modifier.FINAL        | Modifier.TRANSIENT |
+        Modifier.VOLATILE;
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a class.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a class.
+     *
+     * @jls 8.1.1 Class Modifiers
+     * @since 1.7
+     */
+    public static int classModifiers() {
+        return CLASS_MODIFIERS;
+    }
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to an interface.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to an inteface.
+     *
+     * @jls 9.1.1 Interface Modifiers
+     * @since 1.7
+     */
+    public static int interfaceModifiers() {
+        return INTERFACE_MODIFIERS;
+    }
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a constructor.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a constructor.
+     *
+     * @jls 8.8.3 Constructor Modifiers
+     * @since 1.7
+     */
+    public static int constructorModifiers() {
+        return CONSTRUCTOR_MODIFIERS;
+    }
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a method.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a method.
+     *
+     * @jls 8.4.3 Method Modifiers
+     * @since 1.7
+     */
+    public static int methodModifiers() {
+        return METHOD_MODIFIERS;
+    }
+
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a field.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a field.
+     *
+     * @jls 8.3.1 Field Modifiers
+     * @since 1.7
+     */
+    public static int fieldModifiers() {
+        return FIELD_MODIFIERS;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/Proxy.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/Proxy.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+
+/**
+ * {@code Proxy} provides static methods for creating dynamic proxy
+ * classes and instances, and it is also the superclass of all
+ * dynamic proxy classes created by those methods.
+ *
+ * <p>To create a proxy for some interface {@code Foo}:
+ * <pre>
+ *     InvocationHandler handler = new MyInvocationHandler(...);
+ *     Class proxyClass = Proxy.getProxyClass(
+ *         Foo.class.getClassLoader(), new Class[] { Foo.class });
+ *     Foo f = (Foo) proxyClass.
+ *         getConstructor(new Class[] { InvocationHandler.class }).
+ *         newInstance(new Object[] { handler });
+ * </pre>
+ * or more simply:
+ * <pre>
+ *     Foo f = (Foo) Proxy.newProxyInstance(Foo.class.getClassLoader(),
+ *                                          new Class[] { Foo.class },
+ *                                          handler);
+ * </pre>
+ *
+ * <p>A <i>dynamic proxy class</i> (simply referred to as a <i>proxy
+ * class</i> below) is a class that implements a list of interfaces
+ * specified at runtime when the class is created, with behavior as
+ * described below.
+ *
+ * A <i>proxy interface</i> is such an interface that is implemented
+ * by a proxy class.
+ *
+ * A <i>proxy instance</i> is an instance of a proxy class.
+ *
+ * Each proxy instance has an associated <i>invocation handler</i>
+ * object, which implements the interface {@link InvocationHandler}.
+ * A method invocation on a proxy instance through one of its proxy
+ * interfaces will be dispatched to the {@link InvocationHandler#invoke
+ * invoke} method of the instance's invocation handler, passing the proxy
+ * instance, a {@code java.lang.reflect.Method} object identifying
+ * the method that was invoked, and an array of type {@code Object}
+ * containing the arguments.  The invocation handler processes the
+ * encoded method invocation as appropriate and the result that it
+ * returns will be returned as the result of the method invocation on
+ * the proxy instance.
+ *
+ * <p>A proxy class has the following properties:
+ *
+ * <ul>
+ * <li>Proxy classes are public, final, and not abstract.
+ *
+ * <li>The unqualified name of a proxy class is unspecified.  The space
+ * of class names that begin with the string {@code "$Proxy"}
+ * should be, however, reserved for proxy classes.
+ *
+ * <li>A proxy class extends {@code java.lang.reflect.Proxy}.
+ *
+ * <li>A proxy class implements exactly the interfaces specified at its
+ * creation, in the same order.
+ *
+ * <li>If a proxy class implements a non-public interface, then it will
+ * be defined in the same package as that interface.  Otherwise, the
+ * package of a proxy class is also unspecified.  Note that package
+ * sealing will not prevent a proxy class from being successfully defined
+ * in a particular package at runtime, and neither will classes already
+ * defined by the same class loader and the same package with particular
+ * signers.
+ *
+ * <li>Since a proxy class implements all of the interfaces specified at
+ * its creation, invoking {@code getInterfaces} on its
+ * {@code Class} object will return an array containing the same
+ * list of interfaces (in the order specified at its creation), invoking
+ * {@code getMethods} on its {@code Class} object will return
+ * an array of {@code Method} objects that include all of the
+ * methods in those interfaces, and invoking {@code getMethod} will
+ * find methods in the proxy interfaces as would be expected.
+ *
+ * <li>The {@link Proxy#isProxyClass Proxy.isProxyClass} method will
+ * return true if it is passed a proxy class-- a class returned by
+ * {@code Proxy.getProxyClass} or the class of an object returned by
+ * {@code Proxy.newProxyInstance}-- and false otherwise.
+ *
+ * <li>The {@code java.security.ProtectionDomain} of a proxy class
+ * is the same as that of system classes loaded by the bootstrap class
+ * loader, such as {@code java.lang.Object}, because the code for a
+ * proxy class is generated by trusted system code.  This protection
+ * domain will typically be granted
+ * {@code java.security.AllPermission}.
+ *
+ * <li>Each proxy class has one public constructor that takes one argument,
+ * an implementation of the interface {@link InvocationHandler}, to set
+ * the invocation handler for a proxy instance.  Rather than having to use
+ * the reflection API to access the public constructor, a proxy instance
+ * can be also be created by calling the {@link Proxy#newProxyInstance
+ * Proxy.newProxyInstance} method, which combines the actions of calling
+ * {@link Proxy#getProxyClass Proxy.getProxyClass} with invoking the
+ * constructor with an invocation handler.
+ * </ul>
+ *
+ * <p>A proxy instance has the following properties:
+ *
+ * <ul>
+ * <li>Given a proxy instance {@code proxy} and one of the
+ * interfaces implemented by its proxy class {@code Foo}, the
+ * following expression will return true:
+ * <pre>
+ *     {@code proxy instanceof Foo}
+ * </pre>
+ * and the following cast operation will succeed (rather than throwing
+ * a {@code ClassCastException}):
+ * <pre>
+ *     {@code (Foo) proxy}
+ * </pre>
+ *
+ * <li>Each proxy instance has an associated invocation handler, the one
+ * that was passed to its constructor.  The static
+ * {@link Proxy#getInvocationHandler Proxy.getInvocationHandler} method
+ * will return the invocation handler associated with the proxy instance
+ * passed as its argument.
+ *
+ * <li>An interface method invocation on a proxy instance will be
+ * encoded and dispatched to the invocation handler's {@link
+ * InvocationHandler#invoke invoke} method as described in the
+ * documentation for that method.
+ *
+ * <li>An invocation of the {@code hashCode},
+ * {@code equals}, or {@code toString} methods declared in
+ * {@code java.lang.Object} on a proxy instance will be encoded and
+ * dispatched to the invocation handler's {@code invoke} method in
+ * the same manner as interface method invocations are encoded and
+ * dispatched, as described above.  The declaring class of the
+ * {@code Method} object passed to {@code invoke} will be
+ * {@code java.lang.Object}.  Other public methods of a proxy
+ * instance inherited from {@code java.lang.Object} are not
+ * overridden by a proxy class, so invocations of those methods behave
+ * like they do for instances of {@code java.lang.Object}.
+ * </ul>
+ *
+ * <h3>Methods Duplicated in Multiple Proxy Interfaces</h3>
+ *
+ * <p>When two or more interfaces of a proxy class contain a method with
+ * the same name and parameter signature, the order of the proxy class's
+ * interfaces becomes significant.  When such a <i>duplicate method</i>
+ * is invoked on a proxy instance, the {@code Method} object passed
+ * to the invocation handler will not necessarily be the one whose
+ * declaring class is assignable from the reference type of the interface
+ * that the proxy's method was invoked through.  This limitation exists
+ * because the corresponding method implementation in the generated proxy
+ * class cannot determine which interface it was invoked through.
+ * Therefore, when a duplicate method is invoked on a proxy instance,
+ * the {@code Method} object for the method in the foremost interface
+ * that contains the method (either directly or inherited through a
+ * superinterface) in the proxy class's list of interfaces is passed to
+ * the invocation handler's {@code invoke} method, regardless of the
+ * reference type through which the method invocation occurred.
+ *
+ * <p>If a proxy interface contains a method with the same name and
+ * parameter signature as the {@code hashCode}, {@code equals},
+ * or {@code toString} methods of {@code java.lang.Object},
+ * when such a method is invoked on a proxy instance, the
+ * {@code Method} object passed to the invocation handler will have
+ * {@code java.lang.Object} as its declaring class.  In other words,
+ * the public, non-final methods of {@code java.lang.Object}
+ * logically precede all of the proxy interfaces for the determination of
+ * which {@code Method} object to pass to the invocation handler.
+ *
+ * <p>Note also that when a duplicate method is dispatched to an
+ * invocation handler, the {@code invoke} method may only throw
+ * checked exception types that are assignable to one of the exception
+ * types in the {@code throws} clause of the method in <i>all</i> of
+ * the proxy interfaces that it can be invoked through.  If the
+ * {@code invoke} method throws a checked exception that is not
+ * assignable to any of the exception types declared by the method in one
+ * of the proxy interfaces that it can be invoked through, then an
+ * unchecked {@code UndeclaredThrowableException} will be thrown by
+ * the invocation on the proxy instance.  This restriction means that not
+ * all of the exception types returned by invoking
+ * {@code getExceptionTypes} on the {@code Method} object
+ * passed to the {@code invoke} method can necessarily be thrown
+ * successfully by the {@code invoke} method.
+ *
+ * @author      Peter Jones
+ * @see         InvocationHandler
+ * @since       1.3
+ */
+public class Proxy implements java.io.Serializable {
+
+    private static final long serialVersionUID = -2222568056686623797L;
+
+
+
+    /**
+     * the invocation handler for this proxy instance.
+     * @serial
+     */
+    protected InvocationHandler h;
+
+    /**
+     * Prohibits instantiation.
+     */
+    private Proxy() {
+    }
+
+    /**
+     * Constructs a new {@code Proxy} instance from a subclass
+     * (typically, a dynamic proxy class) with the specified value
+     * for its invocation handler.
+     *
+     * @param   h the invocation handler for this proxy instance
+     */
+    protected Proxy(InvocationHandler h) {
+        this.h = h;
+    }
+
+    /**
+     * Returns the {@code java.lang.Class} object for a proxy class
+     * given a class loader and an array of interfaces.  The proxy class
+     * will be defined by the specified class loader and will implement
+     * all of the supplied interfaces.  If a proxy class for the same
+     * permutation of interfaces has already been defined by the class
+     * loader, then the existing proxy class will be returned; otherwise,
+     * a proxy class for those interfaces will be generated dynamically
+     * and defined by the class loader.
+     *
+     * <p>There are several restrictions on the parameters that may be
+     * passed to {@code Proxy.getProxyClass}:
+     *
+     * <ul>
+     * <li>All of the {@code Class} objects in the
+     * {@code interfaces} array must represent interfaces, not
+     * classes or primitive types.
+     *
+     * <li>No two elements in the {@code interfaces} array may
+     * refer to identical {@code Class} objects.
+     *
+     * <li>All of the interface types must be visible by name through the
+     * specified class loader.  In other words, for class loader
+     * {@code cl} and every interface {@code i}, the following
+     * expression must be true:
+     * <pre>
+     *     Class.forName(i.getName(), false, cl) == i
+     * </pre>
+     *
+     * <li>All non-public interfaces must be in the same package;
+     * otherwise, it would not be possible for the proxy class to
+     * implement all of the interfaces, regardless of what package it is
+     * defined in.
+     *
+     * <li>For any set of member methods of the specified interfaces
+     * that have the same signature:
+     * <ul>
+     * <li>If the return type of any of the methods is a primitive
+     * type or void, then all of the methods must have that same
+     * return type.
+     * <li>Otherwise, one of the methods must have a return type that
+     * is assignable to all of the return types of the rest of the
+     * methods.
+     * </ul>
+     *
+     * <li>The resulting proxy class must not exceed any limits imposed
+     * on classes by the virtual machine.  For example, the VM may limit
+     * the number of interfaces that a class may implement to 65535; in
+     * that case, the size of the {@code interfaces} array must not
+     * exceed 65535.
+     * </ul>
+     *
+     * <p>If any of these restrictions are violated,
+     * {@code Proxy.getProxyClass} will throw an
+     * {@code IllegalArgumentException}.  If the {@code interfaces}
+     * array argument or any of its elements are {@code null}, a
+     * {@code NullPointerException} will be thrown.
+     *
+     * <p>Note that the order of the specified proxy interfaces is
+     * significant: two requests for a proxy class with the same combination
+     * of interfaces but in a different order will result in two distinct
+     * proxy classes.
+     *
+     * @param   loader the class loader to define the proxy class
+     * @param   interfaces the list of interfaces for the proxy class
+     *          to implement
+     * @return  a proxy class that is defined in the specified class loader
+     *          and that implements the specified interfaces
+     * @throws  IllegalArgumentException if any of the restrictions on the
+     *          parameters that may be passed to {@code getProxyClass}
+     *          are violated
+     * @throws  NullPointerException if the {@code interfaces} array
+     *          argument or any of its elements are {@code null}
+     */
+    public static Class<?> getProxyClass(ClassLoader loader,
+                                         Class<?>... interfaces)
+        throws IllegalArgumentException
+    {
+        throw new IllegalArgumentException();
+    }
+
+    /**
+     * Returns an instance of a proxy class for the specified interfaces
+     * that dispatches method invocations to the specified invocation
+     * handler.  This method is equivalent to:
+     * <pre>
+     *     Proxy.getProxyClass(loader, interfaces).
+     *         getConstructor(new Class[] { InvocationHandler.class }).
+     *         newInstance(new Object[] { handler });
+     * </pre>
+     *
+     * <p>{@code Proxy.newProxyInstance} throws
+     * {@code IllegalArgumentException} for the same reasons that
+     * {@code Proxy.getProxyClass} does.
+     *
+     * @param   loader the class loader to define the proxy class
+     * @param   interfaces the list of interfaces for the proxy class
+     *          to implement
+     * @param   h the invocation handler to dispatch method invocations to
+     * @return  a proxy instance with the specified invocation handler of a
+     *          proxy class that is defined by the specified class loader
+     *          and that implements the specified interfaces
+     * @throws  IllegalArgumentException if any of the restrictions on the
+     *          parameters that may be passed to {@code getProxyClass}
+     *          are violated
+     * @throws  NullPointerException if the {@code interfaces} array
+     *          argument or any of its elements are {@code null}, or
+     *          if the invocation handler, {@code h}, is
+     *          {@code null}
+     */
+    public static Object newProxyInstance(ClassLoader loader,
+                                          Class<?>[] interfaces,
+                                          InvocationHandler h)
+        throws IllegalArgumentException
+    {
+        if (h == null) {
+            throw new NullPointerException();
+        }
+        throw new IllegalArgumentException();
+    }
+
+    /**
+     * Returns true if and only if the specified class was dynamically
+     * generated to be a proxy class using the {@code getProxyClass}
+     * method or the {@code newProxyInstance} method.
+     *
+     * <p>The reliability of this method is important for the ability
+     * to use it to make security decisions, so its implementation should
+     * not just test if the class in question extends {@code Proxy}.
+     *
+     * @param   cl the class to test
+     * @return  {@code true} if the class is a proxy class and
+     *          {@code false} otherwise
+     * @throws  NullPointerException if {@code cl} is {@code null}
+     */
+    public static boolean isProxyClass(Class<?> cl) {
+        if (cl == null) {
+            throw new NullPointerException();
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the invocation handler for the specified proxy instance.
+     *
+     * @param   proxy the proxy instance to return the invocation handler for
+     * @return  the invocation handler for the proxy instance
+     * @throws  IllegalArgumentException if the argument is not a
+     *          proxy instance
+     */
+    public static InvocationHandler getInvocationHandler(Object proxy)
+        throws IllegalArgumentException
+    {
+        /*
+         * Verify that the object is actually a proxy instance.
+         */
+        if (!isProxyClass(proxy.getClass())) {
+            throw new IllegalArgumentException("not a proxy instance");
+        }
+
+        Proxy p = (Proxy) proxy;
+        return p.h;
+    }
+
+    private static native Class defineClass0(ClassLoader loader, String name,
+                                             byte[] b, int off, int len);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/Type.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/Type.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+/**
+ * Type is the common superinterface for all types in the Java
+ * programming language. These include raw types, parameterized types,
+ * array types, type variables and primitive types.
+ *
+ * @since 1.5
+ */
+
+public interface Type {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/TypeVariable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/TypeVariable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+/**
+ * TypeVariable is the common superinterface for type variables of kinds.
+ * A type variable is created the first time it is needed by a reflective
+ * method, as specified in this package.  If a type variable t is referenced
+ * by a type (i.e, class, interface or annotation type) T, and T is declared
+ * by the nth enclosing class of T (see JLS 8.1.2), then the creation of t
+ * requires the resolution (see JVMS 5) of the ith enclosing class of T,
+ * for i = 0 to n, inclusive. Creating a type variable must not cause the
+ * creation of its bounds. Repeated creation of a type variable has no effect.
+ *
+ * <p>Multiple objects may be instantiated at run-time to
+ * represent a given type variable. Even though a type variable is
+ * created only once, this does not imply any requirement to cache
+ * instances representing the type variable. However, all instances
+ * representing a type variable must be equal() to each other.
+ * As a consequence, users of type variables must not rely on the identity
+ * of instances of classes implementing this interface.
+ *
+ * @param <D> the type of generic declaration that declared the
+ * underlying type variable.
+ *
+ * @since 1.5
+ */
+public interface TypeVariable<D extends GenericDeclaration> extends Type {
+    /**
+     * Returns an array of {@code Type} objects representing the
+     * upper bound(s) of this type variable.  Note that if no upper bound is
+     * explicitly declared, the upper bound is {@code Object}.
+     *
+     * <p>For each upper bound B: <ul> <li>if B is a parameterized
+     * type or a type variable, it is created, (see {@link
+     * java.lang.reflect.ParameterizedType ParameterizedType} for the
+     * details of the creation process for parameterized types).
+     * <li>Otherwise, B is resolved.  </ul>
+     *
+     * @throws TypeNotPresentException  if any of the
+     *     bounds refers to a non-existent type declaration
+     * @throws MalformedParameterizedTypeException if any of the
+     *     bounds refer to a parameterized type that cannot be instantiated
+     *     for any reason
+     * @return an array of {@code Type}s representing the upper
+     *     bound(s) of this type variable
+    */
+    Type[] getBounds();
+
+    /**
+     * Returns the {@code GenericDeclaration} object representing the
+     * generic declaration declared this type variable.
+     *
+     * @return the generic declaration declared for this type variable.
+     *
+     * @since 1.5
+     */
+    D getGenericDeclaration();
+
+    /**
+     * Returns the name of this type variable, as it occurs in the source code.
+     *
+     * @return the name of this type variable, as it appears in the source code
+     */
+    String getName();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/UndeclaredThrowableException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/UndeclaredThrowableException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang.reflect;
+
+/**
+ * Thrown by a method invocation on a proxy instance if its invocation
+ * handler's {@link InvocationHandler#invoke invoke} method throws a
+ * checked exception (a {@code Throwable} that is not assignable
+ * to {@code RuntimeException} or {@code Error}) that
+ * is not assignable to any of the exception types declared in the
+ * {@code throws} clause of the method that was invoked on the
+ * proxy instance and dispatched to the invocation handler.
+ *
+ * <p>An {@code UndeclaredThrowableException} instance contains
+ * the undeclared checked exception that was thrown by the invocation
+ * handler, and it can be retrieved with the
+ * {@code getUndeclaredThrowable()} method.
+ * {@code UndeclaredThrowableException} extends
+ * {@code RuntimeException}, so it is an unchecked exception
+ * that wraps a checked exception.
+ *
+ * <p>As of release 1.4, this exception has been retrofitted to
+ * conform to the general purpose exception-chaining mechanism.  The
+ * "undeclared checked exception that was thrown by the invocation
+ * handler" that may be provided at construction time and accessed via
+ * the {@link #getUndeclaredThrowable()} method is now known as the
+ * <i>cause</i>, and may be accessed via the {@link
+ * Throwable#getCause()} method, as well as the aforementioned "legacy
+ * method."
+ *
+ * @author      Peter Jones
+ * @see         InvocationHandler
+ * @since       1.3
+ */
+public class UndeclaredThrowableException extends RuntimeException {
+    static final long serialVersionUID = 330127114055056639L;
+
+    /**
+     * the undeclared checked exception that was thrown
+     * @serial
+     */
+    private Throwable undeclaredThrowable;
+
+    /**
+     * Constructs an {@code UndeclaredThrowableException} with the
+     * specified {@code Throwable}.
+     *
+     * @param   undeclaredThrowable the undeclared checked exception
+     *          that was thrown
+     */
+    public UndeclaredThrowableException(Throwable undeclaredThrowable) {
+        super((Throwable) null);  // Disallow initCause
+        this.undeclaredThrowable = undeclaredThrowable;
+    }
+
+    /**
+     * Constructs an {@code UndeclaredThrowableException} with the
+     * specified {@code Throwable} and a detail message.
+     *
+     * @param   undeclaredThrowable the undeclared checked exception
+     *          that was thrown
+     * @param   s the detail message
+     */
+    public UndeclaredThrowableException(Throwable undeclaredThrowable,
+                                        String s)
+    {
+        super(s, null);  // Disallow initCause
+        this.undeclaredThrowable = undeclaredThrowable;
+    }
+
+    /**
+     * Returns the {@code Throwable} instance wrapped in this
+     * {@code UndeclaredThrowableException}, which may be {@code null}.
+     *
+     * <p>This method predates the general-purpose exception chaining facility.
+     * The {@link Throwable#getCause()} method is now the preferred means of
+     * obtaining this information.
+     *
+     * @return the undeclared checked exception that was thrown
+     */
+    public Throwable getUndeclaredThrowable() {
+        return undeclaredThrowable;
+    }
+
+    /**
+     * Returns the cause of this exception (the {@code Throwable}
+     * instance wrapped in this {@code UndeclaredThrowableException},
+     * which may be {@code null}).
+     *
+     * @return  the cause of this exception.
+     * @since   1.4
+     */
+    public Throwable getCause() {
+        return undeclaredThrowable;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/lang/reflect/package-info.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/lang/reflect/package-info.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides classes and interfaces for obtaining reflective
+ * information about classes and objects.  Reflection allows
+ * programmatic access to information about the fields, methods and
+ * constructors of loaded classes, and the use of reflected fields,
+ * methods, and constructors to operate on their underlying
+ * counterparts, within security restrictions.
+ *
+ * <p>{@code AccessibleObject} allows suppression of access checks if
+ * the necessary {@code ReflectPermission} is available.
+ *
+ * <p>{@code Array} provides static methods to dynamically create and
+ * access arrays.
+ *
+ * <p>Classes in this package, along with {@code java.lang.Class}
+ * accommodate applications such as debuggers, interpreters, object
+ * inspectors, class browsers, and services such as Object
+ * Serialization and JavaBeans that need access to either the public
+ * members of a target object (based on its runtime class) or the
+ * members declared by a given class.
+ *
+ * @since JDK1.1
+ */
+package java.lang.reflect;
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/net/MalformedURLException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/net/MalformedURLException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.net;
+
+import java.io.IOException;
+
+/**
+ * Thrown to indicate that a malformed URL has occurred. Either no
+ * legal protocol could be found in a specification string or the
+ * string could not be parsed.
+ *
+ * @author  Arthur van Hoff
+ * @since   JDK1.0
+ */
+public class MalformedURLException extends IOException {
+    private static final long serialVersionUID = -182787522200415866L;
+
+    /**
+     * Constructs a <code>MalformedURLException</code> with no detail message.
+     */
+    public MalformedURLException() {
+    }
+
+    /**
+     * Constructs a <code>MalformedURLException</code> with the
+     * specified detail message.
+     *
+     * @param   msg   the detail message.
+     */
+    public MalformedURLException(String msg) {
+        super(msg);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/net/URL.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/net/URL.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1090 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.net;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+
+/**
+ * Class <code>URL</code> represents a Uniform Resource
+ * Locator, a pointer to a "resource" on the World
+ * Wide Web. A resource can be something as simple as a file or a
+ * directory, or it can be a reference to a more complicated object,
+ * such as a query to a database or to a search engine. More
+ * information on the types of URLs and their formats can be found at:
+ * <blockquote>
+ *     <a href="http://www.socs.uts.edu.au/MosaicDocs-old/url-primer.html">
+ *    <i>http://www.socs.uts.edu.au/MosaicDocs-old/url-primer.html</i></a>
+ * </blockquote>
+ * <p>
+ * In general, a URL can be broken into several parts. The previous
+ * example of a URL indicates that the protocol to use is
+ * <code>http</code> (HyperText Transfer Protocol) and that the
+ * information resides on a host machine named
+ * <code>www.socs.uts.edu.au</code>. The information on that host
+ * machine is named <code>/MosaicDocs-old/url-primer.html</code>. The exact
+ * meaning of this name on the host machine is both protocol
+ * dependent and host dependent. The information normally resides in
+ * a file, but it could be generated on the fly. This component of
+ * the URL is called the <i>path</i> component.
+ * <p>
+ * A URL can optionally specify a "port", which is the
+ * port number to which the TCP connection is made on the remote host
+ * machine. If the port is not specified, the default port for
+ * the protocol is used instead. For example, the default port for
+ * <code>http</code> is <code>80</code>. An alternative port could be
+ * specified as:
+ * <blockquote><pre>
+ *     http://www.socs.uts.edu.au:80/MosaicDocs-old/url-primer.html
+ * </pre></blockquote>
+ * <p>
+ * The syntax of <code>URL</code> is defined by  <a
+ * href="http://www.ietf.org/rfc/rfc2396.txt"><i>RFC&nbsp;2396: Uniform
+ * Resource Identifiers (URI): Generic Syntax</i></a>, amended by <a
+ * href="http://www.ietf.org/rfc/rfc2732.txt"><i>RFC&nbsp;2732: Format for
+ * Literal IPv6 Addresses in URLs</i></a>. The Literal IPv6 address format
+ * also supports scope_ids. The syntax and usage of scope_ids is described
+ * <a href="Inet6Address.html#scoped">here</a>.
+ * <p>
+ * A URL may have appended to it a "fragment", also known
+ * as a "ref" or a "reference". The fragment is indicated by the sharp
+ * sign character "#" followed by more characters. For example,
+ * <blockquote><pre>
+ *     http://java.sun.com/index.html#chapter1
+ * </pre></blockquote>
+ * <p>
+ * This fragment is not technically part of the URL. Rather, it
+ * indicates that after the specified resource is retrieved, the
+ * application is specifically interested in that part of the
+ * document that has the tag <code>chapter1</code> attached to it. The
+ * meaning of a tag is resource specific.
+ * <p>
+ * An application can also specify a "relative URL",
+ * which contains only enough information to reach the resource
+ * relative to another URL. Relative URLs are frequently used within
+ * HTML pages. For example, if the contents of the URL:
+ * <blockquote><pre>
+ *     http://java.sun.com/index.html
+ * </pre></blockquote>
+ * contained within it the relative URL:
+ * <blockquote><pre>
+ *     FAQ.html
+ * </pre></blockquote>
+ * it would be a shorthand for:
+ * <blockquote><pre>
+ *     http://java.sun.com/FAQ.html
+ * </pre></blockquote>
+ * <p>
+ * The relative URL need not specify all the components of a URL. If
+ * the protocol, host name, or port number is missing, the value is
+ * inherited from the fully specified URL. The file component must be
+ * specified. The optional fragment is not inherited.
+ * <p>
+ * The URL class does not itself encode or decode any URL components
+ * according to the escaping mechanism defined in RFC2396. It is the
+ * responsibility of the caller to encode any fields, which need to be
+ * escaped prior to calling URL, and also to decode any escaped fields,
+ * that are returned from URL. Furthermore, because URL has no knowledge
+ * of URL escaping, it does not recognise equivalence between the encoded
+ * or decoded form of the same URL. For example, the two URLs:<br>
+ * <pre>    http://foo.com/hello world/ and http://foo.com/hello%20world</pre>
+ * would be considered not equal to each other.
+ * <p>
+ * Note, the {@link java.net.URI} class does perform escaping of its
+ * component fields in certain circumstances. The recommended way
+ * to manage the encoding and decoding of URLs is to use {@link java.net.URI},
+ * and to convert between these two classes using {@link #toURI()} and
+ * {@link URI#toURL()}.
+ * <p>
+ * The {@link URLEncoder} and {@link URLDecoder} classes can also be
+ * used, but only for HTML form encoding, which is not the same
+ * as the encoding scheme defined in RFC2396.
+ *
+ * @author  James Gosling
+ * @since JDK1.0
+ */
+public final class URL implements java.io.Serializable {
+
+    static final long serialVersionUID = -7627629688361524110L;
+
+    /**
+     * The property which specifies the package prefix list to be scanned
+     * for protocol handlers.  The value of this property (if any) should
+     * be a vertical bar delimited list of package names to search through
+     * for a protocol handler to load.  The policy of this class is that
+     * all protocol handlers will be in a class called <protocolname>.Handler,
+     * and each package in the list is examined in turn for a matching
+     * handler.  If none are found (or the property is not specified), the
+     * default package prefix, sun.net.www.protocol, is used.  The search
+     * proceeds from the first package in the list to the last and stops
+     * when a match is found.
+     */
+    private static final String protocolPathProp = "java.protocol.handler.pkgs";
+
+    /**
+     * The protocol to use (ftp, http, nntp, ... etc.) .
+     * @serial
+     */
+    private String protocol;
+
+    /**
+     * The host name to connect to.
+     * @serial
+     */
+    private String host;
+
+    /**
+     * The protocol port to connect to.
+     * @serial
+     */
+    private int port = -1;
+
+    /**
+     * The specified file name on that host. <code>file</code> is
+     * defined as <code>path[?query]</code>
+     * @serial
+     */
+    private String file;
+
+    /**
+     * The query part of this URL.
+     */
+    private transient String query;
+
+    /**
+     * The authority part of this URL.
+     * @serial
+     */
+    private String authority;
+
+    /**
+     * The path part of this URL.
+     */
+    private transient String path;
+
+    /**
+     * The userinfo part of this URL.
+     */
+    private transient String userInfo;
+
+    /**
+     * # reference.
+     * @serial
+     */
+    private String ref;
+
+    /**
+     * The host's IP address, used in equals and hashCode.
+     * Computed on demand. An uninitialized or unknown hostAddress is null.
+     */
+    transient Object hostAddress;
+
+    /**
+     * The URLStreamHandler for this URL.
+     */
+    transient URLStreamHandler handler;
+
+    /* Our hash code.
+     * @serial
+     */
+    private int hashCode = -1;
+    
+    /** input stream associated with the URL */
+    private InputStream is;
+
+    /**
+     * Creates a <code>URL</code> object from the specified
+     * <code>protocol</code>, <code>host</code>, <code>port</code>
+     * number, and <code>file</code>.<p>
+     *
+     * <code>host</code> can be expressed as a host name or a literal
+     * IP address. If IPv6 literal address is used, it should be
+     * enclosed in square brackets (<tt>'['</tt> and <tt>']'</tt>), as
+     * specified by <a
+     * href="http://www.ietf.org/rfc/rfc2732.txt">RFC&nbsp;2732</a>;
+     * However, the literal IPv6 address format defined in <a
+     * href="http://www.ietf.org/rfc/rfc2373.txt"><i>RFC&nbsp;2373: IP
+     * Version 6 Addressing Architecture</i></a> is also accepted.<p>
+     *
+     * Specifying a <code>port</code> number of <code>-1</code>
+     * indicates that the URL should use the default port for the
+     * protocol.<p>
+     *
+     * If this is the first URL object being created with the specified
+     * protocol, a <i>stream protocol handler</i> object, an instance of
+     * class <code>URLStreamHandler</code>, is created for that protocol:
+     * <ol>
+     * <li>If the application has previously set up an instance of
+     *     <code>URLStreamHandlerFactory</code> as the stream handler factory,
+     *     then the <code>createURLStreamHandler</code> method of that instance
+     *     is called with the protocol string as an argument to create the
+     *     stream protocol handler.
+     * <li>If no <code>URLStreamHandlerFactory</code> has yet been set up,
+     *     or if the factory's <code>createURLStreamHandler</code> method
+     *     returns <code>null</code>, then the constructor finds the
+     *     value of the system property:
+     *     <blockquote><pre>
+     *         java.protocol.handler.pkgs
+     *     </pre></blockquote>
+     *     If the value of that system property is not <code>null</code>,
+     *     it is interpreted as a list of packages separated by a vertical
+     *     slash character '<code>|</code>'. The constructor tries to load
+     *     the class named:
+     *     <blockquote><pre>
+     *         &lt;<i>package</i>&gt;.&lt;<i>protocol</i>&gt;.Handler
+     *     </pre></blockquote>
+     *     where &lt;<i>package</i>&gt; is replaced by the name of the package
+     *     and &lt;<i>protocol</i>&gt; is replaced by the name of the protocol.
+     *     If this class does not exist, or if the class exists but it is not
+     *     a subclass of <code>URLStreamHandler</code>, then the next package
+     *     in the list is tried.
+     * <li>If the previous step fails to find a protocol handler, then the
+     *     constructor tries to load from a system default package.
+     *     <blockquote><pre>
+     *         &lt;<i>system default package</i>&gt;.&lt;<i>protocol</i>&gt;.Handler
+     *     </pre></blockquote>
+     *     If this class does not exist, or if the class exists but it is not a
+     *     subclass of <code>URLStreamHandler</code>, then a
+     *     <code>MalformedURLException</code> is thrown.
+     * </ol>
+     *
+     * <p>Protocol handlers for the following protocols are guaranteed
+     * to exist on the search path :-
+     * <blockquote><pre>
+     *     http, https, ftp, file, and jar
+     * </pre></blockquote>
+     * Protocol handlers for additional protocols may also be
+     * available.
+     *
+     * <p>No validation of the inputs is performed by this constructor.
+     *
+     * @param      protocol   the name of the protocol to use.
+     * @param      host       the name of the host.
+     * @param      port       the port number on the host.
+     * @param      file       the file on the host
+     * @exception  MalformedURLException  if an unknown protocol is specified.
+     * @see        java.lang.System#getProperty(java.lang.String)
+     * @see        java.net.URL#setURLStreamHandlerFactory(
+     *                  java.net.URLStreamHandlerFactory)
+     * @see        java.net.URLStreamHandler
+     * @see        java.net.URLStreamHandlerFactory#createURLStreamHandler(
+     *                  java.lang.String)
+     */
+    public URL(String protocol, String host, int port, String file)
+        throws MalformedURLException
+    {
+        this(protocol, host, port, file, null);
+    }
+
+    /**
+     * Creates a URL from the specified <code>protocol</code>
+     * name, <code>host</code> name, and <code>file</code> name. The
+     * default port for the specified protocol is used.
+     * <p>
+     * This method is equivalent to calling the four-argument
+     * constructor with the arguments being <code>protocol</code>,
+     * <code>host</code>, <code>-1</code>, and <code>file</code>.
+     *
+     * No validation of the inputs is performed by this constructor.
+     *
+     * @param      protocol   the name of the protocol to use.
+     * @param      host       the name of the host.
+     * @param      file       the file on the host.
+     * @exception  MalformedURLException  if an unknown protocol is specified.
+     * @see        java.net.URL#URL(java.lang.String, java.lang.String,
+     *                  int, java.lang.String)
+     */
+    public URL(String protocol, String host, String file)
+            throws MalformedURLException {
+        this(protocol, host, -1, file);
+    }
+
+    /**
+     * Creates a <code>URL</code> object from the specified
+     * <code>protocol</code>, <code>host</code>, <code>port</code>
+     * number, <code>file</code>, and <code>handler</code>. Specifying
+     * a <code>port</code> number of <code>-1</code> indicates that
+     * the URL should use the default port for the protocol. Specifying
+     * a <code>handler</code> of <code>null</code> indicates that the URL
+     * should use a default stream handler for the protocol, as outlined
+     * for:
+     *     java.net.URL#URL(java.lang.String, java.lang.String, int,
+     *                      java.lang.String)
+     *
+     * <p>If the handler is not null and there is a security manager,
+     * the security manager's <code>checkPermission</code>
+     * method is called with a
+     * <code>NetPermission("specifyStreamHandler")</code> permission.
+     * This may result in a SecurityException.
+     *
+     * No validation of the inputs is performed by this constructor.
+     *
+     * @param      protocol   the name of the protocol to use.
+     * @param      host       the name of the host.
+     * @param      port       the port number on the host.
+     * @param      file       the file on the host
+     * @param      handler    the stream handler for the URL.
+     * @exception  MalformedURLException  if an unknown protocol is specified.
+     * @exception  SecurityException
+     *        if a security manager exists and its
+     *        <code>checkPermission</code> method doesn't allow
+     *        specifying a stream handler explicitly.
+     * @see        java.lang.System#getProperty(java.lang.String)
+     * @see        java.net.URL#setURLStreamHandlerFactory(
+     *                  java.net.URLStreamHandlerFactory)
+     * @see        java.net.URLStreamHandler
+     * @see        java.net.URLStreamHandlerFactory#createURLStreamHandler(
+     *                  java.lang.String)
+     * @see        SecurityManager#checkPermission
+     * @see        java.net.NetPermission
+     */
+    public URL(String protocol, String host, int port, String file,
+               URLStreamHandler handler) throws MalformedURLException {
+        if (handler != null) {
+            throw new SecurityException();
+        }
+
+        protocol = protocol.toLowerCase();
+        this.protocol = protocol;
+        if (host != null) {
+
+            /**
+             * if host is a literal IPv6 address,
+             * we will make it conform to RFC 2732
+             */
+            if (host.indexOf(':') >= 0 && !host.startsWith("[")) {
+                host = "["+host+"]";
+            }
+            this.host = host;
+
+            if (port < -1) {
+                throw new MalformedURLException("Invalid port number :" +
+                                                    port);
+            }
+            this.port = port;
+            authority = (port == -1) ? host : host + ":" + port;
+        }
+
+        Parts parts = new Parts(file);
+        path = parts.getPath();
+        query = parts.getQuery();
+
+        if (query != null) {
+            this.file = path + "?" + query;
+        } else {
+            this.file = path;
+        }
+        ref = parts.getRef();
+
+        // Note: we don't do validation of the URL here. Too risky to change
+        // right now, but worth considering for future reference. -br
+        if (handler == null &&
+            (handler = getURLStreamHandler(protocol)) == null) {
+            throw new MalformedURLException("unknown protocol: " + protocol);
+        }
+        this.handler = handler;
+    }
+
+    /**
+     * Creates a <code>URL</code> object from the <code>String</code>
+     * representation.
+     * <p>
+     * This constructor is equivalent to a call to the two-argument
+     * constructor with a <code>null</code> first argument.
+     *
+     * @param      spec   the <code>String</code> to parse as a URL.
+     * @exception  MalformedURLException  if no protocol is specified, or an
+     *               unknown protocol is found, or <tt>spec</tt> is <tt>null</tt>.
+     * @see        java.net.URL#URL(java.net.URL, java.lang.String)
+     */
+    public URL(String spec) throws MalformedURLException {
+        this(null, spec);
+    }
+    
+    private URL(String spec, InputStream is) throws MalformedURLException {
+        this(null, spec);
+        this.is = is;
+    }
+
+    /**
+     * Creates a URL by parsing the given spec within a specified context.
+     *
+     * The new URL is created from the given context URL and the spec
+     * argument as described in
+     * RFC2396 &quot;Uniform Resource Identifiers : Generic * Syntax&quot; :
+     * <blockquote><pre>
+     *          &lt;scheme&gt;://&lt;authority&gt;&lt;path&gt;?&lt;query&gt;#&lt;fragment&gt;
+     * </pre></blockquote>
+     * The reference is parsed into the scheme, authority, path, query and
+     * fragment parts. If the path component is empty and the scheme,
+     * authority, and query components are undefined, then the new URL is a
+     * reference to the current document. Otherwise, the fragment and query
+     * parts present in the spec are used in the new URL.
+     * <p>
+     * If the scheme component is defined in the given spec and does not match
+     * the scheme of the context, then the new URL is created as an absolute
+     * URL based on the spec alone. Otherwise the scheme component is inherited
+     * from the context URL.
+     * <p>
+     * If the authority component is present in the spec then the spec is
+     * treated as absolute and the spec authority and path will replace the
+     * context authority and path. If the authority component is absent in the
+     * spec then the authority of the new URL will be inherited from the
+     * context.
+     * <p>
+     * If the spec's path component begins with a slash character
+     * &quot;/&quot; then the
+     * path is treated as absolute and the spec path replaces the context path.
+     * <p>
+     * Otherwise, the path is treated as a relative path and is appended to the
+     * context path, as described in RFC2396. Also, in this case,
+     * the path is canonicalized through the removal of directory
+     * changes made by occurences of &quot;..&quot; and &quot;.&quot;.
+     * <p>
+     * For a more detailed description of URL parsing, refer to RFC2396.
+     *
+     * @param      context   the context in which to parse the specification.
+     * @param      spec      the <code>String</code> to parse as a URL.
+     * @exception  MalformedURLException  if no protocol is specified, or an
+     *               unknown protocol is found, or <tt>spec</tt> is <tt>null</tt>.
+     * @see        java.net.URL#URL(java.lang.String, java.lang.String,
+     *                  int, java.lang.String)
+     * @see        java.net.URLStreamHandler
+     * @see        java.net.URLStreamHandler#parseURL(java.net.URL,
+     *                  java.lang.String, int, int)
+     */
+    public URL(URL context, String spec) throws MalformedURLException {
+        this(context, spec, null);
+    }
+
+    /**
+     * Creates a URL by parsing the given spec with the specified handler
+     * within a specified context. If the handler is null, the parsing
+     * occurs as with the two argument constructor.
+     *
+     * @param      context   the context in which to parse the specification.
+     * @param      spec      the <code>String</code> to parse as a URL.
+     * @param      handler   the stream handler for the URL.
+     * @exception  MalformedURLException  if no protocol is specified, or an
+     *               unknown protocol is found, or <tt>spec</tt> is <tt>null</tt>.
+     * @exception  SecurityException
+     *        if a security manager exists and its
+     *        <code>checkPermission</code> method doesn't allow
+     *        specifying a stream handler.
+     * @see        java.net.URL#URL(java.lang.String, java.lang.String,
+     *                  int, java.lang.String)
+     * @see        java.net.URLStreamHandler
+     * @see        java.net.URLStreamHandler#parseURL(java.net.URL,
+     *                  java.lang.String, int, int)
+     */
+    public URL(URL context, String spec, URLStreamHandler handler)
+        throws MalformedURLException
+    {
+        this(findContext(context), spec, handler != null);
+    }
+    
+    private URL(URL context, String spec, boolean ishandler)
+    throws MalformedURLException {
+        // Check for permission to specify a handler
+        if (ishandler) {
+            throw new SecurityException();
+        }
+        URLStreamHandler handler = null;
+        
+        String original = spec;
+        int i, limit, c;
+        int start = 0;
+        String newProtocol = null;
+        boolean aRef=false;
+        boolean isRelative = false;
+
+
+        try {
+            limit = spec.length();
+            while ((limit > 0) && (spec.charAt(limit - 1) <= ' ')) {
+                limit--;        //eliminate trailing whitespace
+            }
+            while ((start < limit) && (spec.charAt(start) <= ' ')) {
+                start++;        // eliminate leading whitespace
+            }
+
+            if (spec.regionMatches(true, start, "url:", 0, 4)) {
+                start += 4;
+            }
+            if (start < spec.length() && spec.charAt(start) == '#') {
+                /* we're assuming this is a ref relative to the context URL.
+                 * This means protocols cannot start w/ '#', but we must parse
+                 * ref URL's like: "hello:there" w/ a ':' in them.
+                 */
+                aRef=true;
+            }
+            for (i = start ; !aRef && (i < limit) &&
+                     ((c = spec.charAt(i)) != '/') ; i++) {
+                if (c == ':') {
+
+                    String s = spec.substring(start, i).toLowerCase();
+                    if (isValidProtocol(s)) {
+                        newProtocol = s;
+                        start = i + 1;
+                    }
+                    break;
+                }
+            }
+
+            // Only use our context if the protocols match.
+            protocol = newProtocol;
+            if ((context != null) && ((newProtocol == null) ||
+                            newProtocol.equalsIgnoreCase(context.protocol))) {
+                // inherit the protocol handler from the context
+                // if not specified to the constructor
+                if (handler == null) {
+                    handler = context.handler;
+                }
+
+                // If the context is a hierarchical URL scheme and the spec
+                // contains a matching scheme then maintain backwards
+                // compatibility and treat it as if the spec didn't contain
+                // the scheme; see 5.2.3 of RFC2396
+                if (context.path != null && context.path.startsWith("/"))
+                    newProtocol = null;
+
+                if (newProtocol == null) {
+                    protocol = context.protocol;
+                    authority = context.authority;
+                    userInfo = context.userInfo;
+                    host = context.host;
+                    port = context.port;
+                    file = context.file;
+                    path = context.path;
+                    isRelative = true;
+                }
+            }
+
+            if (protocol == null) {
+                throw new MalformedURLException("no protocol: "+original);
+            }
+
+            // Get the protocol handler if not specified or the protocol
+            // of the context could not be used
+            if (handler == null &&
+                (handler = getURLStreamHandler(protocol)) == null) {
+                throw new MalformedURLException("unknown protocol: "+protocol);
+            }
+            this.handler = handler;
+
+            i = spec.indexOf('#', start);
+            if (i >= 0) {
+//thrw(protocol + " hnd: " + handler.getClass().getName() + " i: " + i);
+                ref = spec.substring(i + 1, limit);
+                limit = i;
+            }
+
+            /*
+             * Handle special case inheritance of query and fragment
+             * implied by RFC2396 section 5.2.2.
+             */
+            if (isRelative && start == limit) {
+                query = context.query;
+                if (ref == null) {
+                    ref = context.ref;
+                }
+            }
+
+            handler.parseURL(this, spec, start, limit);
+
+        } catch(MalformedURLException e) {
+            throw e;
+        } catch(Exception e) {
+            MalformedURLException exception = new MalformedURLException(e.getMessage());
+            exception.initCause(e);
+            throw exception;
+        }
+    }
+    
+    /*
+     * Returns true if specified string is a valid protocol name.
+     */
+    private boolean isValidProtocol(String protocol) {
+        int len = protocol.length();
+        if (len < 1)
+            return false;
+        char c = protocol.charAt(0);
+        if (!Character.isLetter(c))
+            return false;
+        for (int i = 1; i < len; i++) {
+            c = protocol.charAt(i);
+            if (!Character.isLetterOrDigit(c) && c != '.' && c != '+' &&
+                c != '-') {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Sets the fields of the URL. This is not a public method so that
+     * only URLStreamHandlers can modify URL fields. URLs are
+     * otherwise constant.
+     *
+     * @param protocol the name of the protocol to use
+     * @param host the name of the host
+       @param port the port number on the host
+     * @param file the file on the host
+     * @param ref the internal reference in the URL
+     */
+    protected void set(String protocol, String host,
+                       int port, String file, String ref) {
+        synchronized (this) {
+            this.protocol = protocol;
+            this.host = host;
+            authority = port == -1 ? host : host + ":" + port;
+            this.port = port;
+            this.file = file;
+            this.ref = ref;
+            /* This is very important. We must recompute this after the
+             * URL has been changed. */
+            hashCode = -1;
+            hostAddress = null;
+            int q = file.lastIndexOf('?');
+            if (q != -1) {
+                query = file.substring(q+1);
+                path = file.substring(0, q);
+            } else
+                path = file;
+        }
+    }
+
+    /**
+     * Sets the specified 8 fields of the URL. This is not a public method so
+     * that only URLStreamHandlers can modify URL fields. URLs are otherwise
+     * constant.
+     *
+     * @param protocol the name of the protocol to use
+     * @param host the name of the host
+     * @param port the port number on the host
+     * @param authority the authority part for the url
+     * @param userInfo the username and password
+     * @param path the file on the host
+     * @param ref the internal reference in the URL
+     * @param query the query part of this URL
+     * @since 1.3
+     */
+    protected void set(String protocol, String host, int port,
+                       String authority, String userInfo, String path,
+                       String query, String ref) {
+        synchronized (this) {
+            this.protocol = protocol;
+            this.host = host;
+            this.port = port;
+            this.file = query == null ? path : path + "?" + query;
+            this.userInfo = userInfo;
+            this.path = path;
+            this.ref = ref;
+            /* This is very important. We must recompute this after the
+             * URL has been changed. */
+            hashCode = -1;
+            hostAddress = null;
+            this.query = query;
+            this.authority = authority;
+        }
+    }
+
+    /**
+     * Gets the query part of this <code>URL</code>.
+     *
+     * @return  the query part of this <code>URL</code>,
+     * or <CODE>null</CODE> if one does not exist
+     * @since 1.3
+     */
+    public String getQuery() {
+        return query;
+    }
+
+    /**
+     * Gets the path part of this <code>URL</code>.
+     *
+     * @return  the path part of this <code>URL</code>, or an
+     * empty string if one does not exist
+     * @since 1.3
+     */
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Gets the userInfo part of this <code>URL</code>.
+     *
+     * @return  the userInfo part of this <code>URL</code>, or
+     * <CODE>null</CODE> if one does not exist
+     * @since 1.3
+     */
+    public String getUserInfo() {
+        return userInfo;
+    }
+
+    /**
+     * Gets the authority part of this <code>URL</code>.
+     *
+     * @return  the authority part of this <code>URL</code>
+     * @since 1.3
+     */
+    public String getAuthority() {
+        return authority;
+    }
+
+    /**
+     * Gets the port number of this <code>URL</code>.
+     *
+     * @return  the port number, or -1 if the port is not set
+     */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * Gets the default port number of the protocol associated
+     * with this <code>URL</code>. If the URL scheme or the URLStreamHandler
+     * for the URL do not define a default port number,
+     * then -1 is returned.
+     *
+     * @return  the port number
+     * @since 1.4
+     */
+    public int getDefaultPort() {
+        return handler.getDefaultPort();
+    }
+
+    /**
+     * Gets the protocol name of this <code>URL</code>.
+     *
+     * @return  the protocol of this <code>URL</code>.
+     */
+    public String getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * Gets the host name of this <code>URL</code>, if applicable.
+     * The format of the host conforms to RFC 2732, i.e. for a
+     * literal IPv6 address, this method will return the IPv6 address
+     * enclosed in square brackets (<tt>'['</tt> and <tt>']'</tt>).
+     *
+     * @return  the host name of this <code>URL</code>.
+     */
+    public String getHost() {
+        return host;
+    }
+
+    /**
+     * Gets the file name of this <code>URL</code>.
+     * The returned file portion will be
+     * the same as <CODE>getPath()</CODE>, plus the concatenation of
+     * the value of <CODE>getQuery()</CODE>, if any. If there is
+     * no query portion, this method and <CODE>getPath()</CODE> will
+     * return identical results.
+     *
+     * @return  the file name of this <code>URL</code>,
+     * or an empty string if one does not exist
+     */
+    public String getFile() {
+        return file;
+    }
+
+    /**
+     * Gets the anchor (also known as the "reference") of this
+     * <code>URL</code>.
+     *
+     * @return  the anchor (also known as the "reference") of this
+     *          <code>URL</code>, or <CODE>null</CODE> if one does not exist
+     */
+    public String getRef() {
+        return ref;
+    }
+
+    /**
+     * Compares this URL for equality with another object.<p>
+     *
+     * If the given object is not a URL then this method immediately returns
+     * <code>false</code>.<p>
+     *
+     * Two URL objects are equal if they have the same protocol, reference
+     * equivalent hosts, have the same port number on the host, and the same
+     * file and fragment of the file.<p>
+     *
+     * Two hosts are considered equivalent if both host names can be resolved
+     * into the same IP addresses; else if either host name can't be
+     * resolved, the host names must be equal without regard to case; or both
+     * host names equal to null.<p>
+     *
+     * Since hosts comparison requires name resolution, this operation is a
+     * blocking operation. <p>
+     *
+     * Note: The defined behavior for <code>equals</code> is known to
+     * be inconsistent with virtual hosting in HTTP.
+     *
+     * @param   obj   the URL to compare against.
+     * @return  <code>true</code> if the objects are the same;
+     *          <code>false</code> otherwise.
+     */
+    public boolean equals(Object obj) {
+        if (!(obj instanceof URL))
+            return false;
+        URL u2 = (URL)obj;
+
+        return handler.equals(this, u2);
+    }
+
+    /**
+     * Creates an integer suitable for hash table indexing.<p>
+     *
+     * The hash code is based upon all the URL components relevant for URL
+     * comparison. As such, this operation is a blocking operation.<p>
+     *
+     * @return  a hash code for this <code>URL</code>.
+     */
+    public synchronized int hashCode() {
+        if (hashCode != -1)
+            return hashCode;
+
+        hashCode = handler.hashCode(this);
+        return hashCode;
+    }
+
+    /**
+     * Compares two URLs, excluding the fragment component.<p>
+     *
+     * Returns <code>true</code> if this <code>URL</code> and the
+     * <code>other</code> argument are equal without taking the
+     * fragment component into consideration.
+     *
+     * @param   other   the <code>URL</code> to compare against.
+     * @return  <code>true</code> if they reference the same remote object;
+     *          <code>false</code> otherwise.
+     */
+    public boolean sameFile(URL other) {
+        return handler.sameFile(this, other);
+    }
+
+    /**
+     * Constructs a string representation of this <code>URL</code>. The
+     * string is created by calling the <code>toExternalForm</code>
+     * method of the stream protocol handler for this object.
+     *
+     * @return  a string representation of this object.
+     * @see     java.net.URL#URL(java.lang.String, java.lang.String, int,
+     *                  java.lang.String)
+     * @see     java.net.URLStreamHandler#toExternalForm(java.net.URL)
+     */
+    public String toString() {
+        return toExternalForm();
+    }
+
+    /**
+     * Constructs a string representation of this <code>URL</code>. The
+     * string is created by calling the <code>toExternalForm</code>
+     * method of the stream protocol handler for this object.
+     *
+     * @return  a string representation of this object.
+     * @see     java.net.URL#URL(java.lang.String, java.lang.String,
+     *                  int, java.lang.String)
+     * @see     java.net.URLStreamHandler#toExternalForm(java.net.URL)
+     */
+    public String toExternalForm() {
+        return handler.toExternalForm(this);
+    }
+
+    /**
+     * Returns a {@link java.net.URLConnection URLConnection} instance that
+     * represents a connection to the remote object referred to by the
+     * {@code URL}.
+     *
+     * <P>A new instance of {@linkplain java.net.URLConnection URLConnection} is
+     * created every time when invoking the
+     * {@linkplain java.net.URLStreamHandler#openConnection(URL)
+     * URLStreamHandler.openConnection(URL)} method of the protocol handler for
+     * this URL.</P>
+     *
+     * <P>It should be noted that a URLConnection instance does not establish
+     * the actual network connection on creation. This will happen only when
+     * calling {@linkplain java.net.URLConnection#connect() URLConnection.connect()}.</P>
+     *
+     * <P>If for the URL's protocol (such as HTTP or JAR), there
+     * exists a public, specialized URLConnection subclass belonging
+     * to one of the following packages or one of their subpackages:
+     * java.lang, java.io, java.util, java.net, the connection
+     * returned will be of that subclass. For example, for HTTP an
+     * HttpURLConnection will be returned, and for JAR a
+     * JarURLConnection will be returned.</P>
+     *
+     * @return     a {@link java.net.URLConnection URLConnection} linking
+     *             to the URL.
+     * @exception  IOException  if an I/O exception occurs.
+     * @see        java.net.URL#URL(java.lang.String, java.lang.String,
+     *             int, java.lang.String)
+     */
+//    public URLConnection openConnection() throws java.io.IOException {
+//        return handler.openConnection(this);
+//    }
+
+
+    /**
+     * Opens a connection to this <code>URL</code> and returns an
+     * <code>InputStream</code> for reading from that connection. This
+     * method is a shorthand for:
+     * <blockquote><pre>
+     *     openConnection().getInputStream()
+     * </pre></blockquote>
+     *
+     * @return     an input stream for reading from the URL connection.
+     * @exception  IOException  if an I/O exception occurs.
+     * @see        java.net.URL#openConnection()
+     * @see        java.net.URLConnection#getInputStream()
+     */
+    public final InputStream openStream() throws java.io.IOException {
+        if (is != null) {
+            return is;
+        }
+        byte[] arr = (byte[]) getContent(new Class[] { byte[].class });
+        if (arr == null) {
+            throw new IOException();
+        }
+        return new ByteArrayInputStream(arr);
+    }
+
+    /**
+     * Gets the contents of this URL. This method is a shorthand for:
+     * <blockquote><pre>
+     *     openConnection().getContent()
+     * </pre></blockquote>
+     *
+     * @return     the contents of this URL.
+     * @exception  IOException  if an I/O exception occurs.
+     * @see        java.net.URLConnection#getContent()
+     */
+    public final Object getContent() throws java.io.IOException {
+        return loadText(toExternalForm());
+    }
+    
+    @JavaScriptBody(args = "url", body = ""
+        + "var request = new XMLHttpRequest();\n"
+        + "request.open('GET', url, false);\n"
+        + "request.send();\n"
+        + "return request.responseText;\n"
+    )
+    private static native String loadText(String url) throws IOException;
+
+    @JavaScriptBody(args = { "url", "arr" }, body = ""
+        + "var request = new XMLHttpRequest();\n"
+        + "request.open('GET', url, false);\n"
+        + "request.overrideMimeType('text\\/plain; charset=x-user-defined');\n"
+        + "request.send();\n"
+        + "var t = request.responseText;\n"
+        + "for (var i = 0; i < t.length; i++) arr.push(t.charCodeAt(i) & 0xff);\n"
+        + "return arr;\n"
+    )
+    private static native Object loadBytes(String url, byte[] arr) throws IOException;
+
+    /**
+     * Gets the contents of this URL. This method is a shorthand for:
+     * <blockquote><pre>
+     *     openConnection().getContent(Class[])
+     * </pre></blockquote>
+     *
+     * @param classes an array of Java types
+     * @return     the content object of this URL that is the first match of
+     *               the types specified in the classes array.
+     *               null if none of the requested types are supported.
+     * @exception  IOException  if an I/O exception occurs.
+     * @see        java.net.URLConnection#getContent(Class[])
+     * @since 1.3
+     */
+    public final Object getContent(Class[] classes)
+    throws java.io.IOException {
+        for (Class<?> c : classes) {
+            if (c == String.class) {
+                return loadText(toExternalForm());
+            }
+            if (c == byte[].class) {
+                return loadBytes(toExternalForm(), new byte[0]);
+            }
+        }
+        return null;
+    }
+
+    static URLStreamHandler getURLStreamHandler(String protocol) {
+        URLStreamHandler universal = new URLStreamHandler() {};
+        return universal;
+    }
+
+    private static URL findContext(URL context) throws MalformedURLException {
+        if (context == null) {
+            String base = findBaseURL();
+            if (base != null) {
+                context = new URL(null, base, false);
+            }
+        }
+        return context;
+    }
+    
+    @JavaScriptBody(args = {}, body = 
+          "if (typeof window !== 'object') return null;\n"
+        + "if (!window.location) return null;\n"
+        + "if (!window.location.href) return null;\n"
+        + "return window.location.href;\n"
+    )
+    private static native String findBaseURL();
+}
+class Parts {
+    String path, query, ref;
+
+    Parts(String file) {
+        int ind = file.indexOf('#');
+        ref = ind < 0 ? null: file.substring(ind + 1);
+        file = ind < 0 ? file: file.substring(0, ind);
+        int q = file.lastIndexOf('?');
+        if (q != -1) {
+            query = file.substring(q+1);
+            path = file.substring(0, q);
+        } else {
+            path = file;
+        }
+    }
+
+    String getPath() {
+        return path;
+    }
+
+    String getQuery() {
+        return query;
+    }
+
+    String getRef() {
+        return ref;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/net/URLStreamHandler.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/net/URLStreamHandler.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,568 @@
+/*
+ * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.net;
+
+
+/**
+ * The abstract class <code>URLStreamHandler</code> is the common
+ * superclass for all stream protocol handlers. A stream protocol
+ * handler knows how to make a connection for a particular protocol
+ * type, such as <code>http</code>, <code>ftp</code>, or
+ * <code>gopher</code>.
+ * <p>
+ * In most cases, an instance of a <code>URLStreamHandler</code>
+ * subclass is not created directly by an application. Rather, the
+ * first time a protocol name is encountered when constructing a
+ * <code>URL</code>, the appropriate stream protocol handler is
+ * automatically loaded.
+ *
+ * @author  James Gosling
+ * @see     java.net.URL#URL(java.lang.String, java.lang.String, int, java.lang.String)
+ * @since   JDK1.0
+ */
+public abstract class URLStreamHandler {
+    /**
+     * Opens a connection to the object referenced by the
+     * <code>URL</code> argument.
+     * This method should be overridden by a subclass.
+     *
+     * <p>If for the handler's protocol (such as HTTP or JAR), there
+     * exists a public, specialized URLConnection subclass belonging
+     * to one of the following packages or one of their subpackages:
+     * java.lang, java.io, java.util, java.net, the connection
+     * returned will be of that subclass. For example, for HTTP an
+     * HttpURLConnection will be returned, and for JAR a
+     * JarURLConnection will be returned.
+     *
+     * @param      u   the URL that this connects to.
+     * @return     a <code>URLConnection</code> object for the <code>URL</code>.
+     * @exception  IOException  if an I/O error occurs while opening the
+     *               connection.
+     */
+//    abstract protected URLConnection openConnection(URL u) throws IOException;
+
+    /**
+     * Same as openConnection(URL), except that the connection will be
+     * made through the specified proxy; Protocol handlers that do not
+     * support proxying will ignore the proxy parameter and make a
+     * normal connection.
+     *
+     * Calling this method preempts the system's default ProxySelector
+     * settings.
+     *
+     * @param      u   the URL that this connects to.
+     * @param      p   the proxy through which the connection will be made.
+     *                 If direct connection is desired, Proxy.NO_PROXY
+     *                 should be specified.
+     * @return     a <code>URLConnection</code> object for the <code>URL</code>.
+     * @exception  IOException  if an I/O error occurs while opening the
+     *               connection.
+     * @exception  IllegalArgumentException if either u or p is null,
+     *               or p has the wrong type.
+     * @exception  UnsupportedOperationException if the subclass that
+     *               implements the protocol doesn't support this method.
+     * @since      1.5
+     */
+//    protected URLConnection openConnection(URL u, Proxy p) throws IOException {
+//        throw new UnsupportedOperationException("Method not implemented.");
+//    }
+
+    /**
+     * Parses the string representation of a <code>URL</code> into a
+     * <code>URL</code> object.
+     * <p>
+     * If there is any inherited context, then it has already been
+     * copied into the <code>URL</code> argument.
+     * <p>
+     * The <code>parseURL</code> method of <code>URLStreamHandler</code>
+     * parses the string representation as if it were an
+     * <code>http</code> specification. Most URL protocol families have a
+     * similar parsing. A stream protocol handler for a protocol that has
+     * a different syntax must override this routine.
+     *
+     * @param   u       the <code>URL</code> to receive the result of parsing
+     *                  the spec.
+     * @param   spec    the <code>String</code> representing the URL that
+     *                  must be parsed.
+     * @param   start   the character index at which to begin parsing. This is
+     *                  just past the '<code>:</code>' (if there is one) that
+     *                  specifies the determination of the protocol name.
+     * @param   limit   the character position to stop parsing at. This is the
+     *                  end of the string or the position of the
+     *                  "<code>#</code>" character, if present. All information
+     *                  after the sharp sign indicates an anchor.
+     */
+    protected void parseURL(URL u, String spec, int start, int limit) {
+        // These fields may receive context content if this was relative URL
+        String protocol = u.getProtocol();
+        String authority = u.getAuthority();
+        String userInfo = u.getUserInfo();
+        String host = u.getHost();
+        int port = u.getPort();
+        String path = u.getPath();
+        String query = u.getQuery();
+
+        // This field has already been parsed
+        String ref = u.getRef();
+
+        boolean isRelPath = false;
+        boolean queryOnly = false;
+
+// FIX: should not assume query if opaque
+        // Strip off the query part
+        if (start < limit) {
+            int queryStart = spec.indexOf('?');
+            queryOnly = queryStart == start;
+            if ((queryStart != -1) && (queryStart < limit)) {
+                query = spec.substring(queryStart+1, limit);
+                if (limit > queryStart)
+                    limit = queryStart;
+                spec = spec.substring(0, queryStart);
+            }
+        }
+
+        int i = 0;
+        // Parse the authority part if any
+        boolean isUNCName = (start <= limit - 4) &&
+                        (spec.charAt(start) == '/') &&
+                        (spec.charAt(start + 1) == '/') &&
+                        (spec.charAt(start + 2) == '/') &&
+                        (spec.charAt(start + 3) == '/');
+        if (!isUNCName && (start <= limit - 2) && (spec.charAt(start) == '/') &&
+            (spec.charAt(start + 1) == '/')) {
+            start += 2;
+            i = spec.indexOf('/', start);
+            if (i < 0) {
+                i = spec.indexOf('?', start);
+                if (i < 0)
+                    i = limit;
+            }
+
+            host = authority = spec.substring(start, i);
+
+            int ind = authority.indexOf('@');
+            if (ind != -1) {
+                userInfo = authority.substring(0, ind);
+                host = authority.substring(ind+1);
+            } else {
+                userInfo = null;
+            }
+            if (host != null) {
+                // If the host is surrounded by [ and ] then its an IPv6
+                // literal address as specified in RFC2732
+                if (host.length()>0 && (host.charAt(0) == '[')) {
+                    if ((ind = host.indexOf(']')) > 2) {
+
+                        String nhost = host ;
+                        host = nhost.substring(0,ind+1);
+//                        if (!IPAddressUtil.
+//                            isIPv6LiteralAddress(host.substring(1, ind))) {
+//                            throw new IllegalArgumentException(
+//                                "Invalid host: "+ host);
+//                        }
+
+                        port = -1 ;
+                        if (nhost.length() > ind+1) {
+                            if (nhost.charAt(ind+1) == ':') {
+                                ++ind ;
+                                // port can be null according to RFC2396
+                                if (nhost.length() > (ind + 1)) {
+                                    port = Integer.parseInt(nhost.substring(ind+1));
+                                }
+                            } else {
+                                throw new IllegalArgumentException(
+                                    "Invalid authority field: " + authority);
+                            }
+                        }
+                    } else {
+                        throw new IllegalArgumentException(
+                            "Invalid authority field: " + authority);
+                    }
+                } else {
+                    ind = host.indexOf(':');
+                    port = -1;
+                    if (ind >= 0) {
+                        // port can be null according to RFC2396
+                        if (host.length() > (ind + 1)) {
+                            port = Integer.parseInt(host.substring(ind + 1));
+                        }
+                        host = host.substring(0, ind);
+                    }
+                }
+            } else {
+                host = "";
+            }
+            if (port < -1)
+                throw new IllegalArgumentException("Invalid port number :" +
+                                                   port);
+            start = i;
+            // If the authority is defined then the path is defined by the
+            // spec only; See RFC 2396 Section 5.2.4.
+            if (authority != null && authority.length() > 0)
+                path = "";
+        }
+
+        if (host == null) {
+            host = "";
+        }
+
+        // Parse the file path if any
+        if (start < limit) {
+            if (spec.charAt(start) == '/') {
+                path = spec.substring(start, limit);
+            } else if (path != null && path.length() > 0) {
+                isRelPath = true;
+                int ind = path.lastIndexOf('/');
+                String seperator = "";
+                if (ind == -1 && authority != null)
+                    seperator = "/";
+                path = path.substring(0, ind + 1) + seperator +
+                         spec.substring(start, limit);
+
+            } else {
+                String seperator = (authority != null) ? "/" : "";
+                path = seperator + spec.substring(start, limit);
+            }
+        } else if (queryOnly && path != null) {
+            int ind = path.lastIndexOf('/');
+            if (ind < 0)
+                ind = 0;
+            path = path.substring(0, ind) + "/";
+        }
+        if (path == null)
+            path = "";
+
+        if (isRelPath) {
+            // Remove embedded /./
+            while ((i = path.indexOf("/./")) >= 0) {
+                path = path.substring(0, i) + path.substring(i + 2);
+            }
+            // Remove embedded /../ if possible
+            i = 0;
+            while ((i = path.indexOf("/../", i)) >= 0) {
+                /*
+                 * A "/../" will cancel the previous segment and itself,
+                 * unless that segment is a "/../" itself
+                 * i.e. "/a/b/../c" becomes "/a/c"
+                 * but "/../../a" should stay unchanged
+                 */
+                if (i > 0 && (limit = path.lastIndexOf('/', i - 1)) >= 0 &&
+                    (path.indexOf("/../", limit) != 0)) {
+                    path = path.substring(0, limit) + path.substring(i + 3);
+                    i = 0;
+                } else {
+                    i = i + 3;
+                }
+            }
+            // Remove trailing .. if possible
+            while (path.endsWith("/..")) {
+                i = path.indexOf("/..");
+                if ((limit = path.lastIndexOf('/', i - 1)) >= 0) {
+                    path = path.substring(0, limit+1);
+                } else {
+                    break;
+                }
+            }
+            // Remove starting .
+            if (path.startsWith("./") && path.length() > 2)
+                path = path.substring(2);
+
+            // Remove trailing .
+            if (path.endsWith("/."))
+                path = path.substring(0, path.length() -1);
+        }
+
+        setURL(u, protocol, host, port, authority, userInfo, path, query, ref);
+    }
+
+    /**
+     * Returns the default port for a URL parsed by this handler. This method
+     * is meant to be overidden by handlers with default port numbers.
+     * @return the default port for a <code>URL</code> parsed by this handler.
+     * @since 1.3
+     */
+    protected int getDefaultPort() {
+        return -1;
+    }
+
+    /**
+     * Provides the default equals calculation. May be overidden by handlers
+     * for other protocols that have different requirements for equals().
+     * This method requires that none of its arguments is null. This is
+     * guaranteed by the fact that it is only called by java.net.URL class.
+     * @param u1 a URL object
+     * @param u2 a URL object
+     * @return <tt>true</tt> if the two urls are
+     * considered equal, ie. they refer to the same
+     * fragment in the same file.
+     * @since 1.3
+     */
+    protected boolean equals(URL u1, URL u2) {
+        String ref1 = u1.getRef();
+        String ref2 = u2.getRef();
+        return (ref1 == ref2 || (ref1 != null && ref1.equals(ref2))) &&
+               sameFile(u1, u2);
+    }
+
+    /**
+     * Provides the default hash calculation. May be overidden by handlers for
+     * other protocols that have different requirements for hashCode
+     * calculation.
+     * @param u a URL object
+     * @return an <tt>int</tt> suitable for hash table indexing
+     * @since 1.3
+     */
+    protected int hashCode(URL u) {
+        int h = 0;
+
+        // Generate the protocol part.
+        String protocol = u.getProtocol();
+        if (protocol != null)
+            h += protocol.hashCode();
+
+        // Generate the host part.
+        Object addr = getHostAddress(u);
+        if (addr != null) {
+            h += addr.hashCode();
+        } else {
+            String host = u.getHost();
+            if (host != null)
+                h += host.toLowerCase().hashCode();
+        }
+
+        // Generate the file part.
+        String file = u.getFile();
+        if (file != null)
+            h += file.hashCode();
+
+        // Generate the port part.
+        if (u.getPort() == -1)
+            h += getDefaultPort();
+        else
+            h += u.getPort();
+
+        // Generate the ref part.
+        String ref = u.getRef();
+        if (ref != null)
+            h += ref.hashCode();
+
+        return h;
+    }
+
+    /**
+     * Compare two urls to see whether they refer to the same file,
+     * i.e., having the same protocol, host, port, and path.
+     * This method requires that none of its arguments is null. This is
+     * guaranteed by the fact that it is only called indirectly
+     * by java.net.URL class.
+     * @param u1 a URL object
+     * @param u2 a URL object
+     * @return true if u1 and u2 refer to the same file
+     * @since 1.3
+     */
+    protected boolean sameFile(URL u1, URL u2) {
+        // Compare the protocols.
+        if (!((u1.getProtocol() == u2.getProtocol()) ||
+              (u1.getProtocol() != null &&
+               u1.getProtocol().equalsIgnoreCase(u2.getProtocol()))))
+            return false;
+
+        // Compare the files.
+        if (!(u1.getFile() == u2.getFile() ||
+              (u1.getFile() != null && u1.getFile().equals(u2.getFile()))))
+            return false;
+
+        // Compare the ports.
+        int port1, port2;
+        port1 = (u1.getPort() != -1) ? u1.getPort() : u1.handler.getDefaultPort();
+        port2 = (u2.getPort() != -1) ? u2.getPort() : u2.handler.getDefaultPort();
+        if (port1 != port2)
+            return false;
+
+        // Compare the hosts.
+        if (!hostsEqual(u1, u2))
+            return false;
+
+        return true;
+    }
+
+    /**
+     * Get the IP address of our host. An empty host field or a DNS failure
+     * will result in a null return.
+     *
+     * @param u a URL object
+     * @return an <code>InetAddress</code> representing the host
+     * IP address.
+     * @since 1.3
+     */
+    private synchronized Object getHostAddress(URL u) {
+        return u.hostAddress;
+    }
+
+    /**
+     * Compares the host components of two URLs.
+     * @param u1 the URL of the first host to compare
+     * @param u2 the URL of the second host to compare
+     * @return  <tt>true</tt> if and only if they
+     * are equal, <tt>false</tt> otherwise.
+     * @since 1.3
+     */
+    protected boolean hostsEqual(URL u1, URL u2) {
+        Object a1 = getHostAddress(u1);
+        Object a2 = getHostAddress(u2);
+        // if we have internet address for both, compare them
+        if (a1 != null && a2 != null) {
+            return a1.equals(a2);
+        // else, if both have host names, compare them
+        } else if (u1.getHost() != null && u2.getHost() != null)
+            return u1.getHost().equalsIgnoreCase(u2.getHost());
+         else
+            return u1.getHost() == null && u2.getHost() == null;
+    }
+
+    /**
+     * Converts a <code>URL</code> of a specific protocol to a
+     * <code>String</code>.
+     *
+     * @param   u   the URL.
+     * @return  a string representation of the <code>URL</code> argument.
+     */
+    protected String toExternalForm(URL u) {
+
+        // pre-compute length of StringBuffer
+        int len = u.getProtocol().length() + 1;
+        if (u.getAuthority() != null && u.getAuthority().length() > 0)
+            len += 2 + u.getAuthority().length();
+        if (u.getPath() != null) {
+            len += u.getPath().length();
+        }
+        if (u.getQuery() != null) {
+            len += 1 + u.getQuery().length();
+        }
+        if (u.getRef() != null)
+            len += 1 + u.getRef().length();
+
+        StringBuffer result = new StringBuffer(len);
+        result.append(u.getProtocol());
+        result.append(":");
+        if (u.getAuthority() != null && u.getAuthority().length() > 0) {
+            result.append("//");
+            result.append(u.getAuthority());
+        }
+        if (u.getPath() != null) {
+            result.append(u.getPath());
+        }
+        if (u.getQuery() != null) {
+            result.append('?');
+            result.append(u.getQuery());
+        }
+        if (u.getRef() != null) {
+            result.append("#");
+            result.append(u.getRef());
+        }
+        return result.toString();
+    }
+
+    /**
+     * Sets the fields of the <code>URL</code> argument to the indicated values.
+     * Only classes derived from URLStreamHandler are supposed to be able
+     * to call the set method on a URL.
+     *
+     * @param   u         the URL to modify.
+     * @param   protocol  the protocol name.
+     * @param   host      the remote host value for the URL.
+     * @param   port      the port on the remote machine.
+     * @param   authority the authority part for the URL.
+     * @param   userInfo the userInfo part of the URL.
+     * @param   path      the path component of the URL.
+     * @param   query     the query part for the URL.
+     * @param   ref       the reference.
+     * @exception       SecurityException       if the protocol handler of the URL is
+     *                                  different from this one
+     * @see     java.net.URL#set(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String)
+     * @since 1.3
+     */
+       protected void setURL(URL u, String protocol, String host, int port,
+                             String authority, String userInfo, String path,
+                             String query, String ref) {
+        if (this != u.handler) {
+            throw new SecurityException("handler for url different from " +
+                                        "this handler");
+        }
+        // ensure that no one can reset the protocol on a given URL.
+        u.set(u.getProtocol(), host, port, authority, userInfo, path, query, ref);
+    }
+
+    /**
+     * Sets the fields of the <code>URL</code> argument to the indicated values.
+     * Only classes derived from URLStreamHandler are supposed to be able
+     * to call the set method on a URL.
+     *
+     * @param   u         the URL to modify.
+     * @param   protocol  the protocol name. This value is ignored since 1.2.
+     * @param   host      the remote host value for the URL.
+     * @param   port      the port on the remote machine.
+     * @param   file      the file.
+     * @param   ref       the reference.
+     * @exception       SecurityException       if the protocol handler of the URL is
+     *                                  different from this one
+     * @deprecated Use setURL(URL, String, String, int, String, String, String,
+     *             String);
+     */
+    @Deprecated
+    protected void setURL(URL u, String protocol, String host, int port,
+                          String file, String ref) {
+        /*
+         * Only old URL handlers call this, so assume that the host
+         * field might contain "user:passwd@host". Fix as necessary.
+         */
+        String authority = null;
+        String userInfo = null;
+        if (host != null && host.length() != 0) {
+            authority = (port == -1) ? host : host + ":" + port;
+            int at = host.lastIndexOf('@');
+            if (at != -1) {
+                userInfo = host.substring(0, at);
+                host = host.substring(at+1);
+            }
+        }
+
+        /*
+         * Assume file might contain query part. Fix as necessary.
+         */
+        String path = null;
+        String query = null;
+        if (file != null) {
+            int q = file.lastIndexOf('?');
+            if (q != -1) {
+                query = file.substring(q+1);
+                path = file.substring(0, q);
+            } else
+                path = file;
+        }
+        setURL(u, protocol, host, port, authority, userInfo, path, query, ref);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/Comparator.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/Comparator.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * A comparison function, which imposes a <i>total ordering</i> on some
+ * collection of objects.  Comparators can be passed to a sort method (such
+ * as {@link Collections#sort(List,Comparator) Collections.sort} or {@link
+ * Arrays#sort(Object[],Comparator) Arrays.sort}) to allow precise control
+ * over the sort order.  Comparators can also be used to control the order of
+ * certain data structures (such as {@link SortedSet sorted sets} or {@link
+ * SortedMap sorted maps}), or to provide an ordering for collections of
+ * objects that don't have a {@link Comparable natural ordering}.<p>
+ *
+ * The ordering imposed by a comparator <tt>c</tt> on a set of elements
+ * <tt>S</tt> is said to be <i>consistent with equals</i> if and only if
+ * <tt>c.compare(e1, e2)==0</tt> has the same boolean value as
+ * <tt>e1.equals(e2)</tt> for every <tt>e1</tt> and <tt>e2</tt> in
+ * <tt>S</tt>.<p>
+ *
+ * Caution should be exercised when using a comparator capable of imposing an
+ * ordering inconsistent with equals to order a sorted set (or sorted map).
+ * Suppose a sorted set (or sorted map) with an explicit comparator <tt>c</tt>
+ * is used with elements (or keys) drawn from a set <tt>S</tt>.  If the
+ * ordering imposed by <tt>c</tt> on <tt>S</tt> is inconsistent with equals,
+ * the sorted set (or sorted map) will behave "strangely."  In particular the
+ * sorted set (or sorted map) will violate the general contract for set (or
+ * map), which is defined in terms of <tt>equals</tt>.<p>
+ *
+ * For example, suppose one adds two elements {@code a} and {@code b} such that
+ * {@code (a.equals(b) && c.compare(a, b) != 0)}
+ * to an empty {@code TreeSet} with comparator {@code c}.
+ * The second {@code add} operation will return
+ * true (and the size of the tree set will increase) because {@code a} and
+ * {@code b} are not equivalent from the tree set's perspective, even though
+ * this is contrary to the specification of the
+ * {@link Set#add Set.add} method.<p>
+ *
+ * Note: It is generally a good idea for comparators to also implement
+ * <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
+ * serializable data structures (like {@link TreeSet}, {@link TreeMap}).  In
+ * order for the data structure to serialize successfully, the comparator (if
+ * provided) must implement <tt>Serializable</tt>.<p>
+ *
+ * For the mathematically inclined, the <i>relation</i> that defines the
+ * <i>imposed ordering</i> that a given comparator <tt>c</tt> imposes on a
+ * given set of objects <tt>S</tt> is:<pre>
+ *       {(x, y) such that c.compare(x, y) &lt;= 0}.
+ * </pre> The <i>quotient</i> for this total order is:<pre>
+ *       {(x, y) such that c.compare(x, y) == 0}.
+ * </pre>
+ *
+ * It follows immediately from the contract for <tt>compare</tt> that the
+ * quotient is an <i>equivalence relation</i> on <tt>S</tt>, and that the
+ * imposed ordering is a <i>total order</i> on <tt>S</tt>.  When we say that
+ * the ordering imposed by <tt>c</tt> on <tt>S</tt> is <i>consistent with
+ * equals</i>, we mean that the quotient for the ordering is the equivalence
+ * relation defined by the objects' {@link Object#equals(Object)
+ * equals(Object)} method(s):<pre>
+ *     {(x, y) such that x.equals(y)}. </pre>
+ *
+ * <p>Unlike {@code Comparable}, a comparator may optionally permit
+ * comparison of null arguments, while maintaining the requirements for
+ * an equivalence relation.
+ *
+ * <p>This interface is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @param <T> the type of objects that may be compared by this comparator
+ *
+ * @author  Josh Bloch
+ * @author  Neal Gafter
+ * @see Comparable
+ * @see java.io.Serializable
+ * @since 1.2
+ */
+
+public interface Comparator<T> {
+    /**
+     * Compares its two arguments for order.  Returns a negative integer,
+     * zero, or a positive integer as the first argument is less than, equal
+     * to, or greater than the second.<p>
+     *
+     * In the foregoing description, the notation
+     * <tt>sgn(</tt><i>expression</i><tt>)</tt> designates the mathematical
+     * <i>signum</i> function, which is defined to return one of <tt>-1</tt>,
+     * <tt>0</tt>, or <tt>1</tt> according to whether the value of
+     * <i>expression</i> is negative, zero or positive.<p>
+     *
+     * The implementor must ensure that <tt>sgn(compare(x, y)) ==
+     * -sgn(compare(y, x))</tt> for all <tt>x</tt> and <tt>y</tt>.  (This
+     * implies that <tt>compare(x, y)</tt> must throw an exception if and only
+     * if <tt>compare(y, x)</tt> throws an exception.)<p>
+     *
+     * The implementor must also ensure that the relation is transitive:
+     * <tt>((compare(x, y)&gt;0) &amp;&amp; (compare(y, z)&gt;0))</tt> implies
+     * <tt>compare(x, z)&gt;0</tt>.<p>
+     *
+     * Finally, the implementor must ensure that <tt>compare(x, y)==0</tt>
+     * implies that <tt>sgn(compare(x, z))==sgn(compare(y, z))</tt> for all
+     * <tt>z</tt>.<p>
+     *
+     * It is generally the case, but <i>not</i> strictly required that
+     * <tt>(compare(x, y)==0) == (x.equals(y))</tt>.  Generally speaking,
+     * any comparator that violates this condition should clearly indicate
+     * this fact.  The recommended language is "Note: this comparator
+     * imposes orderings that are inconsistent with equals."
+     *
+     * @param o1 the first object to be compared.
+     * @param o2 the second object to be compared.
+     * @return a negative integer, zero, or a positive integer as the
+     *         first argument is less than, equal to, or greater than the
+     *         second.
+     * @throws NullPointerException if an argument is null and this
+     *         comparator does not permit null arguments
+     * @throws ClassCastException if the arguments' types prevent them from
+     *         being compared by this comparator.
+     */
+    int compare(T o1, T o2);
+
+    /**
+     * Indicates whether some other object is &quot;equal to&quot; this
+     * comparator.  This method must obey the general contract of
+     * {@link Object#equals(Object)}.  Additionally, this method can return
+     * <tt>true</tt> <i>only</i> if the specified object is also a comparator
+     * and it imposes the same ordering as this comparator.  Thus,
+     * <code>comp1.equals(comp2)</code> implies that <tt>sgn(comp1.compare(o1,
+     * o2))==sgn(comp2.compare(o1, o2))</tt> for every object reference
+     * <tt>o1</tt> and <tt>o2</tt>.<p>
+     *
+     * Note that it is <i>always</i> safe <i>not</i> to override
+     * <tt>Object.equals(Object)</tt>.  However, overriding this method may,
+     * in some cases, improve performance by allowing programs to determine
+     * that two distinct comparators impose the same order.
+     *
+     * @param   obj   the reference object with which to compare.
+     * @return  <code>true</code> only if the specified object is also
+     *          a comparator and it imposes the same ordering as this
+     *          comparator.
+     * @see Object#equals(Object)
+     * @see Object#hashCode()
+     */
+    boolean equals(Object obj);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/Enumeration.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/Enumeration.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1994, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * An object that implements the Enumeration interface generates a
+ * series of elements, one at a time. Successive calls to the
+ * <code>nextElement</code> method return successive elements of the
+ * series.
+ * <p>
+ * For example, to print all elements of a <tt>Vector&lt;E&gt;</tt> <i>v</i>:
+ * <pre>
+ *   for (Enumeration&lt;E&gt; e = v.elements(); e.hasMoreElements();)
+ *       System.out.println(e.nextElement());</pre>
+ * <p>
+ * Methods are provided to enumerate through the elements of a
+ * vector, the keys of a hashtable, and the values in a hashtable.
+ * Enumerations are also used to specify the input streams to a
+ * <code>SequenceInputStream</code>.
+ * <p>
+ * NOTE: The functionality of this interface is duplicated by the Iterator
+ * interface.  In addition, Iterator adds an optional remove operation, and
+ * has shorter method names.  New implementations should consider using
+ * Iterator in preference to Enumeration.
+ *
+ * @see     java.util.Iterator
+ * @see     java.io.SequenceInputStream
+ * @see     java.util.Enumeration#nextElement()
+ * @see     java.util.Hashtable
+ * @see     java.util.Hashtable#elements()
+ * @see     java.util.Hashtable#keys()
+ * @see     java.util.Vector
+ * @see     java.util.Vector#elements()
+ *
+ * @author  Lee Boynton
+ * @since   JDK1.0
+ */
+public interface Enumeration<E> {
+    /**
+     * Tests if this enumeration contains more elements.
+     *
+     * @return  <code>true</code> if and only if this enumeration object
+     *           contains at least one more element to provide;
+     *          <code>false</code> otherwise.
+     */
+    boolean hasMoreElements();
+
+    /**
+     * Returns the next element of this enumeration if this enumeration
+     * object has at least one more element to provide.
+     *
+     * @return     the next element of this enumeration.
+     * @exception  NoSuchElementException  if no more elements exist.
+     */
+    E nextElement();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/NoSuchElementException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/NoSuchElementException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util;
+
+/**
+ * Thrown by the <code>nextElement</code> method of an
+ * <code>Enumeration</code> to indicate that there are no more
+ * elements in the enumeration.
+ *
+ * @author  unascribed
+ * @see     java.util.Enumeration
+ * @see     java.util.Enumeration#nextElement()
+ * @since   JDK1.0
+ */
+public
+class NoSuchElementException extends RuntimeException {
+    private static final long serialVersionUID = 6769829250639411880L;
+
+    /**
+     * Constructs a <code>NoSuchElementException</code> with <tt>null</tt>
+     * as its error message string.
+     */
+    public NoSuchElementException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>NoSuchElementException</code>, saving a reference
+     * to the error message string <tt>s</tt> for later retrieval by the
+     * <tt>getMessage</tt> method.
+     *
+     * @param   s   the detail message.
+     */
+    public NoSuchElementException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/Adler32.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/Adler32.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,205 @@
+/* Adler32.java - Computes Adler32 data checksum of a data stream
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.util.zip;
+
+/*
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * The actual Adler32 algorithm is taken from RFC 1950.
+ * Status:  Believed complete and correct.
+ */
+
+/**
+ * Computes Adler32 checksum for a stream of data. An Adler32 
+ * checksum is not as reliable as a CRC32 checksum, but a lot faster to 
+ * compute.
+ *<p>
+ * The specification for Adler32 may be found in RFC 1950.
+ * (ZLIB Compressed Data Format Specification version 3.3)
+ *<p>
+ *<p>
+ * From that document:
+ *<p>
+ *      "ADLER32 (Adler-32 checksum)
+ *       This contains a checksum value of the uncompressed data
+ *       (excluding any dictionary data) computed according to Adler-32
+ *       algorithm. This algorithm is a 32-bit extension and improvement
+ *       of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
+ *       standard. 
+ *<p>
+ *       Adler-32 is composed of two sums accumulated per byte: s1 is
+ *       the sum of all bytes, s2 is the sum of all s1 values. Both sums
+ *       are done modulo 65521. s1 is initialized to 1, s2 to zero.  The
+ *       Adler-32 checksum is stored as s2*65536 + s1 in most-
+ *       significant-byte first (network) order."
+ *<p>
+ * "8.2. The Adler-32 algorithm
+ *<p>
+ *    The Adler-32 algorithm is much faster than the CRC32 algorithm yet
+ *    still provides an extremely low probability of undetected errors.
+ *<p>
+ *    The modulo on unsigned long accumulators can be delayed for 5552
+ *    bytes, so the modulo operation time is negligible.  If the bytes
+ *    are a, b, c, the second sum is 3a + 2b + c + 3, and so is position
+ *    and order sensitive, unlike the first sum, which is just a
+ *    checksum.  That 65521 is prime is important to avoid a possible
+ *    large class of two-byte errors that leave the check unchanged.
+ *    (The Fletcher checksum uses 255, which is not prime and which also
+ *    makes the Fletcher check insensitive to single byte changes 0 <->
+ *    255.)
+ *<p>
+ *    The sum s1 is initialized to 1 instead of zero to make the length
+ *    of the sequence part of s2, so that the length does not have to be
+ *   checked separately. (Any sequence of zeroes has a Fletcher
+ *    checksum of zero.)"
+ *
+ * @author John Leuner, Per Bothner
+ * @since JDK 1.1
+ *
+ * @see InflaterInputStream
+ * @see DeflaterOutputStream
+ */
+public class Adler32 implements Checksum
+{
+
+  /** largest prime smaller than 65536 */
+  private static final int BASE = 65521;
+
+  private int checksum; //we do all in int.
+
+  //Note that java doesn't have unsigned integers,
+  //so we have to be careful with what arithmetic 
+  //we do. We return the checksum as a long to 
+  //avoid sign confusion.
+
+  /**
+   * Creates a new instance of the <code>Adler32</code> class. 
+   * The checksum starts off with a value of 1. 
+   */
+  public Adler32 ()
+  {
+    reset();
+  }
+
+  /**
+   * Resets the Adler32 checksum to the initial value.
+   */
+  public void reset () 
+  {
+    checksum = 1; //Initialize to 1    
+  }
+
+  /**
+   * Updates the checksum with the byte b. 
+   *
+   * @param bval the data value to add. The high byte of the int is ignored.
+   */
+  public void update (int bval)
+  {
+    //We could make a length 1 byte array and call update again, but I
+    //would rather not have that overhead
+    int s1 = checksum & 0xffff;
+    int s2 = checksum >>> 16;
+    
+    s1 = (s1 + (bval & 0xFF)) % BASE;
+    s2 = (s1 + s2) % BASE;
+    
+    checksum = (s2 << 16) + s1;
+  }
+
+  /**
+   * Updates the checksum with the bytes taken from the array. 
+   * 
+   * @param buffer an array of bytes
+   */
+  public void update (byte[] buffer)
+  {
+    update(buffer, 0, buffer.length);
+  }
+
+  /**
+   * Updates the checksum with the bytes taken from the array. 
+   * 
+   * @param buf an array of bytes
+   * @param off the start of the data used for this update
+   * @param len the number of bytes to use for this update
+   */
+  public void update (byte[] buf, int off, int len)
+  {
+    //(By Per Bothner)
+    int s1 = checksum & 0xffff;
+    int s2 = checksum >>> 16;
+
+    while (len > 0)
+      {
+	// We can defer the modulo operation:
+	// s1 maximally grows from 65521 to 65521 + 255 * 3800
+	// s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31
+	int n = 3800;
+	if (n > len)
+	  n = len;
+	len -= n;
+	while (--n >= 0)
+	  {
+	    s1 = s1 + (buf[off++] & 0xFF);
+	    s2 = s2 + s1;
+	  }
+	s1 %= BASE;
+	s2 %= BASE;
+      }
+
+    /*Old implementation, borrowed from somewhere:
+    int n;
+    
+    while (len-- > 0) {
+
+      s1 = (s1 + (bs[offset++] & 0xff)) % BASE; 
+      s2 = (s2 + s1) % BASE;
+    }*/
+    
+    checksum = (s2 << 16) | s1;
+  }
+
+  /**
+   * Returns the Adler32 data checksum computed so far.
+   */
+  public long getValue()
+  {
+    return (long) checksum & 0xffffffffL;
+  }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/CRC32.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/CRC32.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,132 @@
+/* CRC32.java - Computes CRC32 data checksum of a data stream
+   Copyright (C) 1999. 2000, 2001 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.util.zip;
+
+/*
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * The actual CRC32 algorithm is taken from RFC 1952.
+ * Status:  Believed complete and correct.
+ */
+
+/**
+ * Computes CRC32 data checksum of a data stream.
+ * The actual CRC32 algorithm is described in RFC 1952
+ * (GZIP file format specification version 4.3).
+ * Can be used to get the CRC32 over a stream if used with checked input/output
+ * streams.
+ *
+ * @see InflaterInputStream
+ * @see DeflaterOutputStream
+ *
+ * @author Per Bothner
+ * @date April 1, 1999.
+ */
+public class CRC32 implements Checksum
+{
+  /** The crc data checksum so far. */
+  private int crc = 0;
+
+  /** The fast CRC table. Computed once when the CRC32 class is loaded. */
+  private static int[] crc_table = make_crc_table();
+
+  /** Make the table for a fast CRC. */
+  private static int[] make_crc_table ()
+  {
+    int[] crc_table = new int[256];
+    for (int n = 0; n < 256; n++)
+      {
+	int c = n;
+	for (int k = 8;  --k >= 0; )
+	  {
+	    if ((c & 1) != 0)
+	      c = 0xedb88320 ^ (c >>> 1);
+	    else
+	      c = c >>> 1;
+	  }
+	crc_table[n] = c;
+      }
+    return crc_table;
+  }
+
+  /**
+   * Returns the CRC32 data checksum computed so far.
+   */
+  public long getValue ()
+  {
+    return (long) crc & 0xffffffffL;
+  }
+
+  /**
+   * Resets the CRC32 data checksum as if no update was ever called.
+   */
+  public void reset () { crc = 0; }
+
+  /**
+   * Updates the checksum with the int bval. 
+   *
+   * @param bval (the byte is taken as the lower 8 bits of bval)
+   */
+
+  public void update (int bval)
+  {
+    int c = ~crc;
+    c = crc_table[(c ^ bval) & 0xff] ^ (c >>> 8);
+    crc = ~c;
+  }
+
+  /**
+   * Adds the byte array to the data checksum.
+   *
+   * @param buf the buffer which contains the data
+   * @param off the offset in the buffer where the data starts
+   * @param len the length of the data
+   */
+  public void update (byte[] buf, int off, int len)
+  {
+    int c = ~crc;
+    while (--len >= 0)
+      c = crc_table[(c ^ buf[off++]) & 0xff] ^ (c >>> 8);
+    crc = ~c;
+  }
+
+  /**
+   * Adds the complete byte array to the data checksum.
+   */
+  public void update (byte[] buf) { update(buf, 0, buf.length); }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/Checksum.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/Checksum.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+/**
+ * An interface representing a data checksum.
+ *
+ * @author      David Connelly
+ */
+public
+interface Checksum {
+    /**
+     * Updates the current checksum with the specified byte.
+     *
+     * @param b the byte to update the checksum with
+     */
+    public void update(int b);
+
+    /**
+     * Updates the current checksum with the specified array of bytes.
+     * @param b the byte array to update the checksum with
+     * @param off the start offset of the data
+     * @param len the number of bytes to use for the update
+     */
+    public void update(byte[] b, int off, int len);
+
+    /**
+     * Returns the current checksum value.
+     * @return the current checksum value
+     */
+    public long getValue();
+
+    /**
+     * Resets the checksum to its initial value.
+     */
+    public void reset();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/DataFormatException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/DataFormatException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+/**
+ * Signals that a data format error has occurred.
+ *
+ * @author      David Connelly
+ */
+public
+class DataFormatException extends Exception {
+    private static final long serialVersionUID = 2219632870893641452L;
+
+    /**
+     * Constructs a DataFormatException with no detail message.
+     */
+    public DataFormatException() {
+        super();
+    }
+
+    /**
+     * Constructs a DataFormatException with the specified detail message.
+     * A detail message is a String that describes this particular exception.
+     * @param s the String containing a detail message
+     */
+    public DataFormatException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/Inflater.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/Inflater.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+/**
+ * This class provides support for general purpose decompression using the
+ * popular ZLIB compression library. The ZLIB compression library was
+ * initially developed as part of the PNG graphics standard and is not
+ * protected by patents. It is fully described in the specifications at
+ * the <a href="package-summary.html#package_description">java.util.zip
+ * package description</a>.
+ *
+ * <p>The following code fragment demonstrates a trivial compression
+ * and decompression of a string using <tt>Deflater</tt> and
+ * <tt>Inflater</tt>.
+ *
+ * <blockquote><pre>
+ * try {
+ *     // Encode a String into bytes
+ *     String inputString = "blahblahblah\u20AC\u20AC";
+ *     byte[] input = inputString.getBytes("UTF-8");
+ *
+ *     // Compress the bytes
+ *     byte[] output = new byte[100];
+ *     Deflater compresser = new Deflater();
+ *     compresser.setInput(input);
+ *     compresser.finish();
+ *     int compressedDataLength = compresser.deflate(output);
+ *
+ *     // Decompress the bytes
+ *     Inflater decompresser = new Inflater();
+ *     decompresser.setInput(output, 0, compressedDataLength);
+ *     byte[] result = new byte[100];
+ *     int resultLength = decompresser.inflate(result);
+ *     decompresser.end();
+ *
+ *     // Decode the bytes into a String
+ *     String outputString = new String(result, 0, resultLength, "UTF-8");
+ * } catch(java.io.UnsupportedEncodingException ex) {
+ *     // handle
+ * } catch (java.util.zip.DataFormatException ex) {
+ *     // handle
+ * }
+ * </pre></blockquote>
+ *
+ * @see         Deflater
+ * @author      David Connelly
+ *
+ */
+public
+class Inflater {
+    private final org.apidesign.bck2brwsr.emul.zip.Inflater impl;
+    
+    /**
+     * Creates a new decompressor. If the parameter 'nowrap' is true then
+     * the ZLIB header and checksum fields will not be used. This provides
+     * compatibility with the compression format used by both GZIP and PKZIP.
+     * <p>
+     * Note: When using the 'nowrap' option it is also necessary to provide
+     * an extra "dummy" byte as input. This is required by the ZLIB native
+     * library in order to support certain optimizations.
+     *
+     * @param nowrap if true then support GZIP compatible compression
+     */
+    public Inflater(boolean nowrap) {
+        if (getClass() == org.apidesign.bck2brwsr.emul.zip.Inflater.class) {
+            impl = null;
+        } else {
+            impl = new org.apidesign.bck2brwsr.emul.zip.Inflater(nowrap);
+        }
+    }
+
+    /**
+     * Creates a new decompressor.
+     */
+    public Inflater() {
+        this(false);
+    }
+
+    /**
+     * Sets input data for decompression. Should be called whenever
+     * needsInput() returns true indicating that more input data is
+     * required.
+     * @param b the input data bytes
+     * @param off the start offset of the input data
+     * @param len the length of the input data
+     * @see Inflater#needsInput
+     */
+    public void setInput(byte[] b, int off, int len) {
+        impl.setInput(b, off, len);
+    }
+
+    /**
+     * Sets input data for decompression. Should be called whenever
+     * needsInput() returns true indicating that more input data is
+     * required.
+     * @param b the input data bytes
+     * @see Inflater#needsInput
+     */
+    public void setInput(byte[] b) {
+        impl.setInput(b);
+    }
+
+    /**
+     * Sets the preset dictionary to the given array of bytes. Should be
+     * called when inflate() returns 0 and needsDictionary() returns true
+     * indicating that a preset dictionary is required. The method getAdler()
+     * can be used to get the Adler-32 value of the dictionary needed.
+     * @param b the dictionary data bytes
+     * @param off the start offset of the data
+     * @param len the length of the data
+     * @see Inflater#needsDictionary
+     * @see Inflater#getAdler
+     */
+    public void setDictionary(byte[] b, int off, int len) {
+        impl.setDictionary(b, off, len);
+    }
+
+    /**
+     * Sets the preset dictionary to the given array of bytes. Should be
+     * called when inflate() returns 0 and needsDictionary() returns true
+     * indicating that a preset dictionary is required. The method getAdler()
+     * can be used to get the Adler-32 value of the dictionary needed.
+     * @param b the dictionary data bytes
+     * @see Inflater#needsDictionary
+     * @see Inflater#getAdler
+     */
+    public void setDictionary(byte[] b) {
+        impl.setDictionary(b);
+    }
+
+    /**
+     * Returns the total number of bytes remaining in the input buffer.
+     * This can be used to find out what bytes still remain in the input
+     * buffer after decompression has finished.
+     * @return the total number of bytes remaining in the input buffer
+     */
+    public int getRemaining() {
+        return impl.getRemaining();
+    }
+
+    /**
+     * Returns true if no data remains in the input buffer. This can
+     * be used to determine if #setInput should be called in order
+     * to provide more input.
+     * @return true if no data remains in the input buffer
+     */
+    public boolean needsInput() {
+        return impl.needsInput();
+    }
+
+    /**
+     * Returns true if a preset dictionary is needed for decompression.
+     * @return true if a preset dictionary is needed for decompression
+     * @see Inflater#setDictionary
+     */
+    public boolean needsDictionary() {
+        return impl.needsDictionary();
+    }
+
+    /**
+     * Returns true if the end of the compressed data stream has been
+     * reached.
+     * @return true if the end of the compressed data stream has been
+     * reached
+     */
+    public boolean finished() {
+        return impl.finished();
+    }
+
+    /**
+     * Uncompresses bytes into specified buffer. Returns actual number
+     * of bytes uncompressed. A return value of 0 indicates that
+     * needsInput() or needsDictionary() should be called in order to
+     * determine if more input data or a preset dictionary is required.
+     * In the latter case, getAdler() can be used to get the Adler-32
+     * value of the dictionary required.
+     * @param b the buffer for the uncompressed data
+     * @param off the start offset of the data
+     * @param len the maximum number of uncompressed bytes
+     * @return the actual number of uncompressed bytes
+     * @exception DataFormatException if the compressed data format is invalid
+     * @see Inflater#needsInput
+     * @see Inflater#needsDictionary
+     */
+    public int inflate(byte[] b, int off, int len)
+        throws DataFormatException
+    {
+        return impl.inflate(b, off, len);
+    }
+
+    /**
+     * Uncompresses bytes into specified buffer. Returns actual number
+     * of bytes uncompressed. A return value of 0 indicates that
+     * needsInput() or needsDictionary() should be called in order to
+     * determine if more input data or a preset dictionary is required.
+     * In the latter case, getAdler() can be used to get the Adler-32
+     * value of the dictionary required.
+     * @param b the buffer for the uncompressed data
+     * @return the actual number of uncompressed bytes
+     * @exception DataFormatException if the compressed data format is invalid
+     * @see Inflater#needsInput
+     * @see Inflater#needsDictionary
+     */
+    public int inflate(byte[] b) throws DataFormatException {
+        return impl.inflate(b);
+    }
+
+    /**
+     * Returns the ADLER-32 value of the uncompressed data.
+     * @return the ADLER-32 value of the uncompressed data
+     */
+    public int getAdler() {
+        return impl.getAdler();
+    }
+
+    /**
+     * Returns the total number of compressed bytes input so far.
+     *
+     * <p>Since the number of bytes may be greater than
+     * Integer.MAX_VALUE, the {@link #getBytesRead()} method is now
+     * the preferred means of obtaining this information.</p>
+     *
+     * @return the total number of compressed bytes input so far
+     */
+    public int getTotalIn() {
+        return impl.getTotalIn();
+    }
+
+    /**
+     * Returns the total number of compressed bytes input so far.</p>
+     *
+     * @return the total (non-negative) number of compressed bytes input so far
+     * @since 1.5
+     */
+    public long getBytesRead() {
+        return impl.getBytesRead();
+    }
+
+    /**
+     * Returns the total number of uncompressed bytes output so far.
+     *
+     * <p>Since the number of bytes may be greater than
+     * Integer.MAX_VALUE, the {@link #getBytesWritten()} method is now
+     * the preferred means of obtaining this information.</p>
+     *
+     * @return the total number of uncompressed bytes output so far
+     */
+    public int getTotalOut() {
+        return impl.getTotalOut();
+    }
+
+    /**
+     * Returns the total number of uncompressed bytes output so far.</p>
+     *
+     * @return the total (non-negative) number of uncompressed bytes output so far
+     * @since 1.5
+     */
+    public long getBytesWritten() {
+        return impl.getBytesWritten();
+    }
+
+    /**
+     * Resets inflater so that a new set of input data can be processed.
+     */
+    public void reset() {
+        impl.reset();
+    }
+
+    /**
+     * Closes the decompressor and discards any unprocessed input.
+     * This method should be called when the decompressor is no longer
+     * being used, but will also be called automatically by the finalize()
+     * method. Once this method is called, the behavior of the Inflater
+     * object is undefined.
+     */
+    public void end() {
+        impl.end();
+    }
+
+    /**
+     * Closes the decompressor when garbage is collected.
+     */
+    protected void finalize() {
+        end();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/InflaterInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/InflaterInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,288 @@
+/*
+ * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.EOFException;
+
+/**
+ * This class implements a stream filter for uncompressing data in the
+ * "deflate" compression format. It is also used as the basis for other
+ * decompression filters, such as GZIPInputStream.
+ *
+ * @see         Inflater
+ * @author      David Connelly
+ */
+public
+class InflaterInputStream extends FilterInputStream {
+    /**
+     * Decompressor for this stream.
+     */
+    protected Inflater inf;
+
+    /**
+     * Input buffer for decompression.
+     */
+    protected byte[] buf;
+
+    /**
+     * Length of input buffer.
+     */
+    protected int len;
+
+    private boolean closed = false;
+    // this flag is set to true after EOF has reached
+    private boolean reachEOF = false;
+
+    /**
+     * Check to make sure that this stream has not been closed
+     */
+    private void ensureOpen() throws IOException {
+        if (closed) {
+            throw new IOException("Stream closed");
+        }
+    }
+
+
+    /**
+     * Creates a new input stream with the specified decompressor and
+     * buffer size.
+     * @param in the input stream
+     * @param inf the decompressor ("inflater")
+     * @param size the input buffer size
+     * @exception IllegalArgumentException if size is <= 0
+     */
+    public InflaterInputStream(InputStream in, Inflater inf, int size) {
+        super(in);
+        if (in == null || inf == null) {
+            throw new NullPointerException();
+        } else if (size <= 0) {
+            throw new IllegalArgumentException("buffer size <= 0");
+        }
+        this.inf = inf;
+        buf = new byte[size];
+    }
+
+    /**
+     * Creates a new input stream with the specified decompressor and a
+     * default buffer size.
+     * @param in the input stream
+     * @param inf the decompressor ("inflater")
+     */
+    public InflaterInputStream(InputStream in, Inflater inf) {
+        this(in, inf, 512);
+    }
+
+    boolean usesDefaultInflater = false;
+
+    /**
+     * Creates a new input stream with a default decompressor and buffer size.
+     * @param in the input stream
+     */
+    public InflaterInputStream(InputStream in) {
+        this(in, new Inflater());
+        usesDefaultInflater = true;
+    }
+
+    private byte[] singleByteBuf = new byte[1];
+
+    /**
+     * Reads a byte of uncompressed data. This method will block until
+     * enough input is available for decompression.
+     * @return the byte read, or -1 if end of compressed input is reached
+     * @exception IOException if an I/O error has occurred
+     */
+    public int read() throws IOException {
+        ensureOpen();
+        return read(singleByteBuf, 0, 1) == -1 ? -1 : singleByteBuf[0] & 0xff;
+    }
+
+    /**
+     * Reads uncompressed data into an array of bytes. If <code>len</code> is not
+     * zero, the method will block until some input can be decompressed; otherwise,
+     * no bytes are read and <code>0</code> is returned.
+     * @param b the buffer into which the data is read
+     * @param off the start offset in the destination array <code>b</code>
+     * @param len the maximum number of bytes read
+     * @return the actual number of bytes read, or -1 if the end of the
+     *         compressed input is reached or a preset dictionary is needed
+     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
+     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
+     * <code>len</code> is negative, or <code>len</code> is greater than
+     * <code>b.length - off</code>
+     * @exception ZipException if a ZIP format error has occurred
+     * @exception IOException if an I/O error has occurred
+     */
+    public int read(byte[] b, int off, int len) throws IOException {
+        ensureOpen();
+        if (b == null) {
+            throw new NullPointerException();
+        } else if (off < 0 || len < 0 || len > b.length - off) {
+            throw new IndexOutOfBoundsException();
+        } else if (len == 0) {
+            return 0;
+        }
+        try {
+            int n;
+            while ((n = inf.inflate(b, off, len)) == 0) {
+                if (inf.finished() || inf.needsDictionary()) {
+                    reachEOF = true;
+                    return -1;
+                }
+                if (inf.needsInput()) {
+                    fill();
+                }
+            }
+            return n;
+        } catch (DataFormatException e) {
+            String s = e.getMessage();
+            throw new ZipException(s != null ? s : "Invalid ZLIB data format");
+        }
+    }
+
+    /**
+     * Returns 0 after EOF has been reached, otherwise always return 1.
+     * <p>
+     * Programs should not count on this method to return the actual number
+     * of bytes that could be read without blocking.
+     *
+     * @return     1 before EOF and 0 after EOF.
+     * @exception  IOException  if an I/O error occurs.
+     *
+     */
+    public int available() throws IOException {
+        ensureOpen();
+        if (reachEOF) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    private byte[] b = new byte[512];
+
+    /**
+     * Skips specified number of bytes of uncompressed data.
+     * @param n the number of bytes to skip
+     * @return the actual number of bytes skipped.
+     * @exception IOException if an I/O error has occurred
+     * @exception IllegalArgumentException if n < 0
+     */
+    public long skip(long n) throws IOException {
+        if (n < 0) {
+            throw new IllegalArgumentException("negative skip length");
+        }
+        ensureOpen();
+        int max = (int)Math.min(n, Integer.MAX_VALUE);
+        int total = 0;
+        while (total < max) {
+            int len = max - total;
+            if (len > b.length) {
+                len = b.length;
+            }
+            len = read(b, 0, len);
+            if (len == -1) {
+                reachEOF = true;
+                break;
+            }
+            total += len;
+        }
+        return total;
+    }
+
+    /**
+     * Closes this input stream and releases any system resources associated
+     * with the stream.
+     * @exception IOException if an I/O error has occurred
+     */
+    public void close() throws IOException {
+        if (!closed) {
+            if (usesDefaultInflater)
+                inf.end();
+            in.close();
+            closed = true;
+        }
+    }
+
+    /**
+     * Fills input buffer with more data to decompress.
+     * @exception IOException if an I/O error has occurred
+     */
+    protected void fill() throws IOException {
+        ensureOpen();
+        len = in.read(buf, 0, buf.length);
+        if (len == -1) {
+            throw new EOFException("Unexpected end of ZLIB input stream");
+        }
+        inf.setInput(buf, 0, len);
+    }
+
+    /**
+     * Tests if this input stream supports the <code>mark</code> and
+     * <code>reset</code> methods. The <code>markSupported</code>
+     * method of <code>InflaterInputStream</code> returns
+     * <code>false</code>.
+     *
+     * @return  a <code>boolean</code> indicating if this stream type supports
+     *          the <code>mark</code> and <code>reset</code> methods.
+     * @see     java.io.InputStream#mark(int)
+     * @see     java.io.InputStream#reset()
+     */
+    public boolean markSupported() {
+        return false;
+    }
+
+    /**
+     * Marks the current position in this input stream.
+     *
+     * <p> The <code>mark</code> method of <code>InflaterInputStream</code>
+     * does nothing.
+     *
+     * @param   readlimit   the maximum limit of bytes that can be read before
+     *                      the mark position becomes invalid.
+     * @see     java.io.InputStream#reset()
+     */
+    public synchronized void mark(int readlimit) {
+    }
+
+    /**
+     * Repositions this stream to the position at the time the
+     * <code>mark</code> method was last called on this input stream.
+     *
+     * <p> The method <code>reset</code> for class
+     * <code>InflaterInputStream</code> does nothing except throw an
+     * <code>IOException</code>.
+     *
+     * @exception  IOException  if this method is invoked.
+     * @see     java.io.InputStream#mark(int)
+     * @see     java.io.IOException
+     */
+    public synchronized void reset() throws IOException {
+        throw new IOException("mark/reset not supported");
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/ZStreamRef.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/ZStreamRef.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+/**
+ * A reference to the native zlib's z_stream structure.
+ */
+
+class ZStreamRef {
+
+    private long address;
+    ZStreamRef (long address) {
+        this.address = address;
+    }
+
+    long address() {
+        return address;
+    }
+
+    void clear() {
+        address = 0;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/ZipConstants.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/ZipConstants.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 1995, 1996, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+/*
+ * This interface defines the constants that are used by the classes
+ * which manipulate ZIP files.
+ *
+ * @author      David Connelly
+ */
+interface ZipConstants {
+    /*
+     * Header signatures
+     */
+    static long LOCSIG = 0x04034b50L;   // "PK\003\004"
+    static long EXTSIG = 0x08074b50L;   // "PK\007\008"
+    static long CENSIG = 0x02014b50L;   // "PK\001\002"
+    static long ENDSIG = 0x06054b50L;   // "PK\005\006"
+
+    /*
+     * Header sizes in bytes (including signatures)
+     */
+    static final int LOCHDR = 30;       // LOC header size
+    static final int EXTHDR = 16;       // EXT header size
+    static final int CENHDR = 46;       // CEN header size
+    static final int ENDHDR = 22;       // END header size
+
+    /*
+     * Local file (LOC) header field offsets
+     */
+    static final int LOCVER = 4;        // version needed to extract
+    static final int LOCFLG = 6;        // general purpose bit flag
+    static final int LOCHOW = 8;        // compression method
+    static final int LOCTIM = 10;       // modification time
+    static final int LOCCRC = 14;       // uncompressed file crc-32 value
+    static final int LOCSIZ = 18;       // compressed size
+    static final int LOCLEN = 22;       // uncompressed size
+    static final int LOCNAM = 26;       // filename length
+    static final int LOCEXT = 28;       // extra field length
+
+    /*
+     * Extra local (EXT) header field offsets
+     */
+    static final int EXTCRC = 4;        // uncompressed file crc-32 value
+    static final int EXTSIZ = 8;        // compressed size
+    static final int EXTLEN = 12;       // uncompressed size
+
+    /*
+     * Central directory (CEN) header field offsets
+     */
+    static final int CENVEM = 4;        // version made by
+    static final int CENVER = 6;        // version needed to extract
+    static final int CENFLG = 8;        // encrypt, decrypt flags
+    static final int CENHOW = 10;       // compression method
+    static final int CENTIM = 12;       // modification time
+    static final int CENCRC = 16;       // uncompressed file crc-32 value
+    static final int CENSIZ = 20;       // compressed size
+    static final int CENLEN = 24;       // uncompressed size
+    static final int CENNAM = 28;       // filename length
+    static final int CENEXT = 30;       // extra field length
+    static final int CENCOM = 32;       // comment length
+    static final int CENDSK = 34;       // disk number start
+    static final int CENATT = 36;       // internal file attributes
+    static final int CENATX = 38;       // external file attributes
+    static final int CENOFF = 42;       // LOC header offset
+
+    /*
+     * End of central directory (END) header field offsets
+     */
+    static final int ENDSUB = 8;        // number of entries on this disk
+    static final int ENDTOT = 10;       // total number of entries
+    static final int ENDSIZ = 12;       // central directory size in bytes
+    static final int ENDOFF = 16;       // offset of first CEN header
+    static final int ENDCOM = 20;       // zip file comment length
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/ZipEntry.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/ZipEntry.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+/**
+ * This class is used to represent a ZIP file entry.
+ *
+ * @author      David Connelly
+ */
+public
+class ZipEntry implements ZipConstants, Cloneable {
+    String name;        // entry name
+    long time = -1;     // modification time (in DOS time)
+    long crc = -1;      // crc-32 of entry data
+    long size = -1;     // uncompressed size of entry data
+    long csize = -1;    // compressed size of entry data
+    int method = -1;    // compression method
+    int flag = 0;       // general purpose flag
+    byte[] extra;       // optional extra field data for entry
+    String comment;     // optional comment string for entry
+
+    /**
+     * Compression method for uncompressed entries.
+     */
+    public static final int STORED = 0;
+
+    /**
+     * Compression method for compressed (deflated) entries.
+     */
+    public static final int DEFLATED = 8;
+
+    /**
+     * Creates a new zip entry with the specified name.
+     *
+     * @param name the entry name
+     * @exception NullPointerException if the entry name is null
+     * @exception IllegalArgumentException if the entry name is longer than
+     *            0xFFFF bytes
+     */
+    public ZipEntry(String name) {
+        if (name == null) {
+            throw new NullPointerException();
+        }
+        if (name.length() > 0xFFFF) {
+            throw new IllegalArgumentException("entry name too long");
+        }
+        this.name = name;
+    }
+
+    /**
+     * Creates a new zip entry with fields taken from the specified
+     * zip entry.
+     * @param e a zip Entry object
+     */
+    public ZipEntry(ZipEntry e) {
+        name = e.name;
+        time = e.time;
+        crc = e.crc;
+        size = e.size;
+        csize = e.csize;
+        method = e.method;
+        flag = e.flag;
+        extra = e.extra;
+        comment = e.comment;
+    }
+
+    /*
+     * Creates a new un-initialized zip entry
+     */
+    ZipEntry() {}
+
+    /**
+     * Returns the name of the entry.
+     * @return the name of the entry
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the modification time of the entry.
+     * @param time the entry modification time in number of milliseconds
+     *             since the epoch
+     * @see #getTime()
+     */
+    public void setTime(long time) {
+        this.time = javaToDosTime(time);
+    }
+
+    /**
+     * Returns the modification time of the entry, or -1 if not specified.
+     * @return the modification time of the entry, or -1 if not specified
+     * @see #setTime(long)
+     */
+    public long getTime() {
+        return time != -1 ? dosToJavaTime(time) : -1;
+    }
+
+    /**
+     * Sets the uncompressed size of the entry data.
+     * @param size the uncompressed size in bytes
+     * @exception IllegalArgumentException if the specified size is less
+     *            than 0, is greater than 0xFFFFFFFF when
+     *            <a href="package-summary.html#zip64">ZIP64 format</a> is not supported,
+     *            or is less than 0 when ZIP64 is supported
+     * @see #getSize()
+     */
+    public void setSize(long size) {
+        if (size < 0) {
+            throw new IllegalArgumentException("invalid entry size");
+        }
+        this.size = size;
+    }
+
+    /**
+     * Returns the uncompressed size of the entry data, or -1 if not known.
+     * @return the uncompressed size of the entry data, or -1 if not known
+     * @see #setSize(long)
+     */
+    public long getSize() {
+        return size;
+    }
+
+    /**
+     * Returns the size of the compressed entry data, or -1 if not known.
+     * In the case of a stored entry, the compressed size will be the same
+     * as the uncompressed size of the entry.
+     * @return the size of the compressed entry data, or -1 if not known
+     * @see #setCompressedSize(long)
+     */
+    public long getCompressedSize() {
+        return csize;
+    }
+
+    /**
+     * Sets the size of the compressed entry data.
+     * @param csize the compressed size to set to
+     * @see #getCompressedSize()
+     */
+    public void setCompressedSize(long csize) {
+        this.csize = csize;
+    }
+
+    /**
+     * Sets the CRC-32 checksum of the uncompressed entry data.
+     * @param crc the CRC-32 value
+     * @exception IllegalArgumentException if the specified CRC-32 value is
+     *            less than 0 or greater than 0xFFFFFFFF
+     * @see #getCrc()
+     */
+    public void setCrc(long crc) {
+        if (crc < 0 || crc > 0xFFFFFFFFL) {
+            throw new IllegalArgumentException("invalid entry crc-32");
+        }
+        this.crc = crc;
+    }
+
+    /**
+     * Returns the CRC-32 checksum of the uncompressed entry data, or -1 if
+     * not known.
+     * @return the CRC-32 checksum of the uncompressed entry data, or -1 if
+     * not known
+     * @see #setCrc(long)
+     */
+    public long getCrc() {
+        return crc;
+    }
+
+    /**
+     * Sets the compression method for the entry.
+     * @param method the compression method, either STORED or DEFLATED
+     * @exception IllegalArgumentException if the specified compression
+     *            method is invalid
+     * @see #getMethod()
+     */
+    public void setMethod(int method) {
+        if (method != STORED && method != DEFLATED) {
+            throw new IllegalArgumentException("invalid compression method");
+        }
+        this.method = method;
+    }
+
+    /**
+     * Returns the compression method of the entry, or -1 if not specified.
+     * @return the compression method of the entry, or -1 if not specified
+     * @see #setMethod(int)
+     */
+    public int getMethod() {
+        return method;
+    }
+
+    /**
+     * Sets the optional extra field data for the entry.
+     * @param extra the extra field data bytes
+     * @exception IllegalArgumentException if the length of the specified
+     *            extra field data is greater than 0xFFFF bytes
+     * @see #getExtra()
+     */
+    public void setExtra(byte[] extra) {
+        if (extra != null && extra.length > 0xFFFF) {
+            throw new IllegalArgumentException("invalid extra field length");
+        }
+        this.extra = extra;
+    }
+
+    /**
+     * Returns the extra field data for the entry, or null if none.
+     * @return the extra field data for the entry, or null if none
+     * @see #setExtra(byte[])
+     */
+    public byte[] getExtra() {
+        return extra;
+    }
+
+    /**
+     * Sets the optional comment string for the entry.
+     *
+     * <p>ZIP entry comments have maximum length of 0xffff. If the length of the
+     * specified comment string is greater than 0xFFFF bytes after encoding, only
+     * the first 0xFFFF bytes are output to the ZIP file entry.
+     *
+     * @param comment the comment string
+     *
+     * @see #getComment()
+     */
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    /**
+     * Returns the comment string for the entry, or null if none.
+     * @return the comment string for the entry, or null if none
+     * @see #setComment(String)
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Returns true if this is a directory entry. A directory entry is
+     * defined to be one whose name ends with a '/'.
+     * @return true if this is a directory entry
+     */
+    public boolean isDirectory() {
+        return name.endsWith("/");
+    }
+
+    /**
+     * Returns a string representation of the ZIP entry.
+     */
+    public String toString() {
+        return getName();
+    }
+
+    /*
+     * Converts DOS time to Java time (number of milliseconds since epoch).
+     */
+    private static long dosToJavaTime(long dtime) {
+        return dtime;
+        /* XXX:
+        Date d = new Date((int)(((dtime >> 25) & 0x7f) + 80),
+                          (int)(((dtime >> 21) & 0x0f) - 1),
+                          (int)((dtime >> 16) & 0x1f),
+                          (int)((dtime >> 11) & 0x1f),
+                          (int)((dtime >> 5) & 0x3f),
+                          (int)((dtime << 1) & 0x3e));
+        return d.getTime();
+        */
+    }
+
+    /*
+     * Converts Java time to DOS time.
+     */
+    private static long javaToDosTime(long time) {
+        return time;
+        /* XXX:
+        Date d = new Date(time);
+        int year = d.getYear() + 1900;
+        if (year < 1980) {
+            return (1 << 21) | (1 << 16);
+        }
+        return (year - 1980) << 25 | (d.getMonth() + 1) << 21 |
+               d.getDate() << 16 | d.getHours() << 11 | d.getMinutes() << 5 |
+               d.getSeconds() >> 1;
+        */
+    }
+
+    /**
+     * Returns the hash code value for this entry.
+     */
+    public int hashCode() {
+        return name.hashCode();
+    }
+
+    /**
+     * Returns a copy of this entry.
+     */
+    public Object clone() {
+        try {
+            ZipEntry e = (ZipEntry)super.clone();
+            e.extra = (extra == null) ? null : extra.clone();
+            return e;
+        } catch (CloneNotSupportedException e) {
+            // This should never happen, since we are Cloneable
+            throw new IllegalStateException();
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/ZipException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/ZipException.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+import java.io.IOException;
+
+/**
+ * Signals that a Zip exception of some sort has occurred.
+ *
+ * @author  unascribed
+ * @see     java.io.IOException
+ * @since   JDK1.0
+ */
+
+public
+class ZipException extends IOException {
+    private static final long serialVersionUID = 8000196834066748623L;
+
+    /**
+     * Constructs a <code>ZipException</code> with <code>null</code>
+     * as its error detail message.
+     */
+    public ZipException() {
+        super();
+    }
+
+    /**
+     * Constructs a <code>ZipException</code> with the specified detail
+     * message.
+     *
+     * @param   s   the detail message.
+     */
+
+    public ZipException(String s) {
+        super(s);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/ZipInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/ZipInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.util.zip;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * This class implements an input stream filter for reading files in the
+ * ZIP file format. Includes support for both compressed and uncompressed
+ * entries.
+ *
+ * @author      David Connelly
+ */
+public
+class ZipInputStream extends InflaterInputStream implements ZipConstants {
+    private final org.apidesign.bck2brwsr.emul.zip.ZipInputStream impl;
+
+    /**
+     * Creates a new ZIP input stream.
+     *
+     * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
+     * decode the entry names.
+     *
+     * @param in the actual input stream
+     */
+    public ZipInputStream(InputStream in) {
+        super(in);
+        impl = new org.apidesign.bck2brwsr.emul.zip.ZipInputStream(in);
+    }
+
+    /**
+     * Creates a new ZIP input stream.
+     *
+     * @param in the actual input stream
+     *
+     * @param charset
+     *        The {@linkplain java.nio.charset.Charset charset} to be
+     *        used to decode the ZIP entry name (ignored if the
+     *        <a href="package-summary.html#lang_encoding"> language
+     *        encoding bit</a> of the ZIP entry's general purpose bit
+     *        flag is set).
+     *
+     * @since 1.7
+     *
+    public ZipInputStream(InputStream in, Charset charset) {
+        super(new PushbackInputStream(in, 512), new Inflater(true), 512);
+        usesDefaultInflater = true;
+        if(in == null) {
+            throw new NullPointerException("in is null");
+        }
+        if (charset == null)
+            throw new NullPointerException("charset is null");
+        this.zc = ZipCoder.get(charset);
+    }
+    */
+
+    /**
+     * Reads the next ZIP file entry and positions the stream at the
+     * beginning of the entry data.
+     * @return the next ZIP file entry, or null if there are no more entries
+     * @exception ZipException if a ZIP file error has occurred
+     * @exception IOException if an I/O error has occurred
+     */
+    public ZipEntry getNextEntry() throws IOException {
+        return impl.getNextEntry();
+    }
+
+    /**
+     * Closes the current ZIP entry and positions the stream for reading the
+     * next entry.
+     * @exception ZipException if a ZIP file error has occurred
+     * @exception IOException if an I/O error has occurred
+     */
+    public void closeEntry() throws IOException {
+        impl.closeEntry();
+    }
+
+    /**
+     * Returns 0 after EOF has reached for the current entry data,
+     * otherwise always return 1.
+     * <p>
+     * Programs should not count on this method to return the actual number
+     * of bytes that could be read without blocking.
+     *
+     * @return     1 before EOF and 0 after EOF has reached for current entry.
+     * @exception  IOException  if an I/O error occurs.
+     *
+     */
+    public int available() throws IOException {
+        return impl.available();
+    }
+
+    /**
+     * Reads from the current ZIP entry into an array of bytes.
+     * If <code>len</code> is not zero, the method
+     * blocks until some input is available; otherwise, no
+     * bytes are read and <code>0</code> is returned.
+     * @param b the buffer into which the data is read
+     * @param off the start offset in the destination array <code>b</code>
+     * @param len the maximum number of bytes read
+     * @return the actual number of bytes read, or -1 if the end of the
+     *         entry is reached
+     * @exception  NullPointerException if <code>b</code> is <code>null</code>.
+     * @exception  IndexOutOfBoundsException if <code>off</code> is negative,
+     * <code>len</code> is negative, or <code>len</code> is greater than
+     * <code>b.length - off</code>
+     * @exception ZipException if a ZIP file error has occurred
+     * @exception IOException if an I/O error has occurred
+     */
+    public int read(byte[] b, int off, int len) throws IOException {
+        return impl.read(b, off, len);
+    }
+
+    /**
+     * Skips specified number of bytes in the current ZIP entry.
+     * @param n the number of bytes to skip
+     * @return the actual number of bytes skipped
+     * @exception ZipException if a ZIP file error has occurred
+     * @exception IOException if an I/O error has occurred
+     * @exception IllegalArgumentException if n < 0
+     */
+    public long skip(long n) throws IOException {
+        return impl.skip(n);
+    }
+
+    /**
+     * Closes this input stream and releases any system resources associated
+     * with the stream.
+     * @exception IOException if an I/O error has occurred
+     */
+    public void close() throws IOException {
+        impl.close();
+    }
+
+    /**
+     * Creates a new <code>ZipEntry</code> object for the specified
+     * entry name.
+     *
+     * @param name the ZIP file entry name
+     * @return the ZipEntry just created
+     */
+    protected ZipEntry createZipEntry(String name) {
+        return new ZipEntry(name);
+    }
+
+    @Override
+    public int read() throws IOException {
+        return impl.read();
+    }
+
+    @Override
+    public boolean markSupported() {
+        return impl.markSupported();
+    }
+
+    @Override
+    public void mark(int readlimit) {
+        impl.mark(readlimit);
+    }
+
+    @Override
+    public void reset() throws IOException {
+        impl.reset();
+    }
+
+    @Override
+    public int read(byte[] b) throws IOException {
+        return impl.read(b);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/java/util/zip/package.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/java/util/zip/package.html	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+This code is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 only, as
+published by the Free Software Foundation.  Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the LICENSE file that accompanied this code.
+
+This code is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+version 2 for more details (a copy is included in the LICENSE file that
+accompanied this code).
+
+You should have received a copy of the GNU General Public License version
+2 along with this work; if not, write to the Free Software Foundation,
+Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
+-->
+
+</head>
+<body bgcolor="white">
+
+Provides classes for reading and writing the standard ZIP and GZIP
+file formats.  Also includes classes for compressing and decompressing
+data using the DEFLATE compression algorithm, which is used by the
+ZIP and GZIP file formats. Additionally, there are utility classes
+for computing the CRC-32 and Adler-32 checksums of arbitrary
+input streams.
+
+
+<h2>Package Specification</h2>
+
+</a>
+<ul>
+  <li><a href="ftp://ftp.uu.net/pub/archiving/zip/doc/appnote-970311-iz.zip">
+      Info-ZIP Application Note 970311
+      </a> - a detailed description of the Info-ZIP format upon which
+      the <code>java.util.zip</code> classes are based.
+<p>
+  <a name="zip64">
+  <li>An implementation may optionally support the ZIP64(tm) format extensions
+      defined by the 
+      <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">
+      PKWARE ZIP File Format Specification</a>. The ZIP64(tm) format extensions
+      are used to overcome the size limitations of the original ZIP format.
+<p>
+  <a name="lang_encoding">
+  <li>APPENDIX D of <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">
+      PKWARE ZIP File Format Specification</a> - Language Encoding Flag (EFS) to
+      encode ZIP entry filename and comment fields using UTF-8.
+<p>
+  <li><a href="http://www.ietf.org/rfc/rfc1950.txt">
+      ZLIB Compressed Data Format Specification version 3.3</a>
+      &nbsp;
+      <a href="http://www.ietf.org/rfc/rfc1950.txt.pdf">(pdf)</a>
+      (RFC 1950)
+<p>
+  <li><a href="http://www.ietf.org/rfc/rfc1951.txt">
+      DEFLATE Compressed Data Format Specification version 1.3</a>
+      &nbsp;
+      <a href="http://www.ietf.org/rfc/rfc1951.txt.pdf">(pdf)</a>
+      (RFC 1951)
+<p>
+  <li><a href="http://www.ietf.org/rfc/rfc1952.txt">
+      GZIP file format specification version 4.3</a>
+      &nbsp;
+      <a href="http://www.ietf.org/rfc/rfc1952.txt.pdf">(pdf)</a>
+      (RFC 1952)
+<p>
+  <li>CRC-32 checksum is described in RFC 1952 (above)
+<p>
+  <li>Adler-32 checksum is described in RFC 1950 (above)
+</ul>
+
+
+<!--
+<h2>Related Documentation</h2>
+
+For overviews, tutorials, examples, guides, and tool documentation, please see:
+<ul>
+  <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
+</ul>
+-->
+
+@since JDK1.1
+</body>
+</html>
+
+
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/ManifestInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/ManifestInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.apidesign.bck2brwsr.emul.lang;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/*
+ * A fast buffered input stream for parsing manifest files.
+ * 
+ * Taken from java.util.jar.Manifest.FastInputStream and modified to be
+ * independent of other Manifest functionality.
+ */
+public abstract class ManifestInputStream extends FilterInputStream {
+    private byte[] buf;
+    private int count = 0;
+    private int pos = 0;
+
+    protected ManifestInputStream(InputStream in) {
+        this(in, 8192);
+    }
+
+    protected ManifestInputStream(InputStream in, int size) {
+        super(in);
+        buf = new byte[size];
+    }
+
+    public int read() throws IOException {
+        if (pos >= count) {
+            fill();
+            if (pos >= count) {
+                return -1;
+            }
+        }
+        return buf[pos++] & 0xff;
+    }
+
+    public int read(byte[] b, int off, int len) throws IOException {
+        int avail = count - pos;
+        if (avail <= 0) {
+            if (len >= buf.length) {
+                return in.read(b, off, len);
+            }
+            fill();
+            avail = count - pos;
+            if (avail <= 0) {
+                return -1;
+            }
+        }
+        if (len > avail) {
+            len = avail;
+        }
+        System.arraycopy(buf, pos, b, off, len);
+        pos += len;
+        return len;
+    }
+
+    /*
+     * Reads 'len' bytes from the input stream, or until an end-of-line
+     * is reached. Returns the number of bytes read.
+     */
+    public int readLine(byte[] b, int off, int len) throws IOException {
+        byte[] tbuf = this.buf;
+        int total = 0;
+        while (total < len) {
+            int avail = count - pos;
+            if (avail <= 0) {
+                fill();
+                avail = count - pos;
+                if (avail <= 0) {
+                    return -1;
+                }
+            }
+            int n = len - total;
+            if (n > avail) {
+                n = avail;
+            }
+            int tpos = pos;
+            int maxpos = tpos + n;
+            while (tpos < maxpos && tbuf[tpos++] != '\n') {
+                ;
+            }
+            n = tpos - pos;
+            System.arraycopy(tbuf, pos, b, off, n);
+            off += n;
+            total += n;
+            pos = tpos;
+            if (tbuf[tpos - 1] == '\n') {
+                break;
+            }
+        }
+        return total;
+    }
+
+    public byte peek() throws IOException {
+        if (pos == count) {
+            fill();
+        }
+        if (pos == count) {
+            return -1; // nothing left in buffer
+        }
+        return buf[pos];
+    }
+
+    public int readLine(byte[] b) throws IOException {
+        return readLine(b, 0, b.length);
+    }
+
+    public long skip(long n) throws IOException {
+        if (n <= 0) {
+            return 0;
+        }
+        long avail = count - pos;
+        if (avail <= 0) {
+            return in.skip(n);
+        }
+        if (n > avail) {
+            n = avail;
+        }
+        pos += n;
+        return n;
+    }
+
+    public int available() throws IOException {
+        return (count - pos) + in.available();
+    }
+
+    public void close() throws IOException {
+        if (in != null) {
+            in.close();
+            in = null;
+            buf = null;
+        }
+    }
+
+    private void fill() throws IOException {
+        count = pos = 0;
+        int n = in.read(buf, 0, buf.length);
+        if (n > 0) {
+            count = n;
+        }
+    }
+    
+    protected abstract String putValue(String key, String value);
+
+    public void readAttributes(byte[] lbuf) throws IOException {
+        ManifestInputStream is = this;
+
+        String name = null;
+        String value = null;
+        byte[] lastline = null;
+        int len;
+        while ((len = is.readLine(lbuf)) != -1) {
+            boolean lineContinued = false;
+            if (lbuf[--len] != '\n') {
+                throw new IOException("line too long");
+            }
+            if (len > 0 && lbuf[len - 1] == '\r') {
+                --len;
+            }
+            if (len == 0) {
+                break;
+            }
+            int i = 0;
+            if (lbuf[0] == ' ') {
+                if (name == null) {
+                    throw new IOException("misplaced continuation line");
+                }
+                lineContinued = true;
+                byte[] buf = new byte[lastline.length + len - 1];
+                System.arraycopy(lastline, 0, buf, 0, lastline.length);
+                System.arraycopy(lbuf, 1, buf, lastline.length, len - 1);
+                if (is.peek() == ' ') {
+                    lastline = buf;
+                    continue;
+                }
+                value = new String(buf, 0, buf.length, "UTF8");
+                lastline = null;
+            } else {
+                while (lbuf[i++] != ':') {
+                    if (i >= len) {
+                        throw new IOException("invalid header field");
+                    }
+                }
+                if (lbuf[i++] != ' ') {
+                    throw new IOException("invalid header field");
+                }
+                name = new String(lbuf, 0, 0, i - 2);
+                if (is.peek() == ' ') {
+                    lastline = new byte[len - i];
+                    System.arraycopy(lbuf, i, lastline, 0, len - i);
+                    continue;
+                }
+                value = new String(lbuf, i, len - i, "UTF8");
+            }
+            try {
+                if ((putValue(name, value) != null) && (!lineContinued)) {
+                    throw new IOException("Duplicate name in Manifest: " + name + ".\n" + "Ensure that the manifest does not " + "have duplicate entries, and\n" + "that blank lines separate " + "individual sections in both your\n" + "manifest and in the META-INF/MANIFEST.MF " + "entry in the jar file.");
+                }
+            } catch (IllegalArgumentException e) {
+                throw new IOException("invalid header field name: " + name);
+            }
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,74 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.emul.lang;
+
+import java.lang.reflect.Method;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class System {
+    private System() {
+    }
+
+    @JavaScriptBody(args = { "value", "srcBegin", "dst", "dstBegin", "count" }, body = 
+        "if (srcBegin < dstBegin) {\n" +
+        "    while (count-- > 0) {\n" +
+        "        dst[dstBegin + count] = value[srcBegin + count];\n" +
+        "    }\n" +
+        "} else {\n" +
+        "    while (count-- > 0) {\n" +
+        "        dst[dstBegin++] = value[srcBegin++];\n" +
+        "    }\n" +
+        "}"
+    )
+    public static void arraycopy(Object src, int srcBegin, Object dst, int dstBegin, int count) {
+        try {
+            Class<?> system = Class.forName("java.lang.System");
+            Method m = system.getMethod("arraycopy", Object.class, int.class, Object.class, int.class, int.class);
+            m.invoke(null, src, srcBegin, dst, dstBegin, count);
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    @JavaScriptBody(args = { "arr", "expectedSize" }, body = 
+        "while (expectedSize-- > arr.length) { arr.push(0); }; return arr;"
+    )
+    public static native byte[] expandArray(byte[] arr, int expectedSize);
+
+    @JavaScriptBody(args = { "arr", "expectedSize" }, body = 
+        "while (expectedSize-- > arr.length) { arr.push(0); }; return arr;"
+    )
+    public static native char[] expandArray(char[] arr, int expectedSize);
+
+    @JavaScriptBody(args = {}, body = "return new Date().getTime();")
+    private static native double currentTimeMillisDouble();
+
+    public static long currentTimeMillis() {
+        return (long) currentTimeMillisDouble();
+    }
+
+    public static long nanoTime() {
+        return 1000000L * currentTimeMillis();
+    }
+    @JavaScriptBody(args = { "obj" }, body="return vm.java_lang_Object(false).hashCode__I.call(obj);")
+    public static native int identityHashCode(Object obj);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/AnnotationImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/AnnotationImpl.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,130 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.emul.reflect;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class AnnotationImpl implements Annotation {
+    private final Class<? extends Annotation> type;
+
+    public AnnotationImpl(Class<? extends Annotation> type) {
+        this.type = type;
+    }
+    
+    public Class<? extends Annotation> annotationType() {
+        return type;
+    }
+
+    @JavaScriptBody(args = { "a", "n", "arr", "values" }, body = ""
+        + "function f(val, prop, clazz) {\n"
+        + "  return function() {\n"
+        + "    if (clazz == null) return val[prop];\n"
+        + "    if (clazz.isArray__Z()) {\n"
+        + "      var valarr = val[prop];\n"
+        + "      var cmp = clazz.getComponentType__Ljava_lang_Class_2();\n"
+        + "      var retarr = vm.java_lang_reflect_Array(false).newInstance__Ljava_lang_Object_2Ljava_lang_Class_2I(cmp, valarr.length);\n"
+        + "      for (var i = 0; i < valarr.length; i++) {\n"
+        + "        retarr[i] = CLS.prototype.c__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_Object_2(cmp, valarr[i]);\n"
+        + "      }\n"
+        + "      return retarr;\n"
+        + "    }\n"
+        + "    return CLS.prototype.c__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_Object_2(clazz, val[prop]);\n"
+        + "  };\n"
+        + "}\n"
+        + "for (var i = 0; i < arr.length; i += 3) {\n"
+        + "  var m = arr[i];\n"
+        + "  var p = arr[i + 1];\n"
+        + "  var c = arr[i + 2];\n"
+        + "  a[m] = f(values, p, c);\n"
+        + "}\n"
+        + "a['$instOf_' + n] = true;\n"
+        + "return a;"
+    )
+    private static native <T extends Annotation> T create(
+        AnnotationImpl a, String n, Object[] methodsAndProps, Object values
+    );
+    
+    private static Object c(Class<? extends Annotation> a, Object v) {
+        return create(a, v);
+    }
+    
+    public static <T extends Annotation> T create(Class<T> annoClass, Object values) {
+        return create(new AnnotationImpl(annoClass), 
+            annoClass.getName().replace('.', '_'), 
+            findProps(annoClass), values
+        );
+    }
+
+    public static Annotation[] create(Object anno) {
+        String[] names = findNames(anno);
+        Annotation[] ret = new Annotation[names.length];
+        for (int i = 0; i < names.length; i++) {
+            String annoNameSlash = names[i].substring(1, names[i].length() - 1);
+            Class<? extends Annotation> annoClass;
+            try {
+                annoClass = (Class<? extends Annotation>)Class.forName(annoNameSlash.replace('/', '.'));
+            } catch (ClassNotFoundException ex) {
+                throw new IllegalStateException("Can't find annotation class " + annoNameSlash);
+            }
+            ret[i] = create(
+                new AnnotationImpl(annoClass), 
+                annoNameSlash.replace('/', '_'),
+                findProps(annoClass),
+                findData(anno, names[i])
+            );
+        }
+        return ret;
+    }
+    @JavaScriptBody(args = "anno", body =
+          "var arr = new Array();"
+        + "var props = Object.getOwnPropertyNames(anno);\n"
+        + "for (var i = 0; i < props.length; i++) {\n"
+        + "  var p = props[i];\n"
+        + "  arr.push(p);"
+        + "}"
+        + "return arr;"
+    )
+    private static native String[] findNames(Object anno);
+
+    @JavaScriptBody(args={ "anno", "p"}, body="return anno[p];")
+    private static native Object findData(Object anno, String p);
+
+    private static Object[] findProps(Class<?> annoClass) {
+        final Method[] marr = MethodImpl.findMethods(annoClass, Modifier.PUBLIC);
+        Object[] arr = new Object[marr.length * 3];
+        int pos = 0;
+        for (Method m : marr) {
+            arr[pos++] = MethodImpl.toSignature(m);
+            arr[pos++] = m.getName();
+            final Class<?> rt = m.getReturnType();
+            if (rt.isArray()) {
+                arr[pos++] = rt.getComponentType().isAnnotation() ? rt : null;
+            } else {
+                arr[pos++] = rt.isAnnotation() ? rt : null;
+            }
+        }
+        return arr;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/MethodImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/MethodImpl.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,224 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.emul.reflect;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.util.Enumeration;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/** Utilities to work on methods.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public abstract class MethodImpl {
+    public static MethodImpl INSTANCE;
+    static {
+        try {
+            Class.forName(Method.class.getName());
+        } catch (ClassNotFoundException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    protected abstract Method create(Class<?> declaringClass, String name, Object data, String sig);
+    
+    
+    //
+    // bck2brwsr implementation
+    //
+
+    @JavaScriptBody(args = {"clazz", "prefix"},
+        body = ""
+        + "var c = clazz.cnstr.prototype;"
+        + "var arr = new Array();\n"
+        + "for (m in c) {\n"
+        + "  if (m.indexOf(prefix) === 0) {\n"
+        + "     if (!c[m].cls) continue;\n"
+        + "     arr.push(m);\n"
+        + "     arr.push(c[m]);\n"
+        + "     arr.push(c[m].cls.$class);\n"
+        + "  }"
+        + "}\n"
+        + "return arr;")
+    private static native Object[] findMethodData(
+        Class<?> clazz, String prefix);
+
+    public static Method findMethod(
+        Class<?> clazz, String name, Class<?>... parameterTypes) {
+        Object[] data = findMethodData(clazz, name + "__");
+        BIG: for (int i = 0; i < data.length; i += 3) {
+            String sig = ((String) data[i]).substring(name.length() + 2);
+            Class<?> cls = (Class<?>) data[i + 2];
+            Method tmp = INSTANCE.create(cls, name, data[i + 1], sig);
+            Class<?>[] tmpParms = tmp.getParameterTypes();
+            if (parameterTypes.length != tmpParms.length) {
+                continue;
+            }
+            for (int j = 0; j < tmpParms.length; j++) {
+                if (!parameterTypes[j].equals(tmpParms[j])) {
+                    continue BIG;
+                }
+            }
+            return tmp;
+        }
+        return null;
+    }
+
+    public static Method[] findMethods(Class<?> clazz, int mask) {
+        Object[] namesAndData = findMethodData(clazz, "");
+        int cnt = 0;
+        for (int i = 0; i < namesAndData.length; i += 3) {
+            String sig = (String) namesAndData[i];
+            Object data = namesAndData[i + 1];
+            int middle = sig.indexOf("__");
+            if (middle == -1) {
+                continue;
+            }
+            String name = sig.substring(0, middle);
+            sig = sig.substring(middle + 2);
+            Class<?> cls = (Class<?>) namesAndData[i + 2];
+            final Method m = INSTANCE.create(cls, name, data, sig);
+            if ((m.getModifiers() & mask) == 0) {
+                continue;
+            }
+            namesAndData[cnt++] = m;
+        }
+        Method[] arr = new Method[cnt];
+        for (int i = 0; i < cnt; i++) {
+            arr[i] = (Method) namesAndData[i];
+        }
+        return arr;
+    }
+    static String toSignature(Method m) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(m.getName()).append("__");
+        appendType(sb, m.getReturnType());
+        Class<?>[] arr = m.getParameterTypes();
+        for (int i = 0; i < arr.length; i++) {
+            appendType(sb, arr[i]);
+        }
+        return sb.toString();
+    }
+    
+    private static void appendType(StringBuilder sb, Class<?> type) {
+        if (type == Integer.TYPE) {
+            sb.append('I');
+            return;
+        }
+        if (type == Long.TYPE) {
+            sb.append('J');
+            return;
+        }
+        if (type == Double.TYPE) {
+            sb.append('D');
+            return;
+        }
+        if (type == Float.TYPE) {
+            sb.append('F');
+            return;
+        }
+        if (type == Byte.TYPE) {
+            sb.append('B');
+            return;
+        }
+        if (type == Boolean.TYPE) {
+            sb.append('Z');
+            return;
+        }
+        if (type == Short.TYPE) {
+            sb.append('S');
+            return;
+        }
+        if (type == Void.TYPE) {
+            sb.append('V');
+            return;
+        }
+        if (type == Character.TYPE) {
+            sb.append('C');
+            return;
+        }
+        if (type.isArray()) {
+            sb.append("_3");
+            appendType(sb, type.getComponentType());
+            return;
+        }
+        sb.append('L').append(type.getName().replace('.', '_'));
+        sb.append("_2");
+    }
+
+    public static int signatureElements(String sig) {
+        Enumeration<Class> en = signatureParser(sig);
+        int cnt = 0;
+        while (en.hasMoreElements()) {
+            en.nextElement();
+            cnt++;
+        }
+        return cnt;
+    }
+    
+    public static Enumeration<Class> signatureParser(final String sig) {
+        class E implements Enumeration<Class> {
+            int pos;
+            
+            public boolean hasMoreElements() {
+                return pos < sig.length();
+            }
+
+            public Class nextElement() {
+                switch (sig.charAt(pos++)) {
+                    case 'I':
+                        return Integer.TYPE;
+                    case 'J':
+                        return Long.TYPE;
+                    case 'D':
+                        return Double.TYPE;
+                    case 'F':
+                        return Float.TYPE;
+                    case 'B':
+                        return Byte.TYPE;
+                    case 'Z':
+                        return Boolean.TYPE;
+                    case 'S':
+                        return Short.TYPE;
+                    case 'V':
+                        return Void.TYPE;
+                    case 'C':
+                        return Character.TYPE;
+                    case 'L':
+                        try {
+                            int up = sig.indexOf("_2", pos);
+                            String type = sig.substring(pos, up);
+                            pos = up + 2;
+                            return Class.forName(type.replace('_', '.'));
+                        } catch (ClassNotFoundException ex) {
+                            throw new IllegalStateException(ex);
+                        }
+                    case '_': {
+                        char nch = sig.charAt(pos++);
+                        assert nch == '3' : "Can't find '3' at " + sig.substring(pos - 1);
+                        final Class compType = nextElement();
+                        return Array.newInstance(compType, 0).getClass();
+                    }
+                }
+                throw new UnsupportedOperationException(sig + " at " + pos);
+            }
+        }
+        return new E();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/TypeProvider.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/reflect/TypeProvider.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,40 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.emul.reflect;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public abstract class TypeProvider {
+    private TypeProvider() {
+    }
+    
+    public static TypeProvider getDefault() {
+        return null;
+    }
+    
+    public abstract <T> TypeVariable<Constructor<T>>[] getTypeParameters(Constructor<T> c);
+    public abstract <T> Type[] getGenericParameterTypes(Constructor<T> c);
+    public abstract <T> Type[] getGenericExceptionTypes(Constructor<T> c);
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Adler32.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Adler32.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,139 @@
+/* -*-mode:java; c-basic-offset:2; -*- */
+/*
+Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+final class Adler32 implements Checksum {
+
+  // largest prime smaller than 65536
+  static final private int BASE=65521; 
+  // NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1
+  static final private int NMAX=5552;
+
+  private long s1=1L;
+  private long s2=0L;
+
+  public void reset(long init){
+    s1=init&0xffff;
+    s2=(init>>16)&0xffff;
+  }
+
+  public void reset(){
+    s1=1L;
+    s2=0L;
+  }
+
+  public long getValue(){
+    return ((s2<<16)|s1);
+  }
+
+  public void update(byte[] buf, int index, int len){
+
+    if(len==1){
+      s1+=buf[index++]&0xff; s2+=s1;
+      s1%=BASE;
+      s2%=BASE;
+      return;
+    }
+
+    int len1 = len/NMAX;
+    int len2 = len%NMAX;
+    while(len1-->0) {
+      int k=NMAX;
+      len-=k;
+      while(k-->0){
+	s1+=buf[index++]&0xff; s2+=s1;
+      }
+      s1%=BASE;
+      s2%=BASE;
+    }
+
+    int k=len2;
+    len-=k;
+    while(k-->0){
+      s1+=buf[index++]&0xff; s2+=s1;
+    }
+    s1%=BASE;
+    s2%=BASE;
+  }
+
+  public Adler32 copy(){
+    Adler32 foo = new Adler32();
+    foo.s1 = this.s1;
+    foo.s2 = this.s2;
+    return foo;
+  }
+
+  // The following logic has come from zlib.1.2.
+  static long combine(long adler1, long adler2, long len2){
+    long BASEL = (long)BASE;
+    long sum1;
+    long sum2;
+    long rem;  // unsigned int
+
+    rem = len2 % BASEL;
+    sum1 = adler1 & 0xffffL;
+    sum2 = rem * sum1;
+    sum2 %= BASEL; // MOD(sum2);
+    sum1 += (adler2 & 0xffffL) + BASEL - 1;
+    sum2 += ((adler1 >> 16) & 0xffffL) + ((adler2 >> 16) & 0xffffL) + BASEL - rem;
+    if (sum1 >= BASEL) sum1 -= BASEL;
+    if (sum1 >= BASEL) sum1 -= BASEL;
+    if (sum2 >= (BASEL << 1)) sum2 -= (BASEL << 1);
+    if (sum2 >= BASEL) sum2 -= BASEL;
+    return sum1 | (sum2 << 16);
+  }
+
+/*
+  private java.util.zip.Adler32 adler=new java.util.zip.Adler32();
+  public void update(byte[] buf, int index, int len){
+    if(buf==null) {adler.reset();}
+    else{adler.update(buf, index, len);}
+  }
+  public void reset(){
+    adler.reset();
+  }
+  public void reset(long init){
+    if(init==1L){
+      adler.reset();
+    }
+    else{
+      System.err.println("unsupported operation");
+    }
+  }
+  public long getValue(){
+    return adler.getValue();
+  }
+*/
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/CRC32.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/CRC32.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,181 @@
+/* -*-mode:java; c-basic-offset:2; -*- */
+/*
+Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+final class CRC32 implements Checksum {
+
+  /*
+   *  The following logic has come from RFC1952.
+   */
+  private int v = 0;
+  private static int[] crc_table = null;
+  static {
+    crc_table = new int[256];
+    for (int n = 0; n < 256; n++) {
+      int c = n;
+      for (int k = 8;  --k >= 0; ) {
+        if ((c & 1) != 0)
+	  c = 0xedb88320 ^ (c >>> 1);
+        else
+          c = c >>> 1;
+      }
+      crc_table[n] = c;
+    }
+  }
+
+  public void update (byte[] buf, int index, int len) {
+    int c = ~v;
+    while (--len >= 0)
+      c = crc_table[(c^buf[index++])&0xff]^(c >>> 8);
+    v = ~c;
+  }
+
+  public void reset(){
+    v = 0;
+  }
+
+  public void reset(long vv){
+    v = (int)(vv&0xffffffffL);
+  }
+
+  public long getValue(){
+    return (long)(v&0xffffffffL);
+  }
+
+  // The following logic has come from zlib.1.2.
+  private static final int GF2_DIM = 32;
+  static long combine(long crc1, long crc2, long len2){
+    long row;
+    long[] even = new long[GF2_DIM];
+    long[] odd = new long[GF2_DIM];
+
+    // degenerate case (also disallow negative lengths)
+    if (len2 <= 0)
+      return crc1;
+
+    // put operator for one zero bit in odd
+    odd[0] = 0xedb88320L;          // CRC-32 polynomial
+    row = 1;
+    for (int n = 1; n < GF2_DIM; n++) {
+        odd[n] = row;
+        row <<= 1;
+    }
+
+    // put operator for two zero bits in even
+    gf2_matrix_square(even, odd);
+
+    // put operator for four zero bits in odd
+    gf2_matrix_square(odd, even);
+
+    // apply len2 zeros to crc1 (first square will put the operator for one
+    // zero byte, eight zero bits, in even)
+    do {
+      // apply zeros operator for this bit of len2
+      gf2_matrix_square(even, odd);
+      if ((len2 & 1)!=0)
+        crc1 = gf2_matrix_times(even, crc1);
+      len2 >>= 1;
+
+      // if no more bits set, then done
+      if (len2 == 0)
+        break;
+
+      // another iteration of the loop with odd and even swapped
+      gf2_matrix_square(odd, even);
+      if ((len2 & 1)!=0)
+        crc1 = gf2_matrix_times(odd, crc1);
+      len2 >>= 1;
+
+      // if no more bits set, then done
+    } while (len2 != 0);
+
+    /* return combined crc */
+    crc1 ^= crc2;
+    return crc1;
+  }
+
+  private static long gf2_matrix_times(long[] mat, long vec){
+    long sum = 0;
+    int index = 0;
+    while (vec!=0) {
+      if ((vec & 1)!=0)
+        sum ^= mat[index];
+      vec >>= 1;
+      index++;
+    }
+    return sum;
+  }
+
+  static final void gf2_matrix_square(long[] square, long[] mat) {
+    for (int n = 0; n < GF2_DIM; n++)
+      square[n] = gf2_matrix_times(mat, mat[n]);
+  }
+
+  /*
+  private java.util.zip.CRC32 crc32 = new java.util.zip.CRC32();
+
+  public void update(byte[] buf, int index, int len){
+    if(buf==null) {crc32.reset();}
+    else{crc32.update(buf, index, len);}
+  }
+  public void reset(){
+    crc32.reset();
+  }
+  public void reset(long init){
+    if(init==0L){
+      crc32.reset();
+    }
+    else{
+      System.err.println("unsupported operation");
+    }
+  }
+  public long getValue(){
+    return crc32.getValue();
+  }
+*/
+  public CRC32 copy(){
+    CRC32 foo = new CRC32();
+    foo.v = this.v;
+    return foo;
+  }
+
+  public static int[] getCRC32Table(){
+    int[] tmp = new int[crc_table.length];
+    System.arraycopy(crc_table, 0, tmp, 0, tmp.length);
+    return tmp;
+  }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Checksum.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Checksum.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,43 @@
+/* -*-mode:java; c-basic-offset:2; -*- */
+/*
+Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+interface Checksum {
+  void update(byte[] buf, int index, int len);
+  void reset();
+  void reset(long init);
+  long getValue();
+  Checksum copy();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/FastJar.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/FastJar.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,175 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2007 Sun Microsystems, Inc.
+ */
+package org.apidesign.bck2brwsr.emul.zip;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+/**
+ *
+ * @author Tomas Zezula
+ */
+public final class FastJar {
+    private final byte[] arr;
+
+    public FastJar(byte[] arr) {
+        this.arr = arr;
+    }
+    
+    
+    private static final int GIVE_UP = 1<<16;
+
+    public static final  class Entry {
+        
+        public final String name;
+        final long offset;
+        private final long dosTime;
+        
+        Entry (String name, long offset, long time) {
+            assert name != null;
+            this.name = name;
+            this.offset = offset;
+            this.dosTime = time;
+        }        
+/*        
+        public long getTime () {
+            Date d = new Date((int)(((dosTime >> 25) & 0x7f) + 80),
+                    (int)(((dosTime >> 21) & 0x0f) - 1),
+                    (int)((dosTime >> 16) & 0x1f),
+                    (int)((dosTime >> 11) & 0x1f),
+                    (int)((dosTime >> 5) & 0x3f),
+                    (int)((dosTime << 1) & 0x3e));
+            return d.getTime();
+        }
+        */
+    }
+    
+    public InputStream getInputStream (final Entry e) throws IOException {
+        return getInputStream(arr, e.offset);
+    }
+    
+    private static InputStream getInputStream (byte[] arr, final long offset) throws IOException {
+        ByteArrayInputStream is = new ByteArrayInputStream(arr);
+        is.skip(offset);
+        ZipInputStream in = new ZipInputStream (is);
+        ZipEntry e = in.getNextEntry();
+        if (e != null && e.getCrc() == 0L && e.getMethod() == ZipEntry.STORED) {
+            int cp = arr.length - is.available();
+            return new ByteArrayInputStream(arr, cp, (int)e.getSize());
+        }
+        return in;
+    }
+    
+    public Entry[] list() throws IOException {
+        final int size = arr.length;
+
+        int at = size - ZipInputStream.ENDHDR;
+
+        byte[] data = new byte[ZipInputStream.ENDHDR];        
+        int giveup = 0;
+
+        do {
+            org.apidesign.bck2brwsr.emul.lang.System.arraycopy(arr, at, data, 0, data.length);
+            at--;
+            giveup++;
+            if (giveup > GIVE_UP) {
+                throw new IOException ();
+            }
+        } while (getsig(data) != ZipInputStream.ENDSIG);
+
+
+        final long censize = endsiz(data);
+        final long cenoff  = endoff(data);
+        at = (int) cenoff;                                                     
+
+        Entry[] result = new Entry[0];
+        int cenread = 0;
+        data = new byte[ZipInputStream.CENHDR];
+        while (cenread < censize) {
+            org.apidesign.bck2brwsr.emul.lang.System.arraycopy(arr, at, data, 0, data.length);
+            at += data.length;
+            if (getsig(data) != ZipInputStream.CENSIG) {
+                throw new IOException("No central table");          //NOI18N
+            }
+            int cennam = cennam(data);
+            int cenext = cenext(data);
+            int cencom = cencom(data);
+            long lhoff = cenoff(data);
+            long centim = centim(data);
+            String name = new String(arr, at, cennam, "UTF-8");
+            at += cennam;
+            int seekby = cenext+cencom;
+            int cendatalen = ZipInputStream.CENHDR + cennam + seekby;
+            cenread+=cendatalen;
+            result = addEntry(result, new Entry(name,lhoff, centim));
+            at += seekby;
+        }
+        return result;
+    }
+
+    private Entry[] addEntry(Entry[] result, Entry entry) {
+        Entry[] e = new Entry[result.length + 1];
+        e[result.length] = entry;
+        org.apidesign.bck2brwsr.emul.lang.System.arraycopy(result, 0, e, 0, result.length);
+        return e;
+    }
+
+    private static final long getsig(final byte[] b) throws IOException {return get32(b,0);}
+    private static final long endsiz(final byte[] b) throws IOException {return get32(b,ZipInputStream.ENDSIZ);}
+    private static final long endoff(final byte[] b) throws IOException {return get32(b,ZipInputStream.ENDOFF);}
+    private static final long  cenlen(final byte[] b) throws IOException {return get32(b,ZipInputStream.CENLEN);}
+    private static final long  censiz(final byte[] b) throws IOException {return get32(b,ZipInputStream.CENSIZ);}
+    private static final long centim(final byte[] b) throws IOException {return get32(b,ZipInputStream.CENTIM);}
+    private static final int  cennam(final byte[] b) throws IOException {return get16(b,ZipInputStream.CENNAM);}
+    private static final int  cenext(final byte[] b) throws IOException {return get16(b,ZipInputStream.CENEXT);}
+    private static final int  cencom(final byte[] b) throws IOException {return get16(b,ZipInputStream.CENCOM);}
+    private static final long cenoff (final byte[] b) throws IOException {return get32(b,ZipInputStream.CENOFF);}
+    private static final int lochow(final byte[] b) throws IOException {return get16(b,ZipInputStream.LOCHOW);}
+    private static final int locname(final byte[] b) throws IOException {return get16(b,ZipInputStream.LOCNAM);}
+    private static final int locext(final byte[] b) throws IOException {return get16(b,ZipInputStream.LOCEXT);}
+    private static final long locsiz(final byte[] b) throws IOException {return get32(b,ZipInputStream.LOCSIZ);}
+    
+    private static final int get16(final byte[] b, int off) throws IOException {        
+        final int b1 = b[off];
+	final int b2 = b[off+1];
+        return (b1 & 0xff) | ((b2 & 0xff) << 8);
+    }
+
+    private static final long get32(final byte[] b, int off) throws IOException {
+	final int s1 = get16(b, off);
+	final int s2 = get16(b, off+2);
+        return s1 | ((long)s2 << 16);
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/GZIPHeader.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/GZIPHeader.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,215 @@
+/* -*-mode:java; c-basic-offset:2; -*- */
+/*
+Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @see "http://www.ietf.org/rfc/rfc1952.txt"
+ */
+final class GZIPHeader implements Cloneable {
+
+  public static final byte OS_MSDOS = (byte) 0x00;
+  public static final byte OS_AMIGA = (byte) 0x01;
+  public static final byte OS_VMS = (byte) 0x02;
+  public static final byte OS_UNIX = (byte) 0x03;
+  public static final byte OS_ATARI = (byte) 0x05;
+  public static final byte OS_OS2 = (byte) 0x06;
+  public static final byte OS_MACOS = (byte) 0x07;
+  public static final byte OS_TOPS20 = (byte) 0x0a;
+  public static final byte OS_WIN32 = (byte) 0x0b;
+  public static final byte OS_VMCMS = (byte) 0x04;
+  public static final byte OS_ZSYSTEM = (byte) 0x08;
+  public static final byte OS_CPM = (byte) 0x09;
+  public static final byte OS_QDOS = (byte) 0x0c;
+  public static final byte OS_RISCOS = (byte) 0x0d;
+  public static final byte OS_UNKNOWN = (byte) 0xff;
+
+  boolean text = false;
+  private boolean fhcrc = false;
+  long time;
+  int xflags;
+  int os = 255;
+  byte[] extra;
+  byte[] name;
+  byte[] comment;
+  int hcrc;
+  long crc;
+  boolean done = false;
+  long mtime = 0;
+
+  public void setModifiedTime(long mtime) {
+    this.mtime = mtime;
+  }
+
+  public long getModifiedTime() {
+    return mtime;
+  }
+
+  public void setOS(int os) {
+    if((0<=os && os <=13) || os==255)
+      this.os=os;
+    else
+      throw new IllegalArgumentException("os: "+os);
+  }
+
+  public int getOS(){
+    return os;
+  }
+
+  public void setName(String name) {
+    try{
+      this.name=name.getBytes("ISO-8859-1");
+    }
+    catch(UnsupportedEncodingException e){
+      throw new IllegalArgumentException("name must be in ISO-8859-1 "+name);
+    }
+  }
+
+  public String getName(){
+    if(name==null) return "";
+    try {
+      return new String(name, "ISO-8859-1");
+    }
+    catch (UnsupportedEncodingException e) {
+      throw new IllegalArgumentException(e.toString());
+    }
+  }
+
+  public void setComment(String comment) {
+    try{
+      this.comment=comment.getBytes("ISO-8859-1");
+    }
+    catch(UnsupportedEncodingException e){
+      throw new IllegalArgumentException("comment must be in ISO-8859-1 "+name);
+    }
+  }
+
+  public String getComment(){
+    if(comment==null) return "";
+    try {
+      return new String(comment, "ISO-8859-1");
+    }
+    catch (UnsupportedEncodingException e) {
+      throw new IllegalArgumentException(e.toString());
+    }
+  }
+
+  public void setCRC(long crc){
+    this.crc = crc;
+  }
+
+  public long getCRC(){
+    return crc;
+  }
+/*
+  void put(Deflate d){
+    int flag = 0;
+    if(text){
+      flag |= 1;     // FTEXT
+    }
+    if(fhcrc){
+      flag |= 2;     // FHCRC
+    }
+    if(extra!=null){
+      flag |= 4;     // FEXTRA
+    }
+    if(name!=null){
+      flag |= 8;    // FNAME
+    }
+    if(comment!=null){
+      flag |= 16;   // FCOMMENT
+    }
+    int xfl = 0;
+    if(d.level == JZlib.Z_BEST_SPEED){
+      xfl |= 4;
+    }
+    else if (d.level == JZlib.Z_BEST_COMPRESSION){
+      xfl |= 2;
+    }
+
+    d.put_short((short)0x8b1f);  // ID1 ID2
+    d.put_byte((byte)8);         // CM(Compression Method)
+    d.put_byte((byte)flag);
+    d.put_byte((byte)mtime);
+    d.put_byte((byte)(mtime>>8));
+    d.put_byte((byte)(mtime>>16));
+    d.put_byte((byte)(mtime>>24));
+    d.put_byte((byte)xfl);
+    d.put_byte((byte)os);
+
+    if(extra!=null){
+      d.put_byte((byte)extra.length);
+      d.put_byte((byte)(extra.length>>8));
+      d.put_byte(extra, 0, extra.length);
+    }
+
+    if(name!=null){
+      d.put_byte(name, 0, name.length);
+      d.put_byte((byte)0);
+    }
+
+    if(comment!=null){
+      d.put_byte(comment, 0, comment.length);
+      d.put_byte((byte)0);
+    }
+  }
+*/
+  @Override
+  public Object clone() throws CloneNotSupportedException {
+    GZIPHeader gheader = (GZIPHeader)super.clone();
+    byte[] tmp;
+    if(gheader.extra!=null){
+      tmp=new byte[gheader.extra.length];
+      System.arraycopy(gheader.extra, 0, tmp, 0, tmp.length);
+      gheader.extra = tmp;
+    }
+
+    if(gheader.name!=null){
+      tmp=new byte[gheader.name.length];
+      System.arraycopy(gheader.name, 0, tmp, 0, tmp.length);
+      gheader.name = tmp;
+    }
+
+    if(gheader.comment!=null){
+      tmp=new byte[gheader.comment.length];
+      System.arraycopy(gheader.comment, 0, tmp, 0, tmp.length);
+      gheader.comment = tmp;
+    }
+
+    return gheader;
+  }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfBlocks.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfBlocks.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,616 @@
+/* -*-mode:java; c-basic-offset:2; -*- */
+/*
+Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+final class InfBlocks{
+  static final private int MANY=1440;
+
+  // And'ing with mask[n] masks the lower n bits
+  static final private int[] inflate_mask = {
+    0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f,
+    0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff,
+    0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff,
+    0x00007fff, 0x0000ffff
+  };
+
+  // Table for deflate from PKZIP's appnote.txt.
+  static final int[] border = { // Order of the bit length code lengths
+    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+  };
+
+  static final private int Z_OK=0;
+  static final private int Z_STREAM_END=1;
+  static final private int Z_NEED_DICT=2;
+  static final private int Z_ERRNO=-1;
+  static final private int Z_STREAM_ERROR=-2;
+  static final private int Z_DATA_ERROR=-3;
+  static final private int Z_MEM_ERROR=-4;
+  static final private int Z_BUF_ERROR=-5;
+  static final private int Z_VERSION_ERROR=-6;
+
+  static final private int TYPE=0;  // get type bits (3, including end bit)
+  static final private int LENS=1;  // get lengths for stored
+  static final private int STORED=2;// processing stored block
+  static final private int TABLE=3; // get table lengths
+  static final private int BTREE=4; // get bit lengths tree for a dynamic block
+  static final private int DTREE=5; // get length, distance trees for a dynamic block
+  static final private int CODES=6; // processing fixed or dynamic block
+  static final private int DRY=7;   // output remaining window bytes
+  static final private int DONE=8;  // finished last block, done
+  static final private int BAD=9;   // ot a data error--stuck here
+
+  int mode;            // current inflate_block mode 
+
+  int left;            // if STORED, bytes left to copy 
+
+  int table;           // table lengths (14 bits) 
+  int index;           // index into blens (or border) 
+  int[] blens;         // bit lengths of codes 
+  int[] bb=new int[1]; // bit length tree depth 
+  int[] tb=new int[1]; // bit length decoding tree 
+
+  int[] bl=new int[1];
+  int[] bd=new int[1];
+
+  int[][] tl=new int[1][];
+  int[][] td=new int[1][];
+  int[] tli=new int[1]; // tl_index
+  int[] tdi=new int[1]; // td_index
+
+  private final InfCodes codes;      // if CODES, current state 
+
+  int last;            // true if this block is the last block 
+
+  // mode independent information 
+  int bitk;            // bits in bit buffer 
+  int bitb;            // bit buffer 
+  int[] hufts;         // single malloc for tree space 
+  byte[] window;       // sliding window 
+  int end;             // one byte after sliding window 
+  int read;            // window read pointer 
+  int write;           // window write pointer 
+  private boolean check;
+
+  private final InfTree inftree=new InfTree();
+
+  private final ZStream z; 
+
+  InfBlocks(ZStream z, int w){
+    this.z=z;
+    this.codes=new InfCodes(this.z, this);
+    hufts=new int[MANY*3];
+    window=new byte[w];
+    end=w;
+    this.check = (z.istate.wrap==0) ? false : true;
+    mode = TYPE;
+    reset();
+  }
+
+  void reset(){
+    if(mode==BTREE || mode==DTREE){
+    }
+    if(mode==CODES){
+      codes.free(z);
+    }
+    mode=TYPE;
+    bitk=0;
+    bitb=0;
+    read=write=0;
+    if(check){
+      z.adler.reset();
+    }
+  }
+
+  int proc(int r){
+    int t;              // temporary storage
+    int b;              // bit buffer
+    int k;              // bits in bit buffer
+    int p;              // input data pointer
+    int n;              // bytes available there
+    int q;              // output window write pointer
+    int m;              // bytes to end of window or read pointer
+
+    // copy input/output information to locals (UPDATE macro restores)
+    {p=z.next_in_index;n=z.avail_in;b=bitb;k=bitk;}
+    {q=write;m=(int)(q<read?read-q-1:end-q);}
+
+    // process input based on current state
+    while(true){
+      switch (mode){
+      case TYPE:
+
+	while(k<(3)){
+	  if(n!=0){
+	    r=Z_OK;
+	  }
+	  else{
+	    bitb=b; bitk=k; 
+	    z.avail_in=n;
+	    z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    write=q;
+	    return inflate_flush(r);
+	  };
+	  n--;
+	  b|=(z.next_in[p++]&0xff)<<k;
+	  k+=8;
+	}
+	t = (int)(b & 7);
+	last = t & 1;
+
+	switch (t >>> 1){
+        case 0:                         // stored 
+          {b>>>=(3);k-=(3);}
+          t = k & 7;                    // go to byte boundary
+
+          {b>>>=(t);k-=(t);}
+          mode = LENS;                  // get length of stored block
+          break;
+        case 1:                         // fixed
+          InfTree.inflate_trees_fixed(bl, bd, tl, td, z);
+          codes.init(bl[0], bd[0], tl[0], 0, td[0], 0);
+
+          {b>>>=(3);k-=(3);}
+
+          mode = CODES;
+          break;
+        case 2:                         // dynamic
+
+          {b>>>=(3);k-=(3);}
+
+          mode = TABLE;
+          break;
+        case 3:                         // illegal
+
+          {b>>>=(3);k-=(3);}
+          mode = BAD;
+          z.msg = "invalid block type";
+          r = Z_DATA_ERROR;
+
+	  bitb=b; bitk=k; 
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  write=q;
+	  return inflate_flush(r);
+	}
+	break;
+      case LENS:
+
+	while(k<(32)){
+	  if(n!=0){
+	    r=Z_OK;
+	  }
+	  else{
+	    bitb=b; bitk=k; 
+	    z.avail_in=n;
+	    z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    write=q;
+	    return inflate_flush(r);
+	  };
+	  n--;
+	  b|=(z.next_in[p++]&0xff)<<k;
+	  k+=8;
+	}
+
+	if ((((~b) >>> 16) & 0xffff) != (b & 0xffff)){
+	  mode = BAD;
+	  z.msg = "invalid stored block lengths";
+	  r = Z_DATA_ERROR;
+
+	  bitb=b; bitk=k; 
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  write=q;
+	  return inflate_flush(r);
+	}
+	left = (b & 0xffff);
+	b = k = 0;                       // dump bits
+	mode = left!=0 ? STORED : (last!=0 ? DRY : TYPE);
+	break;
+      case STORED:
+	if (n == 0){
+	  bitb=b; bitk=k; 
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  write=q;
+	  return inflate_flush(r);
+	}
+
+	if(m==0){
+	  if(q==end&&read!=0){
+	    q=0; m=(int)(q<read?read-q-1:end-q);
+	  }
+	  if(m==0){
+	    write=q; 
+	    r=inflate_flush(r);
+	    q=write;m=(int)(q<read?read-q-1:end-q);
+	    if(q==end&&read!=0){
+	      q=0; m=(int)(q<read?read-q-1:end-q);
+	    }
+	    if(m==0){
+	      bitb=b; bitk=k; 
+	      z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	      write=q;
+	      return inflate_flush(r);
+	    }
+	  }
+	}
+	r=Z_OK;
+
+	t = left;
+	if(t>n) t = n;
+	if(t>m) t = m;
+	System.arraycopy(z.next_in, p, window, q, t);
+	p += t;  n -= t;
+	q += t;  m -= t;
+	if ((left -= t) != 0)
+	  break;
+	mode = last!=0 ? DRY : TYPE;
+	break;
+      case TABLE:
+
+	while(k<(14)){
+	  if(n!=0){
+	    r=Z_OK;
+	  }
+	  else{
+	    bitb=b; bitk=k; 
+	    z.avail_in=n;
+	    z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    write=q;
+	    return inflate_flush(r);
+	  };
+	  n--;
+	  b|=(z.next_in[p++]&0xff)<<k;
+	  k+=8;
+	}
+
+	table = t = (b & 0x3fff);
+	if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
+	  {
+	    mode = BAD;
+	    z.msg = "too many length or distance symbols";
+	    r = Z_DATA_ERROR;
+
+	    bitb=b; bitk=k; 
+	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    write=q;
+	    return inflate_flush(r);
+	  }
+	t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
+	if(blens==null || blens.length<t){
+	  blens=new int[t];
+	}
+	else{
+	  for(int i=0; i<t; i++){blens[i]=0;}
+	}
+
+	{b>>>=(14);k-=(14);}
+
+	index = 0;
+	mode = BTREE;
+      case BTREE:
+	while (index < 4 + (table >>> 10)){
+	  while(k<(3)){
+	    if(n!=0){
+	      r=Z_OK;
+	    }
+	    else{
+	      bitb=b; bitk=k; 
+	      z.avail_in=n;
+	      z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	      write=q;
+	      return inflate_flush(r);
+	    };
+	    n--;
+	    b|=(z.next_in[p++]&0xff)<<k;
+	    k+=8;
+	  }
+
+	  blens[border[index++]] = b&7;
+
+	  {b>>>=(3);k-=(3);}
+	}
+
+	while(index < 19){
+	  blens[border[index++]] = 0;
+	}
+
+	bb[0] = 7;
+	t = inftree.inflate_trees_bits(blens, bb, tb, hufts, z);
+	if (t != Z_OK){
+	  r = t;
+	  if (r == Z_DATA_ERROR){
+	    blens=null;
+	    mode = BAD;
+	  }
+
+	  bitb=b; bitk=k; 
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  write=q;
+	  return inflate_flush(r);
+	}
+
+	index = 0;
+	mode = DTREE;
+      case DTREE:
+	while (true){
+	  t = table;
+	  if(!(index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))){
+	    break;
+	  }
+
+	  int[] h;
+	  int i, j, c;
+
+	  t = bb[0];
+
+	  while(k<(t)){
+	    if(n!=0){
+	      r=Z_OK;
+	    }
+	    else{
+	      bitb=b; bitk=k; 
+	      z.avail_in=n;
+	      z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	      write=q;
+	      return inflate_flush(r);
+	    };
+	    n--;
+	    b|=(z.next_in[p++]&0xff)<<k;
+	    k+=8;
+	  }
+
+	  if(tb[0]==-1){
+            //System.err.println("null...");
+	  }
+
+	  t=hufts[(tb[0]+(b&inflate_mask[t]))*3+1];
+	  c=hufts[(tb[0]+(b&inflate_mask[t]))*3+2];
+
+	  if (c < 16){
+	    b>>>=(t);k-=(t);
+	    blens[index++] = c;
+	  }
+	  else { // c == 16..18
+	    i = c == 18 ? 7 : c - 14;
+	    j = c == 18 ? 11 : 3;
+
+	    while(k<(t+i)){
+	      if(n!=0){
+		r=Z_OK;
+	      }
+	      else{
+		bitb=b; bitk=k; 
+		z.avail_in=n;
+		z.total_in+=p-z.next_in_index;z.next_in_index=p;
+		write=q;
+		return inflate_flush(r);
+	      };
+	      n--;
+	      b|=(z.next_in[p++]&0xff)<<k;
+	      k+=8;
+	    }
+
+	    b>>>=(t);k-=(t);
+
+	    j += (b & inflate_mask[i]);
+
+	    b>>>=(i);k-=(i);
+
+	    i = index;
+	    t = table;
+	    if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
+		(c == 16 && i < 1)){
+	      blens=null;
+	      mode = BAD;
+	      z.msg = "invalid bit length repeat";
+	      r = Z_DATA_ERROR;
+
+	      bitb=b; bitk=k; 
+	      z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	      write=q;
+	      return inflate_flush(r);
+	    }
+
+	    c = c == 16 ? blens[i-1] : 0;
+	    do{
+	      blens[i++] = c;
+	    }
+	    while (--j!=0);
+	    index = i;
+	  }
+	}
+
+	tb[0]=-1;
+	{
+	  bl[0] = 9;         // must be <= 9 for lookahead assumptions
+	  bd[0] = 6;         // must be <= 9 for lookahead assumptions
+	  t = table;
+	  t = inftree.inflate_trees_dynamic(257 + (t & 0x1f), 
+					    1 + ((t >> 5) & 0x1f),
+					    blens, bl, bd, tli, tdi, hufts, z);
+
+	  if (t != Z_OK){
+	    if (t == Z_DATA_ERROR){
+	      blens=null;
+	      mode = BAD;
+	    }
+	    r = t;
+
+	    bitb=b; bitk=k; 
+	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    write=q;
+	    return inflate_flush(r);
+	  }
+	  codes.init(bl[0], bd[0], hufts, tli[0], hufts, tdi[0]);
+	}
+	mode = CODES;
+      case CODES:
+	bitb=b; bitk=k;
+	z.avail_in=n; z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	write=q;
+
+	if ((r = codes.proc(r)) != Z_STREAM_END){
+	  return inflate_flush(r);
+	}
+	r = Z_OK;
+	codes.free(z);
+
+	p=z.next_in_index; n=z.avail_in;b=bitb;k=bitk;
+	q=write;m=(int)(q<read?read-q-1:end-q);
+
+	if (last==0){
+	  mode = TYPE;
+	  break;
+	}
+	mode = DRY;
+      case DRY:
+	write=q; 
+	r=inflate_flush(r); 
+	q=write; m=(int)(q<read?read-q-1:end-q);
+	if (read != write){
+	  bitb=b; bitk=k; 
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  write=q;
+	  return inflate_flush(r);
+	}
+	mode = DONE;
+      case DONE:
+	r = Z_STREAM_END;
+
+	bitb=b; bitk=k; 
+	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	write=q;
+	return inflate_flush(r);
+      case BAD:
+	r = Z_DATA_ERROR;
+
+	bitb=b; bitk=k; 
+	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	write=q;
+	return inflate_flush(r);
+
+      default:
+	r = Z_STREAM_ERROR;
+
+	bitb=b; bitk=k; 
+	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	write=q;
+	return inflate_flush(r);
+      }
+    }
+  }
+
+  void free(){
+    reset();
+    window=null;
+    hufts=null;
+    //ZFREE(z, s);
+  }
+
+  void set_dictionary(byte[] d, int start, int n){
+    System.arraycopy(d, start, window, 0, n);
+    read = write = n;
+  }
+
+  // Returns true if inflate is currently at the end of a block generated
+  // by Z_SYNC_FLUSH or Z_FULL_FLUSH. 
+  int sync_point(){
+    return mode == LENS ? 1 : 0;
+  }
+
+  // copy as much as possible from the sliding window to the output area
+  int inflate_flush(int r){
+    int n;
+    int p;
+    int q;
+
+    // local copies of source and destination pointers
+    p = z.next_out_index;
+    q = read;
+
+    // compute number of bytes to copy as far as end of window
+    n = (int)((q <= write ? write : end) - q);
+    if(n > z.avail_out) n = z.avail_out;
+    if(n!=0 && r == Z_BUF_ERROR) r = Z_OK;
+
+    // update counters
+    z.avail_out -= n;
+    z.total_out += n;
+
+    // update check information
+    if(check && n>0){
+      z.adler.update(window, q, n);
+    }
+
+    // copy as far as end of window
+    System.arraycopy(window, q, z.next_out, p, n);
+    p += n;
+    q += n;
+
+    // see if more to copy at beginning of window
+    if (q == end){
+      // wrap pointers
+      q = 0;
+      if (write == end)
+        write = 0;
+
+      // compute bytes to copy
+      n = write - q;
+      if (n > z.avail_out) n = z.avail_out;
+      if (n!=0 && r == Z_BUF_ERROR) r = Z_OK;
+
+      // update counters
+      z.avail_out -= n;
+      z.total_out += n;
+
+      // update check information
+      if(check && n>0){
+	z.adler.update(window, q, n);
+      }
+
+      // copy
+      System.arraycopy(window, q, z.next_out, p, n);
+      p += n;
+      q += n;
+    }
+
+    // update pointers
+    z.next_out_index = p;
+    read = q;
+
+    // done
+    return r;
+  }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfCodes.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfCodes.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,612 @@
+/* -*-mode:java; c-basic-offset:2; -*- */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+final class InfCodes{
+
+  static final private int[] inflate_mask = {
+    0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f,
+    0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff,
+    0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff,
+    0x00007fff, 0x0000ffff
+  };
+
+  static final private int Z_OK=0;
+  static final private int Z_STREAM_END=1;
+  static final private int Z_NEED_DICT=2;
+  static final private int Z_ERRNO=-1;
+  static final private int Z_STREAM_ERROR=-2;
+  static final private int Z_DATA_ERROR=-3;
+  static final private int Z_MEM_ERROR=-4;
+  static final private int Z_BUF_ERROR=-5;
+  static final private int Z_VERSION_ERROR=-6;
+
+  // waiting for "i:"=input,
+  //             "o:"=output,
+  //             "x:"=nothing
+  static final private int START=0;  // x: set up for LEN
+  static final private int LEN=1;    // i: get length/literal/eob next
+  static final private int LENEXT=2; // i: getting length extra (have base)
+  static final private int DIST=3;   // i: get distance next
+  static final private int DISTEXT=4;// i: getting distance extra
+  static final private int COPY=5;   // o: copying bytes in window, waiting for space
+  static final private int LIT=6;    // o: got literal, waiting for output space
+  static final private int WASH=7;   // o: got eob, possibly still output waiting
+  static final private int END=8;    // x: got eob and all data flushed
+  static final private int BADCODE=9;// x: got error
+
+  int mode;      // current inflate_codes mode
+
+  // mode dependent information
+  int len;
+
+  int[] tree; // pointer into tree
+  int tree_index=0;
+  int need;   // bits needed
+
+  int lit;
+
+  // if EXT or COPY, where and how much
+  int get;              // bits to get for extra
+  int dist;             // distance back to copy from
+
+  byte lbits;           // ltree bits decoded per branch
+  byte dbits;           // dtree bits decoder per branch
+  int[] ltree;          // literal/length/eob tree
+  int ltree_index;      // literal/length/eob tree
+  int[] dtree;          // distance tree
+  int dtree_index;      // distance tree
+
+  private final ZStream z;
+  private final InfBlocks s;
+  InfCodes(ZStream z, InfBlocks s){
+    this.z=z; 
+    this.s=s; 
+  }
+
+  void init(int bl, int bd,
+	   int[] tl, int tl_index,
+	   int[] td, int td_index){
+    mode=START;
+    lbits=(byte)bl;
+    dbits=(byte)bd;
+    ltree=tl;
+    ltree_index=tl_index;
+    dtree = td;
+    dtree_index=td_index;
+    tree=null;
+  }
+
+  int proc(int r){ 
+    int j;              // temporary storage
+    int[] t;            // temporary pointer
+    int tindex;         // temporary pointer
+    int e;              // extra bits or operation
+    int b=0;            // bit buffer
+    int k=0;            // bits in bit buffer
+    int p=0;            // input data pointer
+    int n;              // bytes available there
+    int q;              // output window write pointer
+    int m;              // bytes to end of window or read pointer
+    int f;              // pointer to copy strings from
+
+    // copy input/output information to locals (UPDATE macro restores)
+    p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
+    q=s.write;m=q<s.read?s.read-q-1:s.end-q;
+
+    // process input and output based on current state
+    while (true){
+      switch (mode){
+	// waiting for "i:"=input, "o:"=output, "x:"=nothing
+      case START:         // x: set up for LEN
+	if (m >= 258 && n >= 10){
+
+	  s.bitb=b;s.bitk=k;
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  s.write=q;
+	  r = inflate_fast(lbits, dbits, 
+			   ltree, ltree_index, 
+			   dtree, dtree_index,
+			   s, z);
+
+	  p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
+	  q=s.write;m=q<s.read?s.read-q-1:s.end-q;
+
+	  if (r != Z_OK){
+	    mode = r == Z_STREAM_END ? WASH : BADCODE;
+	    break;
+	  }
+	}
+	need = lbits;
+	tree = ltree;
+	tree_index=ltree_index;
+
+	mode = LEN;
+      case LEN:           // i: get length/literal/eob next
+	j = need;
+
+	while(k<(j)){
+	  if(n!=0)r=Z_OK;
+	  else{
+
+	    s.bitb=b;s.bitk=k;
+	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    s.write=q;
+	    return s.inflate_flush(r);
+	  }
+	  n--;
+	  b|=(z.next_in[p++]&0xff)<<k;
+	  k+=8;
+	}
+
+	tindex=(tree_index+(b&inflate_mask[j]))*3;
+
+	b>>>=(tree[tindex+1]);
+	k-=(tree[tindex+1]);
+
+	e=tree[tindex];
+
+	if(e == 0){               // literal
+	  lit = tree[tindex+2];
+	  mode = LIT;
+	  break;
+	}
+	if((e & 16)!=0 ){          // length
+	  get = e & 15;
+	  len = tree[tindex+2];
+	  mode = LENEXT;
+	  break;
+	}
+	if ((e & 64) == 0){        // next table
+	  need = e;
+	  tree_index = tindex/3+tree[tindex+2];
+	  break;
+	}
+	if ((e & 32)!=0){               // end of block
+	  mode = WASH;
+	  break;
+	}
+	mode = BADCODE;        // invalid code
+	z.msg = "invalid literal/length code";
+	r = Z_DATA_ERROR;
+
+	s.bitb=b;s.bitk=k;
+	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	s.write=q;
+	return s.inflate_flush(r);
+
+      case LENEXT:        // i: getting length extra (have base)
+	j = get;
+
+	while(k<(j)){
+	  if(n!=0)r=Z_OK;
+	  else{
+
+	    s.bitb=b;s.bitk=k;
+	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    s.write=q;
+	    return s.inflate_flush(r);
+	  }
+	  n--; b|=(z.next_in[p++]&0xff)<<k;
+	  k+=8;
+	}
+
+	len += (b & inflate_mask[j]);
+
+	b>>=j;
+	k-=j;
+
+	need = dbits;
+	tree = dtree;
+	tree_index=dtree_index;
+	mode = DIST;
+      case DIST:          // i: get distance next
+	j = need;
+
+	while(k<(j)){
+	  if(n!=0)r=Z_OK;
+	  else{
+
+	    s.bitb=b;s.bitk=k;
+	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    s.write=q;
+	    return s.inflate_flush(r);
+	  }
+	  n--; b|=(z.next_in[p++]&0xff)<<k;
+	  k+=8;
+	}
+
+	tindex=(tree_index+(b & inflate_mask[j]))*3;
+
+	b>>=tree[tindex+1];
+	k-=tree[tindex+1];
+
+	e = (tree[tindex]);
+	if((e & 16)!=0){               // distance
+	  get = e & 15;
+	  dist = tree[tindex+2];
+	  mode = DISTEXT;
+	  break;
+	}
+	if ((e & 64) == 0){        // next table
+	  need = e;
+	  tree_index = tindex/3 + tree[tindex+2];
+	  break;
+	}
+	mode = BADCODE;        // invalid code
+	z.msg = "invalid distance code";
+	r = Z_DATA_ERROR;
+
+	s.bitb=b;s.bitk=k;
+	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	s.write=q;
+	return s.inflate_flush(r);
+
+      case DISTEXT:       // i: getting distance extra
+	j = get;
+
+	while(k<(j)){
+	  if(n!=0)r=Z_OK;
+	  else{
+
+	    s.bitb=b;s.bitk=k;
+	    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	    s.write=q;
+	    return s.inflate_flush(r);
+	  }
+	  n--; b|=(z.next_in[p++]&0xff)<<k;
+	  k+=8;
+	}
+
+	dist += (b & inflate_mask[j]);
+
+	b>>=j;
+	k-=j;
+
+	mode = COPY;
+      case COPY:          // o: copying bytes in window, waiting for space
+        f = q - dist;
+        while(f < 0){     // modulo window size-"while" instead
+          f += s.end;     // of "if" handles invalid distances
+	}
+	while (len!=0){
+
+	  if(m==0){
+	    if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
+	    if(m==0){
+	      s.write=q; r=s.inflate_flush(r);
+	      q=s.write;m=q<s.read?s.read-q-1:s.end-q;
+
+	      if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
+
+	      if(m==0){
+		s.bitb=b;s.bitk=k;
+		z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+		s.write=q;
+		return s.inflate_flush(r);
+	      }  
+	    }
+	  }
+
+	  s.window[q++]=s.window[f++]; m--;
+
+	  if (f == s.end)
+            f = 0;
+	  len--;
+	}
+	mode = START;
+	break;
+      case LIT:           // o: got literal, waiting for output space
+	if(m==0){
+	  if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
+	  if(m==0){
+	    s.write=q; r=s.inflate_flush(r);
+	    q=s.write;m=q<s.read?s.read-q-1:s.end-q;
+
+	    if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
+	    if(m==0){
+	      s.bitb=b;s.bitk=k;
+	      z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	      s.write=q;
+	      return s.inflate_flush(r);
+	    }
+	  }
+	}
+	r=Z_OK;
+
+	s.window[q++]=(byte)lit; m--;
+
+	mode = START;
+	break;
+      case WASH:           // o: got eob, possibly more output
+	if (k > 7){        // return unused byte, if any
+	  k -= 8;
+	  n++;
+	  p--;             // can always return one
+	}
+
+	s.write=q; r=s.inflate_flush(r);
+	q=s.write;m=q<s.read?s.read-q-1:s.end-q;
+
+	if (s.read != s.write){
+	  s.bitb=b;s.bitk=k;
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  s.write=q;
+	  return s.inflate_flush(r);
+	}
+	mode = END;
+      case END:
+	r = Z_STREAM_END;
+	s.bitb=b;s.bitk=k;
+	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	s.write=q;
+	return s.inflate_flush(r);
+
+      case BADCODE:       // x: got error
+
+	r = Z_DATA_ERROR;
+
+	s.bitb=b;s.bitk=k;
+	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	s.write=q;
+	return s.inflate_flush(r);
+
+      default:
+	r = Z_STREAM_ERROR;
+
+	s.bitb=b;s.bitk=k;
+	z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	s.write=q;
+	return s.inflate_flush(r);
+      }
+    }
+  }
+
+  void free(ZStream z){
+    //  ZFREE(z, c);
+  }
+
+  // Called with number of bytes left to write in window at least 258
+  // (the maximum string length) and number of input bytes available
+  // at least ten.  The ten bytes are six bytes for the longest length/
+  // distance pair plus four bytes for overloading the bit buffer.
+
+  int inflate_fast(int bl, int bd, 
+		   int[] tl, int tl_index,
+		   int[] td, int td_index,
+		   InfBlocks s, ZStream z){
+    int t;                // temporary pointer
+    int[] tp;             // temporary pointer
+    int tp_index;         // temporary pointer
+    int e;                // extra bits or operation
+    int b;                // bit buffer
+    int k;                // bits in bit buffer
+    int p;                // input data pointer
+    int n;                // bytes available there
+    int q;                // output window write pointer
+    int m;                // bytes to end of window or read pointer
+    int ml;               // mask for literal/length tree
+    int md;               // mask for distance tree
+    int c;                // bytes to copy
+    int d;                // distance back to copy from
+    int r;                // copy source pointer
+
+    int tp_index_t_3;     // (tp_index+t)*3
+
+    // load input, output, bit values
+    p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
+    q=s.write;m=q<s.read?s.read-q-1:s.end-q;
+
+    // initialize masks
+    ml = inflate_mask[bl];
+    md = inflate_mask[bd];
+
+    // do until not enough input or output space for fast loop
+    do {                          // assume called with m >= 258 && n >= 10
+      // get literal/length code
+      while(k<(20)){              // max bits for literal/length code
+	n--;
+	b|=(z.next_in[p++]&0xff)<<k;k+=8;
+      }
+
+      t= b&ml;
+      tp=tl; 
+      tp_index=tl_index;
+      tp_index_t_3=(tp_index+t)*3;
+      if ((e = tp[tp_index_t_3]) == 0){
+	b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
+
+	s.window[q++] = (byte)tp[tp_index_t_3+2];
+	m--;
+	continue;
+      }
+      do {
+
+	b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
+
+	if((e&16)!=0){
+	  e &= 15;
+	  c = tp[tp_index_t_3+2] + ((int)b & inflate_mask[e]);
+
+	  b>>=e; k-=e;
+
+	  // decode distance base of block to copy
+	  while(k<(15)){           // max bits for distance code
+	    n--;
+	    b|=(z.next_in[p++]&0xff)<<k;k+=8;
+	  }
+
+	  t= b&md;
+	  tp=td;
+	  tp_index=td_index;
+          tp_index_t_3=(tp_index+t)*3;
+	  e = tp[tp_index_t_3];
+
+	  do {
+
+	    b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
+
+	    if((e&16)!=0){
+	      // get extra bits to add to distance base
+	      e &= 15;
+	      while(k<(e)){         // get extra bits (up to 13)
+		n--;
+		b|=(z.next_in[p++]&0xff)<<k;k+=8;
+	      }
+
+	      d = tp[tp_index_t_3+2] + (b&inflate_mask[e]);
+
+	      b>>=(e); k-=(e);
+
+	      // do the copy
+	      m -= c;
+	      if (q >= d){                // offset before dest
+		//  just copy
+		r=q-d;
+		if(q-r>0 && 2>(q-r)){           
+		  s.window[q++]=s.window[r++]; // minimum count is three,
+		  s.window[q++]=s.window[r++]; // so unroll loop a little
+		  c-=2;
+		}
+		else{
+		  System.arraycopy(s.window, r, s.window, q, 2);
+		  q+=2; r+=2; c-=2;
+		}
+	      }
+	      else{                  // else offset after destination
+                r=q-d;
+                do{
+                  r+=s.end;          // force pointer in window
+                }while(r<0);         // covers invalid distances
+		e=s.end-r;
+		if(c>e){             // if source crosses,
+		  c-=e;              // wrapped copy
+		  if(q-r>0 && e>(q-r)){           
+		    do{s.window[q++] = s.window[r++];}
+		    while(--e!=0);
+		  }
+		  else{
+		    System.arraycopy(s.window, r, s.window, q, e);
+		    q+=e; r+=e; e=0;
+		  }
+		  r = 0;                  // copy rest from start of window
+		}
+
+	      }
+
+	      // copy all or what's left
+	      if(q-r>0 && c>(q-r)){           
+		do{s.window[q++] = s.window[r++];}
+		while(--c!=0);
+	      }
+	      else{
+		System.arraycopy(s.window, r, s.window, q, c);
+		q+=c; r+=c; c=0;
+	      }
+	      break;
+	    }
+	    else if((e&64)==0){
+	      t+=tp[tp_index_t_3+2];
+	      t+=(b&inflate_mask[e]);
+	      tp_index_t_3=(tp_index+t)*3;
+	      e=tp[tp_index_t_3];
+	    }
+	    else{
+	      z.msg = "invalid distance code";
+
+	      c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
+
+	      s.bitb=b;s.bitk=k;
+	      z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	      s.write=q;
+
+	      return Z_DATA_ERROR;
+	    }
+	  }
+	  while(true);
+	  break;
+	}
+
+	if((e&64)==0){
+	  t+=tp[tp_index_t_3+2];
+	  t+=(b&inflate_mask[e]);
+	  tp_index_t_3=(tp_index+t)*3;
+	  if((e=tp[tp_index_t_3])==0){
+
+	    b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
+
+	    s.window[q++]=(byte)tp[tp_index_t_3+2];
+	    m--;
+	    break;
+	  }
+	}
+	else if((e&32)!=0){
+
+	  c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
+ 
+	  s.bitb=b;s.bitk=k;
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  s.write=q;
+
+	  return Z_STREAM_END;
+	}
+	else{
+	  z.msg="invalid literal/length code";
+
+	  c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
+
+	  s.bitb=b;s.bitk=k;
+	  z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+	  s.write=q;
+
+	  return Z_DATA_ERROR;
+	}
+      } 
+      while(true);
+    } 
+    while(m>=258 && n>= 10);
+
+    // not enough input or output--restore pointers and return
+    c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
+
+    s.bitb=b;s.bitk=k;
+    z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
+    s.write=q;
+
+    return Z_OK;
+  }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfTree.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/InfTree.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,520 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+final class InfTree{
+
+  static final private int MANY=1440;
+
+  static final private int Z_OK=0;
+  static final private int Z_STREAM_END=1;
+  static final private int Z_NEED_DICT=2;
+  static final private int Z_ERRNO=-1;
+  static final private int Z_STREAM_ERROR=-2;
+  static final private int Z_DATA_ERROR=-3;
+  static final private int Z_MEM_ERROR=-4;
+  static final private int Z_BUF_ERROR=-5;
+  static final private int Z_VERSION_ERROR=-6;
+
+  static final int fixed_bl = 9;
+  static final int fixed_bd = 5;
+
+  static final int[] fixed_tl = {
+    96,7,256, 0,8,80, 0,8,16, 84,8,115,
+    82,7,31, 0,8,112, 0,8,48, 0,9,192,
+    80,7,10, 0,8,96, 0,8,32, 0,9,160,
+    0,8,0, 0,8,128, 0,8,64, 0,9,224,
+    80,7,6, 0,8,88, 0,8,24, 0,9,144,
+    83,7,59, 0,8,120, 0,8,56, 0,9,208,
+    81,7,17, 0,8,104, 0,8,40, 0,9,176,
+    0,8,8, 0,8,136, 0,8,72, 0,9,240,
+    80,7,4, 0,8,84, 0,8,20, 85,8,227,
+    83,7,43, 0,8,116, 0,8,52, 0,9,200,
+    81,7,13, 0,8,100, 0,8,36, 0,9,168,
+    0,8,4, 0,8,132, 0,8,68, 0,9,232,
+    80,7,8, 0,8,92, 0,8,28, 0,9,152,
+    84,7,83, 0,8,124, 0,8,60, 0,9,216,
+    82,7,23, 0,8,108, 0,8,44, 0,9,184,
+    0,8,12, 0,8,140, 0,8,76, 0,9,248,
+    80,7,3, 0,8,82, 0,8,18, 85,8,163,
+    83,7,35, 0,8,114, 0,8,50, 0,9,196,
+    81,7,11, 0,8,98, 0,8,34, 0,9,164,
+    0,8,2, 0,8,130, 0,8,66, 0,9,228,
+    80,7,7, 0,8,90, 0,8,26, 0,9,148,
+    84,7,67, 0,8,122, 0,8,58, 0,9,212,
+    82,7,19, 0,8,106, 0,8,42, 0,9,180,
+    0,8,10, 0,8,138, 0,8,74, 0,9,244,
+    80,7,5, 0,8,86, 0,8,22, 192,8,0,
+    83,7,51, 0,8,118, 0,8,54, 0,9,204,
+    81,7,15, 0,8,102, 0,8,38, 0,9,172,
+    0,8,6, 0,8,134, 0,8,70, 0,9,236,
+    80,7,9, 0,8,94, 0,8,30, 0,9,156,
+    84,7,99, 0,8,126, 0,8,62, 0,9,220,
+    82,7,27, 0,8,110, 0,8,46, 0,9,188,
+    0,8,14, 0,8,142, 0,8,78, 0,9,252,
+    96,7,256, 0,8,81, 0,8,17, 85,8,131,
+    82,7,31, 0,8,113, 0,8,49, 0,9,194,
+    80,7,10, 0,8,97, 0,8,33, 0,9,162,
+    0,8,1, 0,8,129, 0,8,65, 0,9,226,
+    80,7,6, 0,8,89, 0,8,25, 0,9,146,
+    83,7,59, 0,8,121, 0,8,57, 0,9,210,
+    81,7,17, 0,8,105, 0,8,41, 0,9,178,
+    0,8,9, 0,8,137, 0,8,73, 0,9,242,
+    80,7,4, 0,8,85, 0,8,21, 80,8,258,
+    83,7,43, 0,8,117, 0,8,53, 0,9,202,
+    81,7,13, 0,8,101, 0,8,37, 0,9,170,
+    0,8,5, 0,8,133, 0,8,69, 0,9,234,
+    80,7,8, 0,8,93, 0,8,29, 0,9,154,
+    84,7,83, 0,8,125, 0,8,61, 0,9,218,
+    82,7,23, 0,8,109, 0,8,45, 0,9,186,
+    0,8,13, 0,8,141, 0,8,77, 0,9,250,
+    80,7,3, 0,8,83, 0,8,19, 85,8,195,
+    83,7,35, 0,8,115, 0,8,51, 0,9,198,
+    81,7,11, 0,8,99, 0,8,35, 0,9,166,
+    0,8,3, 0,8,131, 0,8,67, 0,9,230,
+    80,7,7, 0,8,91, 0,8,27, 0,9,150,
+    84,7,67, 0,8,123, 0,8,59, 0,9,214,
+    82,7,19, 0,8,107, 0,8,43, 0,9,182,
+    0,8,11, 0,8,139, 0,8,75, 0,9,246,
+    80,7,5, 0,8,87, 0,8,23, 192,8,0,
+    83,7,51, 0,8,119, 0,8,55, 0,9,206,
+    81,7,15, 0,8,103, 0,8,39, 0,9,174,
+    0,8,7, 0,8,135, 0,8,71, 0,9,238,
+    80,7,9, 0,8,95, 0,8,31, 0,9,158,
+    84,7,99, 0,8,127, 0,8,63, 0,9,222,
+    82,7,27, 0,8,111, 0,8,47, 0,9,190,
+    0,8,15, 0,8,143, 0,8,79, 0,9,254,
+    96,7,256, 0,8,80, 0,8,16, 84,8,115,
+    82,7,31, 0,8,112, 0,8,48, 0,9,193,
+
+    80,7,10, 0,8,96, 0,8,32, 0,9,161,
+    0,8,0, 0,8,128, 0,8,64, 0,9,225,
+    80,7,6, 0,8,88, 0,8,24, 0,9,145,
+    83,7,59, 0,8,120, 0,8,56, 0,9,209,
+    81,7,17, 0,8,104, 0,8,40, 0,9,177,
+    0,8,8, 0,8,136, 0,8,72, 0,9,241,
+    80,7,4, 0,8,84, 0,8,20, 85,8,227,
+    83,7,43, 0,8,116, 0,8,52, 0,9,201,
+    81,7,13, 0,8,100, 0,8,36, 0,9,169,
+    0,8,4, 0,8,132, 0,8,68, 0,9,233,
+    80,7,8, 0,8,92, 0,8,28, 0,9,153,
+    84,7,83, 0,8,124, 0,8,60, 0,9,217,
+    82,7,23, 0,8,108, 0,8,44, 0,9,185,
+    0,8,12, 0,8,140, 0,8,76, 0,9,249,
+    80,7,3, 0,8,82, 0,8,18, 85,8,163,
+    83,7,35, 0,8,114, 0,8,50, 0,9,197,
+    81,7,11, 0,8,98, 0,8,34, 0,9,165,
+    0,8,2, 0,8,130, 0,8,66, 0,9,229,
+    80,7,7, 0,8,90, 0,8,26, 0,9,149,
+    84,7,67, 0,8,122, 0,8,58, 0,9,213,
+    82,7,19, 0,8,106, 0,8,42, 0,9,181,
+    0,8,10, 0,8,138, 0,8,74, 0,9,245,
+    80,7,5, 0,8,86, 0,8,22, 192,8,0,
+    83,7,51, 0,8,118, 0,8,54, 0,9,205,
+    81,7,15, 0,8,102, 0,8,38, 0,9,173,
+    0,8,6, 0,8,134, 0,8,70, 0,9,237,
+    80,7,9, 0,8,94, 0,8,30, 0,9,157,
+    84,7,99, 0,8,126, 0,8,62, 0,9,221,
+    82,7,27, 0,8,110, 0,8,46, 0,9,189,
+    0,8,14, 0,8,142, 0,8,78, 0,9,253,
+    96,7,256, 0,8,81, 0,8,17, 85,8,131,
+    82,7,31, 0,8,113, 0,8,49, 0,9,195,
+    80,7,10, 0,8,97, 0,8,33, 0,9,163,
+    0,8,1, 0,8,129, 0,8,65, 0,9,227,
+    80,7,6, 0,8,89, 0,8,25, 0,9,147,
+    83,7,59, 0,8,121, 0,8,57, 0,9,211,
+    81,7,17, 0,8,105, 0,8,41, 0,9,179,
+    0,8,9, 0,8,137, 0,8,73, 0,9,243,
+    80,7,4, 0,8,85, 0,8,21, 80,8,258,
+    83,7,43, 0,8,117, 0,8,53, 0,9,203,
+    81,7,13, 0,8,101, 0,8,37, 0,9,171,
+    0,8,5, 0,8,133, 0,8,69, 0,9,235,
+    80,7,8, 0,8,93, 0,8,29, 0,9,155,
+    84,7,83, 0,8,125, 0,8,61, 0,9,219,
+    82,7,23, 0,8,109, 0,8,45, 0,9,187,
+    0,8,13, 0,8,141, 0,8,77, 0,9,251,
+    80,7,3, 0,8,83, 0,8,19, 85,8,195,
+    83,7,35, 0,8,115, 0,8,51, 0,9,199,
+    81,7,11, 0,8,99, 0,8,35, 0,9,167,
+    0,8,3, 0,8,131, 0,8,67, 0,9,231,
+    80,7,7, 0,8,91, 0,8,27, 0,9,151,
+    84,7,67, 0,8,123, 0,8,59, 0,9,215,
+    82,7,19, 0,8,107, 0,8,43, 0,9,183,
+    0,8,11, 0,8,139, 0,8,75, 0,9,247,
+    80,7,5, 0,8,87, 0,8,23, 192,8,0,
+    83,7,51, 0,8,119, 0,8,55, 0,9,207,
+    81,7,15, 0,8,103, 0,8,39, 0,9,175,
+    0,8,7, 0,8,135, 0,8,71, 0,9,239,
+    80,7,9, 0,8,95, 0,8,31, 0,9,159,
+    84,7,99, 0,8,127, 0,8,63, 0,9,223,
+    82,7,27, 0,8,111, 0,8,47, 0,9,191,
+    0,8,15, 0,8,143, 0,8,79, 0,9,255
+  };
+  static final int[] fixed_td = {
+    80,5,1, 87,5,257, 83,5,17, 91,5,4097,
+    81,5,5, 89,5,1025, 85,5,65, 93,5,16385,
+    80,5,3, 88,5,513, 84,5,33, 92,5,8193,
+    82,5,9, 90,5,2049, 86,5,129, 192,5,24577,
+    80,5,2, 87,5,385, 83,5,25, 91,5,6145,
+    81,5,7, 89,5,1537, 85,5,97, 93,5,24577,
+    80,5,4, 88,5,769, 84,5,49, 92,5,12289,
+    82,5,13, 90,5,3073, 86,5,193, 192,5,24577
+  };
+
+  // Tables for deflate from PKZIP's appnote.txt.
+  static final int[] cplens = { // Copy lengths for literal codes 257..285
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
+  };
+
+  // see note #13 above about 258
+  static final int[] cplext = { // Extra bits for literal codes 257..285
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112  // 112==invalid
+  };
+
+  static final int[] cpdist = { // Copy offsets for distance codes 0..29
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577
+  };
+
+  static final int[] cpdext = { // Extra bits for distance codes
+        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+        12, 12, 13, 13};
+
+  // If BMAX needs to be larger than 16, then h and x[] should be uLong.
+  static final int BMAX=15;         // maximum bit length of any code
+
+  int[] hn = null;  // hufts used in space
+  int[] v = null;   // work area for huft_build 
+  int[] c = null;   // bit length count table
+  int[] r = null;   // table entry for structure assignment
+  int[] u = null;   // table stack
+  int[] x = null;   // bit offsets, then code stack
+
+  private int huft_build(int[] b, // code lengths in bits (all assumed <= BMAX)
+                         int bindex, 
+                         int n,   // number of codes (assumed <= 288)
+                         int s,   // number of simple-valued codes (0..s-1)
+                         int[] d, // list of base values for non-simple codes
+                         int[] e, // list of extra bits for non-simple codes
+                         int[] t, // result: starting table
+                         int[] m, // maximum lookup bits, returns actual
+                         int[] hp,// space for trees
+                         int[] hn,// hufts used in space
+                         int[] v  // working area: values in order of bit length
+                         ){
+    // Given a list of code lengths and a maximum table size, make a set of
+    // tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
+    // if the given code set is incomplete (the tables are still built in this
+    // case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
+    // lengths), or Z_MEM_ERROR if not enough memory.
+
+    int a;                       // counter for codes of length k
+    int f;                       // i repeats in table every f entries
+    int g;                       // maximum code length
+    int h;                       // table level
+    int i;                       // counter, current code
+    int j;                       // counter
+    int k;                       // number of bits in current code
+    int l;                       // bits per table (returned in m)
+    int mask;                    // (1 << w) - 1, to avoid cc -O bug on HP
+    int p;                       // pointer into c[], b[], or v[]
+    int q;                       // points to current table
+    int w;                       // bits before this table == (l * h)
+    int xp;                      // pointer into x
+    int y;                       // number of dummy codes added
+    int z;                       // number of entries in current table
+
+    // Generate counts for each bit length
+
+    p = 0; i = n;
+    do {
+      c[b[bindex+p]]++; p++; i--;   // assume all entries <= BMAX
+    }while(i!=0);
+
+    if(c[0] == n){                // null input--all zero length codes
+      t[0] = -1;
+      m[0] = 0;
+      return Z_OK;
+    }
+
+    // Find minimum and maximum length, bound *m by those
+    l = m[0];
+    for (j = 1; j <= BMAX; j++)
+      if(c[j]!=0) break;
+    k = j;                        // minimum code length
+    if(l < j){
+      l = j;
+    }
+    for (i = BMAX; i!=0; i--){
+      if(c[i]!=0) break;
+    }
+    g = i;                        // maximum code length
+    if(l > i){
+      l = i;
+    }
+    m[0] = l;
+
+    // Adjust last length count to fill out codes, if needed
+    for (y = 1 << j; j < i; j++, y <<= 1){
+      if ((y -= c[j]) < 0){
+        return Z_DATA_ERROR;
+      }
+    }
+    if ((y -= c[i]) < 0){
+      return Z_DATA_ERROR;
+    }
+    c[i] += y;
+
+    // Generate starting offsets into the value table for each length
+    x[1] = j = 0;
+    p = 1;  xp = 2;
+    while (--i!=0) {                 // note that i == g from above
+      x[xp] = (j += c[p]);
+      xp++;
+      p++;
+    }
+
+    // Make a table of values in order of bit lengths
+    i = 0; p = 0;
+    do {
+      if ((j = b[bindex+p]) != 0){
+        v[x[j]++] = i;
+      }
+      p++;
+    }
+    while (++i < n);
+    n = x[g];                     // set n to length of v
+
+    // Generate the Huffman codes and for each, make the table entries
+    x[0] = i = 0;                 // first Huffman code is zero
+    p = 0;                        // grab values in bit order
+    h = -1;                       // no tables yet--level -1
+    w = -l;                       // bits decoded == (l * h)
+    u[0] = 0;                     // just to keep compilers happy
+    q = 0;                        // ditto
+    z = 0;                        // ditto
+
+    // go through the bit lengths (k already is bits in shortest code)
+    for (; k <= g; k++){
+      a = c[k];
+      while (a--!=0){
+	// here i is the Huffman code of length k bits for value *p
+	// make tables up to required level
+        while (k > w + l){
+          h++;
+          w += l;                 // previous table always l bits
+	  // compute minimum size table less than or equal to l bits
+          z = g - w;
+          z = (z > l) ? l : z;        // table size upper limit
+          if((f=1<<(j=k-w))>a+1){     // try a k-w bit table
+                                      // too few codes for k-w bit table
+            f -= a + 1;               // deduct codes from patterns left
+            xp = k;
+            if(j < z){
+              while (++j < z){        // try smaller tables up to z bits
+                if((f <<= 1) <= c[++xp])
+                  break;              // enough codes to use up j bits
+                f -= c[xp];           // else deduct codes from patterns
+              }
+	    }
+          }
+          z = 1 << j;                 // table entries for j-bit table
+
+	  // allocate new table
+          if (hn[0] + z > MANY){       // (note: doesn't matter for fixed)
+            return Z_DATA_ERROR;       // overflow of MANY
+          }
+          u[h] = q = /*hp+*/ hn[0];   // DEBUG
+          hn[0] += z;
+ 
+	  // connect to last table, if there is one
+	  if(h!=0){
+            x[h]=i;           // save pattern for backing up
+            r[0]=(byte)j;     // bits in this table
+            r[1]=(byte)l;     // bits to dump before this table
+            j=i>>>(w - l);
+            r[2] = (int)(q - u[h-1] - j);               // offset to this table
+            System.arraycopy(r, 0, hp, (u[h-1]+j)*3, 3); // connect to last table
+          }
+          else{
+            t[0] = q;               // first table is returned result
+	  }
+        }
+
+	// set up table entry in r
+        r[1] = (byte)(k - w);
+        if (p >= n){
+          r[0] = 128 + 64;      // out of values--invalid code
+	}
+        else if (v[p] < s){
+          r[0] = (byte)(v[p] < 256 ? 0 : 32 + 64);  // 256 is end-of-block
+          r[2] = v[p++];          // simple code is just the value
+        }
+        else{
+          r[0]=(byte)(e[v[p]-s]+16+64); // non-simple--look up in lists
+          r[2]=d[v[p++] - s];
+        }
+
+        // fill code-like entries with r
+        f=1<<(k-w);
+        for (j=i>>>w;j<z;j+=f){
+          System.arraycopy(r, 0, hp, (q+j)*3, 3);
+	}
+
+	// backwards increment the k-bit code i
+        for (j = 1 << (k - 1); (i & j)!=0; j >>>= 1){
+          i ^= j;
+	}
+        i ^= j;
+
+	// backup over finished tables
+        mask = (1 << w) - 1;      // needed on HP, cc -O bug
+        while ((i & mask) != x[h]){
+          h--;                    // don't need to update q
+          w -= l;
+          mask = (1 << w) - 1;
+        }
+      }
+    }
+    // Return Z_BUF_ERROR if we were given an incomplete table
+    return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
+  }
+
+  int inflate_trees_bits(int[] c,  // 19 code lengths
+                         int[] bb, // bits tree desired/actual depth
+                         int[] tb, // bits tree result
+                         int[] hp, // space for trees
+                         ZStream z // for messages
+                         ){
+    int result;
+    initWorkArea(19);
+    hn[0]=0;
+    result = huft_build(c, 0, 19, 19, null, null, tb, bb, hp, hn, v);
+
+    if(result == Z_DATA_ERROR){
+      z.msg = "oversubscribed dynamic bit lengths tree";
+    }
+    else if(result == Z_BUF_ERROR || bb[0] == 0){
+      z.msg = "incomplete dynamic bit lengths tree";
+      result = Z_DATA_ERROR;
+    }
+    return result;
+  }
+
+  int inflate_trees_dynamic(int nl,   // number of literal/length codes
+                            int nd,   // number of distance codes
+                            int[] c,  // that many (total) code lengths
+                            int[] bl, // literal desired/actual bit depth
+                            int[] bd, // distance desired/actual bit depth 
+                            int[] tl, // literal/length tree result
+                            int[] td, // distance tree result
+                            int[] hp, // space for trees
+                            ZStream z // for messages
+                            ){
+    int result;
+
+    // build literal/length tree
+    initWorkArea(288);
+    hn[0]=0;
+    result = huft_build(c, 0, nl, 257, cplens, cplext, tl, bl, hp, hn, v);
+    if (result != Z_OK || bl[0] == 0){
+      if(result == Z_DATA_ERROR){
+        z.msg = "oversubscribed literal/length tree";
+      }
+      else if (result != Z_MEM_ERROR){
+        z.msg = "incomplete literal/length tree";
+        result = Z_DATA_ERROR;
+      }
+      return result;
+    }
+
+    // build distance tree
+    initWorkArea(288);
+    result = huft_build(c, nl, nd, 0, cpdist, cpdext, td, bd, hp, hn, v);
+
+    if (result != Z_OK || (bd[0] == 0 && nl > 257)){
+      if (result == Z_DATA_ERROR){
+        z.msg = "oversubscribed distance tree";
+      }
+      else if (result == Z_BUF_ERROR) {
+        z.msg = "incomplete distance tree";
+        result = Z_DATA_ERROR;
+      }
+      else if (result != Z_MEM_ERROR){
+        z.msg = "empty distance tree with lengths";
+        result = Z_DATA_ERROR;
+      }
+      return result;
+    }
+
+    return Z_OK;
+  }
+
+  static int inflate_trees_fixed(int[] bl,  //literal desired/actual bit depth
+                                 int[] bd,  //distance desired/actual bit depth
+                                 int[][] tl,//literal/length tree result
+                                 int[][] td,//distance tree result 
+                                 ZStream z  //for memory allocation
+				 ){
+    bl[0]=fixed_bl;
+    bd[0]=fixed_bd;
+    tl[0]=fixed_tl;
+    td[0]=fixed_td;
+    return Z_OK;
+  }
+
+  private void initWorkArea(int vsize){
+    if(hn==null){
+      hn=new int[1];
+      v=new int[vsize];
+      c=new int[BMAX+1];
+      r=new int[3];
+      u=new int[BMAX];
+      x=new int[BMAX+1];
+    }
+    if(v.length<vsize){ v=new int[vsize]; }
+    for(int i=0; i<vsize; i++){v[i]=0;}
+    for(int i=0; i<BMAX+1; i++){c[i]=0;}
+    for(int i=0; i<3; i++){r[i]=0;}
+    System.arraycopy(c, 0, u, 0, BMAX);
+    System.arraycopy(c, 0, x, 0, BMAX+1);
+  }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Inflate.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Inflate.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,727 @@
+/* -*-mode:java; c-basic-offset:2; -*- */
+/*
+Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+final class Inflate{
+  
+  static final private int MAX_WBITS=15; // 32K LZ77 window
+
+  // preset dictionary flag in zlib header
+  static final private int PRESET_DICT=0x20;
+
+  static final int Z_NO_FLUSH=0;
+  static final int Z_PARTIAL_FLUSH=1;
+  static final int Z_SYNC_FLUSH=2;
+  static final int Z_FULL_FLUSH=3;
+  static final int Z_FINISH=4;
+
+  static final private int Z_DEFLATED=8;
+
+  static final private int Z_OK=0;
+  static final private int Z_STREAM_END=1;
+  static final private int Z_NEED_DICT=2;
+  static final private int Z_ERRNO=-1;
+  static final private int Z_STREAM_ERROR=-2;
+  static final private int Z_DATA_ERROR=-3;
+  static final private int Z_MEM_ERROR=-4;
+  static final private int Z_BUF_ERROR=-5;
+  static final private int Z_VERSION_ERROR=-6;
+
+  static final private int METHOD=0;   // waiting for method byte
+  static final private int FLAG=1;     // waiting for flag byte
+  static final private int DICT4=2;    // four dictionary check bytes to go
+  static final private int DICT3=3;    // three dictionary check bytes to go
+  static final private int DICT2=4;    // two dictionary check bytes to go
+  static final private int DICT1=5;    // one dictionary check byte to go
+  static final int DICT0=6;    // waiting for inflateSetDictionary
+  static final private int BLOCKS=7;   // decompressing blocks
+  static final private int CHECK4=8;   // four check bytes to go
+  static final private int CHECK3=9;   // three check bytes to go
+  static final private int CHECK2=10;  // two check bytes to go
+  static final private int CHECK1=11;  // one check byte to go
+  static final private int DONE=12;    // finished check, done
+  static final private int BAD=13;     // got an error--stay here
+
+  static final private int HEAD=14;
+  static final private int LENGTH=15;
+  static final private int TIME=16;
+  static final private int OS=17;
+  static final private int EXLEN=18;
+  static final private int EXTRA=19;
+  static final private int NAME=20;
+  static final private int COMMENT=21;
+  static final private int HCRC=22;
+  static final private int FLAGS=23;
+
+  int mode;                            // current inflate mode
+
+  // mode dependent information
+  int method;        // if FLAGS, method byte
+
+  // if CHECK, check values to compare
+  long was = -1;           // computed check value
+  long need;               // stream check value
+
+  // if BAD, inflateSync's marker bytes count
+  int marker;
+
+  // mode independent information
+  int  wrap;          // flag for no wrapper
+  int wbits;            // log2(window size)  (8..15, defaults to 15)
+
+  InfBlocks blocks;     // current inflate_blocks state
+
+  private final ZStream z;
+
+  private int flags; 
+
+  private int need_bytes = -1;
+  private byte[] crcbuf=new byte[4];
+
+  GZIPHeader gheader = null;
+
+  int inflateReset(){
+    if(z == null) return Z_STREAM_ERROR;
+    
+    z.total_in = z.total_out = 0;
+    z.msg = null;
+    this.mode = HEAD;
+    this.need_bytes = -1;
+    this.blocks.reset();
+    return Z_OK;
+  }
+
+  int inflateEnd(){
+    if(blocks != null){
+      blocks.free();
+    }
+    return Z_OK;
+  }
+
+  Inflate(ZStream z){
+    this.z=z;
+  }
+
+  int inflateInit(int w){
+    z.msg = null;
+    blocks = null;
+
+    // handle undocumented wrap option (no zlib header or check)
+    wrap = 0;
+    if(w < 0){
+      w = - w;
+    }
+    else {
+      wrap = (w >> 4) + 1;
+      if(w < 48)
+        w &= 15;
+    }
+
+    if(w<8 ||w>15){
+      inflateEnd();
+      return Z_STREAM_ERROR;
+    }
+    if(blocks != null && wbits != w){
+      blocks.free();
+      blocks=null;
+    }
+
+    // set window size
+    wbits=w;
+
+    this.blocks=new InfBlocks(z, 1<<w);
+
+    // reset state
+    inflateReset();
+
+    return Z_OK;
+  }
+
+  int inflate(int f){
+    int hold = 0;
+
+    int r;
+    int b;
+
+    if(z == null || z.next_in == null){
+      if(f == Z_FINISH && this.mode==HEAD)
+        return Z_OK; 
+      return Z_STREAM_ERROR;
+    }
+
+    f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
+    r = Z_BUF_ERROR;
+    while (true){
+
+      switch (this.mode){
+      case HEAD:
+        if(wrap==0){
+	  this.mode = BLOCKS;
+          break;
+        } 
+
+        try { r=readBytes(2, r, f); }
+        catch(Return e){ return e.r; }
+
+        if((wrap&2)!=0 && this.need == 0x8b1fL) {   // gzip header
+	  z.adler=new CRC32();
+          checksum(2, this.need);
+
+          if(gheader==null) 
+            gheader=new GZIPHeader();
+
+          this.mode = FLAGS;
+          break;
+        }
+
+        flags = 0;
+
+        this.method = ((int)this.need)&0xff;
+        b=((int)(this.need>>8))&0xff;
+
+        if((wrap&1)==0 ||  // check if zlib header allowed
+           (((this.method << 8)+b) % 31)!=0){
+          this.mode = BAD;
+          z.msg = "incorrect header check";
+          // since zlib 1.2, it is allowted to inflateSync for this case.
+          /*
+          this.marker = 5;       // can't try inflateSync
+          */
+          break;
+        }
+
+        if((this.method&0xf)!=Z_DEFLATED){
+          this.mode = BAD;
+          z.msg="unknown compression method";
+          // since zlib 1.2, it is allowted to inflateSync for this case.
+	  /*
+          this.marker = 5;       // can't try inflateSync
+	  */
+          break;
+        }
+
+        if((this.method>>4)+8>this.wbits){
+          this.mode = BAD;
+          z.msg="invalid window size";
+          // since zlib 1.2, it is allowted to inflateSync for this case.
+	  /*
+          this.marker = 5;       // can't try inflateSync
+	  */
+          break;
+        }
+
+        z.adler=new Adler32();
+
+        if((b&PRESET_DICT)==0){
+          this.mode = BLOCKS;
+          break;
+        }
+        this.mode = DICT4;
+      case DICT4:
+
+        if(z.avail_in==0)return r;r=f;
+
+        z.avail_in--; z.total_in++;
+        this.need=((z.next_in[z.next_in_index++]&0xff)<<24)&0xff000000L;
+        this.mode=DICT3;
+      case DICT3:
+
+        if(z.avail_in==0)return r;r=f;
+
+        z.avail_in--; z.total_in++;
+        this.need+=((z.next_in[z.next_in_index++]&0xff)<<16)&0xff0000L;
+        this.mode=DICT2;
+      case DICT2:
+
+        if(z.avail_in==0)return r;r=f;
+
+        z.avail_in--; z.total_in++;
+        this.need+=((z.next_in[z.next_in_index++]&0xff)<<8)&0xff00L;
+        this.mode=DICT1;
+      case DICT1:
+
+        if(z.avail_in==0)return r;r=f;
+
+        z.avail_in--; z.total_in++;
+        this.need += (z.next_in[z.next_in_index++]&0xffL);
+        z.adler.reset(this.need);
+        this.mode = DICT0;
+        return Z_NEED_DICT;
+      case DICT0:
+        this.mode = BAD;
+        z.msg = "need dictionary";
+        this.marker = 0;       // can try inflateSync
+        return Z_STREAM_ERROR;
+      case BLOCKS:
+        r = this.blocks.proc(r);
+        if(r == Z_DATA_ERROR){
+          this.mode = BAD;
+          this.marker = 0;     // can try inflateSync
+          break;
+        }
+        if(r == Z_OK){
+          r = f;
+        }
+        if(r != Z_STREAM_END){
+          return r;
+        }
+        r = f;
+        this.was=z.adler.getValue();
+        this.blocks.reset();
+        if(this.wrap==0){
+          this.mode=DONE;
+          break;
+        }
+        this.mode=CHECK4;
+      case CHECK4:
+
+        if(z.avail_in==0)return r;r=f;
+
+        z.avail_in--; z.total_in++;
+        this.need=((z.next_in[z.next_in_index++]&0xff)<<24)&0xff000000L;
+        this.mode=CHECK3;
+      case CHECK3:
+
+        if(z.avail_in==0)return r;r=f;
+
+        z.avail_in--; z.total_in++;
+        this.need+=((z.next_in[z.next_in_index++]&0xff)<<16)&0xff0000L;
+        this.mode = CHECK2;
+      case CHECK2:
+
+        if(z.avail_in==0)return r;r=f;
+
+        z.avail_in--; z.total_in++;
+        this.need+=((z.next_in[z.next_in_index++]&0xff)<<8)&0xff00L;
+        this.mode = CHECK1;
+      case CHECK1:
+
+        if(z.avail_in==0)return r;r=f;
+
+        z.avail_in--; z.total_in++;
+        this.need+=(z.next_in[z.next_in_index++]&0xffL);
+
+        if(flags!=0){  // gzip
+          this.need = ((this.need&0xff000000)>>24 | 
+                          (this.need&0x00ff0000)>>8 | 
+                          (this.need&0x0000ff00)<<8 | 
+                          (this.need&0x0000ffff)<<24)&0xffffffffL;
+        }
+
+        if(((int)(this.was)) != ((int)(this.need))){
+          z.msg = "incorrect data check";
+          // chack is delayed
+          /*
+          this.mode = BAD;
+          this.marker = 5;       // can't try inflateSync
+          break;
+	  */
+        }
+        else if(flags!=0 && gheader!=null){
+          gheader.crc = this.need; 
+        }
+
+        this.mode = LENGTH;
+      case LENGTH:
+        if (wrap!=0 && flags!=0) {
+
+          try { r=readBytes(4, r, f); }
+          catch(Return e){ return e.r; }
+
+          if(z.msg!=null && z.msg.equals("incorrect data check")){
+            this.mode = BAD;
+            this.marker = 5;       // can't try inflateSync
+            break;
+          }
+
+          if (this.need != (z.total_out & 0xffffffffL)) {
+            z.msg = "incorrect length check";
+            this.mode = BAD;
+            break;
+          }
+          z.msg = null;
+        }
+        else {
+          if(z.msg!=null && z.msg.equals("incorrect data check")){
+            this.mode = BAD;
+            this.marker = 5;       // can't try inflateSync
+            break;
+          }
+        }
+
+        this.mode = DONE;
+      case DONE:
+        return Z_STREAM_END;
+      case BAD:
+        return Z_DATA_ERROR;
+
+      case FLAGS:
+
+        try { r=readBytes(2, r, f); }
+        catch(Return e){ return e.r; }
+
+        flags = ((int)this.need)&0xffff;
+
+        if ((flags & 0xff) != Z_DEFLATED) {
+          z.msg = "unknown compression method";
+          this.mode = BAD; 
+          break;
+        }
+        if ((flags & 0xe000)!=0) {
+          z.msg = "unknown header flags set";
+          this.mode = BAD; 
+          break;
+        }
+
+        if ((flags & 0x0200)!=0){
+          checksum(2, this.need);
+        } 
+
+        this.mode = TIME;
+
+      case TIME:
+        try { r=readBytes(4, r, f); }
+        catch(Return e){ return e.r; }
+        if(gheader!=null)
+          gheader.time = this.need;
+        if ((flags & 0x0200)!=0){
+          checksum(4, this.need);
+        }
+        this.mode = OS;
+      case OS:
+        try { r=readBytes(2, r, f); }
+        catch(Return e){ return e.r; }
+        if(gheader!=null){
+          gheader.xflags = ((int)this.need)&0xff;
+          gheader.os = (((int)this.need)>>8)&0xff;
+        }
+        if ((flags & 0x0200)!=0){
+          checksum(2, this.need);
+        }
+        this.mode = EXLEN;
+      case EXLEN:
+        if ((flags & 0x0400)!=0) {
+          try { r=readBytes(2, r, f); }
+          catch(Return e){ return e.r; }
+          if(gheader!=null){
+            gheader.extra = new byte[((int)this.need)&0xffff];
+          }
+          if ((flags & 0x0200)!=0){
+            checksum(2, this.need);
+          }
+        }
+        else if(gheader!=null){
+          gheader.extra=null;
+        }
+        this.mode = EXTRA;
+
+      case EXTRA:
+        if ((flags & 0x0400)!=0) {
+          try { 
+            r=readBytes(r, f);
+            if(gheader!=null){
+              byte[] foo = tmp_array;
+              tmp_array=null;
+              if(foo.length == gheader.extra.length){
+                System.arraycopy(foo, 0, gheader.extra, 0, foo.length);
+	      }
+              else{
+                z.msg = "bad extra field length";
+                this.mode = BAD; 
+                break;
+	      }
+            }
+          }
+          catch(Return e){ return e.r; }
+        }
+        else if(gheader!=null){
+          gheader.extra=null;
+	}
+	this.mode = NAME;
+      case NAME:
+	if ((flags & 0x0800)!=0) {
+          try { 
+            r=readString(r, f);
+            if(gheader!=null){
+              gheader.name=tmp_array;
+            }
+            tmp_array=null;
+          }
+          catch(Return e){ return e.r; }
+        }
+        else if(gheader!=null){
+          gheader.name=null;
+	}
+        this.mode = COMMENT;
+      case COMMENT:
+        if ((flags & 0x1000)!=0) {
+          try { 
+            r=readString(r, f);
+            if(gheader!=null){
+              gheader.comment=tmp_array;
+            }
+            tmp_array=null;
+          }
+          catch(Return e){ return e.r; }
+        }
+        else if(gheader!=null){
+          gheader.comment=null;
+	}
+        this.mode = HCRC;
+      case HCRC:
+	if ((flags & 0x0200)!=0) {
+          try { r=readBytes(2, r, f); }
+          catch(Return e){ return e.r; }
+          if(gheader!=null){
+            gheader.hcrc=(int)(this.need&0xffff);
+          }
+          if(this.need != (z.adler.getValue()&0xffffL)){
+            this.mode = BAD;
+            z.msg = "header crc mismatch";
+            this.marker = 5;       // can't try inflateSync
+            break;
+          }
+        }
+        z.adler = new CRC32();
+
+        this.mode = BLOCKS;
+        break;
+      default:
+        return Z_STREAM_ERROR;
+      }
+    }
+  }
+
+  int inflateSetDictionary(byte[] dictionary, int dictLength){
+    if(z==null || (this.mode != DICT0 && this.wrap != 0)){
+      return Z_STREAM_ERROR;
+    }
+
+    int index=0;
+    int length = dictLength;
+
+    if(this.mode==DICT0){
+      long adler_need=z.adler.getValue();
+      z.adler.reset();
+      z.adler.update(dictionary, 0, dictLength);
+      if(z.adler.getValue()!=adler_need){
+        return Z_DATA_ERROR;
+      }
+    }
+
+    z.adler.reset();
+
+    if(length >= (1<<this.wbits)){
+      length = (1<<this.wbits)-1;
+      index=dictLength - length;
+    }
+    this.blocks.set_dictionary(dictionary, index, length);
+    this.mode = BLOCKS;
+    return Z_OK;
+  }
+
+  static private byte[] mark = {(byte)0, (byte)0, (byte)0xff, (byte)0xff};
+
+  int inflateSync(){
+    int n;       // number of bytes to look at
+    int p;       // pointer to bytes
+    int m;       // number of marker bytes found in a row
+    long r, w;   // temporaries to save total_in and total_out
+
+    // set up
+    if(z == null)
+      return Z_STREAM_ERROR;
+    if(this.mode != BAD){
+      this.mode = BAD;
+      this.marker = 0;
+    }
+    if((n=z.avail_in)==0)
+      return Z_BUF_ERROR;
+
+    p=z.next_in_index;
+    m=this.marker;
+    // search
+    while (n!=0 && m < 4){
+      if(z.next_in[p] == mark[m]){
+        m++;
+      }
+      else if(z.next_in[p]!=0){
+        m = 0;
+      }
+      else{
+        m = 4 - m;
+      }
+      p++; n--;
+    }
+
+    // restore
+    z.total_in += p-z.next_in_index;
+    z.next_in_index = p;
+    z.avail_in = n;
+    this.marker = m;
+
+    // return no joy or set up to restart on a new block
+    if(m != 4){
+      return Z_DATA_ERROR;
+    }
+    r=z.total_in;  w=z.total_out;
+    inflateReset();
+    z.total_in=r;  z.total_out = w;
+    this.mode = BLOCKS;
+
+    return Z_OK;
+  }
+
+  // Returns true if inflate is currently at the end of a block generated
+  // by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+  // implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
+  // but removes the length bytes of the resulting empty stored block. When
+  // decompressing, PPP checks that at the end of input packet, inflate is
+  // waiting for these length bytes.
+  int inflateSyncPoint(){
+    if(z == null || this.blocks == null)
+      return Z_STREAM_ERROR;
+    return this.blocks.sync_point();
+  }
+
+  private int readBytes(int n, int r, int f) throws Return{
+    if(need_bytes == -1){
+      need_bytes=n;
+      this.need=0;
+    }
+    while(need_bytes>0){
+      if(z.avail_in==0){ throw new Return(r); }; r=f;
+      z.avail_in--; z.total_in++;
+      this.need = this.need | 
+	((z.next_in[z.next_in_index++]&0xff)<<((n-need_bytes)*8));
+      need_bytes--;
+    }
+    if(n==2){
+      this.need&=0xffffL;
+    }
+    else if(n==4) {
+      this.need&=0xffffffffL;
+    }
+    need_bytes=-1;
+    return r;
+  }
+  class Return extends Exception{
+    int r;
+    Return(int r){this.r=r; }
+  }
+
+  private byte[] tmp_array;
+  private int readString(int r, int f) throws Return{
+    int b=0; 
+    byte[] arr = new byte[4092];
+    int at = 0;
+    do {
+      if(z.avail_in==0){ throw new Return(r); }; r=f;
+      z.avail_in--; z.total_in++;
+      b = z.next_in[z.next_in_index];
+      if(b!=0) arr = append(arr, z.next_in[z.next_in_index], at++);
+      z.adler.update(z.next_in, z.next_in_index, 1);
+      z.next_in_index++;
+    }while(b!=0);
+    
+    tmp_array = copy(arr, at);
+    
+    return r;
+  }
+
+  private int readBytes(int r, int f) throws Return{
+    int b=0; 
+    byte[] arr = new byte[4092];
+    int at = 0;
+    while(this.need>0){
+      if(z.avail_in==0){ throw new Return(r); }; r=f;
+      z.avail_in--; z.total_in++;
+      b = z.next_in[z.next_in_index];
+      arr = append(arr, z.next_in[z.next_in_index], at++);
+      z.adler.update(z.next_in, z.next_in_index, 1);
+      z.next_in_index++;
+      this.need--;
+    }
+    
+    tmp_array = copy(arr, at);
+    
+    return r;
+  }
+  
+  private static byte[] copy(byte[] arr, int len) {
+      byte[] ret = new byte[len];
+      org.apidesign.bck2brwsr.emul.lang.System.arraycopy(arr, 0, ret, 0, len);
+      return ret;
+  }
+  private static byte[] append(byte[] arr, byte b, int index) {
+      arr[index] = b;
+      return arr;
+  }
+
+  private void checksum(int n, long v){
+    for(int i=0; i<n; i++){
+      crcbuf[i]=(byte)(v&0xff);
+      v>>=8;
+    }
+    z.adler.update(crcbuf, 0, n);
+  }
+
+  public GZIPHeader getGZIPHeader(){
+    return gheader;
+  }
+
+  boolean inParsingHeader(){
+    switch(mode){
+      case HEAD:
+      case DICT4:
+      case DICT3:
+      case DICT2:
+      case DICT1:
+      case FLAGS:
+      case TIME:
+      case OS:
+      case EXLEN:
+      case EXTRA:
+      case NAME:
+      case COMMENT:
+      case HCRC:
+	return true;
+      default:
+	return false;
+    }
+  }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Inflater.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/Inflater.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import java.util.zip.*;
+import java.io.IOException;
+
+/**
+ * This class provides support for general purpose decompression using the
+ * popular ZLIB compression library. The ZLIB compression library was
+ * initially developed as part of the PNG graphics standard and is not
+ * protected by patents. It is fully described in the specifications at
+ * the <a href="package-summary.html#package_description">java.util.zip
+ * package description</a>.
+ *
+ * <p>The following code fragment demonstrates a trivial compression
+ * and decompression of a string using <tt>Deflater</tt> and
+ * <tt>Inflater</tt>.
+ *
+ * <blockquote><pre>
+ * try {
+ *     // Encode a String into bytes
+ *     String inputString = "blahblahblah\u20AC\u20AC";
+ *     byte[] input = inputString.getBytes("UTF-8");
+ *
+ *     // Compress the bytes
+ *     byte[] output = new byte[100];
+ *     Deflater compresser = new Deflater();
+ *     compresser.setInput(input);
+ *     compresser.finish();
+ *     int compressedDataLength = compresser.deflate(output);
+ *
+ *     // Decompress the bytes
+ *     Inflater decompresser = new Inflater();
+ *     decompresser.setInput(output, 0, compressedDataLength);
+ *     byte[] result = new byte[100];
+ *     int resultLength = decompresser.inflate(result);
+ *     decompresser.end();
+ *
+ *     // Decode the bytes into a String
+ *     String outputString = new String(result, 0, resultLength, "UTF-8");
+ * } catch(java.io.UnsupportedEncodingException ex) {
+ *     // handle
+ * } catch (java.util.zip.DataFormatException ex) {
+ *     // handle
+ * }
+ * </pre></blockquote>
+ *
+ * @see         Deflater
+ * @author      David Connelly
+ *
+ */
+public
+class Inflater extends java.util.zip.Inflater {
+    private final boolean nowrap;
+    private JzLibInflater impl;
+    
+    /**
+     * Creates a new decompressor. If the parameter 'nowrap' is true then
+     * the ZLIB header and checksum fields will not be used. This provides
+     * compatibility with the compression format used by both GZIP and PKZIP.
+     * <p>
+     * Note: When using the 'nowrap' option it is also necessary to provide
+     * an extra "dummy" byte as input. This is required by the ZLIB native
+     * library in order to support certain optimizations.
+     *
+     * @param nowrap if true then support GZIP compatible compression
+     */
+    public Inflater(boolean nowrap) {
+        this.nowrap = nowrap;
+        reset();
+    }
+
+    /**
+     * Creates a new decompressor.
+     */
+    public Inflater() {
+        this(false);
+    }
+
+    /**
+     * Sets input data for decompression. Should be called whenever
+     * needsInput() returns true indicating that more input data is
+     * required.
+     * @param b the input data bytes
+     * @param off the start offset of the input data
+     * @param len the length of the input data
+     * @see Inflater#needsInput
+     */
+    public void setInput(byte[] b, int off, int len) {
+        if (b == null) {
+            throw new NullPointerException();
+        }
+        if (off < 0 || len < 0 || off > b.length - len) {
+            throw new ArrayIndexOutOfBoundsException();
+        }
+        impl.setInput(b, off, len, false);
+    }
+
+    /**
+     * Sets input data for decompression. Should be called whenever
+     * needsInput() returns true indicating that more input data is
+     * required.
+     * @param b the input data bytes
+     * @see Inflater#needsInput
+     */
+    public void setInput(byte[] b) {
+        setInput(b, 0, b.length);
+    }
+
+    /**
+     * Sets the preset dictionary to the given array of bytes. Should be
+     * called when inflate() returns 0 and needsDictionary() returns true
+     * indicating that a preset dictionary is required. The method getAdler()
+     * can be used to get the Adler-32 value of the dictionary needed.
+     * @param b the dictionary data bytes
+     * @param off the start offset of the data
+     * @param len the length of the data
+     * @see Inflater#needsDictionary
+     * @see Inflater#getAdler
+     */
+    public void setDictionary(byte[] b, int off, int len) {
+        if (b == null) {
+            throw new NullPointerException();
+        }
+        if (off < 0 || len < 0 || off > b.length - len) {
+            throw new ArrayIndexOutOfBoundsException();
+        }
+        byte[] arr;
+        if (off == 0) {
+            arr = b;
+        } else {
+            arr = new byte[len];
+            org.apidesign.bck2brwsr.emul.lang.System.arraycopy(b, off, arr, 0, len);
+        }
+        impl.setDictionary(arr, len);
+    }
+
+    /**
+     * Sets the preset dictionary to the given array of bytes. Should be
+     * called when inflate() returns 0 and needsDictionary() returns true
+     * indicating that a preset dictionary is required. The method getAdler()
+     * can be used to get the Adler-32 value of the dictionary needed.
+     * @param b the dictionary data bytes
+     * @see Inflater#needsDictionary
+     * @see Inflater#getAdler
+     */
+    public void setDictionary(byte[] b) {
+        impl.setDictionary(b, b.length);
+    }
+
+    /**
+     * Returns the total number of bytes remaining in the input buffer.
+     * This can be used to find out what bytes still remain in the input
+     * buffer after decompression has finished.
+     * @return the total number of bytes remaining in the input buffer
+     */
+    public int getRemaining() {
+        return impl.getAvailIn();
+    }
+
+    /**
+     * Returns true if no data remains in the input buffer. This can
+     * be used to determine if #setInput should be called in order
+     * to provide more input.
+     * @return true if no data remains in the input buffer
+     */
+    public boolean needsInput() {
+        return getRemaining() <= 0;
+    }
+
+    /**
+     * Returns true if a preset dictionary is needed for decompression.
+     * @return true if a preset dictionary is needed for decompression
+     * @see Inflater#setDictionary
+     */
+    public boolean needsDictionary() {
+        return impl.needDict();
+    }
+
+    /**
+     * Returns true if the end of the compressed data stream has been
+     * reached.
+     * @return true if the end of the compressed data stream has been
+     * reached
+     */
+    public boolean finished() {
+        return impl.finished();
+    }
+
+    /**
+     * Uncompresses bytes into specified buffer. Returns actual number
+     * of bytes uncompressed. A return value of 0 indicates that
+     * needsInput() or needsDictionary() should be called in order to
+     * determine if more input data or a preset dictionary is required.
+     * In the latter case, getAdler() can be used to get the Adler-32
+     * value of the dictionary required.
+     * @param b the buffer for the uncompressed data
+     * @param off the start offset of the data
+     * @param len the maximum number of uncompressed bytes
+     * @return the actual number of uncompressed bytes
+     * @exception DataFormatException if the compressed data format is invalid
+     * @see Inflater#needsInput
+     * @see Inflater#needsDictionary
+     */
+    public int inflate(byte[] b, int off, int len)
+        throws DataFormatException
+    {
+        if (b == null) {
+            throw new NullPointerException();
+        }
+        if (off < 0 || len < 0 || off > b.length - len) {
+            throw new ArrayIndexOutOfBoundsException();
+        }
+        impl.setOutput(b, off, len);
+        int err = impl.inflate(JzLibInflater.Z_NO_FLUSH);
+        return impl.next_out_index - off;
+    }
+
+    /**
+     * Uncompresses bytes into specified buffer. Returns actual number
+     * of bytes uncompressed. A return value of 0 indicates that
+     * needsInput() or needsDictionary() should be called in order to
+     * determine if more input data or a preset dictionary is required.
+     * In the latter case, getAdler() can be used to get the Adler-32
+     * value of the dictionary required.
+     * @param b the buffer for the uncompressed data
+     * @return the actual number of uncompressed bytes
+     * @exception DataFormatException if the compressed data format is invalid
+     * @see Inflater#needsInput
+     * @see Inflater#needsDictionary
+     */
+    public int inflate(byte[] b) throws DataFormatException {
+        return inflate(b, 0, b.length);
+    }
+
+    /**
+     * Returns the ADLER-32 value of the uncompressed data.
+     * @return the ADLER-32 value of the uncompressed data
+     */
+    public int getAdler() {
+        return (int) impl.getAdler();
+    }
+
+    /**
+     * Returns the total number of compressed bytes input so far.
+     *
+     * <p>Since the number of bytes may be greater than
+     * Integer.MAX_VALUE, the {@link #getBytesRead()} method is now
+     * the preferred means of obtaining this information.</p>
+     *
+     * @return the total number of compressed bytes input so far
+     */
+    public int getTotalIn() {
+        return (int) getBytesRead();
+    }
+
+    /**
+     * Returns the total number of compressed bytes input so far.</p>
+     *
+     * @return the total (non-negative) number of compressed bytes input so far
+     * @since 1.5
+     */
+    public long getBytesRead() {
+        return impl.total_in;
+    }
+
+    /**
+     * Returns the total number of uncompressed bytes output so far.
+     *
+     * <p>Since the number of bytes may be greater than
+     * Integer.MAX_VALUE, the {@link #getBytesWritten()} method is now
+     * the preferred means of obtaining this information.</p>
+     *
+     * @return the total number of uncompressed bytes output so far
+     */
+    public int getTotalOut() {
+        return (int) getBytesWritten();
+    }
+
+    /**
+     * Returns the total number of uncompressed bytes output so far.</p>
+     *
+     * @return the total (non-negative) number of uncompressed bytes output so far
+     * @since 1.5
+     */
+    public long getBytesWritten() {
+        return impl.total_out;
+    }
+
+    /**
+     * Resets inflater so that a new set of input data can be processed.
+     */
+    public void reset() {
+        impl = new JzLibInflater(15, nowrap);
+    }
+
+    /**
+     * Closes the decompressor and discards any unprocessed input.
+     * This method should be called when the decompressor is no longer
+     * being used, but will also be called automatically by the finalize()
+     * method. Once this method is called, the behavior of the Inflater
+     * object is undefined.
+     */
+    public void end() {
+        impl.end();
+    }
+
+    /**
+     * Closes the decompressor when garbage is collected.
+     */
+    protected void finalize() {
+        end();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/JzLibInflater.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/JzLibInflater.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,137 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/*
+Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+final class JzLibInflater extends ZStream{
+
+  static final private int MAX_WBITS=15;        // 32K LZ77 window
+  static final private int DEF_WBITS=MAX_WBITS;
+
+  public static final int Z_NO_FLUSH=0;
+  static final private int Z_PARTIAL_FLUSH=1;
+  static final private int Z_SYNC_FLUSH=2;
+  static final private int Z_FULL_FLUSH=3;
+  static final private int Z_FINISH=4;
+
+  static final private int MAX_MEM_LEVEL=9;
+
+  static final private int Z_OK=0;
+  static final private int Z_STREAM_END=1;
+  static final private int Z_NEED_DICT=2;
+  static final private int Z_ERRNO=-1;
+  static final private int Z_STREAM_ERROR=-2;
+  static final private int Z_DATA_ERROR=-3;
+  static final private int Z_MEM_ERROR=-4;
+  static final private int Z_BUF_ERROR=-5;
+  static final private int Z_VERSION_ERROR=-6;
+
+  public JzLibInflater() {
+    super();
+    init();
+  }
+
+  public JzLibInflater(int w)  {
+    this(w, false);
+  }
+
+  public JzLibInflater(int w, boolean nowrap)  {
+    super();
+    int ret = init(w, nowrap);
+    if(ret!=Z_OK)
+      throw new IllegalStateException(ret+": "+msg);
+  }
+
+  private boolean finished = false;
+
+  public int init(){
+    return init(DEF_WBITS);
+  }
+
+  public int init(boolean nowrap){
+    return init(DEF_WBITS, nowrap);
+  }
+
+  public int init(int w){
+    return init(w, false);
+  }
+
+  public int init(int w, boolean nowrap){
+    finished = false;
+    istate=new Inflate(this);
+    return istate.inflateInit(nowrap?-w:w);
+  }
+
+  public int inflate(int f){
+    if(istate==null) return Z_STREAM_ERROR;
+    int ret = istate.inflate(f);
+    if(ret == Z_STREAM_END) 
+      finished = true;
+    return ret;
+  }
+
+  public int end(){
+    finished = true;
+    if(istate==null) return Z_STREAM_ERROR;
+    int ret=istate.inflateEnd();
+//    istate = null;
+    return ret;
+  }
+
+  public int sync(){
+    if(istate == null)
+      return Z_STREAM_ERROR;
+    return istate.inflateSync();
+  }
+
+  public int syncPoint(){
+    if(istate == null)
+      return Z_STREAM_ERROR;
+    return istate.inflateSyncPoint();
+  }
+
+  public int setDictionary(byte[] dictionary, int dictLength){
+    if(istate == null)
+      return Z_STREAM_ERROR;
+    return istate.inflateSetDictionary(dictionary, dictLength);
+  }
+
+  public boolean finished(){
+    return istate.mode==12 /*DONE*/;
+  }
+
+  public boolean needDict() {
+    return istate == null ? false : istate.mode == Inflate.DICT0;
+  }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,253 @@
+/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/*
+Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import org.apidesign.bck2brwsr.emul.lang.System;
+
+/**
+ * ZStream
+ *
+ * @deprecated  Not for public use in the future.
+ */
+@Deprecated
+class ZStream{
+
+  static final private int MAX_WBITS=15;        // 32K LZ77 window
+  static final private int DEF_WBITS=MAX_WBITS;
+
+  static final private int Z_NO_FLUSH=0;
+  static final private int Z_PARTIAL_FLUSH=1;
+  static final private int Z_SYNC_FLUSH=2;
+  static final private int Z_FULL_FLUSH=3;
+  static final private int Z_FINISH=4;
+
+  static final private int MAX_MEM_LEVEL=9;
+
+  static final private int Z_OK=0;
+  static final private int Z_STREAM_END=1;
+  static final private int Z_NEED_DICT=2;
+  static final private int Z_ERRNO=-1;
+  static final private int Z_STREAM_ERROR=-2;
+  static final private int Z_DATA_ERROR=-3;
+  static final private int Z_MEM_ERROR=-4;
+  static final private int Z_BUF_ERROR=-5;
+  static final private int Z_VERSION_ERROR=-6;
+
+  public byte[] next_in;     // next input byte
+  public int next_in_index;
+  public int avail_in;       // number of bytes available at next_in
+  public long total_in;      // total nb of input bytes read so far
+
+  public byte[] next_out;    // next output byte should be put there
+  public int next_out_index;
+  public int avail_out;      // remaining free space at next_out
+  public long total_out;     // total nb of bytes output so far
+
+  public String msg;
+
+  Inflate istate; 
+
+  int data_type; // best guess about the data type: ascii or binary
+
+  Checksum adler;
+
+  public ZStream(){
+    this(new Adler32());
+  }
+
+  public ZStream(Checksum adler){
+    this.adler=adler;
+  }
+
+  public int inflateInit(){
+    return inflateInit(DEF_WBITS);
+  }
+  public int inflateInit(boolean nowrap){
+    return inflateInit(DEF_WBITS, nowrap);
+  }
+  public int inflateInit(int w){
+    return inflateInit(w, false);
+  }
+
+  public int inflateInit(int w, boolean nowrap){
+    istate=new Inflate(this);
+    return istate.inflateInit(nowrap?-w:w);
+  }
+
+  public int inflate(int f){
+    if(istate==null) return Z_STREAM_ERROR;
+    return istate.inflate(f);
+  }
+  public int inflateEnd(){
+    if(istate==null) return Z_STREAM_ERROR;
+    int ret=istate.inflateEnd();
+//    istate = null;
+    return ret;
+  }
+  
+  public int inflateSync(){
+    if(istate == null)
+      return Z_STREAM_ERROR;
+    return istate.inflateSync();
+  }
+  public int inflateSyncPoint(){
+    if(istate == null)
+      return Z_STREAM_ERROR;
+    return istate.inflateSyncPoint();
+  }
+  public int inflateSetDictionary(byte[] dictionary, int dictLength){
+    if(istate == null)
+      return Z_STREAM_ERROR;
+    return istate.inflateSetDictionary(dictionary, dictLength);
+  }
+  public boolean inflateFinished(){
+    return istate.mode==12 /*DONE*/;
+  }
+
+
+  public long getAdler(){
+    return adler.getValue();
+  }
+
+  public void free(){
+    next_in=null;
+    next_out=null;
+    msg=null;
+  }
+
+  public void setOutput(byte[] buf){
+    setOutput(buf, 0, buf.length); 
+  }
+
+  public void setOutput(byte[] buf, int off, int len){
+    next_out = buf;
+    next_out_index = off;
+    avail_out = len;
+  }
+
+  public void setInput(byte[] buf){
+    setInput(buf, 0, buf.length, false); 
+  }
+
+  public void setInput(byte[] buf, boolean append){
+    setInput(buf, 0, buf.length, append); 
+  }
+
+  public void setInput(byte[] buf, int off, int len, boolean append){
+    if(len<=0 && append && next_in!=null) return;
+
+    if(avail_in>0 && append){  
+      byte[] tmp = new byte[avail_in+len];
+      System.arraycopy(next_in, next_in_index, tmp, 0, avail_in);
+      System.arraycopy(buf, off, tmp, avail_in, len);
+      next_in=tmp;
+      next_in_index=0;
+      avail_in+=len;
+    }
+    else{
+      next_in=buf;
+      next_in_index=off;
+      avail_in=len;
+    }
+  }
+
+  public byte[] getNextIn(){
+    return next_in;
+  }
+
+  public void setNextIn(byte[] next_in){
+    this.next_in = next_in;
+  }
+
+  public int getNextInIndex(){
+    return next_in_index;
+  }
+
+  public void setNextInIndex(int next_in_index){
+    this.next_in_index = next_in_index;
+  }
+
+  public int getAvailIn(){
+    return avail_in;
+  }
+
+  public void setAvailIn(int avail_in){
+    this.avail_in = avail_in;
+  }
+
+  public byte[] getNextOut(){
+    return next_out;
+  }
+
+  public void setNextOut(byte[] next_out){
+    this.next_out = next_out;
+  }
+
+  public int getNextOutIndex(){
+    return next_out_index;
+  }
+
+  public void setNextOutIndex(int next_out_index){
+    this.next_out_index = next_out_index;
+  }
+
+  public int getAvailOut(){
+    return avail_out;
+
+  }
+
+  public void setAvailOut(int avail_out){
+    this.avail_out = avail_out;
+  }
+
+  public long getTotalOut(){
+    return total_out;
+  }
+
+  public long getTotalIn(){
+    return total_in;
+  }
+
+  public String getMessage(){
+    return msg;
+  }
+
+  /**
+   * Those methods are expected to be override by Inflater and Deflater.
+   * In the future, they will become abstract methods.
+   */ 
+  public int end(){ return Z_OK; }
+  public boolean finished(){ return false; }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZipConstants64.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZipConstants64.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 1995, 1996, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+/*
+ * This class defines the constants that are used by the classes
+ * which manipulate Zip64 files.
+ */
+
+public class ZipConstants64 {
+
+    /*
+     * ZIP64 constants
+     */
+    static final long ZIP64_ENDSIG = 0x06064b50L;  // "PK\006\006"
+    static final long ZIP64_LOCSIG = 0x07064b50L;  // "PK\006\007"
+    static final int  ZIP64_ENDHDR = 56;           // ZIP64 end header size
+    static final int  ZIP64_LOCHDR = 20;           // ZIP64 end loc header size
+    static final int  ZIP64_EXTHDR = 24;           // EXT header size
+    static final int  ZIP64_EXTID  = 0x0001;       // Extra field Zip64 header ID
+
+    static final int  ZIP64_MAGICCOUNT = 0xFFFF;
+    static final long ZIP64_MAGICVAL = 0xFFFFFFFFL;
+
+    /*
+     * Zip64 End of central directory (END) header field offsets
+     */
+    static final int  ZIP64_ENDLEN = 4;       // size of zip64 end of central dir
+    static final int  ZIP64_ENDVEM = 12;      // version made by
+    static final int  ZIP64_ENDVER = 14;      // version needed to extract
+    static final int  ZIP64_ENDNMD = 16;      // number of this disk
+    static final int  ZIP64_ENDDSK = 20;      // disk number of start
+    static final int  ZIP64_ENDTOD = 24;      // total number of entries on this disk
+    static final int  ZIP64_ENDTOT = 32;      // total number of entries
+    static final int  ZIP64_ENDSIZ = 40;      // central directory size in bytes
+    static final int  ZIP64_ENDOFF = 48;      // offset of first CEN header
+    static final int  ZIP64_ENDEXT = 56;      // zip64 extensible data sector
+
+    /*
+     * Zip64 End of central directory locator field offsets
+     */
+    static final int  ZIP64_LOCDSK = 4;       // disk number start
+    static final int  ZIP64_LOCOFF = 8;       // offset of zip64 end
+    static final int  ZIP64_LOCTOT = 16;      // total number of disks
+
+    /*
+     * Zip64 Extra local (EXT) header field offsets
+     */
+    static final int  ZIP64_EXTCRC = 4;       // uncompressed file crc-32 value
+    static final int  ZIP64_EXTSIZ = 8;       // compressed size, 8-byte
+    static final int  ZIP64_EXTLEN = 16;      // uncompressed size, 8-byte
+
+    /*
+     * Language encoding flag EFS
+     */
+    static final int EFS = 0x800;       // If this bit is set the filename and
+                                        // comment fields for this file must be
+                                        // encoded using UTF-8.
+
+    private ZipConstants64() {}
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZipInputStream.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/zip/ZipInputStream.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,468 @@
+/*
+ * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.apidesign.bck2brwsr.emul.zip;
+
+import java.util.zip.*;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.PushbackInputStream;
+import static org.apidesign.bck2brwsr.emul.zip.ZipConstants64.*;
+import static java.util.zip.ZipInputStream.*;
+
+/**
+ * This class implements an input stream filter for reading files in the
+ * ZIP file format. Includes support for both compressed and uncompressed
+ * entries.
+ *
+ * @author      David Connelly
+ */
+public
+class ZipInputStream extends InflaterInputStream  {
+    private ZipEntry entry;
+    private int flag;
+    private CRC32 crc = new CRC32();
+    private long remaining;
+    private byte[] tmpbuf = new byte[512];
+
+    private static final int STORED = ZipEntry.STORED;
+    private static final int DEFLATED = ZipEntry.DEFLATED;
+
+    private boolean closed = false;
+    // this flag is set to true after EOF has reached for
+    // one entry
+    private boolean entryEOF = false;
+
+    /**
+     * Check to make sure that this stream has not been closed
+     */
+    private void ensureOpen() throws IOException {
+        if (closed) {
+            throw new IOException("Stream closed");
+        }
+    }
+
+    /**
+     * Creates a new ZIP input stream.
+     *
+     * <p>The UTF-8 {@link java.nio.charset.Charset charset} is used to
+     * decode the entry names.
+     *
+     * @param in the actual input stream
+     */
+    public ZipInputStream(InputStream in) {
+//        this(in, "UTF-8");
+        super(new PushbackInputStream(in, 512), new Inflater(true), 512);
+        //usesDefaultInflater = true;
+        if(in == null) {
+            throw new NullPointerException("in is null");
+        }
+    }
+
+    /**
+     * Creates a new ZIP input stream.
+     *
+     * @param in the actual input stream
+     *
+     * @param charset
+     *        The {@linkplain java.nio.charset.Charset charset} to be
+     *        used to decode the ZIP entry name (ignored if the
+     *        <a href="package-summary.html#lang_encoding"> language
+     *        encoding bit</a> of the ZIP entry's general purpose bit
+     *        flag is set).
+     *
+     * @since 1.7
+     *
+    public ZipInputStream(InputStream in, Charset charset) {
+        super(new PushbackInputStream(in, 512), new Inflater(true), 512);
+        usesDefaultInflater = true;
+        if(in == null) {
+            throw new NullPointerException("in is null");
+        }
+        if (charset == null)
+            throw new NullPointerException("charset is null");
+        this.zc = ZipCoder.get(charset);
+    }
+    */
+
+    /**
+     * Reads the next ZIP file entry and positions the stream at the
+     * beginning of the entry data.
+     * @return the next ZIP file entry, or null if there are no more entries
+     * @exception ZipException if a ZIP file error has occurred
+     * @exception IOException if an I/O error has occurred
+     */
+    public ZipEntry getNextEntry() throws IOException {
+        ensureOpen();
+        if (entry != null) {
+            closeEntry();
+        }
+        crc.reset();
+        inf.reset();
+        if ((entry = readLOC()) == null) {
+            return null;
+        }
+        if (entry.getMethod() == STORED) {
+            remaining = entry.getSize();
+        }
+        entryEOF = false;
+        return entry;
+    }
+
+    /**
+     * Closes the current ZIP entry and positions the stream for reading the
+     * next entry.
+     * @exception ZipException if a ZIP file error has occurred
+     * @exception IOException if an I/O error has occurred
+     */
+    public void closeEntry() throws IOException {
+        ensureOpen();
+        while (read(tmpbuf, 0, tmpbuf.length) != -1) ;
+        entryEOF = true;
+    }
+
+    /**
+     * Returns 0 after EOF has reached for the current entry data,
+     * otherwise always return 1.
+     * <p>
+     * Programs should not count on this method to return the actual number
+     * of bytes that could be read without blocking.
+     *
+     * @return     1 before EOF and 0 after EOF has reached for current entry.
+     * @exception  IOException  if an I/O error occurs.
+     *
+     */
+    public int available() throws IOException {
+        ensureOpen();
+        if (entryEOF) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    /**
+     * Reads from the current ZIP entry into an array of bytes.
+     * If <code>len</code> is not zero, the method
+     * blocks until some input is available; otherwise, no
+     * bytes are read and <code>0</code> is returned.
+     * @param b the buffer into which the data is read
+     * @param off the start offset in the destination array <code>b</code>
+     * @param len the maximum number of bytes read
+     * @return the actual number of bytes read, or -1 if the end of the
+     *         entry is reached
+     * @exception  NullPointerException if <code>b</code> is <code>null</code>.
+     * @exception  IndexOutOfBoundsException if <code>off</code> is negative,
+     * <code>len</code> is negative, or <code>len</code> is greater than
+     * <code>b.length - off</code>
+     * @exception ZipException if a ZIP file error has occurred
+     * @exception IOException if an I/O error has occurred
+     */
+    public int read(byte[] b, int off, int len) throws IOException {
+        ensureOpen();
+        if (off < 0 || len < 0 || off > b.length - len) {
+            throw new IndexOutOfBoundsException();
+        } else if (len == 0) {
+            return 0;
+        }
+
+        if (entry == null) {
+            return -1;
+        }
+        switch (entry.getMethod()) {
+        case DEFLATED:
+            len = super.read(b, off, len);
+            if (len == -1) {
+                readEnd(entry);
+                entryEOF = true;
+                entry = null;
+            } else {
+                crc.update(b, off, len);
+            }
+            return len;
+        case STORED:
+            if (remaining <= 0) {
+                entryEOF = true;
+                entry = null;
+                return -1;
+            }
+            if (len > remaining) {
+                len = (int)remaining;
+            }
+            len = in.read(b, off, len);
+            if (len == -1) {
+                throw new ZipException("unexpected EOF");
+            }
+            crc.update(b, off, len);
+            remaining -= len;
+            if (remaining == 0 && entry.getCrc() != crc.getValue()) {
+                throw new ZipException(
+                    "invalid entry CRC (expected 0x" + Long.toHexString(entry.getCrc()) +
+                    " but got 0x" + Long.toHexString(crc.getValue()) + ")");
+            }
+            return len;
+        default:
+            throw new ZipException("invalid compression method");
+        }
+    }
+
+    /**
+     * Skips specified number of bytes in the current ZIP entry.
+     * @param n the number of bytes to skip
+     * @return the actual number of bytes skipped
+     * @exception ZipException if a ZIP file error has occurred
+     * @exception IOException if an I/O error has occurred
+     * @exception IllegalArgumentException if n < 0
+     */
+    public long skip(long n) throws IOException {
+        if (n < 0) {
+            throw new IllegalArgumentException("negative skip length");
+        }
+        ensureOpen();
+        int max = (int)Math.min(n, Integer.MAX_VALUE);
+        int total = 0;
+        while (total < max) {
+            int len = max - total;
+            if (len > tmpbuf.length) {
+                len = tmpbuf.length;
+            }
+            len = read(tmpbuf, 0, len);
+            if (len == -1) {
+                entryEOF = true;
+                break;
+            }
+            total += len;
+        }
+        return total;
+    }
+
+    /**
+     * Closes this input stream and releases any system resources associated
+     * with the stream.
+     * @exception IOException if an I/O error has occurred
+     */
+    public void close() throws IOException {
+        if (!closed) {
+            super.close();
+            closed = true;
+        }
+    }
+
+    private byte[] b = new byte[256];
+
+    /*
+     * Reads local file (LOC) header for next entry.
+     */
+    private ZipEntry readLOC() throws IOException {
+        try {
+            readFully(tmpbuf, 0, LOCHDR);
+        } catch (EOFException e) {
+            return null;
+        }
+        if (get32(tmpbuf, 0) != LOCSIG) {
+            return null;
+        }
+        // get flag first, we need check EFS.
+        flag = get16(tmpbuf, LOCFLG);
+        // get the entry name and create the ZipEntry first
+        int len = get16(tmpbuf, LOCNAM);
+        int blen = b.length;
+        if (len > blen) {
+            do
+                blen = blen * 2;
+            while (len > blen);
+            b = new byte[blen];
+        }
+        readFully(b, 0, len);
+        // Force to use UTF-8 if the EFS bit is ON, even the cs is NOT UTF-8
+        ZipEntry e = createZipEntry(((flag & EFS) != 0)
+                                    ? toStringUTF8(b, len)
+                                    : toString(b, len));
+        // now get the remaining fields for the entry
+        if ((flag & 1) == 1) {
+            throw new ZipException("encrypted ZIP entry not supported");
+        }
+        e.setMethod(get16(tmpbuf, LOCHOW));
+        e.setTime(get32(tmpbuf, LOCTIM));
+        if ((flag & 8) == 8) {
+            /* "Data Descriptor" present */
+            if (e.getMethod() != DEFLATED) {
+                throw new ZipException(
+                        "only DEFLATED entries can have EXT descriptor");
+            }
+        } else {
+            e.setCrc(get32(tmpbuf, LOCCRC));
+            e.setCompressedSize(get32(tmpbuf, LOCSIZ));
+            e.setSize(get32(tmpbuf, LOCLEN));
+        }
+        len = get16(tmpbuf, LOCEXT);
+        if (len > 0) {
+            byte[] bb = new byte[len];
+            readFully(bb, 0, len);
+            e.setExtra(bb);
+            // extra fields are in "HeaderID(2)DataSize(2)Data... format
+            if (e.getCompressedSize() == ZIP64_MAGICVAL || e.getCompressedSize() == ZIP64_MAGICVAL) {
+                int off = 0;
+                while (off + 4 < len) {
+                    int sz = get16(bb, off + 2);
+                    if (get16(bb, off) == ZIP64_EXTID) {
+                        off += 4;
+                        // LOC extra zip64 entry MUST include BOTH original and
+                        // compressed file size fields
+                        if (sz < 16 || (off + sz) > len ) {
+                            // Invalid zip64 extra fields, simply skip. Even it's
+                            // rare, it's possible the entry size happens to be
+                            // the magic value and it "accidnetly" has some bytes
+                            // in extra match the id.
+                            return e;
+                        }
+                        e.setSize(get64(bb, off));
+                        e.setCompressedSize(get64(bb, off + 8));
+                        break;
+                    }
+                    off += (sz + 4);
+                }
+            }
+        }
+        return e;
+    }
+
+    /**
+     * Creates a new <code>ZipEntry</code> object for the specified
+     * entry name.
+     *
+     * @param name the ZIP file entry name
+     * @return the ZipEntry just created
+     */
+    protected ZipEntry createZipEntry(String name) {
+        return new ZipEntry(name);
+    }
+
+    /*
+     * Reads end of deflated entry as well as EXT descriptor if present.
+     */
+    private void readEnd(ZipEntry e) throws IOException {
+        int n = inf.getRemaining();
+        if (n > 0) {
+            ((PushbackInputStream)in).unread(buf, len - n, n);
+        }
+        if ((flag & 8) == 8) {
+            /* "Data Descriptor" present */
+            if (inf.getBytesWritten() > ZIP64_MAGICVAL ||
+                inf.getBytesRead() > ZIP64_MAGICVAL) {
+                // ZIP64 format
+                readFully(tmpbuf, 0, ZIP64_EXTHDR);
+                long sig = get32(tmpbuf, 0);
+                if (sig != EXTSIG) { // no EXTSIG present
+                    e.setCrc(sig);
+                    e.setCompressedSize(get64(tmpbuf, ZIP64_EXTSIZ - ZIP64_EXTCRC));
+                    e.setSize(get64(tmpbuf, ZIP64_EXTLEN - ZIP64_EXTCRC));
+                    ((PushbackInputStream)in).unread(
+                        tmpbuf, ZIP64_EXTHDR - ZIP64_EXTCRC - 1, ZIP64_EXTCRC);
+                } else {
+                    e.setCrc(get32(tmpbuf, ZIP64_EXTCRC));
+                    e.setCompressedSize(get64(tmpbuf, ZIP64_EXTSIZ));
+                    e.setSize(get64(tmpbuf, ZIP64_EXTLEN));
+                }
+            } else {
+                readFully(tmpbuf, 0, EXTHDR);
+                long sig = get32(tmpbuf, 0);
+                if (sig != EXTSIG) { // no EXTSIG present
+                    e.setCrc(sig);
+                    e.setCompressedSize(get32(tmpbuf, EXTSIZ - EXTCRC));
+                    e.setSize(get32(tmpbuf, EXTLEN - EXTCRC));
+                    ((PushbackInputStream)in).unread(
+                                               tmpbuf, EXTHDR - EXTCRC - 1, EXTCRC);
+                } else {
+                    e.setCrc(get32(tmpbuf, EXTCRC));
+                    e.setCompressedSize(get32(tmpbuf, EXTSIZ));
+                    e.setSize(get32(tmpbuf, EXTLEN));
+                }
+            }
+        }
+        if (e.getSize() != inf.getBytesWritten()) {
+            throw new ZipException(
+                "invalid entry size (expected " + e.getSize() +
+                " but got " + inf.getBytesWritten() + " bytes)");
+        }
+        if (e.getCompressedSize() != inf.getBytesRead()) {
+            throw new ZipException(
+                "invalid entry compressed size (expected " + e.getCompressedSize() +
+                " but got " + inf.getBytesRead() + " bytes)");
+        }
+        if (e.getCrc() != crc.getValue()) {
+            throw new ZipException(
+                "invalid entry CRC (expected 0x" + Long.toHexString(e.getCrc()) +
+                " but got 0x" + Long.toHexString(crc.getValue()) + ")");
+        }
+    }
+
+    /*
+     * Reads bytes, blocking until all bytes are read.
+     */
+    private void readFully(byte[] b, int off, int len) throws IOException {
+        while (len > 0) {
+            int n = in.read(b, off, len);
+            if (n == -1) {
+                throw new EOFException();
+            }
+            off += n;
+            len -= n;
+        }
+    }
+
+    /*
+     * Fetches unsigned 16-bit value from byte array at specified offset.
+     * The bytes are assumed to be in Intel (little-endian) byte order.
+     */
+    private static final int get16(byte b[], int off) {
+        return (b[off] & 0xff) | ((b[off+1] & 0xff) << 8);
+    }
+
+    /*
+     * Fetches unsigned 32-bit value from byte array at specified offset.
+     * The bytes are assumed to be in Intel (little-endian) byte order.
+     */
+    private static final long get32(byte b[], int off) {
+        return (get16(b, off) | ((long)get16(b, off+2) << 16)) & 0xffffffffL;
+    }
+
+    /*
+     * Fetches signed 64-bit value from byte array at specified offset.
+     * The bytes are assumed to be in Intel (little-endian) byte order.
+     */
+    private static final long get64(byte b[], int off) {
+        return get32(b, off) | (get32(b, off+4) << 32);
+    }
+
+    private static String toStringUTF8(byte[] arr, int len) {
+        return new String(arr, 0, len);
+    }
+    
+    private static String toString(byte[] b, int len) {
+        return new String(b, 0, len);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_Number.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_Number.js	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,555 @@
+// empty line needed here
+Number.prototype.add32 = function(x) { return (this + x) | 0; };
+Number.prototype.sub32 = function(x) { return (this - x) | 0; };
+Number.prototype.mul32 = function(x) { 
+    return (((this * (x >> 16)) << 16) + this * (x & 0xFFFF)) | 0;
+};
+Number.prototype.neg32 = function() { return (-this) | 0; };
+
+Number.prototype.toInt8 = function()  { return (this << 24) >> 24; };
+Number.prototype.toInt16 = function() { return (this << 16) >> 16; };
+
+var __m32 = 0xFFFFFFFF;
+
+Number.prototype.next32 = function(low) {
+  if (this === 0) {
+    return low;
+  }
+  var l = new Number(low);
+  l.hi = this | 0;
+  return l;
+};
+
+Number.prototype.high32 = function() { 
+    return this.hi ? this.hi : (Math.floor(this / (__m32+1))) | 0;
+};
+Number.prototype.toInt32 = function() { return this | 0; };
+Number.prototype.toFP = function() {
+    return this.hi ? this.hi * (__m32+1) + this : this;
+};
+Number.prototype.toLong = function() {
+    var hi = (this / (__m32+1)) | 0;
+    var low = (this % (__m32+1)) | 0;
+    if (low < 0) {
+        low += __m32+1;
+    }
+        
+    if (this < 0) {
+        hi -= 1;
+    }
+
+    return hi.next32(low);
+};
+
+Number.prototype.toExactString = function() {
+    if (this.hi) {
+        // check for Long.MIN_VALUE
+        if ((this.hi == (0x80000000 | 0)) && (this == 0)) {
+            return '-9223372036854775808';
+        }
+        var res = 0;
+        var a = [ 6,9,2,7,6,9,4,9,2,4 ];
+        var s = '';
+        var digit;
+        var neg = this.hi < 0;
+        if (neg) {
+            var x = this.neg64();
+            var hi = x.hi;
+            var low = x;
+        } else {
+            var hi = this.hi;
+            var low = this;
+        }
+        for (var i = 0; i < a.length; i++) {
+            res += hi * a[i];
+            var low_digit = low % 10;
+            digit = (res % 10) + low_digit;
+
+            low = Math.floor(low / 10);
+            res = Math.floor(res / 10);
+
+            if (digit >= 10) {
+                digit -= 10;
+                res++;
+            }
+            s = String(digit).concat(s);
+        }
+        s = String(res).concat(s).replace(/^0+/, '');
+        return (neg ? '-' : '').concat(s);
+    }
+    return String(this);
+};
+
+Number.prototype.add64 = function(x) {
+    var low = this + x;
+    carry = 0;
+    if (low > __m32) {
+        carry = 1;
+        low -= (__m32+1);
+    }
+    var hi = (this.high32() + x.high32() + carry) | 0;
+    return hi.next32(low);
+};
+
+Number.prototype.sub64 = function(x) {
+    var low = this - x;
+    carry = 0;
+    if (low < 0) {
+        carry = 1;
+        low += (__m32+1);
+    }
+    var hi = (this.high32() - x.high32() - carry) | 0;
+    return hi.next32(low);
+};
+
+Number.prototype.mul64 = function(x) {
+    var low = this.mul32(x);
+    low += (low < 0) ? (__m32+1) : 0;
+    // first count upper 32 bits of (this.low * x.low)
+    var hi_hi = 0;
+    var hi_low = 0;
+    var m = 1;
+    for (var i = 0; i < 32; i++) {
+        if (x & m) {
+            hi_hi += this >>> 16;
+            hi_low += this & 0xFFFF
+        }
+        hi_low >>= 1;
+        hi_low += (hi_hi & 1) ? 0x8000 : 0;
+        hi_hi >>= 1;
+        m <<= 1;
+    }
+    var hi = (hi_hi << 16) + hi_low;
+    
+    var m1 = this.high32().mul32(x);
+    var m2 = this.mul32(x.high32());
+    hi = hi.add32(m1).add32(m2);
+    
+    return hi.next32(low);
+};
+
+Number.prototype.and64 = function(x) {
+    var low = this & x;
+    low += (low < 0) ? (__m32+1) : 0;
+    if (this.hi && x.hi) {
+        var hi = this.hi & x.hi;
+        return hi.next32(low);
+    };
+    return low;
+};
+
+Number.prototype.or64 = function(x) {
+    var low = this | x;
+    low += (low < 0) ? (__m32+1) : 0;
+    if (this.hi || x.hi) {
+        var hi = this.hi | x.hi;
+        return hi.next32(low);
+    };
+    return low;
+};
+
+Number.prototype.xor64 = function(x) {
+    var low = this ^ x;
+    low += (low < 0) ? (__m32+1) : 0;
+    if (this.hi || x.hi) {
+        var hi = this.hi ^ x.hi;
+        return hi.next32(low);
+    };
+    return low;
+};
+
+Number.prototype.shl64 = function(x) {
+    if (x >= 32) {
+        var hi = this << (x - 32);
+        return hi.next32(0);
+    } else {
+        var hi = this.high32() << x;
+        var low_reminder = this >> (32 - x);
+        hi |= low_reminder;
+        var low = this << x;
+        low += (low < 0) ? (__m32+1) : 0;
+        return hi.next32(low);
+    }
+};
+
+Number.prototype.shr64 = function(x) {
+    if (x >= 32) {
+        var low = this.high32() >> (x - 32);
+        low += (low < 0) ? (__m32+1) : 0;
+        return low;
+    } else {
+        var low = this >> x;
+        var hi_reminder = this.high32() << (32 - x);
+        low |= hi_reminder;
+        low += (low < 0) ? (__m32+1) : 0;
+        var hi = this.high32() >> x;
+        return hi.next32(low);
+    }
+};
+
+Number.prototype.ushr64 = function(x) {
+    if (x >= 32) {
+        var low = this.high32() >>> (x - 32);
+        low += (low < 0) ? (__m32+1) : 0;
+        return low;
+    } else {
+        var low = this >>> x;
+        var hi_reminder = this.high32() << (32 - x);
+        low |= hi_reminder;
+        low += (low < 0) ? (__m32+1) : 0;
+        var hi = this.high32() >>> x;
+        return hi.next32(low);
+    }
+};
+
+Number.prototype.compare64 = function(x) {
+    if (this.high32() === x.high32()) {
+        return (this < x) ? -1 : ((this > x) ? 1 : 0);
+    }
+    return (this.high32() < x.high32()) ? -1 : 1;
+};
+
+Number.prototype.neg64 = function() {
+    var hi = this.high32();
+    var low = this;
+    if ((hi === 0) && (low < 0)) { return -low; }
+    hi = ~hi;
+    low = ~low;
+    low += (low < 0) ? (__m32+1) : 0;
+    var ret = hi.next32(low);
+    return ret.add64(1);
+};
+
+(function(numberPrototype) {
+    function __handleDivByZero() {
+        var exception = new vm.java_lang_ArithmeticException;
+        vm.java_lang_ArithmeticException(false).constructor
+          .cons__VLjava_lang_String_2.call(exception, "/ by zero");
+
+        throw exception;
+    }
+
+    function __Int64(hi32, lo32) {
+        this.hi32 = hi32 | 0;
+        this.lo32 = lo32 | 0;
+
+        this.get32 = function(bitIndex) {
+            var v0;
+            var v1;
+            bitIndex += 32;
+            var selector = bitIndex >>> 5;
+            switch (selector) {
+                case 0:
+                    v0 = 0;
+                    v1 = this.lo32;
+                    break;
+                case 1:
+                    v0 = this.lo32;
+                    v1 = this.hi32;
+                    break;
+                case 2:
+                    v0 = this.hi32;
+                    v1 = 0;
+                    break
+                default:
+                    return 0;
+            }
+
+            var shift = bitIndex & 31;
+            if (shift === 0) {
+                return v0;
+            }
+
+            return (v1 << (32 - shift)) | (v0 >>> shift);
+        }
+
+        this.get16 = function(bitIndex) {
+            return this.get32(bitIndex) & 0xffff;
+        }
+
+        this.set16 = function(bitIndex, value) {
+            bitIndex += 32;
+            var shift = bitIndex & 15;
+            var svalue = (value & 0xffff) << shift; 
+            var smask = 0xffff << shift;
+            var selector = bitIndex >>> 4;
+            switch (selector) {
+                case 0:
+                    break;
+                case 1:
+                    this.lo32 = (this.lo32 & ~(smask >>> 16))
+                                    | (svalue >>> 16);
+                    break;
+                case 2:
+                    this.lo32 = (this.lo32 & ~smask) | svalue;
+                    break;
+                case 3:
+                    this.lo32 = (this.lo32 & ~(smask << 16))
+                                    | (svalue << 16);
+                    this.hi32 = (this.hi32 & ~(smask >>> 16))
+                                    | (svalue >>> 16);
+                    break;
+                case 4:
+                    this.hi32 = (this.hi32 & ~smask) | svalue;
+                    break;
+                case 5:
+                    this.hi32 = (this.hi32 & ~(smask << 16))
+                                    | (svalue << 16);
+                    break;
+            }
+        }
+
+        this.getDigit = function(index, shift) {
+            return this.get16((index << 4) - shift);
+        }
+
+        this.getTwoDigits = function(index, shift) {
+            return this.get32(((index - 1) << 4) - shift);
+        }
+
+        this.setDigit = function(index, shift, value) {
+            this.set16((index << 4) - shift, value);
+        }
+
+        this.countSignificantDigits = function() {
+            var sd;
+            var remaining;
+
+            if (this.hi32 === 0) {
+                if (this.lo32 === 0) {
+                    return 0;
+                }
+
+                sd = 2;
+                remaining = this.lo32;
+            } else {
+                sd = 4;
+                remaining = this.hi32;
+            }
+
+            if (remaining < 0) {
+                return sd;
+            }
+
+            return (remaining < 65536) ? sd - 1 : sd;
+        }
+        
+        this.toNumber = function() {
+            var lo32 = this.lo32;
+            if (lo32 < 0) {
+                lo32 += 0x100000000;
+            }
+
+            return this.hi32.next32(lo32);
+        }
+    }
+
+    function __countLeadingZeroes16(number) {
+        var nlz = 0;
+
+        if (number < 256) {
+            nlz += 8;
+            number <<= 8;
+        }
+
+        if (number < 4096) {
+            nlz += 4;
+            number <<= 4;
+        }
+
+        if (number < 16384) {
+            nlz += 2;
+            number <<= 2;
+        }
+
+        return (number < 32768) ? nlz + 1 : nlz;
+    }
+    
+    // q = u / v; r = u - q * v;
+    // v != 0
+    function __div64(q, r, u, v) {
+        var m = u.countSignificantDigits();
+        var n = v.countSignificantDigits();
+
+        q.hi32 = q.lo32 = 0;
+
+        if (n === 1) {
+            // v has single digit
+            var vd = v.getDigit(0, 0);
+            var carry = 0;
+            for (var i = m - 1; i >= 0; --i) {
+                var ui = (carry << 16) | u.getDigit(i, 0);
+                if (ui < 0) {
+                    ui += 0x100000000;
+                }
+                var qi = (ui / vd) | 0;
+                q.setDigit(i, 0, qi);
+                carry = ui - qi * vd;
+            }
+
+            r.hi32 = 0;
+            r.lo32 = carry;
+            return;
+        }
+
+        r.hi32 = u.hi32;  
+        r.lo32 = u.lo32;
+
+        if (m < n) {
+            return;
+        }
+
+        // Normalize
+        var nrm = __countLeadingZeroes16(v.getDigit(n - 1, 0));
+
+        var vd1 = v.getDigit(n - 1, nrm);                
+        var vd0 = v.getDigit(n - 2, nrm);
+        for (var j = m - n; j >= 0; --j) {
+            // Calculate qj estimate
+            var ud21 = r.getTwoDigits(j + n, nrm);
+            var ud2 = ud21 >>> 16;
+            if (ud21 < 0) {
+                ud21 += 0x100000000;
+            }
+
+            var qest = (ud2 === vd1) ? 0xFFFF : ((ud21 / vd1) | 0);
+            var rest = ud21 - qest * vd1;
+
+            // 0 <= (qest - qj) <= 2
+
+            // Refine qj estimate
+            var ud0 = r.getDigit(j + n - 2, nrm);
+            while ((qest * vd0) > ((rest * 0x10000) + ud0)) {
+                --qest;
+                rest += vd1;
+            }
+
+            // 0 <= (qest - qj) <= 1
+            
+            // Multiply and subtract
+            var carry = 0;
+            for (var i = 0; i < n; ++i) {
+                var vi = qest * v.getDigit(i, nrm);
+                var ui = r.getDigit(i + j, nrm) - carry - (vi & 0xffff);
+                r.setDigit(i + j, nrm, ui);
+                carry = (vi >>> 16) - (ui >> 16);
+            }
+            var uj = ud2 - carry;
+
+            if (uj < 0) {
+                // qest - qj = 1
+
+                // Add back
+                --qest;
+                var carry = 0;
+                for (var i = 0; i < n; ++i) {
+                    var ui = r.getDigit(i + j, nrm) + v.getDigit(i, nrm)
+                                 + carry;
+                    r.setDigit(i + j, nrm, ui);
+                    carry = ui >> 16;
+                }
+                uj += carry;
+            }
+
+            q.setDigit(j, 0, qest);
+            r.setDigit(j + n, nrm, uj);
+        }
+    }
+
+    numberPrototype.div32 = function(x) {
+        if (x === 0) {
+            __handleDivByZero();
+        }
+
+        return (this / x) | 0;
+    }
+
+    numberPrototype.mod32 = function(x) {
+        if (x === 0) {
+            __handleDivByZero();
+        }
+
+        return (this % x);
+    }
+
+    numberPrototype.div64 = function(x) {
+        var negateResult = false;
+        var u, v;
+
+        if ((this.high32() & 0x80000000) != 0) {
+            u = this.neg64();
+            negateResult = !negateResult;
+        } else {
+            u = this;        
+        }
+
+        if ((x.high32() & 0x80000000) != 0) {
+            v = x.neg64();
+            negateResult = !negateResult;
+        } else {
+            v = x;
+        }
+
+        if ((v == 0) && (v.high32() === 0)) {
+            __handleDivByZero();
+        }
+
+        if (u.high32() === 0) {
+            if (v.high32() === 0) {
+                var result = (u / v) | 0;
+                return negateResult ? result.neg64() : result; 
+            }
+
+            return 0;
+        }
+
+        var u64 = new __Int64(u.high32(), u);
+        var v64 = new __Int64(v.high32(), v);
+        var q64 = new __Int64(0, 0);
+        var r64 = new __Int64(0, 0);
+
+        __div64(q64, r64, u64, v64);
+
+        var result = q64.toNumber();
+        return negateResult ? result.neg64() : result; 
+    }
+
+    numberPrototype.mod64 = function(x) {
+        var negateResult = false;
+        var u, v;
+        
+        if ((this.high32() & 0x80000000) != 0) {
+            u = this.neg64();
+            negateResult = !negateResult;
+        } else {
+            u = this;        
+        }
+
+        if ((x.high32() & 0x80000000) != 0) {
+            v = x.neg64();
+        } else {
+            v = x;
+        }
+
+        if ((v == 0) && (v.high32() === 0)) {
+            __handleDivByZero();
+        }
+
+        if (u.high32() === 0) {
+            var result = (v.high32() === 0) ? (u % v) : u;
+            return negateResult ? result.neg64() : result; 
+        }
+
+        var u64 = new __Int64(u.high32(), u);
+        var v64 = new __Int64(v.high32(), v);
+        var q64 = new __Int64(0, 0);
+        var r64 = new __Int64(0, 0);
+
+        __div64(q64, r64, u64, v64);
+
+        var result = r64.toNumber();
+        return negateResult ? result.neg64() : result; 
+    }
+})(Number.prototype);
+
+vm.java_lang_Number(false);
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_String.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_String.js	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,27 @@
+// initialize methods on arrays and String constants
+vm.java_lang_reflect_Array(false);
+vm.java_lang_String(false);
+
+Array.prototype.at = function(indx, value) {
+  if (indx < 0 || indx > this.length) {
+      var e = vm.java_lang_ArrayIndexOutOfBoundsException(true);
+      e.constructor.cons__VLjava_lang_String_2.call(e, indx.toString());
+      throw e;
+  }
+  if (arguments.length === 2) {
+      this[indx] = value;
+  }
+  return this[indx];
+};
+Array.prototype.getClass__Ljava_lang_Class_2 = function() {
+  return vm.java_lang_Class(false).defineArray__Ljava_lang_Class_2Ljava_lang_String_2(this.jvmName);
+};
+Array.prototype.clone__Ljava_lang_Object_2 = function() {
+  var s = this.length;
+  var ret = new Array(s);
+  for (var i = 0; i < s; i++) {
+      ret[i] = this[i];
+  }
+  ret.jvmName = this.jvmName;
+  return ret;
+};
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/mini/src/test/java/org/apidesign/bck2brwsr/emul/reflect/MethodImplTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/mini/src/test/java/org/apidesign/bck2brwsr/emul/reflect/MethodImplTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,49 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.emul.reflect;
+
+import java.lang.reflect.Method;
+import java.util.Enumeration;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class MethodImplTest {
+    
+    public MethodImplTest() {
+    }
+    
+    public static String[] arr(String... arr) {
+        return arr;
+    }
+
+    @Test
+    public void testSignatureForMethodWithAnArray() throws NoSuchMethodException {
+        Method m = MethodImplTest.class.getMethod("arr", String[].class);
+        String sig = MethodImpl.toSignature(m);
+        int sep = sig.indexOf("__");
+        assert sep > 0 : "Separator found " + sig;
+        
+        Enumeration<Class> en = MethodImpl.signatureParser(sig.substring(sep + 2));
+        
+        assert en.nextElement() == m.getReturnType() : "Return type is the same";
+        assert en.nextElement() == m.getParameterTypes()[0] : "1st param type is the same";
+    }
+}
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 rt/emul/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/emul/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>rt</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>emul.pom</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Emulation of Core Libraries</name>
+  <modules>
+    <module>mini</module>
+    <module>compact</module>
+    <module>brwsrtest</module>
+  </modules>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/launcher/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/launcher/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>rt</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>launcher</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <name>Bck2Brwsr Launcher</name>
+  <url>http://maven.apache.org</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <excludePackageNames>org.apidesign.bck2brwsr.launcher.impl</excludePackageNames>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-http-server</artifactId>
+      <version>2.2.19</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vm4brwsr</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,574 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.launcher;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apidesign.bck2brwsr.launcher.InvocationContext.Resource;
+import org.apidesign.vm4brwsr.Bck2Brwsr;
+import org.glassfish.grizzly.PortRange;
+import org.glassfish.grizzly.http.server.HttpHandler;
+import org.glassfish.grizzly.http.server.HttpServer;
+import org.glassfish.grizzly.http.server.NetworkListener;
+import org.glassfish.grizzly.http.server.Request;
+import org.glassfish.grizzly.http.server.Response;
+import org.glassfish.grizzly.http.server.ServerConfiguration;
+import org.glassfish.grizzly.http.util.HttpStatus;
+
+/**
+ * Lightweight server to launch Bck2Brwsr applications and tests.
+ * Supports execution in native browser as well as Java's internal 
+ * execution engine.
+ */
+final class Bck2BrwsrLauncher extends Launcher implements Closeable {
+    private static final Logger LOG = Logger.getLogger(Bck2BrwsrLauncher.class.getName());
+    private static final InvocationContext END = new InvocationContext(null, null, null);
+    private final Set<ClassLoader> loaders = new LinkedHashSet<>();
+    private final BlockingQueue<InvocationContext> methods = new LinkedBlockingQueue<>();
+    private long timeOut;
+    private final Res resources = new Res();
+    private final String cmd;
+    private Object[] brwsr;
+    private HttpServer server;
+    private CountDownLatch wait;
+    
+    public Bck2BrwsrLauncher(String cmd) {
+        this.cmd = cmd;
+    }
+    
+    @Override
+    InvocationContext runMethod(InvocationContext c) throws IOException {
+        loaders.add(c.clazz.getClassLoader());
+        methods.add(c);
+        try {
+            c.await(timeOut);
+        } catch (InterruptedException ex) {
+            throw new IOException(ex);
+        }
+        return c;
+    }
+    
+    public void setTimeout(long ms) {
+        timeOut = ms;
+    }
+    
+    public void addClassLoader(ClassLoader url) {
+        this.loaders.add(url);
+    }
+
+    public void showURL(String startpage) throws IOException {
+        if (!startpage.startsWith("/")) {
+            startpage = "/" + startpage;
+        }
+        HttpServer s = initServer(".", true);
+        int last = startpage.lastIndexOf('/');
+        String simpleName = startpage.substring(last);
+        s.getServerConfiguration().addHttpHandler(new Page(resources, startpage), simpleName);
+        s.getServerConfiguration().addHttpHandler(new Page(resources, null), "/");
+        try {
+            launchServerAndBrwsr(s, simpleName);
+        } catch (URISyntaxException | InterruptedException ex) {
+            throw new IOException(ex);
+        }
+    }
+
+    void showDirectory(File dir, String startpage) throws IOException {
+        if (!startpage.startsWith("/")) {
+            startpage = "/" + startpage;
+        }
+        HttpServer s = initServer(dir.getPath(), false);
+        try {
+            launchServerAndBrwsr(s, startpage);
+        } catch (URISyntaxException | InterruptedException ex) {
+            throw new IOException(ex);
+        }
+    }
+
+    @Override
+    public void initialize() throws IOException {
+        try {
+            executeInBrowser();
+        } catch (InterruptedException ex) {
+            final InterruptedIOException iio = new InterruptedIOException(ex.getMessage());
+            iio.initCause(ex);
+            throw iio;
+        } catch (Exception ex) {
+            if (ex instanceof IOException) {
+                throw (IOException)ex;
+            }
+            if (ex instanceof RuntimeException) {
+                throw (RuntimeException)ex;
+            }
+            throw new IOException(ex);
+        }
+    }
+    
+    private HttpServer initServer(String path, boolean addClasses) throws IOException {
+        HttpServer s = HttpServer.createSimpleServer(path, new PortRange(8080, 65535));
+
+        final ServerConfiguration conf = s.getServerConfiguration();
+        if (addClasses) {
+            conf.addHttpHandler(new VM(resources), "/bck2brwsr.js");
+            conf.addHttpHandler(new Classes(resources), "/classes/");
+        }
+        return s;
+    }
+    
+    private void executeInBrowser() throws InterruptedException, URISyntaxException, IOException {
+        wait = new CountDownLatch(1);
+        server = initServer(".", true);
+        final ServerConfiguration conf = server.getServerConfiguration();
+        
+        class DynamicResourceHandler extends HttpHandler {
+            private final InvocationContext ic;
+            public DynamicResourceHandler(InvocationContext ic) {
+                if (ic == null || ic.resources.isEmpty()) {
+                    throw new NullPointerException();
+                }
+                this.ic = ic;
+                for (Resource r : ic.resources) {
+                    conf.addHttpHandler(this, r.httpPath);
+                }
+            }
+
+            public void close() {
+                conf.removeHttpHandler(this);
+            }
+            
+            @Override
+            public void service(Request request, Response response) throws Exception {
+                for (Resource r : ic.resources) {
+                    if (r.httpPath.equals(request.getRequestURI())) {
+                        LOG.log(Level.INFO, "Serving HttpResource for {0}", request.getRequestURI());
+                        response.setContentType(r.httpType);
+                        copyStream(r.httpContent, response.getOutputStream(), null);
+                    }
+                }
+            }
+        }
+        
+        conf.addHttpHandler(new Page(resources, 
+            "org/apidesign/bck2brwsr/launcher/harness.xhtml"
+        ), "/execute");
+        
+        conf.addHttpHandler(new HttpHandler() {
+            int cnt;
+            List<InvocationContext> cases = new ArrayList<>();
+            DynamicResourceHandler prev;
+            @Override
+            public void service(Request request, Response response) throws Exception {
+                String id = request.getParameter("request");
+                String value = request.getParameter("result");
+                if (value != null && value.indexOf((char)0xC5) != -1) {
+                    value = toUTF8(value);
+                }
+                
+                
+                InvocationContext mi = null;
+                int caseNmbr = -1;
+                
+                if (id != null && value != null) {
+                    LOG.log(Level.INFO, "Received result for case {0} = {1}", new Object[]{id, value});
+                    value = decodeURL(value);
+                    int indx = Integer.parseInt(id);
+                    cases.get(indx).result(value, null);
+                    if (++indx < cases.size()) {
+                        mi = cases.get(indx);
+                        LOG.log(Level.INFO, "Re-executing case {0}", indx);
+                        caseNmbr = indx;
+                    }
+                } else {
+                    if (!cases.isEmpty()) {
+                        LOG.info("Re-executing test cases");
+                        mi = cases.get(0);
+                        caseNmbr = 0;
+                    }
+                }
+                
+                if (prev != null) {
+                    prev.close();
+                    prev = null;
+                }
+                
+                if (mi == null) {
+                    mi = methods.take();
+                    caseNmbr = cnt++;
+                }
+                if (mi == END) {
+                    response.getWriter().write("");
+                    wait.countDown();
+                    cnt = 0;
+                    LOG.log(Level.INFO, "End of data reached. Exiting.");
+                    return;
+                }
+                
+                if (!mi.resources.isEmpty()) {
+                    prev = new DynamicResourceHandler(mi);
+                }
+                
+                cases.add(mi);
+                final String cn = mi.clazz.getName();
+                final String mn = mi.methodName;
+                LOG.log(Level.INFO, "Request for {0} case. Sending {1}.{2}", new Object[]{caseNmbr, cn, mn});
+                response.getWriter().write("{"
+                    + "className: '" + cn + "', "
+                    + "methodName: '" + mn + "', "
+                    + "request: " + caseNmbr
+                );
+                if (mi.html != null) {
+                    response.getWriter().write(", html: '");
+                    response.getWriter().write(encodeJSON(mi.html));
+                    response.getWriter().write("'");
+                }
+                response.getWriter().write("}");
+            }
+        }, "/data");
+
+        this.brwsr = launchServerAndBrwsr(server, "/execute");
+    }
+    
+    private static String encodeJSON(String in) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < in.length(); i++) {
+            char ch = in.charAt(i);
+            if (ch < 32 || ch == '\'' || ch == '"') {
+                sb.append("\\u");
+                String hs = "0000" + Integer.toHexString(ch);
+                hs = hs.substring(hs.length() - 4);
+                sb.append(hs);
+            } else {
+                sb.append(ch);
+            }
+        }
+        return sb.toString();
+    }
+    
+    @Override
+    public void shutdown() throws IOException {
+        methods.offer(END);
+        for (;;) {
+            int prev = methods.size();
+            try {
+                if (wait != null && wait.await(timeOut, TimeUnit.MILLISECONDS)) {
+                    break;
+                }
+            } catch (InterruptedException ex) {
+                throw new IOException(ex);
+            }
+            if (prev == methods.size()) {
+                LOG.log(
+                    Level.WARNING, 
+                    "Timeout and no test has been executed meanwhile (at {0}). Giving up.", 
+                    methods.size()
+                );
+                break;
+            }
+            LOG.log(Level.INFO, 
+                "Timeout, but tests got from {0} to {1}. Trying again.", 
+                new Object[]{prev, methods.size()}
+            );
+        }
+        stopServerAndBrwsr(server, brwsr);
+    }
+    
+    static void copyStream(InputStream is, OutputStream os, String baseURL, String... params) throws IOException {
+        for (;;) {
+            int ch = is.read();
+            if (ch == -1) {
+                break;
+            }
+            if (ch == '$' && params.length > 0) {
+                int cnt = is.read() - '0';
+                if (cnt == 'U' - '0') {
+                    os.write(baseURL.getBytes("UTF-8"));
+                } else {
+                    if (cnt >= 0 && cnt < params.length) {
+                        os.write(params[cnt].getBytes("UTF-8"));
+                    } else {
+                        os.write('$');
+                        os.write(cnt + '0');
+                    }
+                }
+            } else {
+                os.write(ch);
+            }
+        }
+    }
+
+    private Object[] launchServerAndBrwsr(HttpServer server, final String page) throws IOException, URISyntaxException, InterruptedException {
+        server.start();
+        NetworkListener listener = server.getListeners().iterator().next();
+        int port = listener.getPort();
+        
+        URI uri = new URI("http://localhost:" + port + page);
+        LOG.log(Level.INFO, "Showing {0}", uri);
+        if (cmd == null) {
+            try {
+                LOG.log(Level.INFO, "Trying Desktop.browse on {0} {2} by {1}", new Object[] {
+                    System.getProperty("java.vm.name"),
+                    System.getProperty("java.vm.vendor"),
+                    System.getProperty("java.vm.version"),
+                });
+                java.awt.Desktop.getDesktop().browse(uri);
+                LOG.log(Level.INFO, "Desktop.browse successfully finished");
+                return null;
+            } catch (UnsupportedOperationException ex) {
+                LOG.log(Level.INFO, "Desktop.browse not supported: {0}", ex.getMessage());
+                LOG.log(Level.FINE, null, ex);
+            }
+        }
+        {
+            String cmdName = cmd == null ? "xdg-open" : cmd;
+            String[] cmdArr = { 
+                cmdName, uri.toString()
+            };
+            LOG.log(Level.INFO, "Launching {0}", Arrays.toString(cmdArr));
+            final Process process = Runtime.getRuntime().exec(cmdArr);
+            return new Object[] { process, null };
+        }
+    }
+    private static String toUTF8(String value) throws UnsupportedEncodingException {
+        byte[] arr = new byte[value.length()];
+        for (int i = 0; i < arr.length; i++) {
+            arr[i] = (byte)value.charAt(i);
+        }
+        return new String(arr, "UTF-8");
+    }
+    
+    private static String decodeURL(String s) {
+        for (;;) {
+            int pos = s.indexOf('%');
+            if (pos == -1) {
+                return s;
+            }
+            int i = Integer.parseInt(s.substring(pos + 1, pos + 2), 16);
+            s = s.substring(0, pos) + (char)i + s.substring(pos + 2);
+        }
+    }
+    
+    private void stopServerAndBrwsr(HttpServer server, Object[] brwsr) throws IOException {
+        if (brwsr == null) {
+            return;
+        }
+        Process process = (Process)brwsr[0];
+        
+        server.stop();
+        InputStream stdout = process.getInputStream();
+        InputStream stderr = process.getErrorStream();
+        drain("StdOut", stdout);
+        drain("StdErr", stderr);
+        process.destroy();
+        int res;
+        try {
+            res = process.waitFor();
+        } catch (InterruptedException ex) {
+            throw new IOException(ex);
+        }
+        LOG.log(Level.INFO, "Exit code: {0}", res);
+
+        deleteTree((File)brwsr[1]);
+    }
+    
+    private static void drain(String name, InputStream is) throws IOException {
+        int av = is.available();
+        if (av > 0) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("v== ").append(name).append(" ==v\n");
+            while (av-- > 0) {
+                sb.append((char)is.read());
+            }
+            sb.append("\n^== ").append(name).append(" ==^");
+            LOG.log(Level.INFO, sb.toString());
+        }
+    }
+
+    private void deleteTree(File file) {
+        if (file == null) {
+            return;
+        }
+        File[] arr = file.listFiles();
+        if (arr != null) {
+            for (File s : arr) {
+                deleteTree(s);
+            }
+        }
+        file.delete();
+    }
+
+    @Override
+    public void close() throws IOException {
+        shutdown();
+    }
+
+    private class Res implements Bck2Brwsr.Resources {
+        @Override
+        public InputStream get(String resource) throws IOException {
+            for (ClassLoader l : loaders) {
+                URL u = null;
+                Enumeration<URL> en = l.getResources(resource);
+                while (en.hasMoreElements()) {
+                    u = en.nextElement();
+                }
+                if (u != null) {
+                    return u.openStream();
+                }
+            }
+            throw new IOException("Can't find " + resource);
+        }
+    }
+
+    private static class Page extends HttpHandler {
+        private final String resource;
+        private final String[] args;
+        private final Res res;
+        
+        public Page(Res res, String resource, String... args) {
+            this.res = res;
+            this.resource = resource;
+            this.args = args.length == 0 ? new String[] { "$0" } : args;
+        }
+
+        @Override
+        public void service(Request request, Response response) throws Exception {
+            String r = resource;
+            if (r == null) {
+                r = request.getHttpHandlerPath();
+            }
+            if (r.startsWith("/")) {
+                r = r.substring(1);
+            }
+            String[] replace = {};
+            if (r.endsWith(".html")) {
+                response.setContentType("text/html");
+                LOG.info("Content type text/html");
+                replace = args;
+            }
+            if (r.endsWith(".xhtml")) {
+                response.setContentType("application/xhtml+xml");
+                LOG.info("Content type application/xhtml+xml");
+                replace = args;
+            }
+            OutputStream os = response.getOutputStream();
+            try (InputStream is = res.get(r)) {
+                copyStream(is, os, request.getRequestURL().toString(), replace);
+            } catch (IOException ex) {
+                response.setDetailMessage(ex.getLocalizedMessage());
+                response.setError();
+                response.setStatus(404);
+            }
+        }
+    }
+
+    private static class VM extends HttpHandler {
+        private final String bck2brwsr;
+
+        public VM(Res loader) throws IOException {
+            StringBuilder sb = new StringBuilder();
+            Bck2Brwsr.generate(sb, loader);
+            sb.append(
+                  "(function WrapperVM(global) {"
+                + "  function ldCls(res) {\n"
+                + "    var request = new XMLHttpRequest();\n"
+                + "    request.open('GET', '/classes/' + res, false);\n"
+                + "    request.send();\n"
+                + "    if (request.status !== 200) return null;\n"
+                + "    var arr = eval('(' + request.responseText + ')');\n"
+                + "    return arr;\n"
+                + "  }\n"
+                + "  var prevvm = global.bck2brwsr;\n"
+                + "  global.bck2brwsr = function() {\n"
+                + "    var args = Array.prototype.slice.apply(arguments);\n"
+                + "    args.unshift(ldCls);\n"
+                + "    return prevvm.apply(null, args);\n"
+                + "  };\n"
+                + "})(this);\n"
+            );
+            this.bck2brwsr = sb.toString();
+        }
+
+        @Override
+        public void service(Request request, Response response) throws Exception {
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("text/javascript");
+            response.getWriter().write(bck2brwsr);
+        }
+    }
+
+    private static class Classes extends HttpHandler {
+        private final Res loader;
+
+        public Classes(Res loader) {
+            this.loader = loader;
+        }
+
+        @Override
+        public void service(Request request, Response response) throws Exception {
+            String res = request.getHttpHandlerPath();
+            if (res.startsWith("/")) {
+                res = res.substring(1);
+            }
+            try (InputStream is = loader.get(res)) {
+                response.setContentType("text/javascript");
+                Writer w = response.getWriter();
+                w.append("[");
+                for (int i = 0;; i++) {
+                    int b = is.read();
+                    if (b == -1) {
+                        break;
+                    }
+                    if (i > 0) {
+                        w.append(", ");
+                    }
+                    if (i % 20 == 0) {
+                        w.write("\n");
+                    }
+                    if (b > 127) {
+                        b = b - 256;
+                    }
+                    w.append(Integer.toString(b));
+                }
+                w.append("\n]");
+            } catch (IOException ex) {
+                response.setStatus(HttpStatus.NOT_FOUND_404);
+                response.setError();
+                response.setDetailMessage(ex.getMessage());
+            }
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/InvocationContext.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/InvocationContext.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,110 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.launcher;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/** Represents individual method invocation, its context and its result.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class InvocationContext {
+    final CountDownLatch wait = new CountDownLatch(1);
+    final Class<?> clazz;
+    final String methodName;
+    private final Launcher launcher;
+    private String result;
+    private Throwable exception;
+    String html;
+    final List<Resource> resources = new ArrayList<>();
+
+    InvocationContext(Launcher launcher, Class<?> clazz, String methodName) {
+        this.launcher = launcher;
+        this.clazz = clazz;
+        this.methodName = methodName;
+    }
+    
+    /** An HTML fragment to be available for the execution. Useful primarily when
+     * executing in a browser via {@link Launcher#createBrowser(java.lang.String)}.
+     * @param html the html fragment
+     */
+    public void setHtmlFragment(String html) {
+        this.html = html;
+    }
+    
+    /** HTTP resource to be available during execution. An invocation may
+     * perform an HTTP query and obtain a resource relative to the page.
+     */
+    public void addHttpResource(String relativePath, String mimeType, InputStream content) {
+        if (relativePath == null || mimeType == null || content == null) {
+            throw new NullPointerException();
+        }
+        resources.add(new Resource(content, mimeType, relativePath));
+    }
+    
+    /** Invokes the associated method. 
+     * @return the textual result of the invocation
+     */
+    public String invoke() throws IOException {
+        launcher.runMethod(this);
+        return toString();
+    }
+    
+    /** Obtains textual result of the invocation.
+     * @return text representing the exception or result value
+     */
+    @Override
+    public String toString() {
+        if (exception != null) {
+            return exception.toString();
+        }
+        return result;
+    }
+    
+    /**
+     * @param timeOut
+     * @throws InterruptedException 
+     */
+    void await(long timeOut) throws InterruptedException {
+        wait.await(timeOut, TimeUnit.MILLISECONDS);
+    }
+    
+    void result(String r, Throwable e) {
+        this.result = r;
+        this.exception = e;
+        wait.countDown();
+    }
+
+
+    static final class Resource {
+        final InputStream httpContent;
+        final String httpType;
+        final String httpPath;
+
+        Resource(InputStream httpContent, String httpType, String httpPath) {
+            this.httpContent = httpContent;
+            this.httpType = httpType;
+            this.httpPath = httpPath;
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,132 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.launcher;
+
+import org.apidesign.bck2brwsr.launcher.impl.Console;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.apidesign.vm4brwsr.Bck2Brwsr;
+
+/**
+ * Tests execution in Java's internal scripting engine.
+ */
+final class JSLauncher extends Launcher {
+    private static final Logger LOG = Logger.getLogger(JSLauncher.class.getName());
+    private Set<ClassLoader> loaders = new LinkedHashSet<>();
+    private final Res resources = new Res();
+    private Invocable code;
+    private StringBuilder codeSeq;
+    private Object console;
+    
+    
+    @Override InvocationContext runMethod(InvocationContext mi) {
+        loaders.add(mi.clazz.getClassLoader());
+        try {
+            long time = System.currentTimeMillis();
+            LOG.log(Level.FINE, "Invoking {0}.{1}", new Object[]{mi.clazz.getName(), mi.methodName});
+            String res = code.invokeMethod(
+                console,
+                "invoke__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2",
+                mi.clazz.getName(), mi.methodName).toString();
+            time = System.currentTimeMillis() - time;
+            LOG.log(Level.FINE, "Resut of {0}.{1} = {2} in {3} ms", new Object[]{mi.clazz.getName(), mi.methodName, res, time});
+            mi.result(res, null);
+        } catch (ScriptException | NoSuchMethodException ex) {
+            mi.result(null, ex);
+        }
+        return mi;
+    }
+    
+    public void addClassLoader(ClassLoader url) {
+        this.loaders.add(url);
+    }
+
+    @Override
+    public void initialize() throws IOException {
+        try {
+            initRhino();
+        } catch (Exception ex) {
+            if (ex instanceof IOException) {
+                throw (IOException)ex;
+            }
+            if (ex instanceof RuntimeException) {
+                throw (RuntimeException)ex;
+            }
+            throw new IOException(ex);
+        }
+    }
+    
+    private void initRhino() throws IOException, ScriptException, NoSuchMethodException {
+        StringBuilder sb = new StringBuilder();
+        Bck2Brwsr.generate(sb, new Res());
+
+        ScriptEngineManager sem = new ScriptEngineManager();
+        ScriptEngine mach = sem.getEngineByExtension("js");
+
+        sb.append(
+              "\nvar vm = new bck2brwsr(org.apidesign.bck2brwsr.launcher.impl.Console.read);"
+            + "\nfunction initVM() { return vm; };"
+            + "\n");
+
+        Object res = mach.eval(sb.toString());
+        if (!(mach instanceof Invocable)) {
+            throw new IOException("It is invocable object: " + res);
+        }
+        code = (Invocable) mach;
+        codeSeq = sb;
+        
+        Object vm = code.invokeFunction("initVM");
+        console = code.invokeMethod(vm, "loadClass", Console.class.getName());
+    }
+
+    @Override
+    public void shutdown() throws IOException {
+    }
+
+    @Override
+    public String toString() {
+        return codeSeq.toString();
+    }
+    
+    private class Res implements Bck2Brwsr.Resources {
+        @Override
+        public InputStream get(String resource) throws IOException {
+            for (ClassLoader l : loaders) {
+                URL u = null;
+                Enumeration<URL> en = l.getResources(resource);
+                while (en.hasMoreElements()) {
+                    u = en.nextElement();
+                }
+                if (u != null) {
+                    return u.openStream();
+                }
+            }
+            throw new IOException("Can't find " + resource);
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Launcher.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,116 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.launcher;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import org.apidesign.vm4brwsr.Bck2Brwsr;
+
+/** An abstraction for executing tests in a Bck2Brwsr virtual machine.
+ * Either in {@linkm Launcher#createJavaScript JavaScript engine}, 
+ * or in {@linkm Launcher#createBrowser external browser}.
+ * <p>
+ * There also are methods to {@link #showDir(java.io.File, java.lang.String) display pages} 
+ * in an external browser served by internal HTTP server.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public abstract class Launcher {
+
+    Launcher() {
+    }
+
+    /** Initializes the launcher. This may mean starting a web browser or
+     * initializing execution engine.
+     * @throws IOException if something goes wrong
+     */
+    public abstract void initialize() throws IOException;
+    
+    /** Shuts down the launcher.
+     * @throws IOException if something goes wrong
+     */
+    public abstract void shutdown() throws IOException;
+    
+    
+    /** Builds an invocation context. The context can later be customized
+     * and {@link InvocationContext#invoke() invoked}.
+     * 
+     * @param clazz the class to execute method from
+     * @param method the method to execute
+     * @return the context pointing to the selected method
+     */
+    public InvocationContext createInvocation(Class<?> clazz, String method) {
+        return new InvocationContext(this, clazz, method);
+    }
+    
+
+    /** Creates launcher that uses internal JavaScript engine (Rhino).
+     * @return the launcher
+     */
+    public static Launcher createJavaScript() {
+        final JSLauncher l = new JSLauncher();
+        l.addClassLoader(Bck2Brwsr.class.getClassLoader());
+        return l;
+    }
+    
+    /** Creates launcher that is using external browser.
+     * 
+     * @param cmd <code>null</code> to use <code>java.awt.Desktop</code> to show the launcher
+     *    or a string to execute in an external process (with a parameter to the URL)
+     * @return launcher executing in external browser.
+     */
+    public static Launcher createBrowser(String cmd) {
+        final Bck2BrwsrLauncher l = new Bck2BrwsrLauncher(cmd);
+        l.addClassLoader(Bck2Brwsr.class.getClassLoader());
+        l.setTimeout(180000);
+        return l;
+    }
+    
+    /** Starts an HTTP server which provides access to classes and resources
+     * available in the <code>classes</code> URL and shows a start page
+     * available as {@link ClassLoader#getResource(java.lang.String)} from the
+     * provide classloader. Opens a browser with URL showing the start page.
+     * 
+     * @param classes classloader offering access to classes and resources
+     * @param startpage page to show in the browser
+     * @return interface that allows one to stop the server
+     * @throws IOException if something goes wrong
+     */
+    public static Closeable showURL(ClassLoader classes, String startpage) throws IOException {
+        Bck2BrwsrLauncher l = new Bck2BrwsrLauncher(null);
+        l.addClassLoader(classes);
+        l.showURL(startpage);
+        return l;
+    }
+    /** Starts an HTTP server which provides access to certain directory.
+     * The <code>startpage</code> should be relative location inside the root 
+     * directory. Opens a browser with URL showing the start page.
+     * 
+     * @param directory the root directory on disk
+     * @param startpage relative path from the root to the page
+     * @exception IOException if something goes wrong.
+     */
+    public static Closeable showDir(File directory, String startpage) throws IOException {
+        Bck2BrwsrLauncher l = new Bck2BrwsrLauncher(null);
+        l.showDirectory(directory, startpage);
+        return l;
+    }
+
+    abstract InvocationContext runMethod(InvocationContext c) throws IOException; 
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/Console.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,260 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.launcher.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.util.Enumeration;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class Console {
+    private Console() {
+    }
+    static {
+        turnAssetionStatusOn();
+    }
+    
+    @JavaScriptBody(args = {"id", "attr"}, body = 
+        "return window.document.getElementById(id)[attr].toString();")
+    private static native Object getAttr(String id, String attr);
+
+    @JavaScriptBody(args = {"id", "attr", "value"}, body = 
+        "window.document.getElementById(id)[attr] = value;")
+    private static native void setAttr(String id, String attr, Object value);
+    
+    @JavaScriptBody(args = {}, body = "return; window.close();")
+    private static native void closeWindow();
+
+    private static void log(String newText) {
+        String id = "bck2brwsr.result";
+        String attr = "value";
+        setAttr(id, attr, getAttr(id, attr) + "\n" + newText);
+        setAttr(id, "scrollTop", getAttr(id, "scrollHeight"));
+    }
+    
+    public static void execute() throws Exception {
+        String clazz = (String) getAttr("clazz", "value");
+        String method = (String) getAttr("method", "value");
+        Object res = invokeMethod(clazz, method);
+        setAttr("bck2brwsr.result", "value", res);
+    }
+
+    @JavaScriptBody(args = { "url", "callback", "arr" }, body = ""
+        + "var request = new XMLHttpRequest();\n"
+        + "request.open('GET', url, true);\n"
+        + "request.setRequestHeader('Content-Type', 'text/plain; charset=utf-8');\n"
+        + "request.onreadystatechange = function() {\n"
+        + "  if (this.readyState!==4) return;\n"
+        + "  arr[0] = this.responseText;\n"
+        + "  callback.run__V();\n"
+        + "};"
+        + "request.send();"
+    )
+    private static native void loadText(String url, Runnable callback, String[] arr) throws IOException;
+    
+    public static void harness(String url) throws IOException {
+        log("Connecting to " + url);
+        Request r = new Request(url);
+    }
+    
+    private static class Request implements Runnable {
+        private final String[] arr = { null };
+        private final String url;
+
+        private Request(String url) throws IOException {
+            this.url = url;
+            loadText(url, this, arr);
+        }
+        
+        @Override
+        public void run() {
+            try {
+                String data = arr[0];
+                log("\nGot \"" + data + "\"");
+                
+                if (data == null) {
+                    log("Some error exiting");
+                    closeWindow();
+                    return;
+                }
+                
+                if (data.isEmpty()) {
+                    log("No data, exiting");
+                    closeWindow();
+                    return;
+                }
+                
+                Case c = Case.parseData(data);
+                if (c.getHtmlFragment() != null) {
+                    setAttr("bck2brwsr.fragment", "innerHTML", c.getHtmlFragment());
+                }
+                log("Invoking " + c.getClassName() + '.' + c.getMethodName() + " as request: " + c.getRequestId());
+
+                Object result = invokeMethod(c.getClassName(), c.getMethodName());
+                
+                setAttr("bck2brwsr.fragment", "innerHTML", "");
+                log("Result: " + result);
+                
+                result = encodeURL("" + result);
+                
+                log("Sending back: " + url + "?request=" + c.getRequestId() + "&result=" + result);
+                String u = url + "?request=" + c.getRequestId() + "&result=" + result;
+                
+                loadText(u, this, arr);
+                
+            } catch (Exception ex) {
+                log(ex.getClass().getName() + ":" + ex.getMessage());
+            }
+        }
+    }
+    
+    private static String encodeURL(String r) throws UnsupportedEncodingException {
+        final String SPECIAL = "%$&+,/:;=?@";
+        StringBuilder sb = new StringBuilder();
+        byte[] utf8 = r.getBytes("UTF-8");
+        for (int i = 0; i < utf8.length; i++) {
+            int ch = utf8[i] & 0xff;
+            if (ch < 32 || ch > 127 || SPECIAL.indexOf(ch) >= 0) {
+                final String numbers = "0" + Integer.toHexString(ch);
+                sb.append("%").append(numbers.substring(numbers.length() - 2));
+            } else {
+                if (ch == 32) {
+                    sb.append("+");
+                } else {
+                    sb.append((char)ch);
+                }
+            }
+        }
+        return sb.toString();
+    }
+    
+    static String invoke(String clazz, String method) throws ClassNotFoundException, InvocationTargetException, IllegalAccessException, InstantiationException {
+        final Object r = invokeMethod(clazz, method);
+        return r == null ? "null" : r.toString().toString();
+    }
+
+    /** Helper method that inspects the classpath and loads given resource
+     * (usually a class file). Used while running tests in Rhino.
+     * 
+     * @param name resource name to find
+     * @return the array of bytes in the given resource
+     * @throws IOException I/O in case something goes wrong
+     */
+    public static byte[] read(String name) throws IOException {
+        URL u = null;
+        Enumeration<URL> en = Console.class.getClassLoader().getResources(name);
+        while (en.hasMoreElements()) {
+            u = en.nextElement();
+        }
+        if (u == null) {
+            throw new IOException("Can't find " + name);
+        }
+        try (InputStream is = u.openStream()) {
+            byte[] arr;
+            arr = new byte[is.available()];
+            int offset = 0;
+            while (offset < arr.length) {
+                int len = is.read(arr, offset, arr.length - offset);
+                if (len == -1) {
+                    throw new IOException("Can't read " + name);
+                }
+                offset += len;
+            }
+            return arr;
+        }
+    }
+   
+    private static Object invokeMethod(String clazz, String method) 
+    throws ClassNotFoundException, InvocationTargetException, 
+    SecurityException, IllegalAccessException, IllegalArgumentException,
+    InstantiationException {
+        Method found = null;
+        Class<?> c = Class.forName(clazz);
+        for (Method m : c.getMethods()) {
+            if (m.getName().equals(method)) {
+                found = m;
+            }
+        }
+        Object res;
+        if (found != null) {
+            try {
+                if ((found.getModifiers() & Modifier.STATIC) != 0) {
+                    res = found.invoke(null);
+                } else {
+                    res = found.invoke(c.newInstance());
+                }
+            } catch (Throwable ex) {
+                res = ex.getClass().getName() + ":" + ex.getMessage();
+            }
+        } else {
+            res = "Can't find method " + method + " in " + clazz;
+        }
+        return res;
+    }
+
+    @JavaScriptBody(args = {}, body = "vm.desiredAssertionStatus = true;")
+    private static void turnAssetionStatusOn() {
+    }
+    
+    private static final class Case {
+        private final Object data;
+
+        private Case(Object data) {
+            this.data = data;
+        }
+        
+        public static Case parseData(String s) {
+            return new Case(toJSON(s));
+        }
+        
+        public String getMethodName() {
+            return value("methodName", data);
+        }
+
+        public String getClassName() {
+            return value("className", data);
+        }
+        
+        public String getRequestId() {
+            return value("request", data);
+        }
+
+        public String getHtmlFragment() {
+            return value("html", data);
+        }
+        
+        @JavaScriptBody(args = "s", body = "return eval('(' + s + ')');")
+        private static native Object toJSON(String s);
+        
+        @JavaScriptBody(args = {"p", "d"}, body = 
+              "var v = d[p];\n"
+            + "if (typeof v === 'undefined') return null;\n"
+            + "return v.toString();"
+        )
+        private static native String value(String p, Object d);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Back 2 Browser Bytecode Translator
+    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. Look for COPYING file in the top folder.
+    If not, see http://opensource.org/licenses/GPL-2.0.
+
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Bck2Brwsr Harness</title>
+    </head>
+    <body>
+        <script src="/bck2brwsr.js"></script>
+        <script>
+            var vm = bck2brwsr();
+        </script>
+        
+        <h1>Bck2Brwsr Execution Harness</h1>
+        
+        <textarea id="bck2brwsr.result" rows="25" style="width: 100%;" disabled="">
+        </textarea>
+
+        <div id="bck2brwsr.fragment"/>
+        
+        <script type="text/javascript">
+            vm.loadClass('org.apidesign.bck2brwsr.launcher.impl.Console').harness__VLjava_lang_String_2('$U/../data');
+        </script>
+    </body>
+</html>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/mojo/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/mojo/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>rt</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>mojo</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <packaging>maven-plugin</packaging>
+  <name>Bck2Brwsr Maven Plugins</name>
+  <url>http://maven.apache.org</url>
+      <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <extractors>
+                        <extractor>java-annotations</extractor>
+                    </extractors>
+                    <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+                 </configuration>
+                <executions>
+                    <execution>
+                        <id>mojo-descriptor</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>descriptor</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+      </build>
+      
+<dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>3.0.4</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.0</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vm4brwsr</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>emul.mini</artifactId>
+          <groupId>org.apidesign.bck2brwsr</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-core</artifactId>
+      <version>3.0.2</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>launcher</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+</dependencies>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/BrswrMojo.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/BrswrMojo.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,99 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.mojo;
+
+import java.io.Closeable;
+import org.apache.maven.plugin.AbstractMojo;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apidesign.bck2brwsr.launcher.Launcher;
+
+/** Executes given HTML page in a browser. */
+@Mojo(name="brwsr", defaultPhase=LifecyclePhase.NONE)
+public class BrswrMojo extends AbstractMojo {
+    public BrswrMojo() {
+    }
+    /** Resource to show as initial page */
+    @Parameter
+    private String startpage;
+
+    @Parameter(defaultValue="${project}")
+    private MavenProject prj;
+    
+    /** Root of the class files */
+    @Parameter(defaultValue="${project.build.directory}/classes")
+    private File classes;
+    
+    /** Root of all pages, and files, etc. */
+    @Parameter
+    private File directory;
+
+    @Override
+    public void execute() throws MojoExecutionException {
+        if (startpage == null) {
+            throw new MojoExecutionException("You have to provide a start page");
+        }
+        
+        try {
+            Closeable httpServer;
+            if (directory != null) {
+                httpServer = Launcher.showDir(directory, startpage);
+            } else {
+                URLClassLoader url = buildClassLoader(classes, prj.getDependencyArtifacts());
+                try {
+                    httpServer = Launcher.showURL(url, startpage());
+                } catch (Exception ex) {
+                    throw new MojoExecutionException("Can't open " + startpage(), ex);
+                }
+            }
+            System.in.read();
+            httpServer.close();
+        } catch (IOException ex) {
+            throw new MojoExecutionException("Can't show the browser", ex);
+        }
+    }
+    
+    private String startpage() {
+        return startpage;
+    }
+
+    private static URLClassLoader buildClassLoader(File root, Collection<Artifact> deps) throws MalformedURLException {
+        List<URL> arr = new ArrayList<URL>();
+        arr.add(root.toURI().toURL());
+        for (Artifact a : deps) {
+            final File f = a.getFile();
+            if (f != null) {
+                arr.add(f.toURI().toURL());
+            }
+        }
+        return new URLClassLoader(arr.toArray(new URL[0]), BrswrMojo.class.getClassLoader());
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/Java2JavaScript.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/Java2JavaScript.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,121 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.mojo;
+
+import org.apache.maven.plugin.AbstractMojo;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.apidesign.vm4brwsr.Bck2Brwsr;
+
+/** Compiles classes into JavaScript. */
+@Mojo(name="j2js", defaultPhase=LifecyclePhase.PROCESS_CLASSES)
+public class Java2JavaScript extends AbstractMojo {
+    public Java2JavaScript() {
+    }
+    /** Root of the class files */
+    @Parameter(defaultValue="${project.build.directory}/classes")
+    private File classes;
+    /** JavaScript file to generate */
+    @Parameter
+    private File javascript;
+    
+    /** Additional classes that should be pre-compiled into the javascript 
+     * file. By default compiles all classes found under <code>classes</code>
+     * directory and their transitive closure.
+     */
+    @Parameter
+    private List<String> compileclasses;
+    
+    @Parameter(defaultValue="${project}")
+    private MavenProject prj;
+    
+    
+
+    @Override
+    public void execute() throws MojoExecutionException {
+        if (!classes.isDirectory()) {
+            throw new MojoExecutionException("Can't find " + classes);
+        }
+
+        List<String> arr = new ArrayList<String>();
+        long newest = collectAllClasses("", classes, arr);
+        
+        if (compileclasses != null) {
+            arr.retainAll(compileclasses);
+            arr.addAll(compileclasses);
+        }
+        
+        if (javascript.lastModified() > newest) {
+            return;
+        }
+
+        try {
+            URLClassLoader url = buildClassLoader(classes, prj.getDependencyArtifacts());
+            FileWriter w = new FileWriter(javascript);
+            Bck2Brwsr.generate(w, url, arr.toArray(new String[0]));
+            w.close();
+        } catch (IOException ex) {
+            throw new MojoExecutionException("Can't compile", ex);
+        }
+    }
+
+    private static long collectAllClasses(String prefix, File toCheck, List<String> arr) {
+        File[] files = toCheck.listFiles();
+        if (files != null) {
+            long newest = 0L;
+            for (File f : files) {
+                long lastModified = collectAllClasses(prefix + f.getName() + "/", f, arr);
+                if (newest < lastModified) {
+                    newest = lastModified;
+                }
+            }
+            return newest;
+        } else if (toCheck.getName().endsWith(".class")) {
+            final String cls = prefix.substring(0, prefix.length() - 7);
+            arr.add(cls);
+            return toCheck.lastModified();
+        } else {
+            return 0L;
+        }
+    }
+
+    private static URLClassLoader buildClassLoader(File root, Collection<Artifact> deps) throws MalformedURLException {
+        List<URL> arr = new ArrayList<URL>();
+        arr.add(root.toURI().toURL());
+        for (Artifact a : deps) {
+            if (a.getFile() != null) {
+                arr.add(a.getFile().toURI().toURL());
+            }
+        }
+        return new URLClassLoader(arr.toArray(new URL[0]), Java2JavaScript.class.getClassLoader());
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>rt</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Bck2Brwsr Runtime</name>
+  <parent>
+    <groupId>org.apidesign</groupId>
+    <artifactId>bck2brwsr</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>  
+  <modules>
+    <module>core</module>
+    <module>emul</module>
+    <module>launcher</module>
+    <module>archetype</module>
+    <module>mojo</module>
+    <module>vm</module>
+    <module>vmtest</module>
+  </modules>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,144 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>rt</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>vm4brwsr</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>Virtual Machine for Browser</name>
+  <url>http://bck2brwsr.apidesign.org</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <author.name>Jaroslav Tulach</author.name>
+    <author.email>jaroslav.tulach@apidesign.org</author.email>
+  </properties>
+  
+  <repositories>
+      <repository>
+          <id>netbeans</id>
+          <name>NetBeans</name>
+          <url>http://bits.netbeans.org/maven2/</url>
+      </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+        <id>mc-release</id>
+        <name>Local Maven repository of releases</name>
+        <url>http://mc-repo.googlecode.com/svn/maven2/releases</url>
+        <snapshots>
+            <enabled>false</enabled>
+        </snapshots>
+        <releases>
+            <enabled>true</enabled>
+        </releases>
+    </pluginRepository>
+  </pluginRepositories>
+  <scm>
+      <connection>scm:hg:http://source.apidesign.org/hg/bck2brwsr</connection>
+      <url>http://source.apidesign.org/hg/bck2brwsr</url>
+    <tag>HEAD</tag>
+  </scm>
+  <build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jar-plugin</artifactId>
+              <version>2.4</version>
+              <configuration>
+                  <archive>
+                      <manifest>
+                          <mainClass>org.apidesign.vm4brwsr.Main</mainClass>
+                      </manifest>
+                  </archive>
+              </configuration>
+          </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>2.3.2</version>
+            <configuration>
+               <source>1.7</source>
+               <target>1.7</target>
+            </configuration>
+         </plugin>
+         <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-javadoc-plugin</artifactId>
+             <configuration>
+                 <skip>false</skip>
+             </configuration>
+         </plugin>
+         <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>exec-maven-plugin</artifactId>
+             <version>1.2.1</version>
+             <executions>
+                 <execution>
+                     <id>generate-js</id>
+                     <phase>process-classes</phase>
+                     <goals>
+                         <goal>java</goal>
+                     </goals>
+                 </execution>
+             </executions>
+             <configuration>
+                 <mainClass>org.apidesign.vm4brwsr.Main</mainClass>
+                 <arguments>
+                     <argument>${project.build.directory}/bck2brwsr.js</argument>
+                     <argument>org/apidesign/vm4brwsr/Bck2Brwsr</argument>
+                 </arguments>
+             </configuration>
+         </plugin>
+         <plugin>
+             <artifactId>maven-assembly-plugin</artifactId>
+             <version>2.4</version>
+             <executions>
+                 <execution>
+                     <id>js</id>
+                     <phase>package</phase>
+                     <goals>
+                         <goal>single</goal>
+                     </goals>
+                     <configuration>
+                         <descriptors>
+                             <descriptor>src/main/assembly/bck2brwsr.xml</descriptor>
+                         </descriptors>
+                     </configuration>
+                 </execution>
+             </executions>                
+         </plugin>      
+      </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>core</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>emul.mini</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/assembly/bck2brwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/assembly/bck2brwsr.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+
+    Back 2 Browser Bytecode Translator
+    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, version 2 of the License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. Look for COPYING file in the top folder.
+    If not, see http://opensource.org/licenses/GPL-2.0.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  
+  <id>js</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+  <baseDirectory>/</baseDirectory>
+  <files>
+    <file>
+      <source>${project.build.directory}/bck2brwsr.js</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+  </files>
+
+</assembly>
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/Bck2Brwsr.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/Bck2Brwsr.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,116 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+
+/** Build your own virtual machine! Use methods in this class to generate
+ * a skeleton JVM in JavaScript that contains pre-compiled classes of your
+ * choice. The generated script defines one JavaScript method that can
+ * be used to bootstrap and load the virtual machine: <pre>
+ * var vm = bck2brwsr();
+ * var main = vm.loadClass('org.your.pkg.Main');
+ * main.main__V_3Ljava_lang_String_2(null);
+ * </pre>
+ * In case one wants to initialize the virtual machine with ability to
+ * load classes lazily when needed, one can provide a loader function to
+ * when creating the virtual machine: <pre>
+ * var vm = bck2brwsr(function(resource) { 
+ *   return null; // byte[] for the resource
+ * });
+ * </pre>
+ * In this scenario, when a request for an unknown class is made, the loader
+ * function is asked for its byte code and the system dynamically transforms
+ * it to JavaScript.
+ * <p>
+ * Instead of a loader function, one can also provide a URL to a JAR file.
+ * The <code>bck2brwsr</code> system will do its best to download the file
+ * and provide loader function for it automatically.
+ * <p>
+ * One can provide as many loader functions and JAR URL references as necessary.
+ * Then the initialization code would look like:<pre>
+ * var vm = bck2brwsr(url1, url2, fnctn1, url3, functn2);
+ * </pre>
+ * The provided URLs and loader functions will be consulted one by one.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class Bck2Brwsr {
+    private Bck2Brwsr() {
+    }
+    
+    /** Generates virtual machine from bytes served by a <code>resources</code>
+     * provider.
+     * 
+     * @param out the output to write the generated JavaScript to
+     * @param resources provider of class files to use
+     * @param classes additional classes to include in the generated script
+     * @throws IOException I/O exception can be thrown when something goes wrong
+     */
+    public static void generate(Appendable out, Resources resources, String... classes) throws IOException {
+        StringArray arr = StringArray.asList(classes);
+        arr.add(VM.class.getName().replace('.', '/'));
+        VM.compile(resources, out, arr);
+    }
+    
+    /** Generates virtual machine from bytes served by a class loader.
+     * 
+     * @param out the output to write the generated JavaScript to
+     * @param loader class loader to load needed classes from
+     * @param classes additional classes to include in the generated script
+     * @throws IOException I/O exception can be thrown when something goes wrong
+     */
+    public static void generate(Appendable out, final ClassLoader loader, String... classes) throws IOException {
+        class R implements Resources {
+            @Override
+            public InputStream get(String name) throws IOException {
+                Enumeration<URL> en = loader.getResources(name);
+                URL u = null;
+                while (en.hasMoreElements()) {
+                    u = en.nextElement();
+                }
+                if (u == null) {
+                    throw new IOException("Can't find " + name);
+                }
+                return u.openStream();
+            }
+        }
+        generate(out, new R(), classes);
+    }
+    
+    /** Provider of resources (classes and other files). The 
+     * {@link #generate(java.lang.Appendable, org.apidesign.vm4brwsr.Bck2Brwsr.Resources, java.lang.String[]) 
+     * generator method} will call back here for all classes needed during
+     * translation to JavaScript.
+     */
+    public interface Resources {
+        /** Loads given resource (class or other file like image). The 
+         * resource name to load bytes for the {@link String} class
+         * would be <code>"java/lang/String.class"</code>.
+         * 
+         * @param resource path to resource to load
+         * @return the input stream for the resource 
+         * @throws IOException can be thrown if the loading fails on some error
+         *   or the file cannot be found
+         */
+        public InputStream get(String resource) throws IOException;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeParser.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeParser.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,3461 @@
+/*
+ * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
+
+/** This is a byte code parser heavily based on original code of JavaP utility.
+ * As such I decided to keep the original Oracle's GPLv2 header.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class ByteCodeParser {
+    private ByteCodeParser() {
+    }
+    /* Signature Characters */
+    public static final char   SIGC_VOID                  = 'V';
+    public static final String SIG_VOID                   = "V";
+    public static final char   SIGC_BOOLEAN               = 'Z';
+    public static final String SIG_BOOLEAN                = "Z";
+    public static final char   SIGC_BYTE                  = 'B';
+    public static final String SIG_BYTE                   = "B";
+    public static final char   SIGC_CHAR                  = 'C';
+    public static final String SIG_CHAR                   = "C";
+    public static final char   SIGC_SHORT                 = 'S';
+    public static final String SIG_SHORT                  = "S";
+    public static final char   SIGC_INT                   = 'I';
+    public static final String SIG_INT                    = "I";
+    public static final char   SIGC_LONG                  = 'J';
+    public static final String SIG_LONG                   = "J";
+    public static final char   SIGC_FLOAT                 = 'F';
+    public static final String SIG_FLOAT                  = "F";
+    public static final char   SIGC_DOUBLE                = 'D';
+    public static final String SIG_DOUBLE                 = "D";
+    public static final char   SIGC_ARRAY                 = '[';
+    public static final String SIG_ARRAY                  = "[";
+    public static final char   SIGC_CLASS                 = 'L';
+    public static final String SIG_CLASS                  = "L";
+    public static final char   SIGC_METHOD                = '(';
+    public static final String SIG_METHOD                 = "(";
+    public static final char   SIGC_ENDCLASS              = ';';
+    public static final String SIG_ENDCLASS               = ";";
+    public static final char   SIGC_ENDMETHOD             = ')';
+    public static final String SIG_ENDMETHOD              = ")";
+    public static final char   SIGC_PACKAGE               = '/';
+    public static final String SIG_PACKAGE                = "/";
+
+    /* Class File Constants */
+    public static final int JAVA_MAGIC                   = 0xcafebabe;
+    public static final int JAVA_VERSION                 = 45;
+    public static final int JAVA_MINOR_VERSION           = 3;
+
+    /* Constant table */
+    public static final int CONSTANT_UTF8                = 1;
+    public static final int CONSTANT_UNICODE             = 2;
+    public static final int CONSTANT_INTEGER             = 3;
+    public static final int CONSTANT_FLOAT               = 4;
+    public static final int CONSTANT_LONG                = 5;
+    public static final int CONSTANT_DOUBLE              = 6;
+    public static final int CONSTANT_CLASS               = 7;
+    public static final int CONSTANT_STRING              = 8;
+    public static final int CONSTANT_FIELD               = 9;
+    public static final int CONSTANT_METHOD              = 10;
+    public static final int CONSTANT_INTERFACEMETHOD     = 11;
+    public static final int CONSTANT_NAMEANDTYPE         = 12;
+
+    /* Access Flags */
+    public static final int ACC_PUBLIC                   = 0x00000001;
+    public static final int ACC_PRIVATE                  = 0x00000002;
+    public static final int ACC_PROTECTED                = 0x00000004;
+    public static final int ACC_STATIC                   = 0x00000008;
+    public static final int ACC_FINAL                    = 0x00000010;
+    public static final int ACC_SYNCHRONIZED             = 0x00000020;
+    public static final int ACC_SUPER                        = 0x00000020;
+    public static final int ACC_VOLATILE                 = 0x00000040;
+    public static final int ACC_TRANSIENT                = 0x00000080;
+    public static final int ACC_NATIVE                   = 0x00000100;
+    public static final int ACC_INTERFACE                = 0x00000200;
+    public static final int ACC_ABSTRACT                 = 0x00000400;
+    public static final int ACC_STRICT                   = 0x00000800;
+    public static final int ACC_EXPLICIT                 = 0x00001000;
+    public static final int ACC_SYNTHETIC                = 0x00010000; // actually, this is an attribute
+
+    /* Type codes */
+    public static final int T_CLASS                      = 0x00000002;
+    public static final int T_BOOLEAN                    = 0x00000004;
+    public static final int T_CHAR                       = 0x00000005;
+    public static final int T_FLOAT                      = 0x00000006;
+    public static final int T_DOUBLE                     = 0x00000007;
+    public static final int T_BYTE                       = 0x00000008;
+    public static final int T_SHORT                      = 0x00000009;
+    public static final int T_INT                        = 0x0000000a;
+    public static final int T_LONG                       = 0x0000000b;
+
+    /* Type codes for StackMap attribute */
+    public static final int ITEM_Bogus      =0; // an unknown or uninitialized value
+    public static final int ITEM_Integer    =1; // a 32-bit integer
+    public static final int ITEM_Float      =2; // not used
+    public static final int ITEM_Double     =3; // not used
+    public static final int ITEM_Long       =4; // a 64-bit integer
+    public static final int ITEM_Null       =5; // the type of null
+    public static final int ITEM_InitObject =6; // "this" in constructor
+    public static final int ITEM_Object     =7; // followed by 2-byte index of class name
+    public static final int ITEM_NewObject  =8; // followed by 2-byte ref to "new"
+
+    /* Constants used in StackMapTable attribute */
+    public static final int SAME_FRAME_BOUND                  = 64;
+    public static final int SAME_LOCALS_1_STACK_ITEM_BOUND    = 128;
+    public static final int SAME_LOCALS_1_STACK_ITEM_EXTENDED = 247;
+    public static final int SAME_FRAME_EXTENDED               = 251;
+    public static final int FULL_FRAME                        = 255;
+
+    /* Opcodes */
+    public static final int opc_dead                     = -2;
+    public static final int opc_label                    = -1;
+    public static final int opc_nop                      = 0;
+    public static final int opc_aconst_null              = 1;
+    public static final int opc_iconst_m1                = 2;
+    public static final int opc_iconst_0                 = 3;
+    public static final int opc_iconst_1                 = 4;
+    public static final int opc_iconst_2                 = 5;
+    public static final int opc_iconst_3                 = 6;
+    public static final int opc_iconst_4                 = 7;
+    public static final int opc_iconst_5                 = 8;
+    public static final int opc_lconst_0                 = 9;
+    public static final int opc_lconst_1                 = 10;
+    public static final int opc_fconst_0                 = 11;
+    public static final int opc_fconst_1                 = 12;
+    public static final int opc_fconst_2                 = 13;
+    public static final int opc_dconst_0                 = 14;
+    public static final int opc_dconst_1                 = 15;
+    public static final int opc_bipush                   = 16;
+    public static final int opc_sipush                   = 17;
+    public static final int opc_ldc                      = 18;
+    public static final int opc_ldc_w                    = 19;
+    public static final int opc_ldc2_w                   = 20;
+    public static final int opc_iload                    = 21;
+    public static final int opc_lload                    = 22;
+    public static final int opc_fload                    = 23;
+    public static final int opc_dload                    = 24;
+    public static final int opc_aload                    = 25;
+    public static final int opc_iload_0                  = 26;
+    public static final int opc_iload_1                  = 27;
+    public static final int opc_iload_2                  = 28;
+    public static final int opc_iload_3                  = 29;
+    public static final int opc_lload_0                  = 30;
+    public static final int opc_lload_1                  = 31;
+    public static final int opc_lload_2                  = 32;
+    public static final int opc_lload_3                  = 33;
+    public static final int opc_fload_0                  = 34;
+    public static final int opc_fload_1                  = 35;
+    public static final int opc_fload_2                  = 36;
+    public static final int opc_fload_3                  = 37;
+    public static final int opc_dload_0                  = 38;
+    public static final int opc_dload_1                  = 39;
+    public static final int opc_dload_2                  = 40;
+    public static final int opc_dload_3                  = 41;
+    public static final int opc_aload_0                  = 42;
+    public static final int opc_aload_1                  = 43;
+    public static final int opc_aload_2                  = 44;
+    public static final int opc_aload_3                  = 45;
+    public static final int opc_iaload                   = 46;
+    public static final int opc_laload                   = 47;
+    public static final int opc_faload                   = 48;
+    public static final int opc_daload                   = 49;
+    public static final int opc_aaload                   = 50;
+    public static final int opc_baload                   = 51;
+    public static final int opc_caload                   = 52;
+    public static final int opc_saload                   = 53;
+    public static final int opc_istore                   = 54;
+    public static final int opc_lstore                   = 55;
+    public static final int opc_fstore                   = 56;
+    public static final int opc_dstore                   = 57;
+    public static final int opc_astore                   = 58;
+    public static final int opc_istore_0                 = 59;
+    public static final int opc_istore_1                 = 60;
+    public static final int opc_istore_2                 = 61;
+    public static final int opc_istore_3                 = 62;
+    public static final int opc_lstore_0                 = 63;
+    public static final int opc_lstore_1                 = 64;
+    public static final int opc_lstore_2                 = 65;
+    public static final int opc_lstore_3                 = 66;
+    public static final int opc_fstore_0                 = 67;
+    public static final int opc_fstore_1                 = 68;
+    public static final int opc_fstore_2                 = 69;
+    public static final int opc_fstore_3                 = 70;
+    public static final int opc_dstore_0                 = 71;
+    public static final int opc_dstore_1                 = 72;
+    public static final int opc_dstore_2                 = 73;
+    public static final int opc_dstore_3                 = 74;
+    public static final int opc_astore_0                 = 75;
+    public static final int opc_astore_1                 = 76;
+    public static final int opc_astore_2                 = 77;
+    public static final int opc_astore_3                 = 78;
+    public static final int opc_iastore                  = 79;
+    public static final int opc_lastore                  = 80;
+    public static final int opc_fastore                  = 81;
+    public static final int opc_dastore                  = 82;
+    public static final int opc_aastore                  = 83;
+    public static final int opc_bastore                  = 84;
+    public static final int opc_castore                  = 85;
+    public static final int opc_sastore                  = 86;
+    public static final int opc_pop                      = 87;
+    public static final int opc_pop2                     = 88;
+    public static final int opc_dup                      = 89;
+    public static final int opc_dup_x1                   = 90;
+    public static final int opc_dup_x2                   = 91;
+    public static final int opc_dup2                     = 92;
+    public static final int opc_dup2_x1                  = 93;
+    public static final int opc_dup2_x2                  = 94;
+    public static final int opc_swap                     = 95;
+    public static final int opc_iadd                     = 96;
+    public static final int opc_ladd                     = 97;
+    public static final int opc_fadd                     = 98;
+    public static final int opc_dadd                     = 99;
+    public static final int opc_isub                     = 100;
+    public static final int opc_lsub                     = 101;
+    public static final int opc_fsub                     = 102;
+    public static final int opc_dsub                     = 103;
+    public static final int opc_imul                     = 104;
+    public static final int opc_lmul                     = 105;
+    public static final int opc_fmul                     = 106;
+    public static final int opc_dmul                     = 107;
+    public static final int opc_idiv                     = 108;
+    public static final int opc_ldiv                     = 109;
+    public static final int opc_fdiv                     = 110;
+    public static final int opc_ddiv                     = 111;
+    public static final int opc_irem                     = 112;
+    public static final int opc_lrem                     = 113;
+    public static final int opc_frem                     = 114;
+    public static final int opc_drem                     = 115;
+    public static final int opc_ineg                     = 116;
+    public static final int opc_lneg                     = 117;
+    public static final int opc_fneg                     = 118;
+    public static final int opc_dneg                     = 119;
+    public static final int opc_ishl                     = 120;
+    public static final int opc_lshl                     = 121;
+    public static final int opc_ishr                     = 122;
+    public static final int opc_lshr                     = 123;
+    public static final int opc_iushr                    = 124;
+    public static final int opc_lushr                    = 125;
+    public static final int opc_iand                     = 126;
+    public static final int opc_land                     = 127;
+    public static final int opc_ior                      = 128;
+    public static final int opc_lor                      = 129;
+    public static final int opc_ixor                     = 130;
+    public static final int opc_lxor                     = 131;
+    public static final int opc_iinc                     = 132;
+    public static final int opc_i2l                      = 133;
+    public static final int opc_i2f                      = 134;
+    public static final int opc_i2d                      = 135;
+    public static final int opc_l2i                      = 136;
+    public static final int opc_l2f                      = 137;
+    public static final int opc_l2d                      = 138;
+    public static final int opc_f2i                      = 139;
+    public static final int opc_f2l                      = 140;
+    public static final int opc_f2d                      = 141;
+    public static final int opc_d2i                      = 142;
+    public static final int opc_d2l                      = 143;
+    public static final int opc_d2f                      = 144;
+    public static final int opc_i2b                      = 145;
+    public static final int opc_int2byte                 = 145;
+    public static final int opc_i2c                      = 146;
+    public static final int opc_int2char                 = 146;
+    public static final int opc_i2s                      = 147;
+    public static final int opc_int2short                = 147;
+    public static final int opc_lcmp                     = 148;
+    public static final int opc_fcmpl                    = 149;
+    public static final int opc_fcmpg                    = 150;
+    public static final int opc_dcmpl                    = 151;
+    public static final int opc_dcmpg                    = 152;
+    public static final int opc_ifeq                     = 153;
+    public static final int opc_ifne                     = 154;
+    public static final int opc_iflt                     = 155;
+    public static final int opc_ifge                     = 156;
+    public static final int opc_ifgt                     = 157;
+    public static final int opc_ifle                     = 158;
+    public static final int opc_if_icmpeq                = 159;
+    public static final int opc_if_icmpne                = 160;
+    public static final int opc_if_icmplt                = 161;
+    public static final int opc_if_icmpge                = 162;
+    public static final int opc_if_icmpgt                = 163;
+    public static final int opc_if_icmple                = 164;
+    public static final int opc_if_acmpeq                = 165;
+    public static final int opc_if_acmpne                = 166;
+    public static final int opc_goto                     = 167;
+    public static final int opc_jsr                      = 168;
+    public static final int opc_ret                      = 169;
+    public static final int opc_tableswitch              = 170;
+    public static final int opc_lookupswitch             = 171;
+    public static final int opc_ireturn                  = 172;
+    public static final int opc_lreturn                  = 173;
+    public static final int opc_freturn                  = 174;
+    public static final int opc_dreturn                  = 175;
+    public static final int opc_areturn                  = 176;
+    public static final int opc_return                   = 177;
+    public static final int opc_getstatic                = 178;
+    public static final int opc_putstatic                = 179;
+    public static final int opc_getfield                 = 180;
+    public static final int opc_putfield                 = 181;
+    public static final int opc_invokevirtual            = 182;
+    public static final int opc_invokenonvirtual         = 183;
+    public static final int opc_invokespecial            = 183;
+    public static final int opc_invokestatic             = 184;
+    public static final int opc_invokeinterface          = 185;
+//    public static final int opc_xxxunusedxxx             = 186;
+    public static final int opc_new                      = 187;
+    public static final int opc_newarray                 = 188;
+    public static final int opc_anewarray                = 189;
+    public static final int opc_arraylength              = 190;
+    public static final int opc_athrow                   = 191;
+    public static final int opc_checkcast                = 192;
+    public static final int opc_instanceof               = 193;
+    public static final int opc_monitorenter             = 194;
+    public static final int opc_monitorexit              = 195;
+    public static final int opc_wide                     = 196;
+    public static final int opc_multianewarray           = 197;
+    public static final int opc_ifnull                   = 198;
+    public static final int opc_ifnonnull                = 199;
+    public static final int opc_goto_w                   = 200;
+    public static final int opc_jsr_w                    = 201;
+        /* Pseudo-instructions */
+    public static final int opc_bytecode                 = 203;
+    public static final int opc_try                      = 204;
+    public static final int opc_endtry                   = 205;
+    public static final int opc_catch                    = 206;
+    public static final int opc_var                      = 207;
+    public static final int opc_endvar                   = 208;
+    public static final int opc_localsmap                = 209;
+    public static final int opc_stackmap                 = 210;
+        /* PicoJava prefixes */
+    public static final int opc_nonpriv                  = 254;
+    public static final int opc_priv                     = 255;
+
+        /* Wide instructions */
+    public static final int opc_iload_w         = (opc_wide<<8)|opc_iload;
+    public static final int opc_lload_w         = (opc_wide<<8)|opc_lload;
+    public static final int opc_fload_w         = (opc_wide<<8)|opc_fload;
+    public static final int opc_dload_w         = (opc_wide<<8)|opc_dload;
+    public static final int opc_aload_w         = (opc_wide<<8)|opc_aload;
+    public static final int opc_istore_w        = (opc_wide<<8)|opc_istore;
+    public static final int opc_lstore_w        = (opc_wide<<8)|opc_lstore;
+    public static final int opc_fstore_w        = (opc_wide<<8)|opc_fstore;
+    public static final int opc_dstore_w        = (opc_wide<<8)|opc_dstore;
+    public static final int opc_astore_w        = (opc_wide<<8)|opc_astore;
+    public static final int opc_ret_w           = (opc_wide<<8)|opc_ret;
+    public static final int opc_iinc_w          = (opc_wide<<8)|opc_iinc;
+
+    /* Opcode Names */
+  public static final String opcNamesTab[] = {
+        "nop",
+        "aconst_null",
+        "iconst_m1",
+        "iconst_0",
+        "iconst_1",
+        "iconst_2",
+        "iconst_3",
+        "iconst_4",
+        "iconst_5",
+        "lconst_0",
+        "lconst_1",
+        "fconst_0",
+        "fconst_1",
+        "fconst_2",
+        "dconst_0",
+        "dconst_1",
+        "bipush",
+        "sipush",
+        "ldc",
+        "ldc_w",
+        "ldc2_w",
+        "iload",
+        "lload",
+        "fload",
+        "dload",
+        "aload",
+        "iload_0",
+        "iload_1",
+        "iload_2",
+        "iload_3",
+        "lload_0",
+        "lload_1",
+        "lload_2",
+        "lload_3",
+        "fload_0",
+        "fload_1",
+        "fload_2",
+        "fload_3",
+        "dload_0",
+        "dload_1",
+        "dload_2",
+        "dload_3",
+        "aload_0",
+        "aload_1",
+        "aload_2",
+        "aload_3",
+        "iaload",
+        "laload",
+        "faload",
+        "daload",
+        "aaload",
+        "baload",
+        "caload",
+        "saload",
+        "istore",
+        "lstore",
+        "fstore",
+        "dstore",
+        "astore",
+        "istore_0",
+        "istore_1",
+        "istore_2",
+        "istore_3",
+        "lstore_0",
+        "lstore_1",
+        "lstore_2",
+        "lstore_3",
+        "fstore_0",
+        "fstore_1",
+        "fstore_2",
+        "fstore_3",
+        "dstore_0",
+        "dstore_1",
+        "dstore_2",
+        "dstore_3",
+        "astore_0",
+        "astore_1",
+        "astore_2",
+        "astore_3",
+        "iastore",
+        "lastore",
+        "fastore",
+        "dastore",
+        "aastore",
+        "bastore",
+        "castore",
+        "sastore",
+        "pop",
+        "pop2",
+        "dup",
+        "dup_x1",
+        "dup_x2",
+        "dup2",
+        "dup2_x1",
+        "dup2_x2",
+        "swap",
+        "iadd",
+        "ladd",
+        "fadd",
+        "dadd",
+        "isub",
+        "lsub",
+        "fsub",
+        "dsub",
+        "imul",
+        "lmul",
+        "fmul",
+        "dmul",
+        "idiv",
+        "ldiv",
+        "fdiv",
+        "ddiv",
+        "irem",
+        "lrem",
+        "frem",
+        "drem",
+        "ineg",
+        "lneg",
+        "fneg",
+        "dneg",
+        "ishl",
+        "lshl",
+        "ishr",
+        "lshr",
+        "iushr",
+        "lushr",
+        "iand",
+        "land",
+        "ior",
+        "lor",
+        "ixor",
+        "lxor",
+        "iinc",
+        "i2l",
+        "i2f",
+        "i2d",
+        "l2i",
+        "l2f",
+        "l2d",
+        "f2i",
+        "f2l",
+        "f2d",
+        "d2i",
+        "d2l",
+        "d2f",
+        "i2b",
+        "i2c",
+        "i2s",
+        "lcmp",
+        "fcmpl",
+        "fcmpg",
+        "dcmpl",
+        "dcmpg",
+        "ifeq",
+        "ifne",
+        "iflt",
+        "ifge",
+        "ifgt",
+        "ifle",
+        "if_icmpeq",
+        "if_icmpne",
+        "if_icmplt",
+        "if_icmpge",
+        "if_icmpgt",
+        "if_icmple",
+        "if_acmpeq",
+        "if_acmpne",
+        "goto",
+        "jsr",
+        "ret",
+        "tableswitch",
+        "lookupswitch",
+        "ireturn",
+        "lreturn",
+        "freturn",
+        "dreturn",
+        "areturn",
+        "return",
+        "getstatic",
+        "putstatic",
+        "getfield",
+        "putfield",
+        "invokevirtual",
+        "invokespecial", //     was "invokenonvirtual",
+        "invokestatic",
+        "invokeinterface",
+        "bytecode 186", //"xxxunusedxxx",
+        "new",
+        "newarray",
+        "anewarray",
+        "arraylength",
+        "athrow",
+        "checkcast",
+        "instanceof",
+        "monitorenter",
+        "monitorexit",
+         null, // "wide",
+        "multianewarray",
+        "ifnull",
+        "ifnonnull",
+        "goto_w",
+        "jsr_w",
+        "bytecode 202", // "breakpoint",
+        "bytecode",
+        "try",
+        "endtry",
+        "catch",
+        "var",
+        "endvar",
+        "locals_map",
+        "stack_map"
+  };
+
+    /* Opcode Lengths */
+  public static final int opcLengthsTab[] = {
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        2,
+        3,
+        2,
+        3,
+        3,
+        2,
+        2,
+        2,
+        2,
+        2,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        2,
+        2,
+        2,
+        2,
+        2,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        3,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        2,
+        99,
+        99,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        5,
+        0,
+        3,
+        2,
+        3,
+        1,
+        1,
+        3,
+        3,
+        1,
+        1,
+        0, // wide
+        4,
+        3,
+        3,
+        5,
+        5,
+        1,
+        1, 0, 0, 0, 0, 0 // pseudo
+  };
+
+     /**
+     * End of input
+     */
+    public static final int EOF = -1;
+
+   /*
+     * Flags
+     */
+    public static final int F_VERBOSE           = 1 << 0;
+    public static final int F_DUMP              = 1 << 1;
+    public static final int F_WARNINGS          = 1 << 2;
+    public static final int F_DEBUG             = 1 << 3;
+    public static final int F_OPTIMIZE          = 1 << 4;
+    public static final int F_DEPENDENCIES      = 1 << 5;
+
+    /*
+     * Type codes
+     */
+    public static final int TC_BOOLEAN   = 0;
+    public static final int TC_BYTE      = 1;
+    public static final int TC_CHAR      = 2;
+    public static final int TC_SHORT     = 3;
+    public static final int TC_INT       = 4;
+    public static final int TC_LONG      = 5;
+    public static final int TC_FLOAT     = 6;
+    public static final int TC_DOUBLE    = 7;
+    public static final int TC_NULL      = 8;
+    public static final int TC_ARRAY     = 9;
+    public static final int TC_CLASS     = 10;
+    public static final int TC_VOID      = 11;
+    public static final int TC_METHOD    = 12;
+    public static final int TC_ERROR     = 13;
+
+    /*
+     * Type Masks
+     */
+    public static final int TM_NULL      = 1 << TC_NULL;
+    public static final int TM_VOID      = 1 << TC_VOID;
+    public static final int TM_BOOLEAN   = 1 << TC_BOOLEAN;
+    public static final int TM_BYTE      = 1 << TC_BYTE;
+    public static final int TM_CHAR      = 1 << TC_CHAR;
+    public static final int TM_SHORT     = 1 << TC_SHORT;
+    public static final int TM_INT       = 1 << TC_INT;
+    public static final int TM_LONG      = 1 << TC_LONG;
+    public static final int TM_FLOAT     = 1 << TC_FLOAT;
+    public static final int TM_DOUBLE    = 1 << TC_DOUBLE;
+    public static final int TM_ARRAY     = 1 << TC_ARRAY;
+    public static final int TM_CLASS     = 1 << TC_CLASS;
+    public static final int TM_METHOD    = 1 << TC_METHOD;
+    public static final int TM_ERROR     = 1 << TC_ERROR;
+
+    public static final int TM_INT32     = TM_BYTE | TM_SHORT | TM_CHAR | TM_INT;
+    public static final int TM_NUM32     = TM_INT32 | TM_FLOAT;
+    public static final int TM_NUM64     = TM_LONG | TM_DOUBLE;
+    public static final int TM_INTEGER   = TM_INT32 | TM_LONG;
+    public static final int TM_REAL      = TM_FLOAT | TM_DOUBLE;
+    public static final int TM_NUMBER    = TM_INTEGER | TM_REAL;
+    public static final int TM_REFERENCE = TM_ARRAY | TM_CLASS | TM_NULL;
+
+    /*
+     * Class status
+     */
+    public static final int CS_UNDEFINED        = 0;
+    public static final int CS_UNDECIDED        = 1;
+    public static final int CS_BINARY           = 2;
+    public static final int CS_SOURCE           = 3;
+    public static final int CS_PARSED           = 4;
+    public static final int CS_COMPILED         = 5;
+    public static final int CS_NOTFOUND         = 6;
+
+    /*
+     * Attributes
+     */
+    public static final int ATT_ALL             = -1;
+    public static final int ATT_CODE            = 1;
+
+    /*
+     * Number of bits used in file offsets
+     */
+    public static final int OFFSETBITS          = 19;
+    public static final int MAXFILESIZE         = (1 << OFFSETBITS) - 1;
+    public static final int MAXLINENUMBER       = (1 << (32 - OFFSETBITS)) - 1;
+
+    /*
+     * Operators
+     */
+    public final int COMMA              = 0;
+    public final int ASSIGN             = 1;
+
+    public final int ASGMUL             = 2;
+    public final int ASGDIV             = 3;
+    public final int ASGREM             = 4;
+    public final int ASGADD             = 5;
+    public final int ASGSUB             = 6;
+    public final int ASGLSHIFT          = 7;
+    public final int ASGRSHIFT          = 8;
+    public final int ASGURSHIFT         = 9;
+    public final int ASGBITAND          = 10;
+    public final int ASGBITOR           = 11;
+    public final int ASGBITXOR          = 12;
+
+    public final int COND               = 13;
+    public final int OR                 = 14;
+    public final int AND                = 15;
+    public final int BITOR              = 16;
+    public final int BITXOR             = 17;
+    public final int BITAND             = 18;
+    public final int NE                 = 19;
+    public final int EQ                 = 20;
+    public final int GE                 = 21;
+    public final int GT                 = 22;
+    public final int LE                 = 23;
+    public final int LT                 = 24;
+    public final int INSTANCEOF         = 25;
+    public final int LSHIFT             = 26;
+    public final int RSHIFT             = 27;
+    public final int URSHIFT            = 28;
+    public final int ADD                = 29;
+    public final int SUB                = 30;
+    public final int DIV                = 31;
+    public final int REM                = 32;
+    public final int MUL                = 33;
+    public final int CAST               = 34;           // (x)y
+    public final int POS                = 35;           // +x
+    public final int NEG                = 36;           // -x
+    public final int NOT                = 37;
+    public final int BITNOT             = 38;
+    public final int PREINC             = 39;           // ++x
+    public final int PREDEC             = 40;           // --x
+    public final int NEWARRAY           = 41;
+    public final int NEWINSTANCE        = 42;
+    public final int NEWFROMNAME        = 43;
+    public final int POSTINC            = 44;           // x++
+    public final int POSTDEC            = 45;           // x--
+    public final int FIELD              = 46;
+    public final int METHOD             = 47;           // x(y)
+    public final int ARRAYACCESS        = 48;           // x[y]
+    public final int NEW                = 49;
+    public final int INC                = 50;
+    public final int DEC                = 51;
+
+    public final int CONVERT            = 55;           // implicit conversion
+    public final int EXPR               = 56;           // (x)
+    public final int ARRAY              = 57;           // {x, y, ...}
+    public final int GOTO               = 58;
+
+    /*
+     * Value tokens
+     */
+    public final int IDENT              = 60;
+    public final int BOOLEANVAL         = 61;
+    public final int BYTEVAL            = 62;
+    public final int CHARVAL            = 63;
+    public final int SHORTVAL           = 64;
+    public final int INTVAL                     = 65;
+    public final int LONGVAL            = 66;
+    public final int FLOATVAL           = 67;
+    public final int DOUBLEVAL          = 68;
+    public final int STRINGVAL          = 69;
+
+    /*
+     * Type keywords
+     */
+    public final int BYTE               = 70;
+    public final int CHAR               = 71;
+    public final int SHORT              = 72;
+    public final int INT                = 73;
+    public final int LONG               = 74;
+    public final int FLOAT              = 75;
+    public final int DOUBLE             = 76;
+    public final int VOID               = 77;
+    public final int BOOLEAN            = 78;
+
+    /*
+     * Expression keywords
+     */
+    public final int TRUE               = 80;
+    public final int FALSE              = 81;
+    public final int THIS               = 82;
+    public final int SUPER              = 83;
+    public final int NULL               = 84;
+
+    /*
+     * Statement keywords
+     */
+    public final int IF                 = 90;
+    public final int ELSE               = 91;
+    public final int FOR                = 92;
+    public final int WHILE              = 93;
+    public final int DO                 = 94;
+    public final int SWITCH             = 95;
+    public final int CASE               = 96;
+    public final int DEFAULT            = 97;
+    public final int BREAK              = 98;
+    public final int CONTINUE           = 99;
+    public final int RETURN             = 100;
+    public final int TRY                = 101;
+    public final int CATCH              = 102;
+    public final int FINALLY            = 103;
+    public final int THROW              = 104;
+    public final int STAT               = 105;
+    public final int EXPRESSION         = 106;
+    public final int DECLARATION        = 107;
+    public final int VARDECLARATION     = 108;
+
+    /*
+     * Declaration keywords
+     */
+    public final int IMPORT             = 110;
+    public final int CLASS              = 111;
+    public final int EXTENDS            = 112;
+    public final int IMPLEMENTS         = 113;
+    public final int INTERFACE          = 114;
+    public final int PACKAGE            = 115;
+
+    /*
+     * Modifier keywords
+     */
+    public final int PRIVATE    = 120;
+    public final int PUBLIC             = 121;
+    public final int PROTECTED  = 122;
+    public final int CONST              = 123;
+    public final int STATIC             = 124;
+    public final int TRANSIENT          = 125;
+    public final int SYNCHRONIZED       = 126;
+    public final int NATIVE             = 127;
+    public final int FINAL              = 128;
+    public final int VOLATILE   = 129;
+    public final int ABSTRACT   = 130;
+    public final int STRICT             = 165;
+
+    /*
+     * Punctuation
+     */
+    public final int SEMICOLON  = 135;
+    public final int COLON              = 136;
+    public final int QUESTIONMARK       = 137;
+    public final int LBRACE             = 138;
+    public final int RBRACE             = 139;
+    public final int LPAREN             = 140;
+    public final int RPAREN             = 141;
+    public final int LSQBRACKET = 142;
+    public final int RSQBRACKET = 143;
+    public final int THROWS     = 144;
+
+    /*
+     * Special tokens
+     */
+    public final int ERROR              = 145;          // an error
+    public final int COMMENT    = 146;          // not used anymore.
+    public final int TYPE               = 147;
+    public final int LENGTH             = 148;
+    public final int INLINERETURN       = 149;
+    public final int INLINEMETHOD       = 150;
+    public final int INLINENEWINSTANCE  = 151;
+
+    /*
+     * Added for jasm
+     */
+        public final int METHODREF      = 152;
+        public final int FIELDREF       = 153;
+    public final int STACK              = 154;
+    public final int LOCAL              = 155;
+    public final int CPINDEX    = 156;
+    public final int CPNAME             = 157;
+    public final int SIGN               = 158;
+    public final int BITS               = 159;
+    public final int INF                = 160;
+    public final int NAN                = 161;
+    public final int INNERCLASS = 162;
+    public final int OF         = 163;
+    public final int SYNTHETIC          = 164;
+// last used=165;
+
+   /*
+     * Operator precedence
+     */
+    public static final int opPrecedence[] = {
+        10,     11,     11,     11,     11,     11,     11,     11,     11,     11,
+        11,     11,     11,     12,     13,     14,     15,     16,     17,     18,
+        18,     19,     19,     19,     19,     19,     20,     20,     20,     21,
+        21,     22,     22,     22,     23,     24,     24,     24,     24,     24,
+        24,     25,     25,     26,     26,     26,     26,     26,     26
+    };
+
+    /*
+     * Operator names
+     */
+    public static final String opNames[] = {
+        ",",            "=",            "*=",           "/=",           "%=",
+        "+=",           "-=",           "<<=",          ">>=",          "<<<=",
+        "&=",           "|=",           "^=",           "?:",           "||",
+        "&&",           "|",            "^",            "&",            "!=",
+        "==",           ">=",           ">",            "<=",           "<",
+        "instanceof",   "<<",           ">>",           "<<<",          "+",
+        "-",            "/",            "%",            "*",            "cast",
+        "+",            "-",            "!",            "~",            "++",
+        "--",           "new",          "new",          "new",          "++",
+        "--",           "field",        "method",       "[]",           "new",
+        "++",           "--",           null,           null,           null,
+
+        "convert",      "expr",         "array",        "goto",         null,
+
+        "Identifier",   "Boolean",      "Byte",         "Char",         "Short",
+        "Integer",              "Long",         "Float",        "Double",       "String",
+
+        "byte",         "char",         "short",        "int",          "long",
+        "float",        "double",       "void",         "boolean",      null,
+
+        "true",         "false",        "this",         "super",        "null",
+        null,           null,           null,           null,           null,
+
+        "if",           "else",         "for",          "while",        "do",
+        "switch",       "case",         "default",      "break",        "continue",
+        "return",       "try",          "catch",        "finally",      "throw",
+        "stat",         "expression",   "declaration",  "declaration",  null,
+
+        "import",       "class",        "extends",      "implements",   "interface",
+        "package",      null,           null,           null,           null,
+
+        "private",      "public",       "protected",    "const",        "static",
+        "transient",    "synchronized", "native",       "final",        "volatile",
+        "abstract",     null,           null,           null,           null,
+
+        ";",            ":",            "?",            "{",            "}",
+        "(",            ")",            "[",            "]",            "throws",
+        "error",        "comment",      "type",         "length",       "inline-return",
+        "inline-method", "inline-new",
+        "method", "field", "stack", "locals", "CPINDEX", "CPName", "SIGN",
+        "bits", "INF", "NaN", "InnerClass", "of", "synthetic"
+    };
+    
+    static class AnnotationParser {
+
+        private final boolean textual;
+        private final boolean iterateArray;
+
+        protected AnnotationParser(boolean textual, boolean iterateArray) {
+            this.textual = textual;
+            this.iterateArray = iterateArray;
+        }
+
+        protected void visitAnnotationStart(String type, boolean top) throws IOException {
+        }
+
+        protected void visitAnnotationEnd(String type, boolean top) throws IOException {
+        }
+
+        protected void visitValueStart(String attrName, char type) throws IOException {
+        }
+
+        protected void visitValueEnd(String attrName, char type) throws IOException {
+        }
+
+        protected void visitAttr(
+            String annoType, String attr, String attrType, String value) throws IOException {
+        }
+
+        protected void visitEnumAttr(
+            String annoType, String attr, String attrType, String value) throws IOException {
+            visitAttr(annoType, attr, attrType, value);
+        }
+
+        /**
+         * Initialize the parsing with constant pool from
+         * <code>cd</code>.
+         *
+         * @param attr the attribute defining annotations
+         * @param cd constant pool
+         * @throws IOException in case I/O fails
+         */
+        public final void parse(byte[] attr, ClassData cd) throws IOException {
+            ByteArrayInputStream is = new ByteArrayInputStream(attr);
+            DataInputStream dis = new DataInputStream(is);
+            try {
+                read(dis, cd);
+            } finally {
+                is.close();
+            }
+        }
+
+        private void read(DataInputStream dis, ClassData cd) throws IOException {
+            int cnt = dis.readUnsignedShort();
+            for (int i = 0; i < cnt; i++) {
+                readAnno(dis, cd, true);
+            }
+        }
+
+        private void readAnno(DataInputStream dis, ClassData cd, boolean top) throws IOException {
+            int type = dis.readUnsignedShort();
+            String typeName = cd.StringValue(type);
+            visitAnnotationStart(typeName, top);
+            int cnt = dis.readUnsignedShort();
+            for (int i = 0; i < cnt; i++) {
+                String attrName = cd.StringValue(dis.readUnsignedShort());
+                readValue(dis, cd, typeName, attrName);
+            }
+            visitAnnotationEnd(typeName, top);
+            if (cnt == 0) {
+                visitAttr(typeName, null, null, null);
+            }
+        }
+
+        private void readValue(
+            DataInputStream dis, ClassData cd, String typeName, String attrName) throws IOException {
+            char type = (char) dis.readByte();
+            visitValueStart(attrName, type);
+            if (type == '@') {
+                readAnno(dis, cd, false);
+            } else if ("CFJZsSIDB".indexOf(type) >= 0) { // NOI18N
+                int primitive = dis.readUnsignedShort();
+                String val = cd.stringValue(primitive, textual);
+                String attrType;
+                if (type == 's') {
+                    attrType = "Ljava_lang_String_2";
+                    if (textual) {
+                        val = '"' + val + '"';
+                    }
+                } else {
+                    attrType = "" + type;
+                }
+                visitAttr(typeName, attrName, attrType, val);
+            } else if (type == 'c') {
+                int cls = dis.readUnsignedShort();
+            } else if (type == '[') {
+                int cnt = dis.readUnsignedShort();
+                for (int i = 0; i < cnt; i++) {
+                    readValue(dis, cd, typeName, iterateArray ? attrName : null);
+                }
+            } else if (type == 'e') {
+                int enumT = dis.readUnsignedShort();
+                String attrType = cd.stringValue(enumT, textual);
+                int enumN = dis.readUnsignedShort();
+                String val = cd.stringValue(enumN, textual);
+                visitEnumAttr(typeName, attrName, attrType, val);
+            } else {
+                throw new IOException("Unknown type " + type);
+            }
+            visitValueEnd(attrName, type);
+        }
+    }
+    
+    /**
+     * Reads and stores attribute information.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    private static class AttrData {
+
+        ClassData cls;
+        int name_cpx;
+        int datalen;
+        byte data[];
+
+        public AttrData(ClassData cls) {
+            this.cls = cls;
+        }
+
+        /**
+         * Reads unknown attribute.
+         */
+        public void read(int name_cpx, DataInputStream in) throws IOException {
+            this.name_cpx = name_cpx;
+            datalen = in.readInt();
+            data = new byte[datalen];
+            in.readFully(data);
+        }
+
+        /**
+         * Reads just the name of known attribute.
+         */
+        public void read(int name_cpx) {
+            this.name_cpx = name_cpx;
+        }
+
+        /**
+         * Returns attribute name.
+         */
+        public String getAttrName() {
+            return cls.getString(name_cpx);
+        }
+
+        /**
+         * Returns attribute data.
+         */
+        public byte[] getData() {
+            return data;
+        }
+    }
+
+    /**
+     * Stores constant pool entry information with one field.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    private static class CPX {
+
+        int cpx;
+
+        CPX(int cpx) {
+            this.cpx = cpx;
+        }
+    }
+
+    /**
+     * Stores constant pool entry information with two fields.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    private static class CPX2 {
+
+        int cpx1, cpx2;
+
+        CPX2(int cpx1, int cpx2) {
+            this.cpx1 = cpx1;
+            this.cpx2 = cpx2;
+        }
+    }
+
+    /**
+     * Central data repository of the Java Disassembler. Stores all the
+     * information in java class file.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    static final class ClassData {
+
+        private int magic;
+        private int minor_version;
+        private int major_version;
+        private int cpool_count;
+        private Object cpool[];
+        private int access;
+        private int this_class = 0;
+        private int super_class;
+        private int interfaces_count;
+        private int[] interfaces = new int[0];
+        private int fields_count;
+        private FieldData[] fields;
+        private int methods_count;
+        private MethodData[] methods;
+        private InnerClassData[] innerClasses;
+        private int attributes_count;
+        private AttrData[] attrs;
+        private String classname;
+        private String superclassname;
+        private int source_cpx = 0;
+        private byte tags[];
+        private Hashtable indexHashAscii = new Hashtable();
+        private String pkgPrefix = "";
+        private int pkgPrefixLen = 0;
+
+        /**
+         * Read classfile to disassemble.
+         */
+        public ClassData(InputStream infile) throws IOException {
+            this.read(new DataInputStream(infile));
+        }
+
+        /**
+         * Reads and stores class file information.
+         */
+        public void read(DataInputStream in) throws IOException {
+            // Read the header
+            magic = in.readInt();
+            if (magic != JAVA_MAGIC) {
+                throw new ClassFormatError("wrong magic: "
+                    + toHex(magic) + ", expected "
+                    + toHex(JAVA_MAGIC));
+            }
+            minor_version = in.readShort();
+            major_version = in.readShort();
+            if (major_version != JAVA_VERSION) {
+            }
+
+            // Read the constant pool
+            readCP(in);
+            access = in.readUnsignedShort();
+            this_class = in.readUnsignedShort();
+            super_class = in.readUnsignedShort();
+
+            //Read interfaces.
+            interfaces_count = in.readUnsignedShort();
+            if (interfaces_count > 0) {
+                interfaces = new int[interfaces_count];
+            }
+            for (int i = 0; i < interfaces_count; i++) {
+                interfaces[i] = in.readShort();
+            }
+
+            // Read the fields
+            readFields(in);
+
+            // Read the methods
+            readMethods(in);
+
+            // Read the attributes
+            attributes_count = in.readUnsignedShort();
+            attrs = new AttrData[attributes_count];
+            for (int k = 0; k < attributes_count; k++) {
+                int name_cpx = in.readUnsignedShort();
+                if (getTag(name_cpx) == CONSTANT_UTF8
+                    && getString(name_cpx).equals("SourceFile")) {
+                    if (in.readInt() != 2) {
+                        throw new ClassFormatError("invalid attr length");
+                    }
+                    source_cpx = in.readUnsignedShort();
+                    AttrData attr = new AttrData(this);
+                    attr.read(name_cpx);
+                    attrs[k] = attr;
+
+                } else if (getTag(name_cpx) == CONSTANT_UTF8
+                    && getString(name_cpx).equals("InnerClasses")) {
+                    int length = in.readInt();
+                    int num = in.readUnsignedShort();
+                    if (2 + num * 8 != length) {
+                        throw new ClassFormatError("invalid attr length");
+                    }
+                    innerClasses = new InnerClassData[num];
+                    for (int j = 0; j < num; j++) {
+                        InnerClassData innerClass = new InnerClassData(this);
+                        innerClass.read(in);
+                        innerClasses[j] = innerClass;
+                    }
+                    AttrData attr = new AttrData(this);
+                    attr.read(name_cpx);
+                    attrs[k] = attr;
+                } else {
+                    AttrData attr = new AttrData(this);
+                    attr.read(name_cpx, in);
+                    attrs[k] = attr;
+                }
+            }
+            in.close();
+        } // end ClassData.read()
+
+        /**
+         * Reads and stores constant pool info.
+         */
+        void readCP(DataInputStream in) throws IOException {
+            cpool_count = in.readUnsignedShort();
+            tags = new byte[cpool_count];
+            cpool = new Object[cpool_count];
+            for (int i = 1; i < cpool_count; i++) {
+                byte tag = in.readByte();
+
+                switch (tags[i] = tag) {
+                    case CONSTANT_UTF8:
+                        String str = in.readUTF();
+                        indexHashAscii.put(cpool[i] = str, new Integer(i));
+                        break;
+                    case CONSTANT_INTEGER:
+                        cpool[i] = new Integer(in.readInt());
+                        break;
+                    case CONSTANT_FLOAT:
+                        cpool[i] = new Float(in.readFloat());
+                        break;
+                    case CONSTANT_LONG:
+                        cpool[i++] = new Long(in.readLong());
+                        break;
+                    case CONSTANT_DOUBLE:
+                        cpool[i++] = new Double(in.readDouble());
+                        break;
+                    case CONSTANT_CLASS:
+                    case CONSTANT_STRING:
+                        cpool[i] = new CPX(in.readUnsignedShort());
+                        break;
+
+                    case CONSTANT_FIELD:
+                    case CONSTANT_METHOD:
+                    case CONSTANT_INTERFACEMETHOD:
+                    case CONSTANT_NAMEANDTYPE:
+                        cpool[i] = new CPX2(in.readUnsignedShort(), in.readUnsignedShort());
+                        break;
+
+                    case 0:
+                    default:
+                        throw new ClassFormatError("invalid constant type: " + (int) tags[i]);
+                }
+            }
+        }
+
+        /**
+         * Reads and strores field info.
+         */
+        protected void readFields(DataInputStream in) throws IOException {
+            int fields_count = in.readUnsignedShort();
+            fields = new FieldData[fields_count];
+            for (int k = 0; k < fields_count; k++) {
+                FieldData field = new FieldData(this);
+                field.read(in);
+                fields[k] = field;
+            }
+        }
+
+        /**
+         * Reads and strores Method info.
+         */
+        protected void readMethods(DataInputStream in) throws IOException {
+            int methods_count = in.readUnsignedShort();
+            methods = new MethodData[methods_count];
+            for (int k = 0; k < methods_count; k++) {
+                MethodData method = new MethodData(this);
+                method.read(in);
+                methods[k] = method;
+            }
+        }
+
+        /**
+         * get a string
+         */
+        public String getString(int n) {
+            if (n == 0) {
+                return null;
+            } else {
+                return (String) cpool[n];
+            }
+        }
+
+        /**
+         * get the type of constant given an index
+         */
+        public byte getTag(int n) {
+            try {
+                return tags[n];
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return (byte) 100;
+            }
+        }
+        static final String hexString = "0123456789ABCDEF";
+        public static char hexTable[] = hexString.toCharArray();
+
+        static String toHex(long val, int width) {
+            StringBuffer s = new StringBuffer();
+            for (int i = width - 1; i >= 0; i--) {
+                s.append(hexTable[((int) (val >> (4 * i))) & 0xF]);
+            }
+            return "0x" + s.toString();
+        }
+
+        static String toHex(long val) {
+            int width;
+            for (width = 16; width > 0; width--) {
+                if ((val >> (width - 1) * 4) != 0) {
+                    break;
+                }
+            }
+            return toHex(val, width);
+        }
+
+        static String toHex(int val) {
+            int width;
+            for (width = 8; width > 0; width--) {
+                if ((val >> (width - 1) * 4) != 0) {
+                    break;
+                }
+            }
+            return toHex(val, width);
+        }
+
+        /**
+         * Returns the name of this class.
+         */
+        public String getClassName() {
+            String res = null;
+            if (this_class == 0) {
+                return res;
+            }
+            int tcpx;
+            try {
+                if (tags[this_class] != CONSTANT_CLASS) {
+                    return res; //"<CP["+cpx+"] is not a Class> ";
+                }
+                tcpx = ((CPX) cpool[this_class]).cpx;
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return res; // "#"+cpx+"// invalid constant pool index";
+            } catch (Throwable e) {
+                return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
+            }
+
+            try {
+                return (String) (cpool[tcpx]);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return res; // "class #"+scpx+"// invalid constant pool index";
+            } catch (ClassCastException e) {
+                return res; // "class #"+scpx+"// invalid constant pool reference";
+            } catch (Throwable e) {
+                return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
+            }
+
+        }
+
+        /**
+         * Returns the name of class at perticular index.
+         */
+        public String getClassName(int cpx) {
+            String res = "#" + cpx;
+            if (cpx == 0) {
+                return res;
+            }
+            int scpx;
+            try {
+                if (tags[cpx] != CONSTANT_CLASS) {
+                    return res; //"<CP["+cpx+"] is not a Class> ";
+                }
+                scpx = ((CPX) cpool[cpx]).cpx;
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return res; // "#"+cpx+"// invalid constant pool index";
+            } catch (Throwable e) {
+                return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
+            }
+            res = "#" + scpx;
+            try {
+                return (String) (cpool[scpx]);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return res; // "class #"+scpx+"// invalid constant pool index";
+            } catch (ClassCastException e) {
+                return res; // "class #"+scpx+"// invalid constant pool reference";
+            } catch (Throwable e) {
+                return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
+            }
+        }
+
+        public int getAccessFlags() {
+            return access;
+        }
+
+        /**
+         * Returns true if it is a class
+         */
+        public boolean isClass() {
+            if ((access & ACC_INTERFACE) == 0) {
+                return true;
+            }
+            return false;
+        }
+
+        /**
+         * Returns true if it is a interface.
+         */
+        public boolean isInterface() {
+            if ((access & ACC_INTERFACE) != 0) {
+                return true;
+            }
+            return false;
+        }
+
+        /**
+         * Returns true if this member is public, false otherwise.
+         */
+        public boolean isPublic() {
+            return (access & ACC_PUBLIC) != 0;
+        }
+
+        /**
+         * Returns the access of this class or interface.
+         */
+        public String[] getAccess() {
+            Vector v = new Vector();
+            if ((access & ACC_PUBLIC) != 0) {
+                v.addElement("public");
+            }
+            if ((access & ACC_FINAL) != 0) {
+                v.addElement("final");
+            }
+            if ((access & ACC_ABSTRACT) != 0) {
+                v.addElement("abstract");
+            }
+            String[] accflags = new String[v.size()];
+            v.copyInto(accflags);
+            return accflags;
+        }
+
+        /**
+         * Returns list of innerclasses.
+         */
+        public InnerClassData[] getInnerClasses() {
+            return innerClasses;
+        }
+
+        /**
+         * Returns list of attributes.
+         */
+        final AttrData[] getAttributes() {
+            return attrs;
+        }
+
+        public byte[] findAnnotationData(boolean classRetention) {
+            String n = classRetention
+                ? "RuntimeInvisibleAnnotations" : // NOI18N
+                "RuntimeVisibleAnnotations"; // NOI18N
+            return findAttr(n, attrs);
+        }
+
+        /**
+         * Returns true if superbit is set.
+         */
+        public boolean isSuperSet() {
+            if ((access & ACC_SUPER) != 0) {
+                return true;
+            }
+            return false;
+        }
+
+        /**
+         * Returns super class name.
+         */
+        public String getSuperClassName() {
+            String res = null;
+            if (super_class == 0) {
+                return res;
+            }
+            int scpx;
+            try {
+                if (tags[super_class] != CONSTANT_CLASS) {
+                    return res; //"<CP["+cpx+"] is not a Class> ";
+                }
+                scpx = ((CPX) cpool[super_class]).cpx;
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return res; // "#"+cpx+"// invalid constant pool index";
+            } catch (Throwable e) {
+                return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
+            }
+
+            try {
+                return (String) (cpool[scpx]);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return res; // "class #"+scpx+"// invalid constant pool index";
+            } catch (ClassCastException e) {
+                return res; // "class #"+scpx+"// invalid constant pool reference";
+            } catch (Throwable e) {
+                return res; // "#"+cpx+"// ERROR IN DISASSEMBLER";
+            }
+        }
+
+        /**
+         * Returns list of super interfaces.
+         */
+        public String[] getSuperInterfaces() {
+            String interfacenames[] = new String[interfaces.length];
+            int interfacecpx = -1;
+            for (int i = 0; i < interfaces.length; i++) {
+                interfacecpx = ((CPX) cpool[interfaces[i]]).cpx;
+                interfacenames[i] = (String) (cpool[interfacecpx]);
+            }
+            return interfacenames;
+        }
+
+        /**
+         * Returns string at prticular constant pool index.
+         */
+        public String getStringValue(int cpoolx) {
+            try {
+                return ((String) cpool[cpoolx]);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return "//invalid constant pool index:" + cpoolx;
+            } catch (ClassCastException e) {
+                return "//invalid constant pool ref:" + cpoolx;
+            }
+        }
+
+        /**
+         * Returns list of field info.
+         */
+        public FieldData[] getFields() {
+            return fields;
+        }
+
+        /**
+         * Returns list of method info.
+         */
+        public MethodData[] getMethods() {
+            return methods;
+        }
+
+        /**
+         * Returns constant pool entry at that index.
+         */
+        public CPX2 getCpoolEntry(int cpx) {
+            return ((CPX2) (cpool[cpx]));
+        }
+
+        public Object getCpoolEntryobj(int cpx) {
+            return (cpool[cpx]);
+        }
+
+        /**
+         * Returns index of this class.
+         */
+        public int getthis_cpx() {
+            return this_class;
+        }
+
+        /**
+         * Returns string at that index.
+         */
+        public String StringValue(int cpx) {
+            return stringValue(cpx, false);
+        }
+
+        public String stringValue(int cpx, boolean textual) {
+            return stringValue(cpx, textual, null);
+        }
+
+        public String stringValue(int cpx, String[] classRefs) {
+            return stringValue(cpx, true, classRefs);
+        }
+
+        private String stringValue(int cpx, boolean textual, String[] refs) {
+            if (cpx == 0) {
+                return "#0";
+            }
+            int tag;
+            Object x;
+            String suffix = "";
+            try {
+                tag = tags[cpx];
+                x = cpool[cpx];
+            } catch (IndexOutOfBoundsException e) {
+                return "<Incorrect CP index:" + cpx + ">";
+            }
+
+            if (x == null) {
+                return "<NULL>";
+            }
+            switch (tag) {
+                case CONSTANT_UTF8: {
+                    if (!textual) {
+                        return (String) x;
+                    }
+                    StringBuilder sb = new StringBuilder();
+                    String s = (String) x;
+                    for (int k = 0; k < s.length(); k++) {
+                        char c = s.charAt(k);
+                        switch (c) {
+                            case '\\':
+                                sb.append('\\').append('\\');
+                                break;
+                            case '\t':
+                                sb.append('\\').append('t');
+                                break;
+                            case '\n':
+                                sb.append('\\').append('n');
+                                break;
+                            case '\r':
+                                sb.append('\\').append('r');
+                                break;
+                            case '\"':
+                                sb.append('\\').append('\"');
+                                break;
+                            default:
+                                sb.append(c);
+                        }
+                    }
+                    return sb.toString();
+                }
+                case CONSTANT_DOUBLE: {
+                    Double d = (Double) x;
+                    String sd = d.toString();
+                    if (textual) {
+                        return sd;
+                    }
+                    return sd + "d";
+                }
+                case CONSTANT_FLOAT: {
+                    Float f = (Float) x;
+                    String sf = (f).toString();
+                    if (textual) {
+                        return sf;
+                    }
+                    return sf + "f";
+                }
+                case CONSTANT_LONG: {
+                    Long ln = (Long) x;
+                    if (textual) {
+                        return ln.toString();
+                    }
+                    return ln.toString() + 'l';
+                }
+                case CONSTANT_INTEGER: {
+                    Integer in = (Integer) x;
+                    return in.toString();
+                }
+                case CONSTANT_CLASS:
+                    String jn = getClassName(cpx);
+                    if (textual) {
+                        if (refs != null) {
+                            refs[0] = jn;
+                        }
+                        return jn;
+                    }
+                    return javaName(jn);
+                case CONSTANT_STRING:
+                    String sv = stringValue(((CPX) x).cpx, textual);
+                    if (textual) {
+                        return '"' + sv + '"';
+                    } else {
+                        return sv;
+                    }
+                case CONSTANT_FIELD:
+                case CONSTANT_METHOD:
+                case CONSTANT_INTERFACEMETHOD:
+                    //return getShortClassName(((CPX2)x).cpx1)+"."+StringValue(((CPX2)x).cpx2);
+                    return javaName(getClassName(((CPX2) x).cpx1)) + "." + StringValue(((CPX2) x).cpx2);
+
+                case CONSTANT_NAMEANDTYPE:
+                    return getName(((CPX2) x).cpx1) + ":" + StringValue(((CPX2) x).cpx2);
+                default:
+                    return "UnknownTag"; //TBD
+            }
+        }
+
+        /**
+         * Returns resolved java type name.
+         */
+        public String javaName(String name) {
+            if (name == null) {
+                return "null";
+            }
+            int len = name.length();
+            if (len == 0) {
+                return "\"\"";
+            }
+            int cc = '/';
+            fullname:
+            { // xxx/yyy/zzz
+                int cp;
+                for (int k = 0; k < len; k += Character.charCount(cp)) {
+                    cp = name.codePointAt(k);
+                    if (cc == '/') {
+                        if (!isJavaIdentifierStart(cp)) {
+                            break fullname;
+                        }
+                    } else if (cp != '/') {
+                        if (!isJavaIdentifierPart(cp)) {
+                            break fullname;
+                        }
+                    }
+                    cc = cp;
+                }
+                return name;
+            }
+            return "\"" + name + "\"";
+        }
+
+        public String getName(int cpx) {
+            String res;
+            try {
+                return javaName((String) cpool[cpx]); //.replace('/','.');
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return "<invalid constant pool index:" + cpx + ">";
+            } catch (ClassCastException e) {
+                return "<invalid constant pool ref:" + cpx + ">";
+            }
+        }
+
+        /**
+         * Returns unqualified class name.
+         */
+        public String getShortClassName(int cpx) {
+            String classname = javaName(getClassName(cpx));
+            pkgPrefixLen = classname.lastIndexOf("/") + 1;
+            if (pkgPrefixLen != 0) {
+                pkgPrefix = classname.substring(0, pkgPrefixLen);
+                if (classname.startsWith(pkgPrefix)) {
+                    return classname.substring(pkgPrefixLen);
+                }
+            }
+            return classname;
+        }
+
+        /**
+         * Returns source file name.
+         */
+        public String getSourceName() {
+            return getName(source_cpx);
+        }
+
+        /**
+         * Returns package name.
+         */
+        public String getPkgName() {
+            String classname = getClassName(this_class);
+            pkgPrefixLen = classname.lastIndexOf("/") + 1;
+            if (pkgPrefixLen != 0) {
+                pkgPrefix = classname.substring(0, pkgPrefixLen);
+                return ("package  " + pkgPrefix.substring(0, pkgPrefixLen - 1) + ";\n");
+            } else {
+                return null;
+            }
+        }
+
+        /**
+         * Returns total constant pool entry count.
+         */
+        public int getCpoolCount() {
+            return cpool_count;
+        }
+
+        /**
+         * Returns minor version of class file.
+         */
+        public int getMinor_version() {
+            return minor_version;
+        }
+
+        /**
+         * Returns major version of class file.
+         */
+        public int getMajor_version() {
+            return major_version;
+        }
+
+        private boolean isJavaIdentifierStart(int cp) {
+            return ('a' <= cp && cp <= 'z') || ('A' <= cp && cp <= 'Z');
+        }
+
+        private boolean isJavaIdentifierPart(int cp) {
+            return isJavaIdentifierStart(cp) || ('0' <= cp && cp <= '9');
+        }
+
+        public String[] getNameAndType(int indx) {
+            return getNameAndType(indx, 0, new String[2]);
+        }
+
+        private String[] getNameAndType(int indx, int at, String[] arr) {
+            CPX2 c2 = getCpoolEntry(indx);
+            arr[at] = StringValue(c2.cpx1);
+            arr[at + 1] = StringValue(c2.cpx2);
+            return arr;
+        }
+
+        public String[] getFieldInfoName(int indx) {
+            CPX2 c2 = getCpoolEntry(indx);
+            String[] arr = new String[3];
+            arr[0] = getClassName(c2.cpx1);
+            return getNameAndType(c2.cpx2, 1, arr);
+        }
+
+        static byte[] findAttr(String n, AttrData[] attrs) {
+            for (AttrData ad : attrs) {
+                if (n.equals(ad.getAttrName())) {
+                    return ad.getData();
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Strores field data informastion.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    static class FieldData {
+
+        ClassData cls;
+        int access;
+        int name_index;
+        int descriptor_index;
+        int attributes_count;
+        int value_cpx = 0;
+        boolean isSynthetic = false;
+        boolean isDeprecated = false;
+        Vector attrs;
+
+        public FieldData(ClassData cls) {
+            this.cls = cls;
+        }
+
+        /**
+         * Read and store field info.
+         */
+        public void read(DataInputStream in) throws IOException {
+            access = in.readUnsignedShort();
+            name_index = in.readUnsignedShort();
+            descriptor_index = in.readUnsignedShort();
+            // Read the attributes
+            int attributes_count = in.readUnsignedShort();
+            attrs = new Vector(attributes_count);
+            for (int i = 0; i < attributes_count; i++) {
+                int attr_name_index = in.readUnsignedShort();
+                if (cls.getTag(attr_name_index) != CONSTANT_UTF8) {
+                    continue;
+                }
+                String attr_name = cls.getString(attr_name_index);
+                if (attr_name.equals("ConstantValue")) {
+                    if (in.readInt() != 2) {
+                        throw new ClassFormatError("invalid ConstantValue attr length");
+                    }
+                    value_cpx = in.readUnsignedShort();
+                    AttrData attr = new AttrData(cls);
+                    attr.read(attr_name_index);
+                    attrs.addElement(attr);
+                } else if (attr_name.equals("Synthetic")) {
+                    if (in.readInt() != 0) {
+                        throw new ClassFormatError("invalid Synthetic attr length");
+                    }
+                    isSynthetic = true;
+                    AttrData attr = new AttrData(cls);
+                    attr.read(attr_name_index);
+                    attrs.addElement(attr);
+                } else if (attr_name.equals("Deprecated")) {
+                    if (in.readInt() != 0) {
+                        throw new ClassFormatError("invalid Synthetic attr length");
+                    }
+                    isDeprecated = true;
+                    AttrData attr = new AttrData(cls);
+                    attr.read(attr_name_index);
+                    attrs.addElement(attr);
+                } else {
+                    AttrData attr = new AttrData(cls);
+                    attr.read(attr_name_index, in);
+                    attrs.addElement(attr);
+                }
+            }
+
+        }  // end read
+
+        public boolean isStatic() {
+            return (access & ACC_STATIC) != 0;
+        }
+
+        /**
+         * Returns access of a field.
+         */
+        public String[] getAccess() {
+            Vector v = new Vector();
+            if ((access & ACC_PUBLIC) != 0) {
+                v.addElement("public");
+            }
+            if ((access & ACC_PRIVATE) != 0) {
+                v.addElement("private");
+            }
+            if ((access & ACC_PROTECTED) != 0) {
+                v.addElement("protected");
+            }
+            if ((access & ACC_STATIC) != 0) {
+                v.addElement("static");
+            }
+            if ((access & ACC_FINAL) != 0) {
+                v.addElement("final");
+            }
+            if ((access & ACC_VOLATILE) != 0) {
+                v.addElement("volatile");
+            }
+            if ((access & ACC_TRANSIENT) != 0) {
+                v.addElement("transient");
+            }
+            String[] accflags = new String[v.size()];
+            v.copyInto(accflags);
+            return accflags;
+        }
+
+        /**
+         * Returns name of a field.
+         */
+        public String getName() {
+            return cls.getStringValue(name_index);
+        }
+
+        /**
+         * Returns internal signature of a field
+         */
+        public String getInternalSig() {
+            return cls.getStringValue(descriptor_index);
+        }
+
+        /**
+         * Returns true if field is synthetic.
+         */
+        public boolean isSynthetic() {
+            return isSynthetic;
+        }
+
+        /**
+         * Returns true if field is deprecated.
+         */
+        public boolean isDeprecated() {
+            return isDeprecated;
+        }
+
+        /**
+         * Returns index of constant value in cpool.
+         */
+        public int getConstantValueIndex() {
+            return (value_cpx);
+        }
+
+        /**
+         * Returns list of attributes of field.
+         */
+        public Vector getAttributes() {
+            return attrs;
+        }
+
+        public byte[] findAnnotationData(boolean classRetention) {
+            String n = classRetention
+                ? "RuntimeInvisibleAnnotations" : // NOI18N
+                "RuntimeVisibleAnnotations"; // NOI18N
+            AttrData[] arr = new AttrData[attrs.size()];
+            attrs.copyInto(arr);
+            return ClassData.findAttr(n, arr);
+        }
+    }
+
+    /**
+     * A JavaScript optimized replacement for Hashtable.
+     *
+     * @author Jaroslav Tulach <jtulach@netbeans.org>
+     */
+    private static final class Hashtable {
+
+        private Object[] keys;
+        private Object[] values;
+
+        Hashtable(int i) {
+            this();
+        }
+
+        Hashtable(int i, double d) {
+            this();
+        }
+
+        Hashtable() {
+        }
+
+        synchronized void put(Object key, Object val) {
+            int[] where = {-1, -1};
+            Object found = get(key, where);
+            if (where[0] != -1) {
+                // key exists
+                values[where[0]] = val;
+            } else {
+                if (where[1] != -1) {
+                    // null found
+                    keys[where[1]] = key;
+                    values[where[1]] = val;
+                } else {
+                    if (keys == null) {
+                        keys = new Object[11];
+                        values = new Object[11];
+                        keys[0] = key;
+                        values[0] = val;
+                    } else {
+                        Object[] newKeys = new Object[keys.length * 2];
+                        Object[] newValues = new Object[values.length * 2];
+                        for (int i = 0; i < keys.length; i++) {
+                            newKeys[i] = keys[i];
+                            newValues[i] = values[i];
+                        }
+                        newKeys[keys.length] = key;
+                        newValues[keys.length] = val;
+                        keys = newKeys;
+                        values = newValues;
+                    }
+                }
+            }
+        }
+
+        Object get(Object key) {
+            return get(key, null);
+        }
+
+        private synchronized Object get(Object key, int[] foundAndNull) {
+            if (keys == null) {
+                return null;
+            }
+            for (int i = 0; i < keys.length; i++) {
+                if (keys[i] == null) {
+                    if (foundAndNull != null) {
+                        foundAndNull[1] = i;
+                    }
+                } else if (keys[i].equals(key)) {
+                    if (foundAndNull != null) {
+                        foundAndNull[0] = i;
+                    }
+                    return values[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Strores InnerClass data informastion.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    private static class InnerClassData {
+
+        ClassData cls;
+        int inner_class_info_index, outer_class_info_index, inner_name_index, access;
+
+        public InnerClassData(ClassData cls) {
+            this.cls = cls;
+
+        }
+
+        /**
+         * Read Innerclass attribute data.
+         */
+        public void read(DataInputStream in) throws IOException {
+            inner_class_info_index = in.readUnsignedShort();
+            outer_class_info_index = in.readUnsignedShort();
+            inner_name_index = in.readUnsignedShort();
+            access = in.readUnsignedShort();
+        }  // end read
+
+        /**
+         * Returns the access of this class or interface.
+         */
+        public String[] getAccess() {
+            Vector v = new Vector();
+            if ((access & ACC_PUBLIC) != 0) {
+                v.addElement("public");
+            }
+            if ((access & ACC_FINAL) != 0) {
+                v.addElement("final");
+            }
+            if ((access & ACC_ABSTRACT) != 0) {
+                v.addElement("abstract");
+            }
+            String[] accflags = new String[v.size()];
+            v.copyInto(accflags);
+            return accflags;
+        }
+    } // end InnerClassData
+
+    /**
+     * Strores LineNumberTable data information.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    private static class LineNumData {
+
+        short start_pc, line_number;
+
+        public LineNumData() {
+        }
+
+        /**
+         * Read LineNumberTable attribute.
+         */
+        public LineNumData(DataInputStream in) throws IOException {
+            start_pc = in.readShort();
+            line_number = in.readShort();
+
+        }
+    }
+
+    /**
+     * Strores LocalVariableTable data information.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    private static class LocVarData {
+
+        short start_pc, length, name_cpx, sig_cpx, slot;
+
+        public LocVarData() {
+        }
+
+        /**
+         * Read LocalVariableTable attribute.
+         */
+        public LocVarData(DataInputStream in) throws IOException {
+            start_pc = in.readShort();
+            length = in.readShort();
+            name_cpx = in.readShort();
+            sig_cpx = in.readShort();
+            slot = in.readShort();
+
+        }
+    }
+    /**
+     * Strores method data informastion.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    static class MethodData {
+
+        ClassData cls;
+        int access;
+        int name_index;
+        int descriptor_index;
+        int attributes_count;
+        byte[] code;
+        Vector exception_table = new Vector(0);
+        Vector lin_num_tb = new Vector(0);
+        Vector loc_var_tb = new Vector(0);
+        StackMapTableData[] stackMapTable;
+        StackMapData[] stackMap;
+        int[] exc_index_table = null;
+        Vector attrs = new Vector(0);
+        Vector code_attrs = new Vector(0);
+        int max_stack, max_locals;
+        boolean isSynthetic = false;
+        boolean isDeprecated = false;
+
+        public MethodData(ClassData cls) {
+            this.cls = cls;
+        }
+
+        /**
+         * Read method info.
+         */
+        public void read(DataInputStream in) throws IOException {
+            access = in.readUnsignedShort();
+            name_index = in.readUnsignedShort();
+            descriptor_index = in.readUnsignedShort();
+            int attributes_count = in.readUnsignedShort();
+            for (int i = 0; i < attributes_count; i++) {
+                int attr_name_index = in.readUnsignedShort();
+
+                readAttr:
+                {
+                    if (cls.getTag(attr_name_index) == CONSTANT_UTF8) {
+                        String attr_name = cls.getString(attr_name_index);
+                        if (attr_name.equals("Code")) {
+                            readCode(in);
+                            AttrData attr = new AttrData(cls);
+                            attr.read(attr_name_index);
+                            attrs.addElement(attr);
+                            break readAttr;
+                        } else if (attr_name.equals("Exceptions")) {
+                            readExceptions(in);
+                            AttrData attr = new AttrData(cls);
+                            attr.read(attr_name_index);
+                            attrs.addElement(attr);
+                            break readAttr;
+                        } else if (attr_name.equals("Synthetic")) {
+                            if (in.readInt() != 0) {
+                                throw new ClassFormatError("invalid Synthetic attr length");
+                            }
+                            isSynthetic = true;
+                            AttrData attr = new AttrData(cls);
+                            attr.read(attr_name_index);
+                            attrs.addElement(attr);
+                            break readAttr;
+                        } else if (attr_name.equals("Deprecated")) {
+                            if (in.readInt() != 0) {
+                                throw new ClassFormatError("invalid Synthetic attr length");
+                            }
+                            isDeprecated = true;
+                            AttrData attr = new AttrData(cls);
+                            attr.read(attr_name_index);
+                            attrs.addElement(attr);
+                            break readAttr;
+                        }
+                    }
+                    AttrData attr = new AttrData(cls);
+                    attr.read(attr_name_index, in);
+                    attrs.addElement(attr);
+                }
+            }
+        }
+
+        /**
+         * Read code attribute info.
+         */
+        public void readCode(DataInputStream in) throws IOException {
+
+            int attr_length = in.readInt();
+            max_stack = in.readUnsignedShort();
+            max_locals = in.readUnsignedShort();
+            int codelen = in.readInt();
+
+            code = new byte[codelen];
+            int totalread = 0;
+            while (totalread < codelen) {
+                totalread += in.read(code, totalread, codelen - totalread);
+            }
+            //      in.read(code, 0, codelen);
+            int clen = 0;
+            readExceptionTable(in);
+            int code_attributes_count = in.readUnsignedShort();
+
+            for (int k = 0; k < code_attributes_count; k++) {
+                int table_name_index = in.readUnsignedShort();
+                int table_name_tag = cls.getTag(table_name_index);
+                AttrData attr = new AttrData(cls);
+                if (table_name_tag == CONSTANT_UTF8) {
+                    String table_name_tstr = cls.getString(table_name_index);
+                    if (table_name_tstr.equals("LineNumberTable")) {
+                        readLineNumTable(in);
+                        attr.read(table_name_index);
+                    } else if (table_name_tstr.equals("LocalVariableTable")) {
+                        readLocVarTable(in);
+                        attr.read(table_name_index);
+                    } else if (table_name_tstr.equals("StackMapTable")) {
+                        readStackMapTable(in);
+                        attr.read(table_name_index);
+                    } else if (table_name_tstr.equals("StackMap")) {
+                        readStackMap(in);
+                        attr.read(table_name_index);
+                    } else {
+                        attr.read(table_name_index, in);
+                    }
+                    code_attrs.addElement(attr);
+                    continue;
+                }
+
+                attr.read(table_name_index, in);
+                code_attrs.addElement(attr);
+            }
+        }
+
+        /**
+         * Read exception table info.
+         */
+        void readExceptionTable(DataInputStream in) throws IOException {
+            int exception_table_len = in.readUnsignedShort();
+            exception_table = new Vector(exception_table_len);
+            for (int l = 0; l < exception_table_len; l++) {
+                exception_table.addElement(new TrapData(in, l));
+            }
+        }
+
+        /**
+         * Read LineNumberTable attribute info.
+         */
+        void readLineNumTable(DataInputStream in) throws IOException {
+            int attr_len = in.readInt(); // attr_length
+            int lin_num_tb_len = in.readUnsignedShort();
+            lin_num_tb = new Vector(lin_num_tb_len);
+            for (int l = 0; l < lin_num_tb_len; l++) {
+                lin_num_tb.addElement(new LineNumData(in));
+            }
+        }
+
+        /**
+         * Read LocalVariableTable attribute info.
+         */
+        void readLocVarTable(DataInputStream in) throws IOException {
+            int attr_len = in.readInt(); // attr_length
+            int loc_var_tb_len = in.readUnsignedShort();
+            loc_var_tb = new Vector(loc_var_tb_len);
+            for (int l = 0; l < loc_var_tb_len; l++) {
+                loc_var_tb.addElement(new LocVarData(in));
+            }
+        }
+
+        /**
+         * Read Exception attribute info.
+         */
+        public void readExceptions(DataInputStream in) throws IOException {
+            int attr_len = in.readInt(); // attr_length in prog
+            int num_exceptions = in.readUnsignedShort();
+            exc_index_table = new int[num_exceptions];
+            for (int l = 0; l < num_exceptions; l++) {
+                int exc = in.readShort();
+                exc_index_table[l] = exc;
+            }
+        }
+
+        /**
+         * Read StackMapTable attribute info.
+         */
+        void readStackMapTable(DataInputStream in) throws IOException {
+            int attr_len = in.readInt();  //attr_length
+            int stack_map_tb_len = in.readUnsignedShort();
+            stackMapTable = new StackMapTableData[stack_map_tb_len];
+            for (int i = 0; i < stack_map_tb_len; i++) {
+                stackMapTable[i] = StackMapTableData.getInstance(in, this);
+            }
+        }
+
+        /**
+         * Read StackMap attribute info.
+         */
+        void readStackMap(DataInputStream in) throws IOException {
+            int attr_len = in.readInt();  //attr_length
+            int stack_map_len = in.readUnsignedShort();
+            stackMap = new StackMapData[stack_map_len];
+            for (int i = 0; i < stack_map_len; i++) {
+                stackMap[i] = new StackMapData(in, this);
+            }
+        }
+
+        /**
+         * Return access of the method.
+         */
+        public int getAccess() {
+            return access;
+        }
+
+        /**
+         * Return name of the method.
+         */
+        public String getName() {
+            return cls.getStringValue(name_index);
+        }
+
+        /**
+         * Return internal siganature of the method.
+         */
+        public String getInternalSig() {
+            return cls.getStringValue(descriptor_index);
+        }
+
+        /**
+         * Return code attribute data of a method.
+         */
+        public byte[] getCode() {
+            return code;
+        }
+
+        /**
+         * Return LineNumberTable size.
+         */
+        public int getnumlines() {
+            return lin_num_tb.size();
+        }
+
+        /**
+         * Return LineNumberTable
+         */
+        public Vector getlin_num_tb() {
+            return lin_num_tb;
+        }
+
+        /**
+         * Return LocalVariableTable size.
+         */
+        public int getloc_var_tbsize() {
+            return loc_var_tb.size();
+        }
+
+        /**
+         * Return LocalVariableTable.
+         */
+        public Vector getloc_var_tb() {
+            return loc_var_tb;
+        }
+
+        /**
+         * Return StackMap.
+         */
+        public StackMapData[] getStackMap() {
+            return stackMap;
+        }
+
+        /**
+         * Return StackMapTable.
+         */
+        public StackMapTableData[] getStackMapTable() {
+            return stackMapTable;
+        }
+
+        public StackMapIterator createStackMapIterator() {
+            return new StackMapIterator(this);
+        }
+
+        /**
+         * Return true if method is static
+         */
+        public boolean isStatic() {
+            if ((access & ACC_STATIC) != 0) {
+                return true;
+            }
+            return false;
+        }
+
+        /**
+         * Return max depth of operand stack.
+         */
+        public int getMaxStack() {
+            return max_stack;
+        }
+
+        /**
+         * Return number of local variables.
+         */
+        public int getMaxLocals() {
+            return max_locals;
+        }
+
+        /**
+         * Return exception index table in Exception attribute.
+         */
+        public int[] get_exc_index_table() {
+            return exc_index_table;
+        }
+
+        /**
+         * Return exception table in code attributre.
+         */
+        public TrapDataIterator getTrapDataIterator() {
+            return new TrapDataIterator(exception_table);
+        }
+
+        /**
+         * Return method attributes.
+         */
+        public Vector getAttributes() {
+            return attrs;
+        }
+
+        /**
+         * Return code attributes.
+         */
+        public Vector getCodeAttributes() {
+            return code_attrs;
+        }
+
+        /**
+         * Return true if method id synthetic.
+         */
+        public boolean isSynthetic() {
+            return isSynthetic;
+        }
+
+        /**
+         * Return true if method is deprecated.
+         */
+        public boolean isDeprecated() {
+            return isDeprecated;
+        }
+
+        public byte[] findAnnotationData(boolean classRetention) {
+            String n = classRetention
+                ? "RuntimeInvisibleAnnotations" : // NOI18N
+                "RuntimeVisibleAnnotations"; // NOI18N
+            AttrData[] arr = new AttrData[attrs.size()];
+            attrs.copyInto(arr);
+            return ClassData.findAttr(n, arr);
+        }
+
+        public boolean isConstructor() {
+            return "<init>".equals(getName());
+        }
+    }
+
+    /* represents one entry of StackMap attribute
+     */
+    private static class StackMapData {
+
+        final int offset;
+        final int[] locals;
+        final int[] stack;
+
+        StackMapData(int offset, int[] locals, int[] stack) {
+            this.offset = offset;
+            this.locals = locals;
+            this.stack = stack;
+        }
+
+        StackMapData(DataInputStream in, MethodData method) throws IOException {
+            offset = in.readUnsignedShort();
+            int local_size = in.readUnsignedShort();
+            locals = readTypeArray(in, local_size, method);
+            int stack_size = in.readUnsignedShort();
+            stack = readTypeArray(in, stack_size, method);
+        }
+
+        static final int[] readTypeArray(DataInputStream in, int length, MethodData method) throws IOException {
+            int[] types = new int[length];
+            for (int i = 0; i < length; i++) {
+                types[i] = readType(in, method);
+            }
+            return types;
+        }
+
+        static final int readType(DataInputStream in, MethodData method) throws IOException {
+            int type = in.readUnsignedByte();
+            if (type == ITEM_Object || type == ITEM_NewObject) {
+                type = type | (in.readUnsignedShort() << 8);
+            }
+            return type;
+        }
+    }
+
+    static final class StackMapIterator {
+
+        private final StackMapTableData[] stackMapTable;
+        private final TypeArray argTypes;
+        private final TypeArray localTypes;
+        private final TypeArray stackTypes;
+        private int nextFrameIndex;
+        private int lastFrameByteCodeOffset;
+        private int byteCodeOffset;
+
+        StackMapIterator(final MethodData methodData) {
+            this(methodData.getStackMapTable(),
+                methodData.getInternalSig(),
+                methodData.isStatic());
+        }
+
+        StackMapIterator(final StackMapTableData[] stackMapTable,
+            final String methodSignature,
+            final boolean isStaticMethod) {
+            this.stackMapTable = (stackMapTable != null)
+                ? stackMapTable
+                : new StackMapTableData[0];
+
+            argTypes = getArgTypes(methodSignature, isStaticMethod);
+            localTypes = new TypeArray();
+            stackTypes = new TypeArray();
+
+            localTypes.addAll(argTypes);
+
+            lastFrameByteCodeOffset = -1;
+            advanceBy(0);
+        }
+
+        public String getFrameAsString() {
+            return (nextFrameIndex == 0)
+                ? StackMapTableData.toString("INITIAL", 0, null, null)
+                : stackMapTable[nextFrameIndex - 1].toString();
+        }
+
+        public int getFrameIndex() {
+            return nextFrameIndex;
+        }
+
+        public TypeArray getFrameStack() {
+            return stackTypes;
+        }
+
+        public TypeArray getFrameLocals() {
+            return localTypes;
+        }
+
+        public TypeArray getArguments() {
+            return argTypes;
+        }
+
+        public void advanceBy(final int numByteCodes) {
+            if (numByteCodes < 0) {
+                throw new IllegalStateException("Forward only iterator");
+            }
+
+            byteCodeOffset += numByteCodes;
+            while ((nextFrameIndex < stackMapTable.length)
+                && ((byteCodeOffset - lastFrameByteCodeOffset)
+                >= (stackMapTable[nextFrameIndex].offsetDelta
+                + 1))) {
+                final StackMapTableData nextFrame = stackMapTable[nextFrameIndex];
+
+                lastFrameByteCodeOffset += nextFrame.offsetDelta + 1;
+                nextFrame.applyTo(localTypes, stackTypes);
+
+                ++nextFrameIndex;
+            }
+        }
+
+        public void advanceTo(final int nextByteCodeOffset) {
+            advanceBy(nextByteCodeOffset - byteCodeOffset);
+        }
+
+        private static TypeArray getArgTypes(final String methodSignature,
+            final boolean isStaticMethod) {
+            final TypeArray argTypes = new TypeArray();
+
+            if (!isStaticMethod) {
+                argTypes.add(ITEM_Object);
+            }
+
+            if (methodSignature.charAt(0) != '(') {
+                throw new IllegalArgumentException("Invalid method signature");
+            }
+
+            final int length = methodSignature.length();
+            boolean skipType = false;
+            int argType;
+            for (int i = 1; i < length; ++i) {
+                switch (methodSignature.charAt(i)) {
+                    case 'B':
+                    case 'C':
+                    case 'S':
+                    case 'Z':
+                    case 'I':
+                        argType = ITEM_Integer;
+                        break;
+                    case 'J':
+                        argType = ITEM_Long;
+                        break;
+                    case 'F':
+                        argType = ITEM_Float;
+                        break;
+                    case 'D':
+                        argType = ITEM_Double;
+                        break;
+                    case 'L': {
+                        i = methodSignature.indexOf(';', i + 1);
+                        if (i == -1) {
+                            throw new IllegalArgumentException(
+                                "Invalid method signature");
+                        }
+                        argType = ITEM_Object;
+                        break;
+                    }
+                    case ')':
+                        // not interested in the return value type
+                        return argTypes;
+                    case '[':
+                        if (!skipType) {
+                            argTypes.add(ITEM_Object);
+                            skipType = true;
+                        }
+                        continue;
+
+                    default:
+                        throw new IllegalArgumentException(
+                            "Invalid method signature");
+                }
+
+                if (!skipType) {
+                    argTypes.add(argType);
+                } else {
+                    skipType = false;
+                }
+            }
+
+            return argTypes;
+        }
+    }
+    /* represents one entry of StackMapTable attribute
+     */
+
+    private static abstract class StackMapTableData {
+
+        final int frameType;
+        int offsetDelta;
+
+        StackMapTableData(int frameType) {
+            this.frameType = frameType;
+        }
+
+        abstract void applyTo(TypeArray localTypes, TypeArray stackTypes);
+
+        protected static String toString(
+            final String frameType,
+            final int offset,
+            final int[] localTypes,
+            final int[] stackTypes) {
+            final StringBuilder sb = new StringBuilder(frameType);
+
+            sb.append("(off: +").append(offset);
+            if (localTypes != null) {
+                sb.append(", locals: ");
+                appendTypes(sb, localTypes);
+            }
+            if (stackTypes != null) {
+                sb.append(", stack: ");
+                appendTypes(sb, stackTypes);
+            }
+            sb.append(')');
+
+            return sb.toString();
+        }
+
+        private static void appendTypes(final StringBuilder sb, final int[] types) {
+            sb.append('[');
+            if (types.length > 0) {
+                sb.append(TypeArray.typeString(types[0]));
+                for (int i = 1; i < types.length; ++i) {
+                    sb.append(", ");
+                    sb.append(TypeArray.typeString(types[i]));
+                }
+            }
+            sb.append(']');
+        }
+
+        private static class SameFrame extends StackMapTableData {
+
+            SameFrame(int frameType, int offsetDelta) {
+                super(frameType);
+                this.offsetDelta = offsetDelta;
+            }
+
+            @Override
+            void applyTo(TypeArray localTypes, TypeArray stackTypes) {
+                stackTypes.clear();
+            }
+
+            @Override
+            public String toString() {
+                return toString("SAME" + ((frameType == SAME_FRAME_EXTENDED)
+                    ? "_FRAME_EXTENDED" : ""),
+                    offsetDelta,
+                    null, null);
+            }
+        }
+
+        private static class SameLocals1StackItem extends StackMapTableData {
+
+            final int[] stack;
+
+            SameLocals1StackItem(int frameType, int offsetDelta, int[] stack) {
+                super(frameType);
+                this.offsetDelta = offsetDelta;
+                this.stack = stack;
+            }
+
+            @Override
+            void applyTo(TypeArray localTypes, TypeArray stackTypes) {
+                stackTypes.setAll(stack);
+            }
+
+            @Override
+            public String toString() {
+                return toString(
+                    "SAME_LOCALS_1_STACK_ITEM"
+                    + ((frameType == SAME_LOCALS_1_STACK_ITEM_EXTENDED)
+                    ? "_EXTENDED" : ""),
+                    offsetDelta,
+                    null, stack);
+            }
+        }
+
+        private static class ChopFrame extends StackMapTableData {
+
+            ChopFrame(int frameType, int offsetDelta) {
+                super(frameType);
+                this.offsetDelta = offsetDelta;
+            }
+
+            @Override
+            void applyTo(TypeArray localTypes, TypeArray stackTypes) {
+                localTypes.setSize(localTypes.getSize()
+                    - (SAME_FRAME_EXTENDED - frameType));
+                stackTypes.clear();
+            }
+
+            @Override
+            public String toString() {
+                return toString("CHOP", offsetDelta, null, null);
+            }
+        }
+
+        private static class AppendFrame extends StackMapTableData {
+
+            final int[] locals;
+
+            AppendFrame(int frameType, int offsetDelta, int[] locals) {
+                super(frameType);
+                this.offsetDelta = offsetDelta;
+                this.locals = locals;
+            }
+
+            @Override
+            void applyTo(TypeArray localTypes, TypeArray stackTypes) {
+                localTypes.addAll(locals);
+                stackTypes.clear();
+            }
+
+            @Override
+            public String toString() {
+                return toString("APPEND", offsetDelta, locals, null);
+            }
+        }
+
+        private static class FullFrame extends StackMapTableData {
+
+            final int[] locals;
+            final int[] stack;
+
+            FullFrame(int offsetDelta, int[] locals, int[] stack) {
+                super(FULL_FRAME);
+                this.offsetDelta = offsetDelta;
+                this.locals = locals;
+                this.stack = stack;
+            }
+
+            @Override
+            void applyTo(TypeArray localTypes, TypeArray stackTypes) {
+                localTypes.setAll(locals);
+                stackTypes.setAll(stack);
+            }
+
+            @Override
+            public String toString() {
+                return toString("FULL", offsetDelta, locals, stack);
+            }
+        }
+
+        static StackMapTableData getInstance(DataInputStream in, MethodData method)
+            throws IOException {
+            int frameType = in.readUnsignedByte();
+
+            if (frameType < SAME_FRAME_BOUND) {
+                // same_frame
+                return new SameFrame(frameType, frameType);
+            } else if (SAME_FRAME_BOUND <= frameType && frameType < SAME_LOCALS_1_STACK_ITEM_BOUND) {
+                // same_locals_1_stack_item_frame
+                // read additional single stack element
+                return new SameLocals1StackItem(frameType,
+                    (frameType - SAME_FRAME_BOUND),
+                    StackMapData.readTypeArray(in, 1, method));
+            } else if (frameType == SAME_LOCALS_1_STACK_ITEM_EXTENDED) {
+                // same_locals_1_stack_item_extended
+                return new SameLocals1StackItem(frameType,
+                    in.readUnsignedShort(),
+                    StackMapData.readTypeArray(in, 1, method));
+            } else if (SAME_LOCALS_1_STACK_ITEM_EXTENDED < frameType && frameType < SAME_FRAME_EXTENDED) {
+                // chop_frame or same_frame_extended
+                return new ChopFrame(frameType, in.readUnsignedShort());
+            } else if (frameType == SAME_FRAME_EXTENDED) {
+                // chop_frame or same_frame_extended
+                return new SameFrame(frameType, in.readUnsignedShort());
+            } else if (SAME_FRAME_EXTENDED < frameType && frameType < FULL_FRAME) {
+                // append_frame
+                return new AppendFrame(frameType, in.readUnsignedShort(),
+                    StackMapData.readTypeArray(in, frameType - SAME_FRAME_EXTENDED, method));
+            } else if (frameType == FULL_FRAME) {
+                // full_frame
+                int offsetDelta = in.readUnsignedShort();
+                int locals_size = in.readUnsignedShort();
+                int[] locals = StackMapData.readTypeArray(in, locals_size, method);
+                int stack_size = in.readUnsignedShort();
+                int[] stack = StackMapData.readTypeArray(in, stack_size, method);
+                return new FullFrame(offsetDelta, locals, stack);
+            } else {
+                throw new ClassFormatError("unrecognized frame_type in StackMapTable");
+            }
+        }
+    }
+
+    /**
+     * Stores exception table data in code attribute.
+     *
+     * @author Sucheta Dambalkar (Adopted code from jdis)
+     */
+    static final class TrapData {
+
+        public final short start_pc;
+        public final short end_pc;
+        public final short handler_pc;
+        public final short catch_cpx;
+        final int num;
+
+        /**
+         * Read and store exception table data in code attribute.
+         */
+        TrapData(DataInputStream in, int num) throws IOException {
+            this.num = num;
+            start_pc = in.readShort();
+            end_pc = in.readShort();
+            handler_pc = in.readShort();
+            catch_cpx = in.readShort();
+        }
+
+        /**
+         * returns recommended identifier
+         */
+        public String ident() {
+            return "t" + num;
+        }
+    }
+    /**
+     *
+     * @author Jaroslav Tulach <jtulach@netbeans.org>
+     */
+    static final class TrapDataIterator {
+
+        private final Hashtable exStart = new Hashtable();
+        private final Hashtable exStop = new Hashtable();
+        private TrapData[] current = new TrapData[10];
+        private int currentCount;
+
+        TrapDataIterator(Vector exceptionTable) {
+            for (int i = 0; i < exceptionTable.size(); i++) {
+                final TrapData td = (TrapData) exceptionTable.elementAt(i);
+                put(exStart, td.start_pc, td);
+                put(exStop, td.end_pc, td);
+            }
+        }
+
+        private static void put(Hashtable h, short key, TrapData td) {
+            Short s = Short.valueOf((short) key);
+            Vector v = (Vector) h.get(s);
+            if (v == null) {
+                v = new Vector(1);
+                h.put(s, v);
+            }
+            v.add(td);
+        }
+
+        private boolean processAll(Hashtable h, Short key, boolean add) {
+            boolean change = false;
+            Vector v = (Vector) h.get(key);
+            if (v != null) {
+                int s = v.size();
+                for (int i = 0; i < s; i++) {
+                    TrapData td = (TrapData) v.elementAt(i);
+                    if (add) {
+                        add(td);
+                        change = true;
+                    } else {
+                        remove(td);
+                        change = true;
+                    }
+                }
+            }
+            return change;
+        }
+
+        public boolean advanceTo(int i) {
+            Short s = Short.valueOf((short) i);
+            boolean ch1 = processAll(exStart, s, true);
+            boolean ch2 = processAll(exStop, s, false);
+            return ch1 || ch2;
+        }
+
+        public boolean useTry() {
+            return currentCount > 0;
+        }
+
+        public TrapData[] current() {
+            TrapData[] copy = new TrapData[currentCount];
+            for (int i = 0; i < currentCount; i++) {
+                copy[i] = current[i];
+            }
+            return copy;
+        }
+
+        private void add(TrapData e) {
+            if (currentCount == current.length) {
+                TrapData[] data = new TrapData[currentCount * 2];
+                for (int i = 0; i < currentCount; i++) {
+                    data[i] = current[i];
+                }
+                current = data;
+            }
+            current[currentCount++] = e;
+        }
+
+        private void remove(TrapData e) {
+            if (currentCount == 0) {
+                return;
+            }
+            int from = 0;
+            while (from < currentCount) {
+                if (e == current[from++]) {
+                    break;
+                }
+            }
+            while (from < currentCount) {
+                current[from - 1] = current[from];
+                current[from] = null;
+                from++;
+            }
+            currentCount--;
+        }
+    }
+    static final class TypeArray {
+
+        private static final int CAPACITY_INCREMENT = 16;
+        private int[] types;
+        private int size;
+
+        public TypeArray() {
+        }
+
+        public TypeArray(final TypeArray initialTypes) {
+            setAll(initialTypes);
+        }
+
+        public void add(final int newType) {
+            ensureCapacity(size + 1);
+            types[size++] = newType;
+        }
+
+        public void addAll(final TypeArray newTypes) {
+            addAll(newTypes.types, 0, newTypes.size);
+        }
+
+        public void addAll(final int[] newTypes) {
+            addAll(newTypes, 0, newTypes.length);
+        }
+
+        public void addAll(final int[] newTypes,
+            final int offset,
+            final int count) {
+            if (count > 0) {
+                ensureCapacity(size + count);
+                arraycopy(newTypes, offset, types, size, count);
+                size += count;
+            }
+        }
+
+        public void set(final int index, final int newType) {
+            types[index] = newType;
+        }
+
+        public void setAll(final TypeArray newTypes) {
+            setAll(newTypes.types, 0, newTypes.size);
+        }
+
+        public void setAll(final int[] newTypes) {
+            setAll(newTypes, 0, newTypes.length);
+        }
+
+        public void setAll(final int[] newTypes,
+            final int offset,
+            final int count) {
+            if (count > 0) {
+                ensureCapacity(count);
+                arraycopy(newTypes, offset, types, 0, count);
+                size = count;
+            } else {
+                clear();
+            }
+        }
+
+        public void setSize(final int newSize) {
+            if (size != newSize) {
+                ensureCapacity(newSize);
+
+                for (int i = size; i < newSize; ++i) {
+                    types[i] = 0;
+                }
+                size = newSize;
+            }
+        }
+
+        public void clear() {
+            size = 0;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public int get(final int index) {
+            return types[index];
+        }
+
+        public static String typeString(final int type) {
+            switch (type & 0xff) {
+                case ITEM_Bogus:
+                    return "_top_";
+                case ITEM_Integer:
+                    return "_int_";
+                case ITEM_Float:
+                    return "_float_";
+                case ITEM_Double:
+                    return "_double_";
+                case ITEM_Long:
+                    return "_long_";
+                case ITEM_Null:
+                    return "_null_";
+                case ITEM_InitObject: // UninitializedThis
+                    return "_init_";
+                case ITEM_Object:
+                    return "_object_";
+                case ITEM_NewObject: // Uninitialized
+                    return "_new_";
+                default:
+                    throw new IllegalArgumentException("Unknown type");
+            }
+        }
+
+        @Override
+        public String toString() {
+            final StringBuilder sb = new StringBuilder("[");
+            if (size > 0) {
+                sb.append(typeString(types[0]));
+                for (int i = 1; i < size; ++i) {
+                    sb.append(", ");
+                    sb.append(typeString(types[i]));
+                }
+            }
+
+            return sb.append(']').toString();
+        }
+
+        private void ensureCapacity(final int minCapacity) {
+            if ((minCapacity == 0)
+                || (types != null) && (minCapacity <= types.length)) {
+                return;
+            }
+
+            final int newCapacity =
+                ((minCapacity + CAPACITY_INCREMENT - 1) / CAPACITY_INCREMENT)
+                * CAPACITY_INCREMENT;
+            final int[] newTypes = new int[newCapacity];
+
+            if (size > 0) {
+                arraycopy(types, 0, newTypes, 0, size);
+            }
+
+            types = newTypes;
+        }
+
+        // no System.arraycopy
+        private void arraycopy(final int[] src, final int srcPos,
+            final int[] dest, final int destPos,
+            final int length) {
+            for (int i = 0; i < length; ++i) {
+                dest[destPos + i] = src[srcPos + i];
+            }
+        }
+    }
+    /**
+     * A JavaScript ready replacement for java.util.Vector
+     *
+     * @author Jaroslav Tulach <jtulach@netbeans.org>
+     */
+    @JavaScriptPrototype(prototype = "new Array")
+    private static final class Vector {
+
+        private Object[] arr;
+
+        Vector() {
+        }
+
+        Vector(int i) {
+        }
+
+        void add(Object objectType) {
+            addElement(objectType);
+        }
+
+        @JavaScriptBody(args = {"obj"}, body =
+            "this.push(obj);")
+        void addElement(Object obj) {
+            final int s = size();
+            setSize(s + 1);
+            setElementAt(obj, s);
+        }
+
+        @JavaScriptBody(args = {}, body =
+            "return this.length;")
+        int size() {
+            return arr == null ? 0 : arr.length;
+        }
+
+        @JavaScriptBody(args = {"newArr"}, body =
+            "for (var i = 0; i < this.length; i++) {\n"
+            + "  newArr[i] = this[i];\n"
+            + "}\n")
+        void copyInto(Object[] newArr) {
+            if (arr == null) {
+                return;
+            }
+            int min = Math.min(newArr.length, arr.length);
+            for (int i = 0; i < min; i++) {
+                newArr[i] = arr[i];
+            }
+        }
+
+        @JavaScriptBody(args = {"index"}, body =
+            "return this[index];")
+        Object elementAt(int index) {
+            return arr[index];
+        }
+
+        private void setSize(int len) {
+            Object[] newArr = new Object[len];
+            copyInto(newArr);
+            arr = newArr;
+        }
+
+        @JavaScriptBody(args = {"val", "index"}, body =
+            "this[index] = val;")
+        void setElementAt(Object val, int index) {
+            arr[index] = val;
+        }
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1936 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.IOException;
+import java.io.InputStream;
+import static org.apidesign.vm4brwsr.ByteCodeParser.*;
+
+/** Translator of the code inside class files to JavaScript.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+abstract class ByteCodeToJavaScript {
+    private ClassData jc;
+    final Appendable out;
+
+    protected ByteCodeToJavaScript(Appendable out) {
+        this.out = out;
+    }
+    
+    /* Collects additional required resources.
+     * 
+     * @param internalClassName classes that were referenced and should be loaded in order the
+     *   generated JavaScript code works properly. The names are in internal 
+     *   JVM form so String is <code>java/lang/String</code>. 
+     */
+    protected abstract boolean requireReference(String internalClassName);
+    
+    /*
+     * @param resourcePath name of resources to read
+     */
+    protected abstract void requireScript(String resourcePath) throws IOException;
+    
+    /** Allows subclasses to redefine what field a function representing a
+     * class gets assigned. By default it returns the suggested name followed
+     * by <code>" = "</code>;
+     * 
+     * @param className suggested name of the class
+     */
+    /* protected */ String assignClass(String className) {
+        return className + " = ";
+    }
+    /* protected */ String accessClass(String classOperation) {
+        return classOperation;
+    }
+    
+    /** Prints out a debug message. 
+     * 
+     * @param msg the message
+     * @return true if the message has been printed
+     * @throws IOException 
+     */
+    boolean debug(String msg) throws IOException {
+        out.append(msg);
+        return true;
+    }
+
+    /**
+     * Converts a given class file to a JavaScript version.
+     *
+     * @param classFile input stream with code of the .class file
+     * @return the initialization code for this class, if any. Otherwise <code>null</code>
+     * 
+     * @throws IOException if something goes wrong during read or write or translating
+     */
+    
+    public String compile(InputStream classFile) throws IOException {
+        this.jc = new ClassData(classFile);
+        if (jc.getMajor_version() < 50) {
+            throw new IOException("Can't compile " + jc.getClassName() + ". Class file version " + jc.getMajor_version() + "."
+                + jc.getMinor_version() + " - recompile with -target 1.6 (at least)."
+            );
+        }
+        byte[] arrData = jc.findAnnotationData(true);
+        String[] arr = findAnnotation(arrData, jc, 
+            "org.apidesign.bck2brwsr.core.ExtraJavaScript", 
+            "resource", "processByteCode"
+        );
+        if (arr != null) {
+            requireScript(arr[0]);
+            if ("0".equals(arr[1])) {
+                return null;
+            }
+        }
+        String[] proto = findAnnotation(arrData, jc, 
+            "org.apidesign.bck2brwsr.core.JavaScriptPrototype", 
+            "container", "prototype"
+        );
+        StringArray toInitilize = new StringArray();
+        final String className = className(jc);
+        out.append("\n\n").append(assignClass(className));
+        out.append("function CLS() {");
+        out.append("\n  if (!CLS.$class) {");
+        if (proto == null) {
+            String sc = jc.getSuperClassName(); // with _
+            out.append("\n    var pp = ").
+                append(accessClass(sc.replace('/', '_'))).append("(true);");
+            out.append("\n    var p = CLS.prototype = pp;");
+            out.append("\n    var c = p;");
+            out.append("\n    var sprcls = pp.constructor.$class;");
+        } else {
+            out.append("\n    var p = CLS.prototype = ").append(proto[1]).append(";");
+            if (proto[0] == null) {
+                proto[0] = "p";
+            }
+            out.append("\n    var c = ").append(proto[0]).append(";");
+            out.append("\n    var sprcls = null;");
+        }
+        for (FieldData v : jc.getFields()) {
+            if (v.isStatic()) {
+                out.append("\n  CLS.").append(v.getName()).append(initField(v));
+                out.append("\n  c._").append(v.getName()).append(" = function (v) {")
+                   .append("  if (arguments.length == 1) CLS.").append(v.getName())
+                   .append(" = v; return CLS.").
+                    append(v.getName()).append("; };");
+            } else {
+                out.append("\n  c._").append(v.getName()).append(" = function (v) {")
+                   .append("  if (arguments.length == 1) this.fld_").
+                    append(className).append('_').append(v.getName())
+                   .append(" = v; return this.fld_").
+                    append(className).append('_').append(v.getName())
+                   .append("; };");
+            }
+        }
+        for (MethodData m : jc.getMethods()) {
+            byte[] onlyArr = m.findAnnotationData(true);
+            String[] only = findAnnotation(onlyArr, jc, 
+                "org.apidesign.bck2brwsr.core.JavaScriptOnly", 
+                "name", "value"
+            );
+            if (only != null) {
+                if (only[0] != null && only[1] != null) {
+                    out.append("\n    p.").append(only[0]).append(" = ")
+                        .append(only[1]).append(";");
+                }
+                continue;
+            }
+            String prefix;
+            String mn;
+            if (m.isStatic()) {
+                prefix = "\n    c.";
+                mn = generateStaticMethod(prefix, m, toInitilize);
+            } else {
+                if (m.isConstructor()) {
+                    prefix = "\n    CLS.";
+                    mn = generateInstanceMethod(prefix, m);
+                } else {
+                    prefix = "\n    c.";
+                    mn = generateInstanceMethod(prefix, m);
+                }
+            }
+            byte[] runAnno = m.findAnnotationData(false);
+            if (runAnno != null) {
+                out.append(prefix).append(mn).append(".anno = {");
+                generateAnno(jc, out, runAnno);
+                out.append("\n    };");
+            }
+            out.append(prefix).append(mn).append(".access = " + m.getAccess()).append(";");
+            out.append(prefix).append(mn).append(".cls = CLS;");
+        }
+        out.append("\n    c.constructor = CLS;");
+        out.append("\n    c.$instOf_").append(className).append(" = true;");
+        for (String superInterface : jc.getSuperInterfaces()) {
+            out.append("\n    c.$instOf_").append(superInterface.replace('/', '_')).append(" = true;");
+        }
+        out.append("\n    CLS.$class = 'temp';");
+        out.append("\n    CLS.$class = ");
+        out.append(accessClass("java_lang_Class(true);"));
+        out.append("\n    CLS.$class.jvmName = '").append(jc.getClassName()).append("';");
+        out.append("\n    CLS.$class.superclass = sprcls;");
+        out.append("\n    CLS.$class.access = ").append(jc.getAccessFlags()+";");
+        out.append("\n    CLS.$class.cnstr = CLS;");
+        byte[] classAnno = jc.findAnnotationData(false);
+        if (classAnno != null) {
+            out.append("\n    CLS.$class.anno = {");
+            generateAnno(jc, out, classAnno);
+            out.append("\n    };");
+        }
+        for (String init : toInitilize.toArray()) {
+            out.append("\n    ").append(init).append("();");
+        }
+        out.append("\n  }");
+        out.append("\n  if (arguments.length === 0) {");
+        out.append("\n    if (!(this instanceof CLS)) {");
+        out.append("\n      return new CLS();");
+        out.append("\n    }");
+        for (FieldData v : jc.getFields()) {
+            byte[] onlyArr = v.findAnnotationData(true);
+            String[] only = findAnnotation(onlyArr, jc, 
+                "org.apidesign.bck2brwsr.core.JavaScriptOnly", 
+                "name", "value"
+            );
+            if (only != null) {
+                if (only[0] != null && only[1] != null) {
+                    out.append("\n    p.").append(only[0]).append(" = ")
+                        .append(only[1]).append(";");
+                }
+                continue;
+            }
+            if (!v.isStatic()) {
+                out.append("\n    this.fld_").
+                    append(className).append('_').
+                    append(v.getName()).append(initField(v));
+            }
+        }
+        out.append("\n    return this;");
+        out.append("\n  }");
+        out.append("\n  return arguments[0] ? new CLS() : CLS.prototype;");
+        out.append("\n};");
+//        StringBuilder sb = new StringBuilder();
+//        for (String init : toInitilize.toArray()) {
+//            sb.append("\n").append(init).append("();");
+//        }
+        return "";
+    }
+    private String generateStaticMethod(String prefix, MethodData m, StringArray toInitilize) throws IOException {
+        String jsb = javaScriptBody(prefix, m, true);
+        if (jsb != null) {
+            return jsb;
+        }
+        final String mn = findMethodName(m, new StringBuilder());
+        if (mn.equals("class__V")) {
+            toInitilize.add(accessClass(className(jc)) + "(false)." + mn);
+        }
+        generateMethod(prefix, mn, m);
+        return mn;
+    }
+
+    private String generateInstanceMethod(String prefix, MethodData m) throws IOException {
+        String jsb = javaScriptBody(prefix, m, false);
+        if (jsb != null) {
+            return jsb;
+        }
+        final String mn = findMethodName(m, new StringBuilder());
+        generateMethod(prefix, mn, m);
+        return mn;
+    }
+
+    private void generateMethod(String prefix, String name, MethodData m)
+            throws IOException {
+        final StackMapIterator stackMapIterator = m.createStackMapIterator();
+        TrapDataIterator trap = m.getTrapDataIterator();
+        final LocalsMapper lmapper =
+                new LocalsMapper(stackMapIterator.getArguments());
+
+        out.append(prefix).append(name).append(" = function(");
+        lmapper.outputArguments(out, m.isStatic());
+        out.append(") {").append("\n");
+
+        final byte[] byteCodes = m.getCode();
+        if (byteCodes == null) {
+            out.append("  throw 'no code found for ")
+               .append(jc.getClassName()).append('.')
+               .append(m.getName()).append("';\n");
+            out.append("};");
+            return;
+        }
+
+        final StackMapper smapper = new StackMapper();
+
+        if (!m.isStatic()) {
+            out.append("  var ").append(" lcA0 = this;\n");
+        }
+
+        int lastStackFrame = -1;
+        TrapData[] previousTrap = null;
+        boolean wide = false;
+        
+        out.append("\n  var gt = 0;\n");
+        int openBraces = 0;
+        int topMostLabel = 0;
+        for (int i = 0; i < byteCodes.length; i++) {
+            int prev = i;
+            stackMapIterator.advanceTo(i);
+            boolean changeInCatch = trap.advanceTo(i);
+            if (changeInCatch || lastStackFrame != stackMapIterator.getFrameIndex()) {
+                if (previousTrap != null) {
+                    generateCatch(previousTrap, i, topMostLabel);
+                    previousTrap = null;
+                }
+            }
+            if (lastStackFrame != stackMapIterator.getFrameIndex()) {
+                if (i != 0) {
+                    out.append("    }\n");
+                }
+                if (openBraces > 64) {
+                    for (int c = 0; c < 64; c++) {
+                        out.append("break;}\n");
+                    }
+                    openBraces = 1;
+                    topMostLabel = i;
+                }
+                
+                lastStackFrame = stackMapIterator.getFrameIndex();
+                lmapper.syncWithFrameLocals(stackMapIterator.getFrameLocals());
+                smapper.syncWithFrameStack(stackMapIterator.getFrameStack());
+                out.append("    X_" + i).append(": for (;;) { IF: if (gt <= " + i + ") {\n");
+                openBraces++;
+                changeInCatch = true;
+            } else {
+                debug("    /* " + i + " */ ");
+            }
+            if (changeInCatch && trap.useTry()) {
+                out.append("try {");
+                previousTrap = trap.current();
+            }
+            final int c = readUByte(byteCodes, i);
+            switch (c) {
+                case opc_aload_0:
+                    emit(out, "var @1 = @2;", smapper.pushA(), lmapper.getA(0));
+                    break;
+                case opc_iload_0:
+                    emit(out, "var @1 = @2;", smapper.pushI(), lmapper.getI(0));
+                    break;
+                case opc_lload_0:
+                    emit(out, "var @1 = @2;", smapper.pushL(), lmapper.getL(0));
+                    break;
+                case opc_fload_0:
+                    emit(out, "var @1 = @2;", smapper.pushF(), lmapper.getF(0));
+                    break;
+                case opc_dload_0:
+                    emit(out, "var @1 = @2;", smapper.pushD(), lmapper.getD(0));
+                    break;
+                case opc_aload_1:
+                    emit(out, "var @1 = @2;", smapper.pushA(), lmapper.getA(1));
+                    break;
+                case opc_iload_1:
+                    emit(out, "var @1 = @2;", smapper.pushI(), lmapper.getI(1));
+                    break;
+                case opc_lload_1:
+                    emit(out, "var @1 = @2;", smapper.pushL(), lmapper.getL(1));
+                    break;
+                case opc_fload_1:
+                    emit(out, "var @1 = @2;", smapper.pushF(), lmapper.getF(1));
+                    break;
+                case opc_dload_1:
+                    emit(out, "var @1 = @2;", smapper.pushD(), lmapper.getD(1));
+                    break;
+                case opc_aload_2:
+                    emit(out, "var @1 = @2;", smapper.pushA(), lmapper.getA(2));
+                    break;
+                case opc_iload_2:
+                    emit(out, "var @1 = @2;", smapper.pushI(), lmapper.getI(2));
+                    break;
+                case opc_lload_2:
+                    emit(out, "var @1 = @2;", smapper.pushL(), lmapper.getL(2));
+                    break;
+                case opc_fload_2:
+                    emit(out, "var @1 = @2;", smapper.pushF(), lmapper.getF(2));
+                    break;
+                case opc_dload_2:
+                    emit(out, "var @1 = @2;", smapper.pushD(), lmapper.getD(2));
+                    break;
+                case opc_aload_3:
+                    emit(out, "var @1 = @2;", smapper.pushA(), lmapper.getA(3));
+                    break;
+                case opc_iload_3:
+                    emit(out, "var @1 = @2;", smapper.pushI(), lmapper.getI(3));
+                    break;
+                case opc_lload_3:
+                    emit(out, "var @1 = @2;", smapper.pushL(), lmapper.getL(3));
+                    break;
+                case opc_fload_3:
+                    emit(out, "var @1 = @2;", smapper.pushF(), lmapper.getF(3));
+                    break;
+                case opc_dload_3:
+                    emit(out, "var @1 = @2;", smapper.pushD(), lmapper.getD(3));
+                    break;
+                case opc_iload: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         smapper.pushI(), lmapper.getI(indx));
+                    break;
+                }
+                case opc_lload: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         smapper.pushL(), lmapper.getL(indx));
+                    break;
+                }
+                case opc_fload: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         smapper.pushF(), lmapper.getF(indx));
+                    break;
+                }
+                case opc_dload: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         smapper.pushD(), lmapper.getD(indx));
+                    break;
+                }
+                case opc_aload: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         smapper.pushA(), lmapper.getA(indx));
+                    break;
+                }
+                case opc_istore: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         lmapper.setI(indx), smapper.popI());
+                    break;
+                }
+                case opc_lstore: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         lmapper.setL(indx), smapper.popL());
+                    break;
+                }
+                case opc_fstore: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         lmapper.setF(indx), smapper.popF());
+                    break;
+                }
+                case opc_dstore: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         lmapper.setD(indx), smapper.popD());
+                    break;
+                }
+                case opc_astore: {
+                    ++i;
+                    final int indx = wide ? readUShort(byteCodes, i++)
+                                          : readUByte(byteCodes, i);
+                    wide = false;
+                    emit(out, "var @1 = @2;",
+                         lmapper.setA(indx), smapper.popA());
+                    break;
+                }
+                case opc_astore_0:
+                    emit(out, "var @1 = @2;", lmapper.setA(0), smapper.popA());
+                    break;
+                case opc_istore_0:
+                    emit(out, "var @1 = @2;", lmapper.setI(0), smapper.popI());
+                    break;
+                case opc_lstore_0:
+                    emit(out, "var @1 = @2;", lmapper.setL(0), smapper.popL());
+                    break;
+                case opc_fstore_0:
+                    emit(out, "var @1 = @2;", lmapper.setF(0), smapper.popF());
+                    break;
+                case opc_dstore_0:
+                    emit(out, "var @1 = @2;", lmapper.setD(0), smapper.popD());
+                    break;
+                case opc_astore_1:
+                    emit(out, "var @1 = @2;", lmapper.setA(1), smapper.popA());
+                    break;
+                case opc_istore_1:
+                    emit(out, "var @1 = @2;", lmapper.setI(1), smapper.popI());
+                    break;
+                case opc_lstore_1:
+                    emit(out, "var @1 = @2;", lmapper.setL(1), smapper.popL());
+                    break;
+                case opc_fstore_1:
+                    emit(out, "var @1 = @2;", lmapper.setF(1), smapper.popF());
+                    break;
+                case opc_dstore_1:
+                    emit(out, "var @1 = @2;", lmapper.setD(1), smapper.popD());
+                    break;
+                case opc_astore_2:
+                    emit(out, "var @1 = @2;", lmapper.setA(2), smapper.popA());
+                    break;
+                case opc_istore_2:
+                    emit(out, "var @1 = @2;", lmapper.setI(2), smapper.popI());
+                    break;
+                case opc_lstore_2:
+                    emit(out, "var @1 = @2;", lmapper.setL(2), smapper.popL());
+                    break;
+                case opc_fstore_2:
+                    emit(out, "var @1 = @2;", lmapper.setF(2), smapper.popF());
+                    break;
+                case opc_dstore_2:
+                    emit(out, "var @1 = @2;", lmapper.setD(2), smapper.popD());
+                    break;
+                case opc_astore_3:
+                    emit(out, "var @1 = @2;", lmapper.setA(3), smapper.popA());
+                    break;
+                case opc_istore_3:
+                    emit(out, "var @1 = @2;", lmapper.setI(3), smapper.popI());
+                    break;
+                case opc_lstore_3:
+                    emit(out, "var @1 = @2;", lmapper.setL(3), smapper.popL());
+                    break;
+                case opc_fstore_3:
+                    emit(out, "var @1 = @2;", lmapper.setF(3), smapper.popF());
+                    break;
+                case opc_dstore_3:
+                    emit(out, "var @1 = @2;", lmapper.setD(3), smapper.popD());
+                    break;
+                case opc_iadd:
+                    emit(out, "@1 = @1.add32(@2);", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_ladd:
+                    emit(out, "@1 = @1.add64(@2);", smapper.getL(1), smapper.popL());
+                    break;
+                case opc_fadd:
+                    emit(out, "@1 += @2;", smapper.getF(1), smapper.popF());
+                    break;
+                case opc_dadd:
+                    emit(out, "@1 += @2;", smapper.getD(1), smapper.popD());
+                    break;
+                case opc_isub:
+                    emit(out, "@1 = @1.sub32(@2);", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_lsub:
+                    emit(out, "@1 = @1.sub64(@2);", smapper.getL(1), smapper.popL());
+                    break;
+                case opc_fsub:
+                    emit(out, "@1 -= @2;", smapper.getF(1), smapper.popF());
+                    break;
+                case opc_dsub:
+                    emit(out, "@1 -= @2;", smapper.getD(1), smapper.popD());
+                    break;
+                case opc_imul:
+                    emit(out, "@1 = @1.mul32(@2);", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_lmul:
+                    emit(out, "@1 = @1.mul64(@2);", smapper.getL(1), smapper.popL());
+                    break;
+                case opc_fmul:
+                    emit(out, "@1 *= @2;", smapper.getF(1), smapper.popF());
+                    break;
+                case opc_dmul:
+                    emit(out, "@1 *= @2;", smapper.getD(1), smapper.popD());
+                    break;
+                case opc_idiv:
+                    emit(out, "@1 = @1.div32(@2);",
+                         smapper.getI(1), smapper.popI());
+                    break;
+                case opc_ldiv:
+                    emit(out, "@1 = @1.div64(@2);",
+                         smapper.getL(1), smapper.popL());
+                    break;
+                case opc_fdiv:
+                    emit(out, "@1 /= @2;", smapper.getF(1), smapper.popF());
+                    break;
+                case opc_ddiv:
+                    emit(out, "@1 /= @2;", smapper.getD(1), smapper.popD());
+                    break;
+                case opc_irem:
+                    emit(out, "@1 = @1.mod32(@2);",
+                         smapper.getI(1), smapper.popI());
+                    break;
+                case opc_lrem:
+                    emit(out, "@1 = @1.mod64(@2);",
+                         smapper.getL(1), smapper.popL());
+                    break;
+                case opc_frem:
+                    emit(out, "@1 %= @2;", smapper.getF(1), smapper.popF());
+                    break;
+                case opc_drem:
+                    emit(out, "@1 %= @2;", smapper.getD(1), smapper.popD());
+                    break;
+                case opc_iand:
+                    emit(out, "@1 &= @2;", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_land:
+                    emit(out, "@1 = @1.and64(@2);", smapper.getL(1), smapper.popL());
+                    break;
+                case opc_ior:
+                    emit(out, "@1 |= @2;", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_lor:
+                    emit(out, "@1 = @1.or64(@2);", smapper.getL(1), smapper.popL());
+                    break;
+                case opc_ixor:
+                    emit(out, "@1 ^= @2;", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_lxor:
+                    emit(out, "@1 = @1.xor64(@2);", smapper.getL(1), smapper.popL());
+                    break;
+                case opc_ineg:
+                    emit(out, "@1 = @1.neg32();", smapper.getI(0));
+                    break;
+                case opc_lneg:
+                    emit(out, "@1 = @1.neg64();", smapper.getL(0));
+                    break;
+                case opc_fneg:
+                    emit(out, "@1 = -@1;", smapper.getF(0));
+                    break;
+                case opc_dneg:
+                    emit(out, "@1 = -@1;", smapper.getD(0));
+                    break;
+                case opc_ishl:
+                    emit(out, "@1 <<= @2;", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_lshl:
+                    emit(out, "@1 = @1.shl64(@2);", smapper.getL(1), smapper.popI());
+                    break;
+                case opc_ishr:
+                    emit(out, "@1 >>= @2;", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_lshr:
+                    emit(out, "@1 = @1.shr64(@2);", smapper.getL(1), smapper.popI());
+                    break;
+                case opc_iushr:
+                    emit(out, "@1 >>>= @2;", smapper.getI(1), smapper.popI());
+                    break;
+                case opc_lushr:
+                    emit(out, "@1 = @1.ushr64(@2);", smapper.getL(1), smapper.popI());
+                    break;
+                case opc_iinc: {
+                    ++i;
+                    final int varIndx = wide ? readUShort(byteCodes, i++)
+                                             : readUByte(byteCodes, i);
+                    ++i;
+                    final int incrBy = wide ? readShort(byteCodes, i++)
+                                            : byteCodes[i];
+                    wide = false;
+                    if (incrBy == 1) {
+                        emit(out, "@1++;", lmapper.getI(varIndx));
+                    } else {
+                        emit(out, "@1 += @2;",
+                             lmapper.getI(varIndx),
+                             Integer.toString(incrBy));
+                    }
+                    break;
+                }
+                case opc_return:
+                    emit(out, "return;");
+                    break;
+                case opc_ireturn:
+                    emit(out, "return @1;", smapper.popI());
+                    break;
+                case opc_lreturn:
+                    emit(out, "return @1;", smapper.popL());
+                    break;
+                case opc_freturn:
+                    emit(out, "return @1;", smapper.popF());
+                    break;
+                case opc_dreturn:
+                    emit(out, "return @1;", smapper.popD());
+                    break;
+                case opc_areturn:
+                    emit(out, "return @1;", smapper.popA());
+                    break;
+                case opc_i2l:
+                    emit(out, "var @2 = @1;", smapper.popI(), smapper.pushL());
+                    break;
+                case opc_i2f:
+                    emit(out, "var @2 = @1;", smapper.popI(), smapper.pushF());
+                    break;
+                case opc_i2d:
+                    emit(out, "var @2 = @1;", smapper.popI(), smapper.pushD());
+                    break;
+                case opc_l2i:
+                    emit(out, "var @2 = @1.toInt32();", smapper.popL(), smapper.pushI());
+                    break;
+                    // max int check?
+                case opc_l2f:
+                    emit(out, "var @2 = @1.toFP();", smapper.popL(), smapper.pushF());
+                    break;
+                case opc_l2d:
+                    emit(out, "var @2 = @1.toFP();", smapper.popL(), smapper.pushD());
+                    break;
+                case opc_f2d:
+                    emit(out, "var @2 = @1;", smapper.popF(), smapper.pushD());
+                    break;
+                case opc_d2f:
+                    emit(out, "var @2 = @1;", smapper.popD(), smapper.pushF());
+                    break;
+                case opc_f2i:
+                    emit(out, "var @2 = @1.toInt32();",
+                         smapper.popF(), smapper.pushI());
+                    break;
+                case opc_f2l:
+                    emit(out, "var @2 = @1.toLong();",
+                         smapper.popF(), smapper.pushL());
+                    break;
+                case opc_d2i:
+                    emit(out, "var @2 = @1.toInt32();",
+                         smapper.popD(), smapper.pushI());
+                    break;
+                case opc_d2l:
+                    emit(out, "var @2 = @1.toLong();",
+                         smapper.popD(), smapper.pushL());
+                    break;
+                case opc_i2b:
+                    emit(out, "var @1 = @1.toInt8();", smapper.getI(0));
+                    break;
+                case opc_i2c:
+                    out.append("{ /* number conversion */ }");
+                    break;
+                case opc_i2s:
+                    emit(out, "var @1 = @1.toInt16();", smapper.getI(0));
+                    break;
+                case opc_aconst_null:
+                    emit(out, "var @1 = null;", smapper.pushA());
+                    break;
+                case opc_iconst_m1:
+                    emit(out, "var @1 = -1;", smapper.pushI());
+                    break;
+                case opc_iconst_0:
+                    emit(out, "var @1 = 0;", smapper.pushI());
+                    break;
+                case opc_dconst_0:
+                    emit(out, "var @1 = 0;", smapper.pushD());
+                    break;
+                case opc_lconst_0:
+                    emit(out, "var @1 = 0;", smapper.pushL());
+                    break;
+                case opc_fconst_0:
+                    emit(out, "var @1 = 0;", smapper.pushF());
+                    break;
+                case opc_iconst_1:
+                    emit(out, "var @1 = 1;", smapper.pushI());
+                    break;
+                case opc_lconst_1:
+                    emit(out, "var @1 = 1;", smapper.pushL());
+                    break;
+                case opc_fconst_1:
+                    emit(out, "var @1 = 1;", smapper.pushF());
+                    break;
+                case opc_dconst_1:
+                    emit(out, "var @1 = 1;", smapper.pushD());
+                    break;
+                case opc_iconst_2:
+                    emit(out, "var @1 = 2;", smapper.pushI());
+                    break;
+                case opc_fconst_2:
+                    emit(out, "var @1 = 2;", smapper.pushF());
+                    break;
+                case opc_iconst_3:
+                    emit(out, "var @1 = 3;", smapper.pushI());
+                    break;
+                case opc_iconst_4:
+                    emit(out, "var @1 = 4;", smapper.pushI());
+                    break;
+                case opc_iconst_5:
+                    emit(out, "var @1 = 5;", smapper.pushI());
+                    break;
+                case opc_ldc: {
+                    int indx = readUByte(byteCodes, ++i);
+                    String v = encodeConstant(indx);
+                    int type = VarType.fromConstantType(jc.getTag(indx));
+                    emit(out, "var @1 = @2;", smapper.pushT(type), v);
+                    break;
+                }
+                case opc_ldc_w:
+                case opc_ldc2_w: {
+                    int indx = readUShortArg(byteCodes, i);
+                    i += 2;
+                    String v = encodeConstant(indx);
+                    int type = VarType.fromConstantType(jc.getTag(indx));
+                    if (type == VarType.LONG) {
+                        final Long lv = new Long(v);
+                        final int low = (int)(lv.longValue() & 0xFFFFFFFF);
+                        final int hi = (int)(lv.longValue() >> 32);
+                        emit(out, "var @1 = 0x@3.next32(0x@2);", smapper.pushL(), 
+                                Integer.toHexString(low), Integer.toHexString(hi));
+                    } else {
+                        emit(out, "var @1 = @2;", smapper.pushT(type), v);
+                    }
+                    break;
+                }
+                case opc_lcmp:
+                    emit(out, "var @3 = @2.compare64(@1);",
+                         smapper.popL(), smapper.popL(), smapper.pushI());
+                    break;
+                case opc_fcmpl:
+                case opc_fcmpg:
+                    emit(out, "var @3 = (@2 == @1) ? 0 : ((@2 < @1) ? -1 : 1);",
+                         smapper.popF(), smapper.popF(), smapper.pushI());
+                    break;
+                case opc_dcmpl:
+                case opc_dcmpg:
+                    emit(out, "var @3 = (@2 == @1) ? 0 : ((@2 < @1) ? -1 : 1);",
+                         smapper.popD(), smapper.popD(), smapper.pushI());
+                    break;
+                case opc_if_acmpeq:
+                    i = generateIf(byteCodes, i, smapper.popA(), smapper.popA(),
+                                   "===", topMostLabel);
+                    break;
+                case opc_if_acmpne:
+                    i = generateIf(byteCodes, i, smapper.popA(), smapper.popA(),
+                                   "!==", topMostLabel);
+                    break;
+                case opc_if_icmpeq:
+                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
+                                   "==", topMostLabel);
+                    break;
+                case opc_ifeq: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    emitIf(out, "if (@1 == 0) ",
+                         smapper.popI(), i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_ifne: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    emitIf(out, "if (@1 != 0) ",
+                         smapper.popI(), i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_iflt: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    emitIf(out, "if (@1 < 0) ",
+                         smapper.popI(), i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_ifle: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    emitIf(out, "if (@1 <= 0) ",
+                         smapper.popI(), i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_ifgt: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    emitIf(out, "if (@1 > 0) ",
+                         smapper.popI(), i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_ifge: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    emitIf(out, "if (@1 >= 0) ",
+                         smapper.popI(), i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_ifnonnull: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    emitIf(out, "if (@1 !== null) ",
+                         smapper.popA(), i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_ifnull: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    emitIf(out, "if (@1 === null) ",
+                         smapper.popA(), i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_if_icmpne:
+                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
+                                   "!=", topMostLabel);
+                    break;
+                case opc_if_icmplt:
+                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
+                                   "<", topMostLabel);
+                    break;
+                case opc_if_icmple:
+                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
+                                   "<=", topMostLabel);
+                    break;
+                case opc_if_icmpgt:
+                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
+                                   ">", topMostLabel);
+                    break;
+                case opc_if_icmpge:
+                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
+                                   ">=", topMostLabel);
+                    break;
+                case opc_goto: {
+                    int indx = i + readShortArg(byteCodes, i);
+                    goTo(out, i, indx, topMostLabel);
+                    i += 2;
+                    break;
+                }
+                case opc_lookupswitch: {
+                    i = generateLookupSwitch(i, byteCodes, smapper, topMostLabel);
+                    break;
+                }
+                case opc_tableswitch: {
+                    i = generateTableSwitch(i, byteCodes, smapper, topMostLabel);
+                    break;
+                }
+                case opc_invokeinterface: {
+                    i = invokeVirtualMethod(byteCodes, i, smapper) + 2;
+                    break;
+                }
+                case opc_invokevirtual:
+                    i = invokeVirtualMethod(byteCodes, i, smapper);
+                    break;
+                case opc_invokespecial:
+                    i = invokeStaticMethod(byteCodes, i, smapper, false);
+                    break;
+                case opc_invokestatic:
+                    i = invokeStaticMethod(byteCodes, i, smapper, true);
+                    break;
+                case opc_new: {
+                    int indx = readUShortArg(byteCodes, i);
+                    String ci = jc.getClassName(indx);
+                    emit(out, "var @1 = new @2;",
+                         smapper.pushA(), accessClass(ci.replace('/', '_')));
+                    addReference(ci);
+                    i += 2;
+                    break;
+                }
+                case opc_newarray:
+                    int atype = readUByte(byteCodes, ++i);
+                    generateNewArray(atype, smapper);
+                    break;
+                case opc_anewarray: {
+                    int type = readUShortArg(byteCodes, i);
+                    i += 2;
+                    generateANewArray(type, smapper);
+                    break;
+                }
+                case opc_multianewarray: {
+                    int type = readUShortArg(byteCodes, i);
+                    i += 2;
+                    i = generateMultiANewArray(type, byteCodes, i, smapper);
+                    break;
+                }
+                case opc_arraylength:
+                    emit(out, "var @2 = @1.length;",
+                         smapper.popA(), smapper.pushI());
+                    break;
+                case opc_lastore:
+                    emit(out, "@3.at(@2, @1);",
+                         smapper.popL(), smapper.popI(), smapper.popA());
+                    break;
+                case opc_fastore:
+                    emit(out, "@3.at(@2, @1);",
+                         smapper.popF(), smapper.popI(), smapper.popA());
+                    break;
+                case opc_dastore:
+                    emit(out, "@3.at(@2, @1);",
+                         smapper.popD(), smapper.popI(), smapper.popA());
+                    break;
+                case opc_aastore:
+                    emit(out, "@3.at(@2, @1);",
+                         smapper.popA(), smapper.popI(), smapper.popA());
+                    break;
+                case opc_iastore:
+                case opc_bastore:
+                case opc_castore:
+                case opc_sastore:
+                    emit(out, "@3.at(@2, @1);",
+                         smapper.popI(), smapper.popI(), smapper.popA());
+                    break;
+                case opc_laload:
+                    emit(out, "var @3 = @2.at(@1);",
+                         smapper.popI(), smapper.popA(), smapper.pushL());
+                    break;
+                case opc_faload:
+                    emit(out, "var @3 = @2.at(@1);",
+                         smapper.popI(), smapper.popA(), smapper.pushF());
+                    break;
+                case opc_daload:
+                    emit(out, "var @3 = @2.at(@1);",
+                         smapper.popI(), smapper.popA(), smapper.pushD());
+                    break;
+                case opc_aaload:
+                    emit(out, "var @3 = @2.at(@1);",
+                         smapper.popI(), smapper.popA(), smapper.pushA());
+                    break;
+                case opc_iaload:
+                case opc_baload:
+                case opc_caload:
+                case opc_saload:
+                    emit(out, "var @3 = @2.at(@1);",
+                         smapper.popI(), smapper.popA(), smapper.pushI());
+                    break;
+                case opc_pop:
+                case opc_pop2:
+                    smapper.pop(1);
+                    debug("/* pop */");
+                    break;
+                case opc_dup: {
+                    final Variable v = smapper.get(0);
+                    emit(out, "var @1 = @2;", smapper.pushT(v.getType()), v);
+                    break;
+                }
+                case opc_dup2: {
+                    final Variable vi1 = smapper.get(0);
+
+                    if (vi1.isCategory2()) {
+                        emit(out, "var @1 = @2;",
+                             smapper.pushT(vi1.getType()), vi1);
+                    } else {
+                        final Variable vi2 = smapper.get(1);
+                        emit(out, "var @1 = @2, @3 = @4;",
+                             smapper.pushT(vi2.getType()), vi2,
+                             smapper.pushT(vi1.getType()), vi1);
+                    }
+                    break;
+                }
+                case opc_dup_x1: {
+                    final Variable vi1 = smapper.pop();
+                    final Variable vi2 = smapper.pop();
+                    final Variable vo3 = smapper.pushT(vi1.getType());
+                    final Variable vo2 = smapper.pushT(vi2.getType());
+                    final Variable vo1 = smapper.pushT(vi1.getType());
+
+                    emit(out, "var @1 = @2, @3 = @4, @5 = @6;",
+                         vo1, vi1, vo2, vi2, vo3, vo1);
+                    break;
+                }
+                case opc_dup2_x1: {
+                    final Variable vi1 = smapper.pop();
+                    final Variable vi2 = smapper.pop();
+
+                    if (vi1.isCategory2()) {
+                        final Variable vo3 = smapper.pushT(vi1.getType());
+                        final Variable vo2 = smapper.pushT(vi2.getType());
+                        final Variable vo1 = smapper.pushT(vi1.getType());
+
+                        emit(out, "var @1 = @2, @3 = @4, @5 = @6;",
+                             vo1, vi1, vo2, vi2, vo3, vo1);
+                    } else {
+                        final Variable vi3 = smapper.pop();
+                        final Variable vo5 = smapper.pushT(vi2.getType());
+                        final Variable vo4 = smapper.pushT(vi1.getType());
+                        final Variable vo3 = smapper.pushT(vi3.getType());
+                        final Variable vo2 = smapper.pushT(vi2.getType());
+                        final Variable vo1 = smapper.pushT(vi1.getType());
+
+                        emit(out, "var @1 = @2, @3 = @4, @5 = @6,",
+                             vo1, vi1, vo2, vi2, vo3, vi3);
+                        emit(out, " @1 = @2, @3 = @4;",
+                             vo4, vo1, vo5, vo2);
+                    }
+                    break;
+                }
+                case opc_dup_x2: {
+                    final Variable vi1 = smapper.pop();
+                    final Variable vi2 = smapper.pop();
+
+                    if (vi2.isCategory2()) {
+                        final Variable vo3 = smapper.pushT(vi1.getType());
+                        final Variable vo2 = smapper.pushT(vi2.getType());
+                        final Variable vo1 = smapper.pushT(vi1.getType());
+
+                        emit(out, "var @1 = @2, @3 = @4, @5 = @6;",
+                             vo1, vi1, vo2, vi2, vo3, vo1);
+                    } else {
+                        final Variable vi3 = smapper.pop();
+                        final Variable vo4 = smapper.pushT(vi1.getType());
+                        final Variable vo3 = smapper.pushT(vi3.getType());
+                        final Variable vo2 = smapper.pushT(vi2.getType());
+                        final Variable vo1 = smapper.pushT(vi1.getType());
+
+                        emit(out, "var @1 = @2, @3 = @4, @5 = @6, @7 = @8;",
+                             vo1, vi1, vo2, vi2, vo3, vi3, vo4, vo1);
+                    }
+                    break;
+                }
+                case opc_dup2_x2: {
+                    final Variable vi1 = smapper.pop();
+                    final Variable vi2 = smapper.pop();
+
+                    if (vi1.isCategory2()) {
+                        if (vi2.isCategory2()) {
+                            final Variable vo3 = smapper.pushT(vi1.getType());
+                            final Variable vo2 = smapper.pushT(vi2.getType());
+                            final Variable vo1 = smapper.pushT(vi1.getType());
+
+                            emit(out, "var @1 = @2, @3 = @4, @5 = @6;",
+                                 vo1, vi1, vo2, vi2, vo3, vo1);
+                        } else {
+                            final Variable vi3 = smapper.pop();
+                            final Variable vo4 = smapper.pushT(vi1.getType());
+                            final Variable vo3 = smapper.pushT(vi3.getType());
+                            final Variable vo2 = smapper.pushT(vi2.getType());
+                            final Variable vo1 = smapper.pushT(vi1.getType());
+
+                            emit(out, "var @1 = @2, @3 = @4, @5 = @6, @7 = @8;",
+                                 vo1, vi1, vo2, vi2, vo3, vi3, vo4, vo1);
+                        }
+                    } else {
+                        final Variable vi3 = smapper.pop();
+
+                        if (vi3.isCategory2()) {
+                            final Variable vo5 = smapper.pushT(vi2.getType());
+                            final Variable vo4 = smapper.pushT(vi1.getType());
+                            final Variable vo3 = smapper.pushT(vi3.getType());
+                            final Variable vo2 = smapper.pushT(vi2.getType());
+                            final Variable vo1 = smapper.pushT(vi1.getType());
+
+                            emit(out, "var @1 = @2, @3 = @4, @5 = @6,",
+                                 vo1, vi1, vo2, vi2, vo3, vi3);
+                            emit(out, " @1 = @2, @3 = @4;",
+                                 vo4, vo1, vo5, vo2);
+                        } else {
+                            final Variable vi4 = smapper.pop();
+                            final Variable vo6 = smapper.pushT(vi2.getType());
+                            final Variable vo5 = smapper.pushT(vi1.getType());
+                            final Variable vo4 = smapper.pushT(vi4.getType());
+                            final Variable vo3 = smapper.pushT(vi3.getType());
+                            final Variable vo2 = smapper.pushT(vi2.getType());
+                            final Variable vo1 = smapper.pushT(vi1.getType());
+                            
+                            emit(out, "var @1 = @2, @3 = @4, @5 = @6, @7 = @8,",
+                                 vo1, vi1, vo2, vi2, vo3, vi3, vo4, vi4);
+                            emit(out, " @1 = @2, @3 = @4;",
+                                 vo5, vo1, vo6, vo2);
+                        }
+                    }
+                    break;
+                }
+                case opc_swap: {
+                    final Variable vi1 = smapper.get(0);
+                    final Variable vi2 = smapper.get(1);
+
+                    if (vi1.getType() == vi2.getType()) {
+                        final Variable tmp = smapper.pushT(vi1.getType());
+
+                        emit(out, "var @1 = @2, @2 = @3, @3 = @1;",
+                             tmp, vi1, vi2);
+                        smapper.pop(1);
+                    } else {
+                        smapper.pop(2);
+                        smapper.pushT(vi1.getType());
+                        smapper.pushT(vi2.getType());
+                    }
+                    break;
+                }
+                case opc_bipush:
+                    emit(out, "var @1 = @2;",
+                         smapper.pushI(), Integer.toString(byteCodes[++i]));
+                    break;
+                case opc_sipush:
+                    emit(out, "var @1 = @2;",
+                         smapper.pushI(),
+                         Integer.toString(readShortArg(byteCodes, i)));
+                    i += 2;
+                    break;
+                case opc_getfield: {
+                    int indx = readUShortArg(byteCodes, i);
+                    String[] fi = jc.getFieldInfoName(indx);
+                    final int type = VarType.fromFieldType(fi[2].charAt(0));
+                    final String mangleClass = mangleSig(fi[0]);
+                    final String mangleClassAccess = accessClass(mangleClass);
+                    emit(out, "var @2 = @4(false)._@3.call(@1);",
+                         smapper.popA(),
+                         smapper.pushT(type), fi[1], mangleClassAccess
+                    );
+                    i += 2;
+                    break;
+                }
+                case opc_putfield: {
+                    int indx = readUShortArg(byteCodes, i);
+                    String[] fi = jc.getFieldInfoName(indx);
+                    final int type = VarType.fromFieldType(fi[2].charAt(0));
+                    final String mangleClass = mangleSig(fi[0]);
+                    final String mangleClassAccess = accessClass(mangleClass);
+                    emit(out, "@4(false)._@3.call(@2, @1);",
+                         smapper.popT(type),
+                         smapper.popA(), fi[1], 
+                         mangleClassAccess
+                    );
+                    i += 2;
+                    break;
+                }
+                case opc_getstatic: {
+                    int indx = readUShortArg(byteCodes, i);
+                    String[] fi = jc.getFieldInfoName(indx);
+                    final int type = VarType.fromFieldType(fi[2].charAt(0));
+                    emit(out, "var @1 = @2(false)._@3();",
+                         smapper.pushT(type),
+                         accessClass(fi[0].replace('/', '_')), fi[1]);
+                    i += 2;
+                    addReference(fi[0]);
+                    break;
+                }
+                case opc_putstatic: {
+                    int indx = readUShortArg(byteCodes, i);
+                    String[] fi = jc.getFieldInfoName(indx);
+                    final int type = VarType.fromFieldType(fi[2].charAt(0));
+                    emit(out, "@1(false)._@2(@3);",
+                         accessClass(fi[0].replace('/', '_')), fi[1],
+                         smapper.popT(type));
+                    i += 2;
+                    addReference(fi[0]);
+                    break;
+                }
+                case opc_checkcast: {
+                    int indx = readUShortArg(byteCodes, i);
+                    generateCheckcast(indx, smapper);
+                    i += 2;
+                    break;
+                }
+                case opc_instanceof: {
+                    int indx = readUShortArg(byteCodes, i);
+                    generateInstanceOf(indx, smapper);
+                    i += 2;
+                    break;
+                }
+                case opc_athrow: {
+                    final Variable v = smapper.popA();
+                    smapper.clear();
+
+                    emit(out, "{ var @1 = @2; throw @2; }",
+                         smapper.pushA(), v);
+                    break;
+                }
+
+                case opc_monitorenter: {
+                    out.append("/* monitor enter */");
+                    smapper.popA();
+                    break;
+                }
+
+                case opc_monitorexit: {
+                    out.append("/* monitor exit */");
+                    smapper.popA();
+                    break;
+                }
+
+                case opc_wide:
+                    wide = true;
+                    break;
+
+                default: {
+                    wide = false;
+                    emit(out, "throw 'unknown bytecode @1';",
+                         Integer.toString(c));
+                }
+            }
+            if (debug(" //")) {
+                generateByteCodeComment(prev, i, byteCodes);
+            }
+            out.append("\n");            
+        }
+        if (previousTrap != null) {
+            generateCatch(previousTrap, byteCodes.length, topMostLabel);
+        }
+        out.append("\n    }\n");
+        while (openBraces-- > 0) {
+            out.append('}');
+        }
+        out.append("\n};");
+    }
+
+    private int generateIf(byte[] byteCodes, int i, final Variable v2, final Variable v1, final String test, int topMostLabel) throws IOException {
+        int indx = i + readShortArg(byteCodes, i);
+        out.append("if (").append(v1)
+           .append(' ').append(test).append(' ')
+           .append(v2).append(") ");
+        goTo(out, i, indx, topMostLabel);
+        return i + 2;
+    }
+    
+    private int readInt4(byte[] byteCodes, int offset) {
+        final int d = byteCodes[offset + 0] << 24;
+        final int c = byteCodes[offset + 1] << 16;
+        final int b = byteCodes[offset + 2] << 8;
+        final int a = byteCodes[offset + 3];
+        return (d & 0xff000000) | (c & 0xff0000) | (b & 0xff00) | (a & 0xff);
+    }
+    private static int readUByte(byte[] byteCodes, int offset) {
+        return byteCodes[offset] & 0xff;
+    }
+
+    private static int readUShort(byte[] byteCodes, int offset) {
+        return ((byteCodes[offset] & 0xff) << 8)
+                    | (byteCodes[offset + 1] & 0xff);
+    }
+    private static int readUShortArg(byte[] byteCodes, int offsetInstruction) {
+        return readUShort(byteCodes, offsetInstruction + 1);
+    }
+
+    private static int readShort(byte[] byteCodes, int offset) {
+        int signed = byteCodes[offset];
+        byte b0 = (byte)signed;
+        return (b0 << 8) | (byteCodes[offset + 1] & 0xff);
+    }
+    private static int readShortArg(byte[] byteCodes, int offsetInstruction) {
+        return readShort(byteCodes, offsetInstruction + 1);
+    }
+
+    private static void countArgs(String descriptor, char[] returnType, StringBuilder sig, StringBuilder cnt) {
+        int i = 0;
+        Boolean count = null;
+        boolean array = false;
+        sig.append("__");
+        int firstPos = sig.length();
+        while (i < descriptor.length()) {
+            char ch = descriptor.charAt(i++);
+            switch (ch) {
+                case '(':
+                    count = true;
+                    continue;
+                case ')':
+                    count = false;
+                    continue;
+                case 'B': 
+                case 'C': 
+                case 'D': 
+                case 'F': 
+                case 'I': 
+                case 'J': 
+                case 'S': 
+                case 'Z': 
+                    if (count) {
+                        if (array) {
+                            sig.append("_3");
+                        }
+                        sig.append(ch);
+                        if (ch == 'J' || ch == 'D') {
+                            cnt.append('1');
+                        } else {
+                            cnt.append('0');
+                        }
+                    } else {
+                        sig.insert(firstPos, ch);
+                        if (array) {
+                            returnType[0] = '[';
+                            sig.insert(firstPos, "_3");
+                        } else {
+                            returnType[0] = ch;
+                        }
+                    }
+                    array = false;
+                    continue;
+                case 'V': 
+                    assert !count;
+                    returnType[0] = 'V';
+                    sig.insert(firstPos, 'V');
+                    continue;
+                case 'L':
+                    int next = descriptor.indexOf(';', i);
+                    String realSig = mangleSig(descriptor, i - 1, next + 1);
+                    if (count) {
+                        if (array) {
+                            sig.append("_3");
+                        }
+                        sig.append(realSig);
+                        cnt.append('0');
+                    } else {
+                        sig.insert(firstPos, realSig);
+                        if (array) {
+                            sig.insert(firstPos, "_3");
+                        }
+                        returnType[0] = 'L';
+                    }
+                    i = next + 1;
+                    array = false;
+                    continue;
+                case '[':
+                    array = true;
+                    continue;
+                default:
+                    throw new IllegalStateException("Invalid char: " + ch);
+            }
+        }
+    }
+    
+    static String mangleSig(String sig) {
+        return mangleSig(sig, 0, sig.length());
+    }
+    
+    private static String mangleSig(String txt, int first, int last) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = first; i < last; i++) {
+            final char ch = txt.charAt(i);
+            switch (ch) {
+                case '/': sb.append('_'); break;
+                case '_': sb.append("_1"); break;
+                case ';': sb.append("_2"); break;
+                case '[': sb.append("_3"); break;
+                default: sb.append(ch); break;
+            }
+        }
+        return sb.toString();
+    }
+
+    private static String findMethodName(MethodData m, StringBuilder cnt) {
+        StringBuilder name = new StringBuilder();
+        if ("<init>".equals(m.getName())) { // NOI18N
+            name.append("cons"); // NOI18N
+        } else if ("<clinit>".equals(m.getName())) { // NOI18N
+            name.append("class"); // NOI18N
+        } else {
+            name.append(m.getName());
+        } 
+        
+        countArgs(m.getInternalSig(), new char[1], name, cnt);
+        return name.toString();
+    }
+
+    static String findMethodName(String[] mi, StringBuilder cnt, char[] returnType) {
+        StringBuilder name = new StringBuilder();
+        String descr = mi[2];//mi.getDescriptor();
+        String nm= mi[1];
+        if ("<init>".equals(nm)) { // NOI18N
+            name.append("cons"); // NOI18N
+        } else {
+            name.append(nm);
+        }
+        countArgs(descr, returnType, name, cnt);
+        return name.toString();
+    }
+
+    private int invokeStaticMethod(byte[] byteCodes, int i, final StackMapper mapper, boolean isStatic)
+    throws IOException {
+        int methodIndex = readUShortArg(byteCodes, i);
+        String[] mi = jc.getFieldInfoName(methodIndex);
+        char[] returnType = { 'V' };
+        StringBuilder cnt = new StringBuilder();
+        String mn = findMethodName(mi, cnt, returnType);
+
+        final int numArguments = isStatic ? cnt.length() : cnt.length() + 1;
+        final Variable[] vars = new Variable[numArguments];
+
+        for (int j = numArguments - 1; j >= 0; --j) {
+            vars[j] = mapper.pop();
+        }
+
+        if (returnType[0] != 'V') {
+            out.append("var ")
+               .append(mapper.pushT(VarType.fromFieldType(returnType[0])))
+               .append(" = ");
+        }
+
+        final String in = mi[0];
+        out.append(accessClass(in.replace('/', '_')));
+        out.append("(false).");
+        if (mn.startsWith("cons_")) {
+            out.append("constructor.");
+        }
+        out.append(mn);
+        if (isStatic) {
+            out.append('(');
+        } else {
+            out.append(".call(");
+        }
+        if (numArguments > 0) {
+            out.append(vars[0]);
+            for (int j = 1; j < numArguments; ++j) {
+                out.append(", ");
+                out.append(vars[j]);
+            }
+        }
+        out.append(");");
+        i += 2;
+        addReference(in);
+        return i;
+    }
+    private int invokeVirtualMethod(byte[] byteCodes, int i, final StackMapper mapper)
+    throws IOException {
+        int methodIndex = readUShortArg(byteCodes, i);
+        String[] mi = jc.getFieldInfoName(methodIndex);
+        char[] returnType = { 'V' };
+        StringBuilder cnt = new StringBuilder();
+        String mn = findMethodName(mi, cnt, returnType);
+
+        final int numArguments = cnt.length() + 1;
+        final Variable[] vars = new Variable[numArguments];
+
+        for (int j = numArguments - 1; j >= 0; --j) {
+            vars[j] = mapper.pop();
+        }
+
+        if (returnType[0] != 'V') {
+            out.append("var ")
+               .append(mapper.pushT(VarType.fromFieldType(returnType[0])))
+               .append(" = ");
+        }
+
+        out.append(vars[0]).append('.');
+        out.append(mn);
+        out.append('(');
+        String sep = "";
+        for (int j = 1; j < numArguments; ++j) {
+            out.append(sep);
+            out.append(vars[j]);
+            sep = ", ";
+        }
+        out.append(");");
+        i += 2;
+        return i;
+    }
+
+    private void addReference(String cn) throws IOException {
+        if (requireReference(cn)) {
+            debug(" /* needs " + cn + " */");
+        }
+    }
+
+    private void outType(String d, StringBuilder out) {
+        int arr = 0;
+        while (d.charAt(0) == '[') {
+            out.append('A');
+            d = d.substring(1);
+        }
+        if (d.charAt(0) == 'L') {
+            assert d.charAt(d.length() - 1) == ';';
+            out.append(d.replace('/', '_').substring(0, d.length() - 1));
+        } else {
+            out.append(d);
+        }
+    }
+
+    private String encodeConstant(int entryIndex) throws IOException {
+        String[] classRef = { null };
+        String s = jc.stringValue(entryIndex, classRef);
+        if (classRef[0] != null) {
+            if (classRef[0].startsWith("[")) {
+                s = accessClass("java_lang_Class") + "(false).forName__Ljava_lang_Class_2Ljava_lang_String_2('" + classRef[0] + "');";
+            } else {
+                addReference(classRef[0]);
+                s = accessClass(s.replace('/', '_')) + "(false).constructor.$class";
+            }
+        }
+        return s;
+    }
+
+    private String javaScriptBody(String prefix, MethodData m, boolean isStatic) throws IOException {
+        byte[] arr = m.findAnnotationData(true);
+        if (arr == null) {
+            return null;
+        }
+        final String jvmType = "Lorg/apidesign/bck2brwsr/core/JavaScriptBody;";
+        class P extends AnnotationParser {
+            public P() {
+                super(false, true);
+            }
+            
+            int cnt;
+            String[] args = new String[30];
+            String body;
+            
+            @Override
+            protected void visitAttr(String type, String attr, String at, String value) {
+                if (type.equals(jvmType)) {
+                    if ("body".equals(attr)) {
+                        body = value;
+                    } else if ("args".equals(attr)) {
+                        args[cnt++] = value;
+                    } else {
+                        throw new IllegalArgumentException(attr);
+                    }
+                }
+            }
+        }
+        P p = new P();
+        p.parse(arr, jc);
+        if (p.body == null) {
+            return null;
+        }
+        StringBuilder cnt = new StringBuilder();
+        final String mn = findMethodName(m, cnt);
+        out.append(prefix).append(mn);
+        out.append(" = function(");
+        String space = "";
+        int index = 0;
+        for (int i = 0; i < cnt.length(); i++) {
+            out.append(space);
+            space = outputArg(out, p.args, index);
+            index++;
+        }
+        out.append(") {").append("\n");
+        out.append(p.body);
+        out.append("\n}\n");
+        return mn;
+    }
+    private static String className(ClassData jc) {
+        //return jc.getName().getInternalName().replace('/', '_');
+        return jc.getClassName().replace('/', '_');
+    }
+    
+    private static String[] findAnnotation(
+        byte[] arr, ClassData cd, final String className, 
+        final String... attrNames
+    ) throws IOException {
+        if (arr == null) {
+            return null;
+        }
+        final String[] values = new String[attrNames.length];
+        final boolean[] found = { false };
+        final String jvmType = "L" + className.replace('.', '/') + ";";
+        AnnotationParser ap = new AnnotationParser(false, true) {
+            @Override
+            protected void visitAttr(String type, String attr, String at, String value) {
+                if (type.equals(jvmType)) {
+                    found[0] = true;
+                    for (int i = 0; i < attrNames.length; i++) {
+                        if (attrNames[i].equals(attr)) {
+                            values[i] = value;
+                        }
+                    }
+                }
+            }
+            
+        };
+        ap.parse(arr, cd);
+        return found[0] ? values : null;
+    }
+
+    private CharSequence initField(FieldData v) {
+        final String is = v.getInternalSig();
+        if (is.length() == 1) {
+            switch (is.charAt(0)) {
+                case 'S':
+                case 'J':
+                case 'B':
+                case 'Z':
+                case 'C':
+                case 'I': return " = 0;";
+                case 'F': 
+                case 'D': return " = 0.0;";
+                default:
+                    throw new IllegalStateException(is);
+            }
+        }
+        return " = null;";
+    }
+
+    private void generateAnno(ClassData cd, final Appendable out, byte[] data) throws IOException {
+        AnnotationParser ap = new AnnotationParser(true, false) {
+            int[] cnt = new int[32];
+            int depth;
+            
+            @Override
+            protected void visitAnnotationStart(String attrType, boolean top) throws IOException {
+                final String slashType = attrType.substring(1, attrType.length() - 1);
+                requireReference(slashType);
+                
+                if (cnt[depth]++ > 0) {
+                    out.append(",");
+                }
+                if (top) {
+                    out.append('"').append(attrType).append("\" : ");
+                }
+                out.append("{\n");
+                cnt[++depth] = 0;
+            }
+
+            @Override
+            protected void visitAnnotationEnd(String type, boolean top) throws IOException {
+                out.append("\n}\n");
+                depth--;
+            }
+
+            @Override
+            protected void visitValueStart(String attrName, char type) throws IOException {
+                if (cnt[depth]++ > 0) {
+                    out.append(",\n");
+                }
+                cnt[++depth] = 0;
+                if (attrName != null) {
+                    out.append(attrName).append(" : ");
+                }
+                if (type == '[') {
+                    out.append("[");
+                }
+            }
+
+            @Override
+            protected void visitValueEnd(String attrName, char type) throws IOException {
+                if (type == '[') {
+                    out.append("]");
+                }
+                depth--;
+            }
+            
+            @Override
+            protected void visitAttr(String type, String attr, String attrType, String value) 
+            throws IOException {
+                if (attr == null && value == null) {
+                    return;
+                }
+                out.append(value);
+            }
+
+            @Override
+            protected void visitEnumAttr(String type, String attr, String attrType, String value) 
+            throws IOException {
+                final String slashType = attrType.substring(1, attrType.length() - 1);
+                requireReference(slashType);
+                
+                out.append(accessClass(slashType.replace('/', '_')))
+                   .append("(false).constructor.").append(value);
+            }
+        };
+        ap.parse(data, cd);
+    }
+
+    private static String outputArg(Appendable out, String[] args, int indx) throws IOException {
+        final String name = args[indx];
+        if (name == null) {
+            return "";
+        }
+        if (name.contains(",")) {
+            throw new IOException("Wrong parameter with ',': " + name);
+        }
+        out.append(name);
+        return ",";
+    }
+
+    private static void emit(final Appendable out,
+                             final String format,
+                             final CharSequence... params) throws IOException {
+        final int length = format.length();
+
+        int processed = 0;
+        int paramOffset = format.indexOf('@');
+        while ((paramOffset != -1) && (paramOffset < (length - 1))) {
+            final char paramChar = format.charAt(paramOffset + 1);
+            if ((paramChar >= '1') && (paramChar <= '9')) {
+                final int paramIndex = paramChar - '0' - 1;
+
+                out.append(format, processed, paramOffset);
+                out.append(params[paramIndex]);
+
+                ++paramOffset;
+                processed = paramOffset + 1;
+            }
+
+            paramOffset = format.indexOf('@', paramOffset + 1);
+        }
+
+        out.append(format, processed, length);
+    }
+
+    private void generateCatch(TrapData[] traps, int current, int topMostLabel) throws IOException {
+        out.append("} catch (e) {\n");
+        int finallyPC = -1;
+        for (TrapData e : traps) {
+            if (e == null) {
+                break;
+            }
+            if (e.catch_cpx != 0) { //not finally
+                final String classInternalName = jc.getClassName(e.catch_cpx);
+                addReference(classInternalName);
+                if ("java/lang/Throwable".equals(classInternalName)) {
+                    out.append("if (e.$instOf_java_lang_Throwable) {");
+                    out.append("  var stA0 = e;");
+                    out.append("} else {");
+                    out.append("  var stA0 = vm.java_lang_Throwable(true);");
+                    out.append("  vm.java_lang_Throwable.cons__VLjava_lang_String_2.call(stA0, e.toString());");
+                    out.append("}");
+                    goTo(out, current, e.handler_pc, topMostLabel);
+                } else {
+                    out.append("if (e.$instOf_" + classInternalName.replace('/', '_') + ") {");
+                    out.append("var stA0 = e;");
+                    goTo(out, current, e.handler_pc, topMostLabel);
+                    out.append("}\n");
+                }
+            } else {
+                finallyPC = e.handler_pc;
+            }
+        }
+        if (finallyPC == -1) {
+            out.append("throw e;");
+        } else {
+            out.append("var stA0 = e;");
+            goTo(out, current, finallyPC, topMostLabel);
+        }
+        out.append("\n}");
+    }
+
+    private static void goTo(Appendable out, int current, int to, int canBack) throws IOException {
+        if (to < current) {
+            if (canBack < to) {
+                out.append("{ gt = 0; continue X_" + to + "; }");
+            } else {
+                out.append("{ gt = " + to + "; continue X_0; }");
+            }
+        } else {
+            out.append("{ gt = " + to + "; break IF; }");
+        }
+    }
+
+    private static void emitIf(
+        Appendable out, String pattern, Variable param, 
+        int current, int to, int canBack
+    ) throws IOException {
+        emit(out, pattern, param);
+        goTo(out, current, to, canBack);
+    }
+
+    private void generateNewArray(int atype, final StackMapper smapper) throws IOException, IllegalStateException {
+        String jvmType;
+        switch (atype) {
+            case 4: jvmType = "[Z"; break;
+            case 5: jvmType = "[C"; break;
+            case 6: jvmType = "[F"; break;
+            case 7: jvmType = "[D"; break;
+            case 8: jvmType = "[B"; break;
+            case 9: jvmType = "[S"; break;
+            case 10: jvmType = "[I"; break;
+            case 11: jvmType = "[J"; break;
+            default: throw new IllegalStateException("Array type: " + atype);
+        }
+        emit(out, "var @2 = Array.prototype.newArray__Ljava_lang_Object_2ZLjava_lang_String_2I(true, '@3', @1);",
+             smapper.popI(), smapper.pushA(), jvmType);
+    }
+
+    private void generateANewArray(int type, final StackMapper smapper) throws IOException {
+        String typeName = jc.getClassName(type);
+        if (typeName.startsWith("[")) {
+            typeName = "[" + typeName;
+        } else {
+            typeName = "[L" + typeName + ";";
+        }
+        emit(out, "var @2 = Array.prototype.newArray__Ljava_lang_Object_2ZLjava_lang_String_2I(false, '@3', @1);",
+             smapper.popI(), smapper.pushA(), typeName);
+    }
+
+    private int generateMultiANewArray(int type, final byte[] byteCodes, int i, final StackMapper smapper) throws IOException {
+        String typeName = jc.getClassName(type);
+        int dim = readUByte(byteCodes, ++i);
+        StringBuilder dims = new StringBuilder();
+        dims.append('[');
+        for (int d = 0; d < dim; d++) {
+            if (d != 0) {
+                dims.insert(1, ",");
+            }
+            dims.insert(1, smapper.popI());
+        }
+        dims.append(']');
+        emit(out, "var @2 = Array.prototype.multiNewArray__Ljava_lang_Object_2Ljava_lang_String_2_3II('@3', @1, 0);",
+             dims.toString(), smapper.pushA(), typeName);
+        return i;
+    }
+
+    private int generateTableSwitch(int i, final byte[] byteCodes, final StackMapper smapper, int topMostLabel) throws IOException {
+        int table = i / 4 * 4 + 4;
+        int dflt = i + readInt4(byteCodes, table);
+        table += 4;
+        int low = readInt4(byteCodes, table);
+        table += 4;
+        int high = readInt4(byteCodes, table);
+        table += 4;
+        out.append("switch (").append(smapper.popI()).append(") {\n");
+        while (low <= high) {
+            int offset = i + readInt4(byteCodes, table);
+            table += 4;
+            out.append("  case " + low).append(":"); goTo(out, i, offset, topMostLabel); out.append('\n');
+            low++;
+        }
+        out.append("  default: ");
+        goTo(out, i, dflt, topMostLabel);
+        out.append("\n}");
+        i = table - 1;
+        return i;
+    }
+
+    private int generateLookupSwitch(int i, final byte[] byteCodes, final StackMapper smapper, int topMostLabel) throws IOException {
+        int table = i / 4 * 4 + 4;
+        int dflt = i + readInt4(byteCodes, table);
+        table += 4;
+        int n = readInt4(byteCodes, table);
+        table += 4;
+        out.append("switch (").append(smapper.popI()).append(") {\n");
+        while (n-- > 0) {
+            int cnstnt = readInt4(byteCodes, table);
+            table += 4;
+            int offset = i + readInt4(byteCodes, table);
+            table += 4;
+            out.append("  case " + cnstnt).append(": "); goTo(out, i, offset, topMostLabel); out.append('\n');
+        }
+        out.append("  default: ");
+        goTo(out, i, dflt, topMostLabel);
+        out.append("\n}");
+        i = table - 1;
+        return i;
+    }
+
+    private void generateInstanceOf(int indx, final StackMapper smapper) throws IOException {
+        final String type = jc.getClassName(indx);
+        if (!type.startsWith("[")) {
+            emit(out, "var @2 = @1 != null && @1.$instOf_@3 ? 1 : 0;",
+                 smapper.popA(), smapper.pushI(),
+                 type.replace('/', '_'));
+        } else {
+            emit(out, "var @2 = vm.java_lang_Class(false).forName__Ljava_lang_Class_2Ljava_lang_String_2('@3').isInstance__ZLjava_lang_Object_2(@1);",
+                smapper.popA(), smapper.pushI(),
+                type
+            );
+        }
+    }
+
+    private void generateCheckcast(int indx, final StackMapper smapper) throws IOException {
+        final String type = jc.getClassName(indx);
+        if (!type.startsWith("[")) {
+            emit(out,
+                 "if (@1 !== null && !@1.$instOf_@2) throw {};",
+                 smapper.getA(0), type.replace('/', '_'));
+        } else {
+            emit(out, "vm.java_lang_Class(false).forName__Ljava_lang_Class_2Ljava_lang_String_2('@2').cast__Ljava_lang_Object_2Ljava_lang_Object_2(@1);",
+                 smapper.getA(0), type
+            );
+        }
+    }
+
+    private void generateByteCodeComment(int prev, int i, final byte[] byteCodes) throws IOException {
+        for (int j = prev; j <= i; j++) {
+            out.append(" ");
+            final int cc = readUByte(byteCodes, j);
+            out.append(Integer.toString(cc));
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/LocalsMapper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/LocalsMapper.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,141 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.IOException;
+import org.apidesign.vm4brwsr.ByteCodeParser.TypeArray;
+
+final class LocalsMapper {
+    private final TypeArray argTypeRecords;
+    private final TypeArray localTypeRecords;
+
+    public LocalsMapper(final TypeArray stackMapArgs) {
+        final TypeArray initTypeRecords = new TypeArray();
+        updateRecords(initTypeRecords, stackMapArgs);
+
+        argTypeRecords = initTypeRecords;
+        localTypeRecords = new TypeArray(initTypeRecords);
+    }
+
+    public void outputArguments(final Appendable out, boolean isStatic) throws IOException {
+        final int argRecordCount = argTypeRecords.getSize();
+        int first = isStatic ? 0 : 1;
+        if (argRecordCount > first) {
+            Variable variable = getVariable(argTypeRecords, first);
+            out.append(variable);
+
+            int i = first + (variable.isCategory2() ? 2 : 1);
+            while (i < argRecordCount) {
+                variable = getVariable(argTypeRecords, i);
+                out.append(", ");
+                out.append(variable);
+                i += variable.isCategory2() ? 2 : 1;
+            }
+        }
+    }
+
+    public void syncWithFrameLocals(final TypeArray frameLocals) {
+        updateRecords(localTypeRecords, frameLocals);
+    }
+
+    public Variable setI(final int index) {
+        return setT(index, VarType.INTEGER);
+    }
+
+    public Variable setL(final int index) {
+        return setT(index, VarType.LONG);
+    }
+
+    public Variable setF(final int index) {
+        return setT(index, VarType.FLOAT);
+    }
+
+    public Variable setD(final int index) {
+        return setT(index, VarType.DOUBLE);
+    }
+
+    public Variable setA(final int index) {
+        return setT(index, VarType.REFERENCE);
+    }
+
+    public Variable setT(final int index, final int type) {
+        updateRecord(localTypeRecords, index, type);
+        return Variable.getLocalVariable(type, index);
+    }
+
+    public Variable getI(final int index) {
+        return getT(index, VarType.INTEGER);
+    }
+
+    public Variable getL(final int index) {
+        return getT(index, VarType.LONG);
+    }
+
+    public Variable getF(final int index) {
+        return getT(index, VarType.FLOAT);
+    }
+
+    public Variable getD(final int index) {
+        return getT(index, VarType.DOUBLE);
+    }
+
+    public Variable getA(final int index) {
+        return getT(index, VarType.REFERENCE);
+    }
+
+    public Variable getT(final int index, final int type) {
+        final int oldRecordValue = localTypeRecords.get(index);
+        if ((oldRecordValue & 0xff) != type) {
+            throw new IllegalStateException("Type mismatch");
+        }
+
+        return Variable.getLocalVariable(type, index);
+    }
+
+    private static void updateRecords(final TypeArray typeRecords,
+                                      final TypeArray stackMapTypes) {
+        final int srcSize = stackMapTypes.getSize();
+        for (int i = 0, dstIndex = 0; i < srcSize; ++i) {
+            final int smType = stackMapTypes.get(i);
+            if (smType == ByteCodeParser.ITEM_Bogus) {
+                ++dstIndex;
+                continue;
+            }
+            final int varType = VarType.fromStackMapType(smType);
+            updateRecord(typeRecords, dstIndex, varType);
+            dstIndex += VarType.isCategory2(varType) ? 2 : 1;
+        }
+    }
+
+    private static void updateRecord(final TypeArray typeRecords,
+                                     final int index, final int type) {
+        if (typeRecords.getSize() < (index + 1)) {
+            typeRecords.setSize(index + 1);
+        }
+
+        final int oldRecordValue = typeRecords.get(index);
+        final int usedTypesMask =
+                (oldRecordValue >> 8) | (1 << type);
+        typeRecords.set(index, (usedTypesMask << 8) | type);
+    }
+
+    private static Variable getVariable(final TypeArray typeRecords,
+                                        final int index) {
+        return Variable.getLocalVariable(typeRecords.get(index) & 0xff, index);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/Main.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/Main.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,50 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+
+/** Generator of JavaScript from bytecode of classes on classpath of the VM
+ * with a Main method.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class Main {
+    private Main() {}
+    
+    public static void main(String... args) throws IOException {
+        if (args.length < 2) {
+            System.err.println("Bck2Brwsr Translator from Java(tm) to JavaScript, (c) Jaroslav Tulach 2012");
+            System.err.println("Usage: java -cp ... -jar ... <file_to_generate_js_code_to> java/lang/Class org/your/App ...");
+            return;
+        }
+        
+        Writer w = new BufferedWriter(new FileWriter(args[0]));
+        StringArray classes = StringArray.asList(args);
+        classes.delete(0);
+        try {
+            Bck2Brwsr.generate(w, Main.class.getClassLoader(),
+                               classes.toArray());
+        } finally {
+            w.close();
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/ParseMan.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ParseMan.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,57 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.IOException;
+import java.io.InputStream;
+import org.apidesign.bck2brwsr.emul.lang.ManifestInputStream;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class ParseMan extends ManifestInputStream {
+    private String cp;
+    private String mc;
+
+    public ParseMan(InputStream is) throws IOException {
+        super(is);
+        readAttributes(new byte[512]);
+    }
+
+    @Override
+    protected String putValue(String key, String value) {
+        if ("Class-Path".equals(key)) {
+            cp = value;
+        }
+        if ("Main-Class".equals(key)) {
+            mc = value;
+        }
+        return null;
+    }
+    
+    String getMainClass() {
+        return mc;
+    }
+
+    @Override
+    public String toString() {
+        return cp;
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/StackMapper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/StackMapper.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,194 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.apidesign.vm4brwsr.ByteCodeParser.TypeArray;
+
+final class StackMapper {
+    private final TypeArray stackTypeIndexPairs;
+    private int[] typeCounters;
+    private int[] typeMaxCounters;
+
+    public StackMapper() {
+        stackTypeIndexPairs = new TypeArray();
+        typeCounters = new int[VarType.LAST + 1];
+        typeMaxCounters = new int[VarType.LAST + 1];
+    }
+
+    public void clear() {
+        for (int type = 0; type <= VarType.LAST; ++type) {
+            typeCounters[type] = 0;
+        }
+        stackTypeIndexPairs.clear();
+    }
+
+    public void syncWithFrameStack(final TypeArray frameStack) {
+        clear();
+
+        final int size = frameStack.getSize();
+        for (int i = 0; i < size; ++i) {
+            pushTypeImpl(VarType.fromStackMapType(frameStack.get(i)));
+        }
+    }
+
+    public Variable pushI() {
+        return pushT(VarType.INTEGER);
+    }
+
+    public Variable pushL() {
+        return pushT(VarType.LONG);
+    }
+
+    public Variable pushF() {
+        return pushT(VarType.FLOAT);
+    }
+
+    public Variable pushD() {
+        return pushT(VarType.DOUBLE);
+    }
+
+    public Variable pushA() {
+        return pushT(VarType.REFERENCE);
+    }
+
+    public Variable pushT(final int type) {
+        return getVariable(pushTypeImpl(type));
+    }
+
+    public Variable popI() {
+        return popT(VarType.INTEGER);
+    }
+
+    public Variable popL() {
+        return popT(VarType.LONG);
+    }
+
+    public Variable popF() {
+        return popT(VarType.FLOAT);
+    }
+
+    public Variable popD() {
+        return popT(VarType.DOUBLE);
+    }
+
+    public Variable popA() {
+        return popT(VarType.REFERENCE);
+    }
+
+    public Variable popT(final int type) {
+        final Variable variable = getT(0, type);
+        popImpl(1);
+        return variable;
+    }
+
+    public Variable pop() {
+        final Variable variable = get(0);
+        popImpl(1);
+        return variable;
+    }
+
+    public void pop(final int count) {
+        final int stackSize = stackTypeIndexPairs.getSize();
+        if (count > stackSize) {
+            throw new IllegalStateException("Stack underflow");
+        }
+        popImpl(count);
+    }
+
+    public Variable getI(final int indexFromTop) {
+        return getT(indexFromTop, VarType.INTEGER);
+    }
+
+    public Variable getL(final int indexFromTop) {
+        return getT(indexFromTop, VarType.LONG);
+    }
+
+    public Variable getF(final int indexFromTop) {
+        return getT(indexFromTop, VarType.FLOAT);
+    }
+
+    public Variable getD(final int indexFromTop) {
+        return getT(indexFromTop, VarType.DOUBLE);
+    }
+
+    public Variable getA(final int indexFromTop) {
+        return getT(indexFromTop, VarType.REFERENCE);
+    }
+
+    public Variable getT(final int indexFromTop, final int type) {
+        final int stackSize = stackTypeIndexPairs.getSize();
+        if (indexFromTop >= stackSize) {
+            throw new IllegalStateException("Stack underflow");
+        }
+        final int stackValue =
+                stackTypeIndexPairs.get(stackSize - indexFromTop - 1);
+        if ((stackValue & 0xff) != type) {
+            throw new IllegalStateException("Type mismatch");
+        }
+
+        return getVariable(stackValue);
+    }
+
+    public Variable get(final int indexFromTop) {
+        final int stackSize = stackTypeIndexPairs.getSize();
+        if (indexFromTop >= stackSize) {
+            throw new IllegalStateException("Stack underflow");
+        }
+        final int stackValue =
+                stackTypeIndexPairs.get(stackSize - indexFromTop - 1);
+
+        return getVariable(stackValue);
+    }
+
+    private int pushTypeImpl(final int type) {
+        final int count = typeCounters[type];
+        final int value = (count << 8) | (type & 0xff);
+        incCounter(type);
+        stackTypeIndexPairs.add(value);
+
+        return value;
+    }
+
+    private void popImpl(final int count) {
+        final int stackSize = stackTypeIndexPairs.getSize();
+        for (int i = stackSize - count; i < stackSize; ++i) {
+            final int value = stackTypeIndexPairs.get(i);
+            decCounter(value & 0xff);
+        }
+
+        stackTypeIndexPairs.setSize(stackSize - count);
+    }
+
+    private void incCounter(final int type) {
+        final int newValue = ++typeCounters[type];
+        if (typeMaxCounters[type] < newValue) {
+            typeMaxCounters[type] = newValue;
+        }
+    }
+
+    private void decCounter(final int type) {
+        --typeCounters[type];
+    }
+
+    public Variable getVariable(final int typeAndIndex) {
+        final int type = typeAndIndex & 0xff;
+        final int index = typeAndIndex >> 8;
+
+        return Variable.getStackVariable(type, index);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/StringArray.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/StringArray.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,97 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+class StringArray {
+    private String[] arr;
+
+    public StringArray() {
+    }
+
+    private StringArray(String[] arr) {
+        this.arr = arr;
+    }
+    
+    public void add(String s) {
+        if (arr == null) {
+            arr = new String[1];
+        } else {
+            String[] tmp = new String[arr.length + 1];
+            for (int i = 0; i < arr.length; i++) {
+                tmp[i] = arr[i];
+            }
+            arr = tmp;
+        }
+        arr[arr.length - 1] = s;
+    }
+    
+    public String[] toArray() {
+        return arr == null ? new String[0] : arr;
+    }
+    
+    static StringArray asList(String... names) {
+        return new StringArray(names);
+    }
+
+    void reverse() {
+        for (int i = 0, j = arr.length; i < j; i++) {
+            String s = arr[i];
+            arr[i] = arr[--j];
+            arr[j] = s;
+        }
+    }
+
+    boolean contains(String n) {
+        if (arr == null) {
+            return false;
+        }
+        for (int i = 0; i < arr.length; i++) {
+            if (n.equals(arr[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    void delete(int indx) {
+        if (arr == null || indx < 0 || indx >= arr.length) {
+            return;
+        }
+        String[] tmp = new String[arr.length - 1];
+        for (int i = 0, j = 0; i < arr.length; i++) {
+            if (i != indx) {
+                tmp[j++] = arr[i];
+            }
+        }
+        arr = tmp;
+    }
+
+    int indexOf(String ic) {
+        for (int i = 0; i < arr.length; i++) {
+            if (ic.equals(arr[i])) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,233 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/** Generator of JavaScript from bytecode of classes on classpath of the VM.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+class VM extends ByteCodeToJavaScript {
+    public VM(Appendable out) {
+        super(out);
+    }
+    
+    static {
+        // uses VMLazy to load dynamic classes
+        boolean assertsOn = false;
+        assert assertsOn = true;
+        if (assertsOn) {
+            VMLazy.init();
+            Zips.init();
+        }
+    }
+
+    @Override
+    boolean debug(String msg) throws IOException {
+        return false;
+    }
+    
+    static void compile(Bck2Brwsr.Resources l, Appendable out, StringArray names) throws IOException {
+        new VM(out).doCompile(l, names);
+    }
+    protected void doCompile(Bck2Brwsr.Resources l, StringArray names) throws IOException {
+        out.append("(function VM(global) {var fillInVMSkeleton = function(vm) {");
+        StringArray processed = new StringArray();
+        StringArray initCode = new StringArray();
+        for (String baseClass : names.toArray()) {
+            references.add(baseClass);
+            for (;;) {
+                String name = null;
+                for (String n : references.toArray()) {
+                    if (processed.contains(n)) {
+                        continue;
+                    }
+                    name = n;
+                }
+                if (name == null) {
+                    break;
+                }
+                InputStream is = loadClass(l, name);
+                if (is == null) {
+                    throw new IOException("Can't find class " + name); 
+                }
+                try {
+                    String ic = compile(is);
+                    processed.add(name);
+                    initCode.add(ic == null ? "" : ic);
+                } catch (RuntimeException ex) {
+                    if (out instanceof CharSequence) {
+                        CharSequence seq = (CharSequence)out;
+                        int lastBlock = seq.length();
+                        while (lastBlock-- > 0) {
+                            if (seq.charAt(lastBlock) == '{') {
+                                break;
+                            }
+                        }
+                        throw new IOException("Error while compiling " + name + "\n" 
+                            + seq.subSequence(lastBlock + 1, seq.length()), ex
+                        );
+                    } else {
+                        throw new IOException("Error while compiling " + name + "\n" 
+                            + out, ex
+                        );
+                    }
+                }
+            }
+
+            for (String resource : scripts.toArray()) {
+                while (resource.startsWith("/")) {
+                    resource = resource.substring(1);
+                }
+                InputStream emul = l.get(resource);
+                if (emul == null) {
+                    throw new IOException("Can't find " + resource);
+                }
+                readResource(emul, out);
+            }
+            scripts = new StringArray();
+            
+            StringArray toInit = StringArray.asList(references.toArray());
+            toInit.reverse();
+
+            for (String ic : toInit.toArray()) {
+                int indx = processed.indexOf(ic);
+                if (indx >= 0) {
+                    final String theCode = initCode.toArray()[indx];
+                    if (!theCode.isEmpty()) {
+                        out.append(theCode).append("\n");
+                    }
+                    initCode.toArray()[indx] = "";
+                }
+            }
+        }
+        out.append(
+              "  return vm;\n"
+            + "  };\n"
+            + "  global.bck2brwsr = function() {\n"
+            + "    var args = Array.prototype.slice.apply(arguments);\n"
+            + "    var vm = fillInVMSkeleton({});\n"
+            + "    var loader = {};\n"
+            + "    loader.vm = vm;\n"
+            + "    loader.loadClass = function(name) {\n"
+            + "      var attr = name.replace__Ljava_lang_String_2CC('.','_');\n"
+            + "      var fn = vm[attr];\n"
+            + "      if (fn) return fn(false);\n"
+            + "      return vm.org_apidesign_vm4brwsr_VMLazy(false).\n"
+            + "        load__Ljava_lang_Object_2Ljava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, name, args);\n"
+            + "    }\n"
+            + "    if (vm.loadClass) {\n"
+            + "      throw 'Cannot initialize the bck2brwsr VM twice!';\n"
+            + "    }\n"
+            + "    vm.loadClass = loader.loadClass;\n"
+            + "    vm.loadBytes = function(name) {\n"
+            + "      return vm.org_apidesign_vm4brwsr_VMLazy(false).\n"
+            + "        loadBytes___3BLjava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, name, args);\n"
+            + "    }\n"
+            + "    vm.java_lang_reflect_Array(false);\n"
+            + "    vm.org_apidesign_vm4brwsr_VMLazy(false).\n"
+            + "      loadBytes___3BLjava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, null, args);\n"
+            + "    return loader;\n"
+            + "  };\n");
+        out.append("}(this));");
+    }
+    private static void readResource(InputStream emul, Appendable out) throws IOException {
+        try {
+            int state = 0;
+            for (;;) {
+                int ch = emul.read();
+                if (ch == -1) {
+                    break;
+                }
+                if (ch < 0 || ch > 255) {
+                    throw new IOException("Invalid char in emulation " + ch);
+                }
+                switch (state) {
+                    case 0: 
+                        if (ch == '/') {
+                            state = 1;
+                        } else {
+                            out.append((char)ch);
+                        }
+                        break;
+                    case 1:
+                        if (ch == '*') {
+                            state = 2;
+                        } else {
+                            out.append('/').append((char)ch);
+                            state = 0;
+                        }
+                        break;
+                    case 2:
+                        if (ch == '*') {
+                            state = 3;
+                        }
+                        break;
+                    case 3:
+                        if (ch == '/') {
+                            state = 0;
+                        } else {
+                            state = 2;
+                        }
+                        break;
+                }
+            }
+        } finally {
+            emul.close();
+        }
+    }
+
+    private static InputStream loadClass(Bck2Brwsr.Resources l, String name) throws IOException {
+        return l.get(name + ".class"); // NOI18N
+    }
+
+    static String toString(String name) throws IOException {
+        StringBuilder sb = new StringBuilder();
+//        compile(sb, name);
+        return sb.toString().toString();
+    }
+
+    private StringArray scripts = new StringArray();
+    private StringArray references = new StringArray();
+    
+    @Override
+    protected boolean requireReference(String cn) {
+        if (references.contains(cn)) {
+            return false;
+        }
+        references.add(cn);
+        return true;
+    }
+
+    @Override
+    protected void requireScript(String resourcePath) {
+        scripts.add(resourcePath);
+    }
+
+    @Override
+    String assignClass(String className) {
+        return "vm." + className + " = ";
+    }
+    
+    @Override
+    String accessClass(String className) {
+        return "vm." + className;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/VMLazy.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VMLazy.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,155 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Array;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class VMLazy {
+    private final Object loader;
+    private final Object[] args;
+    
+    private VMLazy(Object loader, Object[] args) {
+        this.loader = loader;
+        this.args = args;
+    }
+    
+    static void init() {
+    }
+    
+    static Object load(Object loader, String name, Object[] arguments) 
+    throws IOException, ClassNotFoundException {
+        return new VMLazy(loader, arguments).load(name, false);
+    }
+    
+    static byte[] loadBytes(Object loader, String name, Object[] arguments) throws Exception {
+        return Zips.loadFromCp(arguments, name);
+    }
+    
+    private Object load(String name, boolean instance)
+    throws IOException, ClassNotFoundException {
+        String res = name.replace('.', '/') + ".class";
+        byte[] arr = Zips.loadFromCp(args, res);
+        if (arr == null) {
+            throw new ClassNotFoundException(name);
+        }
+//        beingDefined(loader, name);
+        StringBuilder out = new StringBuilder(65535);
+        out.append("var loader = arguments[0];\n");
+        out.append("var vm = loader.vm;\n");
+        int prelude = out.length();
+        String initCode = new Gen(this, out).compile(new ByteArrayInputStream(arr));
+        String code = out.toString().toString();
+//        dump("Loading " + name);
+        dump(code);
+        String under = name.replace('.', '_');
+        Object fn = applyCode(loader, under, code, instance);
+        
+        if (!initCode.isEmpty()) {
+            out.setLength(prelude);
+            out.append(initCode);
+            code = out.toString().toString();
+            dump(code);
+            applyCode(loader, null, code, false);
+        }            
+        
+        return fn;
+    }
+
+//    @JavaScriptBody(args = "s", body = "java.lang.System.out.println(s.toString());")
+    static void dump(String s) {
+    }
+
+/* possibly not needed:
+    @JavaScriptBody(args = {"loader", "n" }, body =
+        "var cls = n.replace__Ljava_lang_String_2CC(n, '.','_').toString();" +
+        "loader.vm[cls] = true;\n"
+    )
+    private static native void beingDefined(Object loader, String name);
+*/
+    
+
+    @JavaScriptBody(args = {"loader", "name", "script", "instance" }, body =
+        "try {\n" +
+        "  new Function(script)(loader, name);\n" +
+        "} catch (ex) {\n" +
+        "  throw 'Cannot compile ' + name + ' ' + ex + ' line: ' + ex.lineNumber + ' script:\\n' + script;\n" +
+        "}\n" +
+        "return name != null ? vm[name](instance) : null;\n"
+    )
+    private static native Object applyCode(Object loader, String name, String script, boolean instance);
+    
+    
+    private static final class Gen extends ByteCodeToJavaScript {
+        private final VMLazy lazy;
+
+        public Gen(VMLazy vm, Appendable out) {
+            super(out);
+            this.lazy = vm;
+        }
+        
+        @JavaScriptBody(args = {"n"},
+        body =
+        "var cls = n.replace__Ljava_lang_String_2CC('/','_').toString();"
+        + "\nvar dot = n.replace__Ljava_lang_String_2CC('/','.').toString();"
+        + "\nvar lazy = this._lazy();"
+        + "\nvar loader = lazy._loader();"
+        + "\nvar vm = loader.vm;"
+        + "\nif (vm[cls]) return false;"
+        + "\nvm[cls] = function() {"
+        + "\n  var instance = arguments.length == 0 || arguments[0] === true;"
+        + "\n  return lazy.load__Ljava_lang_Object_2Ljava_lang_String_2Z(dot, instance);"
+        + "\n};"
+        + "\nreturn true;")
+        @Override
+        protected boolean requireReference(String internalClassName) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        protected void requireScript(String resourcePath) throws IOException {
+            InputStream is = getClass().getResourceAsStream(resourcePath);
+            StringBuilder sb = new StringBuilder();
+            for (;;) {
+                int ch = is.read();
+                if (ch == -1) {
+                    break;
+                }
+                sb.append((char)ch);
+            }
+            applyCode(lazy.loader, null, sb.toString(), false);
+        }
+
+        @Override
+        String assignClass(String className) {
+            return "vm[arguments[1]]=";
+        }
+
+        @Override
+        String accessClass(String classOperation) {
+            return "vm." + classOperation;
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/VarType.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VarType.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,108 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+final class VarType {
+    public static final int INTEGER = 0;
+    public static final int LONG = 1;
+    public static final int FLOAT = 2;
+    public static final int DOUBLE = 3;
+    public static final int REFERENCE = 4;
+
+    public static final int LAST = REFERENCE;
+
+    private VarType() {
+    }
+
+    public static boolean isCategory2(final int varType) {
+        return (varType == LONG) || (varType == DOUBLE);
+    }
+
+    public static int fromStackMapType(final int smType) {
+        switch (smType & 0xff) {
+            case ByteCodeParser.ITEM_Integer:
+                return VarType.INTEGER;
+            case ByteCodeParser.ITEM_Float:
+                return VarType.FLOAT;
+            case ByteCodeParser.ITEM_Double:
+                return VarType.DOUBLE;
+            case ByteCodeParser.ITEM_Long:
+                return VarType.LONG;
+            case ByteCodeParser.ITEM_Null:
+            case ByteCodeParser.ITEM_InitObject:
+            case ByteCodeParser.ITEM_Object:
+            case ByteCodeParser.ITEM_NewObject:
+                return VarType.REFERENCE;
+
+            case ByteCodeParser.ITEM_Bogus:
+                /* unclear how to handle for now */
+            default:
+                throw new IllegalStateException("Unhandled stack map type");
+        }
+    }
+
+    public static int fromConstantType(final byte constantTag) {
+        switch (constantTag) {
+            case ByteCodeParser.CONSTANT_INTEGER:
+                return VarType.INTEGER;
+            case ByteCodeParser.CONSTANT_FLOAT:
+                return VarType.FLOAT;
+            case ByteCodeParser.CONSTANT_LONG:
+                return VarType.LONG;
+            case ByteCodeParser.CONSTANT_DOUBLE:
+                return VarType.DOUBLE;
+
+            case ByteCodeParser.CONSTANT_CLASS:
+            case ByteCodeParser.CONSTANT_UTF8:
+            case ByteCodeParser.CONSTANT_UNICODE:
+            case ByteCodeParser.CONSTANT_STRING:
+                return VarType.REFERENCE;
+
+            case ByteCodeParser.CONSTANT_FIELD:
+            case ByteCodeParser.CONSTANT_METHOD:
+            case ByteCodeParser.CONSTANT_INTERFACEMETHOD:
+            case ByteCodeParser.CONSTANT_NAMEANDTYPE:
+                /* unclear how to handle for now */
+            default:
+                throw new IllegalStateException("Unhandled constant tag");
+        }
+    }
+
+    public static int fromFieldType(final char fieldType) {
+        switch (fieldType) {
+            case 'B':
+            case 'C':
+            case 'S':
+            case 'Z':
+            case 'I':
+                return VarType.INTEGER;
+            case 'J':
+                return VarType.LONG;
+            case 'F':
+                return VarType.FLOAT;
+            case 'D':
+                return VarType.DOUBLE;
+            case 'L':
+            case '[':
+                return VarType.REFERENCE;
+
+            default:
+                throw new IllegalStateException("Unhandled field type");
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/Variable.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/Variable.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,100 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+final class Variable implements CharSequence {
+    private static final String STACK_VAR_PREFIX = "st";
+    private static final String LOCAL_VAR_PREFIX = "lc";
+
+    private final String name;
+    private final int type;
+    private final int index;
+
+    private static final char[] TYPE_IDS = { 'I', 'L', 'F', 'D', 'A' };
+
+    private Variable(final String prefix, final int type, final int index) {
+        this.name = prefix + TYPE_IDS[type] + index;
+        this.type = type;
+        this.index = index;
+    }
+
+    public static Variable getStackVariable(
+            final int type, final int index) {
+        // TODO: precreate frequently used variables
+        return new Variable(STACK_VAR_PREFIX, type, index);
+    }
+
+    public static Variable getLocalVariable(
+            final int type, final int index) {
+        // TODO: precreate frequently used variables
+        return new Variable(LOCAL_VAR_PREFIX, type, index);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public boolean isCategory2() {
+        return VarType.isCategory2(type);
+    }
+
+    @Override
+    public int length() {
+        return name.length();
+    }
+
+    @Override
+    public char charAt(final int index) {
+        return name.charAt(index);
+    }
+
+    @Override
+    public CharSequence subSequence(final int start, final int end) {
+        return name.subSequence(start, end);
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof Variable)) {
+            return false;
+        }
+
+        return name.equals(((Variable) other).name);
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/main/java/org/apidesign/vm4brwsr/Zips.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/Zips.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,187 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.emul.zip.FastJar;
+
+/** Conversion from classpath to load function.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class Zips {
+    private final FastJar fj;
+
+    private Zips(String path, byte[] zipData) throws IOException {
+        long bef = timeNow();
+        fj = new FastJar(zipData);
+        for (FastJar.Entry e : fj.list()) {
+            putRes(e.name, e);
+        }
+        log("Iterating thru " + path + " took " + (timeNow() - bef) + "ms");
+    }
+    
+    public static void init() {
+    }
+    @JavaScriptBody(args = { "arr" }, body = "return arr.length;")
+    private static native int length(Object arr);
+    @JavaScriptBody(args = { "arr", "index" }, body = "return arr[index];")
+    private static native Object at(Object arr, int index);
+    @JavaScriptBody(args = { "arr", "index", "value" }, body = "arr[index] = value; return value;")
+    private static native Object set(Object arr, int index, Object value);
+    
+    public static byte[] loadFromCp(Object classpath, String res) 
+    throws IOException, ClassNotFoundException {
+        for (int i = 0; i < length(classpath); i++) {
+            Object c = at(classpath, i);
+            if (c instanceof String) {
+                try {
+                    String url = (String)c;
+                    final Zips z = toZip(url);
+                    c = set(classpath, i, z);
+                    final byte[] man = z.findRes("META-INF/MANIFEST.MF");
+                    if (man != null) {
+                        String mainClass = processClassPathAttr(man, url, classpath);
+//                        if (mainClass != null) {
+//                            Class.forName(mainClass);
+//                        }
+                    }
+                } catch (IOException ex) {
+                    set(classpath, i, ex);
+                    log("Cannot load " + c + " - " + ex.getClass().getName() + ":" + ex.getMessage());
+                }
+            }
+            if (res != null) {
+                byte[] checkRes;
+                if (c instanceof Zips) {
+                    checkRes = ((Zips)c).findRes(res);
+                } else {
+                    checkRes = callFunction(c, res);
+                }
+                if (checkRes != null) {
+                    return checkRes;
+                }
+            }
+        }
+        return null;
+    }
+    
+    @JavaScriptBody(args = { "fn", "res" }, body = 
+        "if (typeof fn === 'function') return fn(res);\n"
+      + "return null;"
+    )
+    private static native byte[] callFunction(Object fn, String res);
+    
+    @JavaScriptBody(args = { "msg" }, body = "console.log(msg.toString());")
+    private static native void log(String msg);
+
+    private byte[] findRes(String res) throws IOException {
+        Object arr = findResImpl(res);
+        if (arr instanceof FastJar.Entry) {
+            long bef = timeNow();
+            InputStream zip = fj.getInputStream((FastJar.Entry)arr);
+            arr = readFully(new byte[512], zip);
+            putRes(res, arr);
+            log("Reading " + res + " took " + (timeNow() - bef) + "ms");
+        }
+        return (byte[]) arr;
+    }
+
+    @JavaScriptBody(args = { "res" }, body = "var r = this[res]; return r ? r : null;")
+    private native Object findResImpl(String res);
+
+    @JavaScriptBody(args = { "res", "arr" }, body = "this[res] = arr;")
+    private native void putRes(String res, Object arr);
+    
+    private static Zips toZip(String path) throws IOException {
+        URL u = new URL(path);
+        byte[] zipData = (byte[]) u.getContent(new Class[] { byte[].class });
+        return new Zips(path, zipData);
+    }
+
+    private static String processClassPathAttr(final byte[] man, String url, Object classpath) throws IOException {
+        try (ParseMan is = new ParseMan(new ByteArrayInputStream(man))) {
+            String cp = is.toString();
+            if (cp != null) {
+                cp = cp.trim();
+                for (int p = 0; p < cp.length();) {
+                    int n = cp.indexOf(' ', p);
+                    if (n == -1) {
+                        n = cp.length();
+                    }
+                    String el = cp.substring(p, n);
+                    URL u = new URL(new URL(url), el);
+                    classpath = addToArray(classpath, u.toString());
+                    p = n + 1;
+                }
+            }
+            return is.getMainClass();
+        }
+    }
+
+    private static Object addToArray(Object arr, String value) {
+        final int last = length(arr);
+        Object ret = enlargeArray(arr, last + 1);
+        set(ret, last, value);
+        return ret;
+    }
+
+    @JavaScriptBody(args = { "arr", "len" }, body = "while (arr.length < len) arr.push(null); return arr;")
+    private static native Object enlargeArray(Object arr, int len);
+    @JavaScriptBody(args = { "arr", "len" }, body = "while (arr.length < len) arr.push(0);")
+    private static native void enlargeBytes(byte[] arr, int len);
+
+    @JavaScriptBody(args = { "arr", "len" }, body = "arr.splice(len, arr.length - len);")
+    private static native void sliceArray(byte[] arr, int len);
+
+    private static Object readFully(byte[] arr, InputStream zip) throws IOException {
+        int offset = 0;
+        for (;;) {
+            int len = zip.read(arr, offset, arr.length - offset);
+            if (len == -1) {
+                break;
+            }
+            offset += len;
+            if (offset == arr.length) {
+                enlargeBytes(arr, arr.length + 4096);
+            }
+        }
+        sliceArray(arr, offset);
+        return arr;
+    }
+
+    private static long timeNow() {
+        double time = m();
+        if (time >= 0) {
+            return (long)time;
+        }
+        return org.apidesign.bck2brwsr.emul.lang.System.currentTimeMillis();
+    }
+    @JavaScriptBody(args = {}, body = 
+        "if (typeof window.performance === 'undefined') return -1;\n"
+      + "if (typeof window.performance.now === 'undefined') return -1;\n"
+      + "return window.performance.now();"
+    )
+    private static native double m();
+    
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/Array.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/Array.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,139 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class Array {
+    byte[] bytes = { 1 };
+    short[] shorts = { 2, 3 };
+    int[] ints = { 4, 5, 6 };
+    float[] floats = { 7, 8, 9, 10 };
+    double[][] doubles = { {11}, {12}, {13}, {14}, {15} };
+    char[] chars = { 'a', 'b' };
+    
+    private Array() {
+    }
+    
+    byte bytes() {
+        return bytes[0];
+    }
+    short shorts() {
+        return shorts[1];
+    }
+    
+    int[] ints() {
+        return ints;
+    }
+    
+    float floats() {
+        return floats[3];
+    }
+    
+    double doubles() {
+        return doubles[4][0];
+    }
+    
+    static double[][] dbls = new double[1][2];
+    public static double twoDoubles() {
+        return dbls[0][0] + dbls[0][0];
+    }
+
+    static int[][] tints = new int[1][2];
+    public static int twoInts() {
+        return tints[0][0] + tints[0][0];
+    }
+    
+    private static final Array[] ARR = { new Array(), new Array(), new Array() };
+    
+    private static Array[][] arr() {
+        Array[][] matrix = new Array[3][3];
+        for (int i = 0; i < ARR.length; i++) {
+            matrix[i][i] = ARR[i];
+        }
+        return matrix;
+    }
+    private static <T> T[] filter(T[] in) {
+        return in;
+    }
+    
+    public static double sum() {
+        double sum = 0.0;
+        for (Array[] row : arr()) {
+            int indx = -1;
+            for (Array a : row) {
+                indx++;
+                if (a == null) {
+                    continue;
+                }
+                sum += a.bytes();
+                sum += a.shorts();
+                sum += a.ints()[2];
+                sum += a.floats();
+                sum += filter(row)[indx].doubles();
+            }
+        }
+        return sum;
+    }
+    private static final int[] arr = { 0, 1, 2, 3, 4, 5 };
+    public static int simple(boolean clone) {
+        int[] ar;
+        if (clone) {
+            ar = arr.clone();
+        } else {
+            ar = arr;
+        }
+        
+        int sum = 0;
+        for (int a : ar) {
+            sum += a;
+        }
+        return sum;
+    }
+    
+    public static String objectArrayClass() {
+        return Object[].class.getName();
+    }
+    
+    public static boolean instanceOfArray(Object obj) {
+        return obj instanceof Object[];
+    }
+    
+    public static int sum(int size) {
+        int[] arr = new int[size];
+        return arr[0] + arr[1];
+    }
+    
+    static void arraycopy(char[] value, int srcBegin, char[] dst, int dstBegin, int count) {
+        while (count-- > 0) {
+            dst[dstBegin++] = value[srcBegin++];
+        }
+    }
+
+    public static char copyArray() {
+        char[] arr = { '0' };
+        arraycopy(arr()[0][0].chars, 0, arr, 0, 1);
+        return arr[0];
+    }
+    
+    public static int multiLen() {
+        return new int[1][0].length;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,95 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ArrayTest {
+    @Test public void intArrayShouldBeFilledWithZeroes() throws Exception {
+            assertExec("0 + 0", Array.class, "sum__II", 
+            Double.valueOf(0), 2
+        );
+    }
+    @Test public void verifySimpleIntOperation() throws Exception {
+            assertExec("CheckTheSum", Array.class, "simple__IZ", 
+            Double.valueOf(15), false
+        );
+    }
+    
+    @Test public void cloneOnArray() throws Exception {
+            assertExec("CheckTheSum on clone", Array.class, "simple__IZ", 
+            Double.valueOf(15), true
+        );
+    }
+    
+    @Test public void realOperationOnArrays() throws Exception {
+        assertEquals(Array.sum(), 105.0, "Computes to 105");
+    }
+    
+    @Test public void verifyOperationsOnArrays() throws Exception {
+        assertExec("The sum is 105", Array.class, "sum__D", 
+            Double.valueOf(105)
+        );
+    }
+
+    @Test public void twoDoubles() throws Exception {
+        assertExec("Elements are initialized", Array.class, "twoDoubles__D", 
+            Double.valueOf(0)
+        );
+    }
+    @Test public void twoInts() throws Exception {
+        assertExec("Elements are initialized", Array.class, "twoInts__I", 
+            Double.valueOf(0)
+        );
+    }
+    
+    @Test public void doesCopyArrayWork() throws Exception {
+        assertExec("Returns 'a'", Array.class, "copyArray__C", Double.valueOf('a'));
+    }
+
+    @Test public void verifyObjectArrayClass() throws Exception {
+        assertExec("Returns 'Object[]'", Array.class, "objectArrayClass__Ljava_lang_String_2", Array.objectArrayClass());
+    }
+    @Test public void verifyInstanceOfArray() throws Exception {
+        assertExec("Returns 'false'", Array.class, "instanceOfArray__ZLjava_lang_Object_2", Double.valueOf(0), "non-array");
+    }
+    @Test public void verifyMultiLen() throws Exception {
+        assertExec("Multi len is one", Array.class, "multiLen__I", Double.valueOf(1));
+    }
+    
+    private static TestVM code;
+    
+    @BeforeClass 
+    public void compileTheCode() throws Exception {
+        code = TestVM.compileClass("org/apidesign/vm4brwsr/Array");
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    private static void assertExec(String msg, Class clazz, String method, Object expRes, Object... args) throws Exception {
+        code.assertExec(msg, clazz, method, expRes, args);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/ByteCodeToJavaScriptTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ByteCodeToJavaScriptTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,55 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ByteCodeToJavaScriptTest {
+    
+    public ByteCodeToJavaScriptTest() {
+    }
+
+    @Test
+    public void findMethodNameManglesObjectsCorrectly() {
+        StringBuilder cnt = new StringBuilder();
+        char[] returnType = { 'V' };
+        String ret = ByteCodeToJavaScript.findMethodName(new String[] { 
+            "StringTest", "replace", "(Ljava/lang/String;CC)Ljava/lang/String;"
+        }, cnt, returnType);
+        assertEquals(cnt.toString(), "000", "No doubles or longs");
+        assertTrue(returnType[0] != 'V', "Returns string");
+        assertEquals(ret, "replace__Ljava_lang_String_2Ljava_lang_String_2CC");
+    }
+
+    @Test
+    public void manglingArrays() {
+        StringBuilder cnt = new StringBuilder();
+        char[] returnType = { 'V' };
+        String ret = ByteCodeToJavaScript.findMethodName(new String[] { 
+            "VMinVM", "toJavaScript", "([B)Ljava/lang/String;"
+        }, cnt, returnType);
+        assertEquals(cnt.toString(), "0", "No doubles or longs");
+        assertTrue(returnType[0] != 'V', "Returns string");
+        assertEquals(ret, "toJavaScript__Ljava_lang_String_2_3B");
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/BytesLoader.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/BytesLoader.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,76 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class BytesLoader {
+    private static Set<String> requested = new TreeSet<String>();
+
+    public byte[] get(String name) throws IOException {
+        if (!requested.add(name)) {
+            throw new IllegalStateException("Requested for second time: " + name);
+        }
+        byte[] arr = readClass(name);
+        /*
+        System.err.print("loader['" + name + "'] = [");
+        for (int i = 0; i < arr.length; i++) {
+        if (i > 0) {
+        System.err.print(", ");
+        }
+        System.err.print(arr[i]);
+        }
+        System.err.println("]");
+         */
+        return arr;
+    }
+
+    static byte[] readClass(String name) throws IOException {
+        URL u = null;
+        Enumeration<URL> en = BytesLoader.class.getClassLoader().getResources(name);
+        while (en.hasMoreElements()) {
+            u = en.nextElement();
+        }
+        if (u == null) {
+            throw new IOException("Can't find " + name);
+        }
+        try (InputStream is = u.openStream()) {
+            byte[] arr;
+            arr = new byte[is.available()];
+            int offset = 0;
+            while (offset < arr.length) {
+                int len = is.read(arr, offset, arr.length - offset);
+                if (len == -1) {
+                    throw new IOException("Can't read " + name);
+                }
+                offset += len;
+            }
+            return arr;
+        }
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,211 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ClassTest {
+
+    @Test public void superClassEqualsGetSuperclass() {
+        assertTrue(Classes.equalsClassesOfExceptions(), "Classes are equal");
+    }
+
+    @Test public void jsSuperClassEqualsGetSuperclass() throws Exception {
+        assertExec("Classes are equal", Classes.class, "equalsClassesOfExceptions__Z", Double.valueOf(1.0));
+    }
+
+    @Test public void classesAreDifferent() {
+        assertTrue(Classes.differenceInClasses(), "Classes are not equal");
+    }
+
+    @Test public void jsClassesAreDifferent() throws Exception {
+        assertExec("Classes are not equal", Classes.class, "differenceInClasses__Z", Double.valueOf(1.0));
+    }
+
+    @Test public void javaInstanceName() throws Exception {
+        assertEquals(Classes.classForInstance(), "java.io.IOException");
+    }
+    @Test public void jsInstanceName() throws Exception {
+        assertExec("I/O name", Classes.class, "classForInstance__Ljava_lang_String_2", "java.io.IOException");
+    }
+    @Test public void javaName() throws Exception {
+        assertEquals(Classes.name(), "java.io.IOException");
+    }
+    @Test public void jsName() throws Exception {
+        assertExec("I/O name", Classes.class, "name__Ljava_lang_String_2", "java.io.IOException");
+    }
+    @Test public void javaSimpleName() throws Exception {
+        assertEquals(Classes.simpleName(), "IOException");
+    }
+    @Test public void jsGetsSimpleName() throws Exception {
+        assertExec("I/O simple name", Classes.class, "simpleName__Ljava_lang_String_2", "IOException");
+    }
+    @Test public void javaCanonicalName() {
+        assertEquals(Classes.canonicalName(), "java.io.IOException");
+    }
+    @Test public void jsCanonicalName() throws Exception {
+        assertExec("I/O simple name", Classes.class, "canonicalName__Ljava_lang_String_2", "java.io.IOException");
+    }
+    @Test public void javaNewInstance() throws Exception {
+        assertTrue(Classes.newInstance());
+    }
+    @Test public void jsNewInstance() throws Exception {
+        assertExec("Check new instance", Classes.class, "newInstance__Z", Double.valueOf(1));
+    }
+    @Test public void javaNoNewInstance() throws Exception {
+        assertEquals("java.lang.InstantiationException:java.lang.Float", 
+            Classes.newInstanceNoPubConstructor()
+        );
+    }
+    @Test public void jsNoNewInstance() throws Exception {
+        assertExec("Check problems with new instance", Classes.class, "newInstanceNoPubConstructor__Ljava_lang_String_2", 
+            "java.lang.InstantiationException:java.lang.Float"
+        );
+    }
+    @Test public void jsAnnotation() throws Exception {
+        assertExec("Check class annotation", Classes.class, "getMarker__I", Double.valueOf(10));
+    }
+    @Test public void jsArrayAnnotation() throws Exception {
+        assertExec("Check array annotation", Classes.class, "getMarkerNicknames__Ljava_lang_String_2", Classes.getMarkerNicknames());
+    }
+    @Test public void jsEnumAnnotation() throws Exception {
+        assertExec("Check enum annotation", Classes.class, "getMarkerE__Ljava_lang_String_2", Classes.getMarkerE());
+    }
+    @Test public void jsRetentionAnnotation() throws Exception {
+        assertExec("Check enum annotation", Classes.class, "getRetention__Ljava_lang_String_2", Classes.getRetention());
+    }
+    @Test public void jsStringAnnotation() throws Exception {
+        assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", true);
+    }
+    @Test public void jsStringAnnotationFromArray() throws Exception {
+        assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", false);
+    }
+    @Test public void jsInnerAnnotation() throws Exception {
+        assertExec("Check inner annotation", Classes.class, "getInnerNamer__I", Double.valueOf(Classes.getInnerNamer()));
+    }
+    @Test public void jsInnerAnnotationFromArray() throws Exception {
+        assertExec("Check inner annotation", Classes.class, "getInnerNamers__I", Double.valueOf(Classes.getInnerNamers()));
+    }
+    @Test public void javaInvokeMethod() throws Exception {
+        assertEquals(Classes.reflectiveMethodCall(true, "name"), "java.io.IOException", "Calls the name() method via reflection");
+    }
+    @Test public void jsInvokeMethod() throws Exception {
+        assertExec("Calls the name() method via reflection", Classes.class, 
+            "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", 
+            "java.io.IOException", true, "name"
+        );
+    }
+    
+    @Test public void jsMethodDeclaredInObject() throws Exception {
+        assertExec("Defined in Object", Classes.class, 
+            "objectName__Ljava_lang_String_2", 
+            "java.lang.Object"
+        );
+    }
+    
+    @Test public void jsInvokeParamMethod() throws Exception {
+        assertExec("sums two numbers via reflection", Classes.class, 
+            "reflectiveSum__III", Double.valueOf(5), 2, 3
+        );
+    }
+    @Test public void javaFindMethod() throws Exception {
+        assertEquals(Classes.reflectiveMethodCall(false, "name"), "java.io.IOException", "Calls the name() method via reflection");
+    }
+    @Test public void jsFindMethod() throws Exception {
+        assertExec("Calls the name() method via reflection", Classes.class, 
+            "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", 
+            "java.io.IOException", false, "name"
+        );
+    }
+    @Test public void primitiveReturnType() throws Exception {
+        assertExec("Tries to get an integer via reflection", Classes.class, 
+            "primitiveType__Ljava_lang_String_2Ljava_lang_String_2", 
+            Classes.primitiveType("primitive"), "primitive"
+        );
+    }
+    @Test public void primitiveBoolReturnType() throws Exception {
+        assertExec("Tries to get an integer via reflection", Classes.class, 
+            "primitiveType__Ljava_lang_String_2Ljava_lang_String_2", 
+            Classes.primitiveType("primitiveB"), "primitiveB"
+        );
+    }
+    @Test public void javaAnnotatedMethod() throws Exception {
+        assertEquals(Classes.reflectiveMethodCall(false, null), "java.io.IOException", "Calls the name() method via reflection");
+    }
+    @Test public void jsAnnotatedMethod() throws Exception {
+        assertExec("Calls the name() method via reflection", Classes.class, 
+            "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", 
+            "java.io.IOException", false, null
+        );
+    }
+    @Test public void jsClassParam() throws Exception {
+        assertExec("Calls the nameOfIO()", Classes.class, 
+            "nameOfIO__Ljava_lang_String_2", 
+            "java.io.IOException"
+        );
+    }
+    @Test public void noInterface() throws Exception {
+        assertExec("Calls Class.isInterface", Classes.class, 
+            "isInterface__ZLjava_lang_String_2", 
+            0.0, "java.lang.String"
+        );
+    }
+    @Test public void isInterface() throws Exception {
+        assertExec("Calls Class.isInterface", Classes.class, 
+            "isInterface__ZLjava_lang_String_2", 
+            1.0, "java.lang.Runnable"
+        );
+    }
+    @Test public void integerType() throws Exception {
+        assertExec("Computes the type", Classes.class, 
+            "intType__Ljava_lang_String_2", 
+            Classes.intType()
+        );
+    }
+    
+    private static TestVM code;
+    
+    @BeforeClass
+    public void compileTheCode() throws Exception {
+        code = TestVM.compileClass("org/apidesign/vm4brwsr/Classes");
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    
+    private void assertExec(
+        String msg, Class clazz, String method, Object expRes, Object... args
+    ) throws Exception {
+        code.assertExec(msg, clazz, method, expRes, args);
+    }
+    @Test public void isClassAssignable() throws Exception {
+        assertExec("isAssignable works on subclasses", Classes.class, 
+            "isClassAssignable__Z", 
+            true
+        );
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/Classes.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/Classes.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,233 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ClassesMarker(number = 10, nicknames = { "Ten", "Deset" }, count = ClassesMarker.E.TWO, subs = {
+    @ClassesMarker.Anno(Integer.SIZE),
+    @ClassesMarker.Anno(Integer.MIN_VALUE)
+})
+@ClassesNamer(name = "my text", anno = @ClassesMarker.Anno(333))
+public class Classes {
+    public static String nameOfIO() {
+        return nameFor(IOException.class);
+    }
+    
+    private static String nameFor(Class<?> c) {
+        return c.getName();
+    }
+    
+    private static final Class<?> PRELOAD = Runnable.class;
+    
+    public static boolean isInterface(String s) throws ClassNotFoundException {
+        return Class.forName(s).isInterface();
+    }
+    
+    public static boolean equalsClassesOfExceptions() {
+        return MalformedURLException.class.getSuperclass() == IOException.class;
+    }
+    public static boolean differenceInClasses() {
+        Class<?> c1 = MalformedURLException.class;
+        Class<?> c2 = IOException.class;
+        return c1 != c2;
+    }
+    
+    public static String classForInstance() {
+        return new IOException().getClass().getName().toString();
+    }
+    
+    @ClassesMarker(number = 1, nicknames = { "One", "Jedna" } )
+    public static String name() {
+        return IOException.class.getName().toString();
+    }
+    public static String simpleName() {
+        return IOException.class.getSimpleName();
+    }
+    public static String canonicalName() {
+        return IOException.class.getCanonicalName();
+    }
+    
+    public static String objectName() throws NoSuchMethodException {
+        return IOException.class.getMethod("wait").getDeclaringClass().getName();
+    }
+    
+    public static boolean newInstance() throws Exception {
+        IOException ioe = IOException.class.newInstance();
+        if (ioe instanceof IOException) {
+            return ioe.getClass() == IOException.class;
+        }
+        throw new IllegalStateException("Not a subtype: " + ioe);
+    }
+    public static String newInstanceNoPubConstructor() throws Exception {
+        try {
+            Float f = Float.class.newInstance();
+            return "wrong, can't instantiate: " + f;
+        } catch (Exception ex) {
+            return (ex.getClass().getName() + ":" + ex.getMessage()).toString().toString();
+        }
+    }
+    public static int getMarker() {
+        if (!Classes.class.isAnnotationPresent(ClassesMarker.class)) {
+            return -2;
+        }
+        ClassesMarker cm = Classes.class.getAnnotation(ClassesMarker.class);
+        assert cm instanceof Object : "Is object " + cm;
+        assert cm instanceof Annotation : "Is annotation " + cm;
+        assert !((Object)cm instanceof Class) : "Is not Class " + cm;
+        return cm == null ? -1 : cm.number();
+    }
+    public static String getMarkerNicknames() {
+        ClassesMarker cm = Classes.class.getAnnotation(ClassesMarker.class);
+        if (cm == null) {
+            return null;
+        }
+        
+        final Object[] arr = cm.nicknames();
+        assert arr instanceof Object[] : "Instance of Object array: " + arr;
+        assert arr instanceof String[] : "Instance of String array: " + arr;
+        assert !(arr instanceof Integer[]) : "Not instance of Integer array: " + arr;
+        
+        StringBuilder sb = new StringBuilder();
+        for (String s : cm.nicknames()) {
+            sb.append(s).append("\n");
+        }
+        return sb.toString().toString();
+    }
+    @Retention(RetentionPolicy.CLASS)
+    @interface Ann {
+    }
+    
+    public static String getRetention() throws Exception {
+        Retention r = Ann.class.getAnnotation(Retention.class);
+        assert r != null : "Annotation is present";
+        assert r.value() == RetentionPolicy.CLASS : "Policy value is OK: " + r.value();
+        return r.annotationType().getName();
+    }
+    public static String getMarkerE() {
+        ClassesMarker cm = Classes.class.getAnnotation(ClassesMarker.class);
+        if (cm == null) {
+            return null;
+        }
+        return cm.count().name();
+    }
+    public static String getNamer(boolean direct) {
+        if (direct) {
+            ClassesNamer cm = Classes.class.getAnnotation(ClassesNamer.class);
+            return cm == null ? null : cm.name();
+        }
+        for (Annotation a : Classes.class.getAnnotations()) {
+            if (a instanceof ClassesNamer) {
+                return ((ClassesNamer)a).name();
+            }
+        }
+        return null;
+    }
+    public static int getInnerNamer() {
+        ClassesNamer cm = Classes.class.getAnnotation(ClassesNamer.class);
+        assert cm != null : "ClassesNamer is present";
+        return cm.anno().value();
+    }
+    public static int getInnerNamers() {
+        ClassesMarker cm = Classes.class.getAnnotation(ClassesMarker.class);
+        assert cm != null : "ClassesNamer is present";
+        int sum = 0;
+        for (ClassesMarker.Anno anno : cm.subs()) {
+            sum += anno.value();
+        }
+        return sum;
+    }
+    
+    public static String intType() {
+        return Integer.TYPE.getName();
+    }
+    
+    public static int primitive() {
+        return 1;
+    }
+    public static boolean primitiveB() {
+        return true;
+    }
+    
+    public static String primitiveType(String method) throws Exception {
+        return reflectiveMethodCall(false, method).getClass().getName();
+    }
+    
+    @JavaScriptBody(args = "msg", body = "throw msg;")
+    private static native void thrw(String msg);
+    
+    public static Object reflectiveMethodCall(boolean direct, String mn) throws Exception {
+        Method find = null;
+        StringBuilder sb = new StringBuilder();
+        if (!direct) {
+            final Class<? extends Annotation> v = ClassesMarker.class;
+            for (Method m : Classes.class.getMethods()) {
+                sb.append("\n").append(m.getName());
+                if (mn != null) {
+                    if (m.getName().equals(mn)) {
+                        find = m;
+                        break;
+                    }
+                } else {
+                    if (m.getAnnotation(v) != null) {
+                        find = m;
+                        break;
+                    }
+                }
+            }
+        } else {
+            find = Classes.class.getMethod(mn);
+        }
+        if (find == null) {
+            thrw(sb.toString());
+            throw new NullPointerException(sb.toString());
+        }
+        return find.invoke(null);
+    }
+    
+    public static int reflectiveSum(int a, int b) throws Exception {
+        Method m = StaticMethod.class.getMethod("sum", int.class, int.class);
+        return (int) m.invoke(null, a, b);
+    }
+    
+    private abstract class Application {
+        public abstract int getID();
+    }
+
+    private class MyApplication extends Application {
+        @Override
+        public int getID() {
+            return 1;
+        }
+    }
+
+    public static boolean isClassAssignable() {
+        return Application.class.isAssignableFrom(MyApplication.class);
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/ClassesMarker.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ClassesMarker.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,42 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ClassesMarker {
+    int number();
+    String[] nicknames();
+    E count() default E.ONE;
+    
+    enum E {
+        ONE, TWO;
+    }
+    
+    Anno[] subs() default {};
+    
+    public @interface Anno {
+        int value();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/ClassesNamer.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ClassesNamer.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,31 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ClassesNamer {
+    String name();
+    ClassesMarker.Anno anno();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/Exceptions.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/Exceptions.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,88 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author tom
+ */
+public class Exceptions {
+    private Exceptions() {
+    }
+
+    public static int methodWithTryCatchNoThrow() {
+        int res = 0;
+        try {
+            res = 1;
+        } catch (IllegalArgumentException e) {
+            res = 2;
+        }
+        //join point
+        return res;
+    }
+
+    public static int methodWithTryCatchThrow() {
+        int res = 0;
+        try {
+            res = 1;
+            throw new IllegalArgumentException();
+        } catch (IllegalArgumentException e) {
+            res = 2;
+        }
+        //join point
+        return res;
+    }
+    
+    @JavaScriptBody(args = "msg", body = "throw msg;")
+    public static void thrw(String msg) {}
+    
+    public static String catchThrowableCatchesAll() {
+        try {
+            thrw("Hello!");
+            return "Not here!";
+        } catch (Throwable ex) {
+            return ex.getMessage();
+        }
+    }
+
+    public static String newInstance(String n) {
+        try {
+            Class c;
+            try {
+                c = Class.forName(n);
+            } catch (ClassNotFoundException ex) {
+                return ("CNFE:" + ex.getMessage()).toString();
+            }
+            return c.newInstance().getClass().getName();
+        } catch (InstantiationException | IllegalAccessException ex) {
+            return ex.getMessage();
+        }
+    }
+    
+    private static int counter;
+    public static int readCounter(String n) throws ClassNotFoundException {
+        try {
+            Class.forName(n);
+        } finally {
+            counter++;
+        }
+        return counter;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/ExceptionsTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ExceptionsTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,119 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import javax.script.ScriptException;
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Tomas Zezula <tzezula@netbeans.org>
+ */
+public class ExceptionsTest {
+    @Test
+    public void verifyMethodWithTryCatchNoThrow() throws Exception {
+            assertExec(
+                    "No throw",
+                    Exceptions.class,
+                    "methodWithTryCatchNoThrow__I",
+                    new Double(1.0));
+    }
+
+    @Test
+    public void catchJavaScriptStringAsThrowable() throws Exception {
+        assertExec(
+            "Throw hello!",
+            Exceptions.class,
+            "catchThrowableCatchesAll__Ljava_lang_String_2",
+            "Hello!"
+        );
+    }
+
+    @Test
+    public void verifyMethodWithTryCatchThrow() throws Exception {
+            assertExec(
+                    "Throw",
+                    Exceptions.class,
+                    "methodWithTryCatchThrow__I",
+                    new Double(2.0));
+    }
+    
+    @Test public void createObject() throws Exception {
+        assertExec("Object created", Exceptions.class, 
+            "newInstance__Ljava_lang_String_2Ljava_lang_String_2",
+            "java.lang.Object",
+            "java.lang.Object"
+        );
+    }
+
+    @Test public void createFloatFails() throws Exception {
+        assertExec("Float not created", Exceptions.class, 
+            "newInstance__Ljava_lang_String_2Ljava_lang_String_2",
+            "java.lang.Float",
+            "java.lang.Float"
+        );
+    }
+
+    @Test public void createUnknownFails() throws Exception {
+        assertExec("Object created", Exceptions.class, 
+            "newInstance__Ljava_lang_String_2Ljava_lang_String_2",
+            "CNFE:org.apidesign.Unknown",
+            "org.apidesign.Unknown"
+        );
+    }
+    
+    @Test public void testThreeCalls() throws Exception {
+        Object clazz = code.loadClass("loadClass", Exceptions.class.getName());
+        
+        String method = "readCounter__ILjava_lang_String_2";
+        
+        try {
+            Object ret = code.invokeMethod(clazz, method, "org.apidesign.Unknown");
+            fail("We expect an CNFE!");
+        } catch (ScriptException scriptException) {
+            // script exception should be OK
+        }
+        {
+            // 2nd invocation
+            Object ret = code.invokeMethod(clazz, method, "java.lang.String");
+            assertEquals(ret, Double.valueOf(2));
+        }
+        {
+            // 3rd invocation
+            Object ret = code.invokeMethod(clazz, method, "java.lang.Integer");
+            assertEquals(ret, Double.valueOf(3));
+        }
+    }
+    
+    private static TestVM code;
+    
+    @BeforeClass 
+    public void compileTheCode() throws Exception {
+        code = TestVM.compileClass("org/apidesign/vm4brwsr/Exceptions");
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    private static void assertExec(String msg, Class clazz, String method, Object expRes, Object... args) throws Exception {
+        code.assertExec(msg, clazz, method, expRes, args);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/GetByte.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/GetByte.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,22 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+public interface GetByte {
+    public byte getByte();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/Instance.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/Instance.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,140 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class Instance {
+    private int in;
+    protected short s;
+    public double d;
+    private float f;
+    protected byte b = (byte)31;
+    
+    private Instance() {
+    }
+
+    public Instance(int i, double d) {
+        this.in = i;
+        this.d = d;
+    }
+    public byte getByte() {
+        return b;
+    }
+    
+    public void setByte(byte b) {
+        this.b = b;
+    }
+    public static double defaultDblValue() {
+        Instance create = new Instance();
+        return create.d;
+    }
+    
+    public static byte assignedByteValue() {
+        return new Instance().b;
+    }
+    public static double magicOne() {
+        Instance i = new Instance(10, 3.3d);
+        i.b = (byte)0x09;
+        return (i.in - i.b) * i.d;
+    }
+    public static int virtualBytes() {
+        Instance i = new InstanceSub(7, 2.2d);
+        i.setByte((byte)0x0a);
+        Instance i2 = new Instance(3, 333.0d);
+        i2.setByte((byte)44);
+        return i.getByte() + i2.getByte();
+    }
+    public static float interfaceBytes() {
+        GetByte i = new InstanceSub(7, 2.2d);
+        return i.getByte();
+    }
+    public static boolean instanceOf(int sub) {
+        Instance i = createInstance(sub);
+        return isInstanceSubOf(i);
+    }
+    public static int castsWork(boolean interfc) {
+        Instance i = createInstance(2);
+        if (interfc) {
+            GetByte b = (GetByte)i;
+        } else {
+            InstanceSub s = (InstanceSub)i;
+        }
+        return 5;
+    }
+    
+    private static boolean isInstanceSubOf(Instance instance) {
+        return instance instanceof InstanceSub;
+    }
+    private static Instance createInstance(int type) {
+        switch (type) {
+            case 0: return null;
+            case 1: return new Instance();
+            case 2: return new InstanceSub(3, 0);
+        }
+        throw new IllegalArgumentException();
+    }
+    private static boolean isNull() {
+        return createInstance(2) == null;
+    }
+    
+    @JavaScriptBody(args = "obj", body = "return obj.constructor;")
+    static Object constructor(Object obj) {
+        return obj;
+    }
+    
+    public static boolean sharedConstructor() {
+        class X {
+        }
+        
+        X x1 = new X();
+        X x2 = new X();
+        
+        return constructor(x1) == constructor(x2);
+    }
+    public static boolean differentConstructor() {
+        class X {
+        }
+        class Y {
+        }
+        
+        X x = new X();
+        Y y = new Y();
+        
+        return constructor(x) == constructor(y);
+    }
+    @JavaScriptBody(args = {}, body = "return {};")
+    private static Object jsObj() {
+        return null;
+    }
+    
+    public static boolean iofObject() {
+        return jsObj() instanceof Object;
+    }
+    
+    public static int jscall() {
+        return jsgetbytes(new Instance());
+    }
+    
+    @JavaScriptBody(args = { "instance" }, body = "return instance.getByte__B();")
+    private static native int jsgetbytes(Instance instance);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/InstanceSub.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/InstanceSub.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,40 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class InstanceSub extends Instance implements GetByte {
+    private double in;
+    
+    public InstanceSub(int i, double d) {
+        super(i, d);
+        in = 555.55;
+    }
+    
+    @Override
+    public void setByte(byte b) {
+        super.setByte((byte) (b + 1));
+    }
+    
+    public static double recallDbl() {
+        return defaultDblValue();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/InstanceSubTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/InstanceSubTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,32 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+/** Checks if everything works OK, when we switch the
+ * order of loaded classes.
+ * 
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class InstanceSubTest extends InstanceTest {
+
+    @Override
+    protected String startCompilationWith() {
+        return "org/apidesign/vm4brwsr/InstanceSub";
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/InstanceTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/InstanceTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,171 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeClass;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class InstanceTest {
+    @Test public void verifyDefaultDoubleValue() throws Exception {
+        assertExec(
+            "Will be zero",
+            Instance.class, "defaultDblValue__D",
+            Double.valueOf(0)
+        );
+    }
+    @Test public void verifyStaticMethodCall() throws Exception {
+        assertExec(
+            "Will be zero",
+            InstanceSub.class, "recallDbl__D",
+            Double.valueOf(0)
+        );
+    }
+    @Test public void verifyAssignedByteValue() throws Exception {
+        assertExec(
+            "Will one thirty one",
+            Instance.class, "assignedByteValue__B",
+            Double.valueOf(31)
+        );
+    }
+    @Test public void verifyMagicOne() throws Exception {
+        assertExec(
+            "Should be three and something",
+            Instance.class, "magicOne__D",
+            Double.valueOf(3.3)
+        );
+    }
+    @Test public void verifyInstanceMethods() throws Exception {
+        assertExec(
+            "Should be eleven as we invoke overwritten method, plus 44",
+            Instance.class, "virtualBytes__I",
+            Double.valueOf(55)
+        );
+    }
+    @Test public void verifyInterfaceMethods() throws Exception {
+        assertExec(
+            "Retruns default value",
+            Instance.class, "interfaceBytes__F",
+            Double.valueOf(31)
+        );
+    }
+
+    @Test public void isNull() throws Exception {
+        assertExec(
+            "Yes, we are instance",
+            Instance.class, "isNull__Z",
+            Double.valueOf(0.0)
+        );
+    }
+
+    @Test public void isInstanceOf() throws Exception {
+        assertExec(
+            "Yes, we are instance",
+            Instance.class, "instanceOf__ZI",
+            Double.valueOf(1.0), 2
+        );
+    }
+
+    @Test public void notInstanceOf() throws Exception {
+        assertExec(
+            "No, we are not an instance",
+            Instance.class, "instanceOf__ZI",
+            Double.valueOf(0.0), 1
+        );
+    }
+    @Test public void nullInstanceOf() throws Exception {
+        assertExec(
+            "No, null is not an instance",
+            Instance.class, "instanceOf__ZI",
+            Double.valueOf(0.0), 0
+        );
+    }
+    
+    @Test public void verifyCastToClass() throws Exception {
+        assertExec(
+            "Five signals all is good",
+            Instance.class, "castsWork__IZ",
+            Double.valueOf(5.0), false
+        );
+    }
+    @Test public void verifyCastToInterface() throws Exception {
+        assertExec(
+            "Five signals all is good",
+            Instance.class, "castsWork__IZ",
+            Double.valueOf(5.0), true
+        );
+    }
+    
+    @Test public void sharedConstructor() throws Exception {
+        assertExec(
+            "Constructor of first and 2nd instance should be the same",
+            Instance.class, "sharedConstructor__Z",
+            Double.valueOf(1.0)
+        );
+    }
+
+    @Test public void differentConstructor() throws Exception {
+        assertExec(
+            "Constructor of X and Y should be the different",
+            Instance.class, "differentConstructor__Z",
+            Double.valueOf(0)
+        );
+    }
+
+    @Test public void jsObjectIsLikeJavaObject() throws Exception {
+        assertExec(
+            "JavaScript object is instance of Java Object",
+            Instance.class, "iofObject__Z",
+            Double.valueOf(1)
+        );
+    }
+
+    @Test public void jsCallingConvention() throws Exception {
+        assertExec(
+            "Pointer to 'this' is passed automatically (and not as a first argument)",
+            Instance.class, "jscall__I",
+            Double.valueOf(31)
+        );
+    }
+    
+    protected String startCompilationWith() {
+        return "org/apidesign/vm4brwsr/Instance";
+    }
+    
+    private static TestVM code;
+    
+    @BeforeClass
+    public void compileTheCode() throws Exception {
+        code = TestVM.compileClass(startCompilationWith());
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    
+    private void assertExec(
+        String msg, Class clazz, String method, Object expRes, Object... args
+    ) throws Exception {
+        code.assertExec(msg, clazz, method, expRes, args);
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,236 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class NumberTest {
+    @Test public void integerFromString() throws Exception {
+        assertExec("Can convert string to integer", Integer.class, "parseInt__ILjava_lang_String_2",
+            Double.valueOf(333), "333"
+        );
+    }
+
+    @Test public void doubleFromString() throws Exception {
+        assertExec("Can convert string to double", Double.class, "parseDouble__DLjava_lang_String_2",
+            Double.valueOf(33.3), "33.3"
+        );
+    }
+
+    @Test public void autoboxDouble() throws Exception {
+        assertExec("Autoboxing of doubles is OK", Numbers.class, "autoboxDblToString__Ljava_lang_String_2",
+            "3.3"
+        );
+    }
+    
+    @Test public void javalog1000() throws Exception {
+        assertEquals(3.0, Math.log10(1000.0), 0.00003, "log_10(1000) == 3");
+    }
+
+    @Test public void jslog1000() throws Exception {
+        assertExec("log_10(1000) == 3", Math.class, "log10__DD", 
+            Double.valueOf(3.0), 1000.0
+        );
+    }
+    
+    @Test public void javaRem() {
+        assertEquals(3, Numbers.rem(303, 10));
+    }
+    @Test public void jsRem() throws Exception {
+        assertExec("Should be three", Numbers.class, "rem__III", 
+            Double.valueOf(3.0), 303, 10
+        );
+    }
+    
+    @Test public void deserializeInt() throws Exception {
+        int exp = Numbers.deserInt();
+        assertExec("Should be the same", Numbers.class, "deserInt__I", 
+            Double.valueOf(exp)
+        );
+    }
+
+    @Test public void deserializeSimpleLong() throws Exception {
+        assertExec("Should be 3454", Numbers.class, "deserLong__J_3B", 
+            Double.valueOf(3454), 
+            new byte[] { (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)13, (byte)126 }
+        );
+    }
+    /* XXX: JavaScript cannot represent as big longs as Java. 
+    @Test public void deserializeLargeLong() throws Exception {
+        final byte[] arr = new byte[] {
+            (byte)64, (byte)8, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0
+        };
+        long exp = Numbers.deserLong(arr);
+        assertExec("Should be " + exp, "org_apidesign_vm4brwsr_Numbers_deserLong__JAB", 
+            Double.valueOf(exp), arr);
+    }
+    */
+    
+    @Test public void deserializeFloatInJava() throws Exception {
+        float f = 54324.32423f;
+        float r = Numbers.deserFloat();
+        assertEquals(r, f, "Floats are the same");
+    }
+    
+    @Test public void deserializeFloatInJS() throws Exception {
+        float f = 54324.32423f;
+        assertExec("Should be the same", Numbers.class, "deserFloat__F", 
+            Double.valueOf(f)
+        );
+    }
+
+    @Test public void deserializeDoubleInJava() throws Exception {
+        double f = 3.0;
+        double r = Numbers.deserDouble();
+        assertEquals(r, f, 0.001, "Doubles are the same");
+    }
+    
+    @Test public void deserializeDoubleInJS() throws Exception {
+        double f = 3.0;
+        assertExec("Should be the same", Numbers.class, "deserDouble__D", f);
+    }
+    /*
+    @Test public void serDouble() throws IOException {
+        double f = 3.0;
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        DataOutputStream d = new DataOutputStream(os);
+        d.writeLong(3454);
+        d.close();
+        
+        StringBuilder sb = new StringBuilder();
+        byte[] arr = os.toByteArray();
+        for (int i = 0; i < arr.length; i++) {
+            sb.append("(byte)").append(arr[i]).append(", ");
+        }
+        fail("" + sb);
+    }
+*/    
+    @Test public void fiveInStringJS() throws Exception {
+        String s = Numbers.intToString();
+        assertExec("Should be the same: " + s, 
+            Numbers.class, "intToString__Ljava_lang_String_2", 
+            s
+        );
+    }
+
+    @Test public void sevenInStringJS() throws Exception {
+        String s = Numbers.floatToString();
+        assertExec("Should be the same: " + s, 
+            Numbers.class, "floatToString__Ljava_lang_String_2", 
+            s
+        );
+    }
+
+    @Test public void everyNumberHasJavaLangNumberMethods() throws Exception {
+        assertExec("Can we call doubleValue?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(7.0), 0
+        );
+    }
+    @Test public void everyNumberHasJavaLangNumberMethodsInt() throws Exception {
+        assertExec("Can we call doubleValue?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(7.0), 1
+        );
+    }
+    @Test public void everyNumberHasJavaLangNumberMethodsLong() throws Exception {
+        assertExec("Can we call doubleValue?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(7.0), 2
+        );
+    }
+    @Test public void everyNumberHasJavaLangNumberMethodsShort() throws Exception {
+        assertExec("Can we call doubleValue?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(7.0), 3
+        );
+    }
+    @Test public void everyNumberHasJavaLangNumberMethodsByte() throws Exception {
+        assertExec("Can we call doubleValue?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(7.0), 4
+        );
+    }
+    @Test public void valueOfNumber() throws Exception {
+        assertExec("Can we call JavaScripts valueOf?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(7.0), 8
+        );
+    }
+    @Test public void valueOfLongNumber() throws Exception {
+        assertExec("Can we call JavaScripts valueOf?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(Long.MAX_VALUE / 5), 9
+        );
+    }
+    @Test public void valueOfLongCharA() throws Exception {
+        assertExec("Can we call JavaScripts valueOf on Character?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf('A'), 65
+        );
+    }
+
+    @Test public void valueOfLongBooleanTrue() throws Exception {
+        assertExec("Can we call JavaScripts valueOf on Boolean?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(1), 31
+        );
+    }
+    @Test public void valueOfLongBooleanFalse() throws Exception {
+        assertExec("Can we call JavaScripts valueOf on Boolean?", 
+            Numbers.class, "seven__DI", 
+            Double.valueOf(0), 30
+        );
+    }
+
+    private static TestVM code;
+
+    @BeforeClass
+    public static void compileTheCode() throws Exception {
+        code = TestVM.compileClass("org/apidesign/vm4brwsr/Numbers");
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+
+    private static void assertExec(
+        String msg, Class<?> clazz, String method, Object expRes, Object... args) throws Exception
+    {
+        Object ret = code.execCode(msg, clazz, method, expRes, args);
+        if (ret == null) {
+            return;
+        }
+        if (expRes instanceof Double && ret instanceof Double) {
+            double expD = ((Double)expRes).doubleValue();
+            double retD = ((Double)ret).doubleValue();
+            assertEquals(retD, expD, 0.000004, msg + " "
+                    + code.toString());
+            return;
+        }
+        assertEquals(ret, expRes, msg + " " + code.toString());
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/Numbers.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/Numbers.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,93 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class Numbers {
+    private static Double autoboxDbl() {
+        return 3.3;
+    }
+    public static String autoboxDblToString() {
+        return autoboxDbl().toString().toString();
+    }
+    public static int rem(int a, int b) {
+        return a % b;
+    }
+
+    static float deserFloat() throws IOException {
+        byte[] arr = {(byte) 71, (byte) 84, (byte) 52, (byte) 83};
+        ByteArrayInputStream is = new ByteArrayInputStream(arr);
+        DataInputStream dis = new DataInputStream(is);
+        float r = dis.readFloat();
+        return r;
+    }
+    static double deserDouble() throws IOException {
+        byte[] arr = {(byte)64, (byte)8, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0};
+        ByteArrayInputStream is = new ByteArrayInputStream(arr);
+        DataInputStream dis = new DataInputStream(is);
+        return dis.readDouble();
+    }
+    static long deserLong(byte[] arr) throws IOException {
+        ByteArrayInputStream is = new ByteArrayInputStream(arr);
+        DataInputStream dis = new DataInputStream(is);
+        return dis.readLong();
+    }
+    static int deserInt() throws IOException {
+        byte[] arr = {(byte) 71, (byte) 84, (byte) 52, (byte) 83};
+        ByteArrayInputStream is = new ByteArrayInputStream(arr);
+        DataInputStream dis = new DataInputStream(is);
+        return dis.readInt();
+    }
+
+    static String intToString() {
+        return new Integer(5).toString().toString();
+    }
+    static String floatToString() {
+        return new Float(7.0).toString().toString();
+    }
+    
+    static double seven(int todo) {
+        switch (todo) {
+            case 0: return sevenNew().doubleValue();
+            case 1: return sevenNew().intValue();
+            case 2: return sevenNew().longValue();
+            case 3: return sevenNew().shortValue();
+            case 4: return sevenNew().byteValue();
+            case 8: return valueOf(Double.valueOf(7.0));
+            case 9: return valueOf(Long.valueOf(Long.MAX_VALUE / 5));
+            case 30: return valueOf(Boolean.FALSE);
+            case 31: return valueOf(Boolean.TRUE);
+            case 65: return valueOf(Character.valueOf('A'));
+            default: throw new IllegalStateException();
+        }
+    }
+    
+    @JavaScriptBody(args = {}, body = "return 7;")
+    private static native Number sevenNew();
+    
+    @JavaScriptBody(args = { "o" }, body = "return o.valueOf();")
+    private static native double valueOf(Object o);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/Script.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/Script.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,31 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.apidesign.bck2brwsr.core.ExtraJavaScript;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/** Test to verify external scripts are processed in lazy mode.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ExtraJavaScript(resource = "/org/apidesign/vm4brwsr/ko.js")
+public class Script {
+    @JavaScriptBody(args = {  }, body = "return ko !== null;")
+    public static native boolean checkNotNull();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,135 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class StaticMethod {
+    private static int cnt;
+    private static Object NULL;
+
+    public static int minusOne() {
+        return -1;
+    }
+    
+    public static Object none(int x, int y) {
+        Object toRet = null;
+        for (int i = x; i < y; i++) {
+            if (i == 2) {
+                toRet = null;
+            } else {
+                toRet = new Object();
+            }
+        }
+        return toRet;
+    }
+    
+    public static boolean isNull() {
+        return NULL == null;
+    }
+    
+    public static int sum(int x, int y) {
+        return x + y;
+    }
+    public static float power(float x) {
+        return x * x;
+    }
+    public static double minus(double x, long y) {
+        return x - y;
+    }
+    public static int div(byte c, double d) {
+        return (int)(d / c);
+    }
+    public static int mix(int a, long b, byte c, double d) {
+        return (int)((b / a + c) * d);
+    }
+    public static long xor(int a, long b) {
+        return a ^ b;
+    }
+    public static long orOrAnd(boolean doOr, int a, int b) {
+        return doOr ? a | b : a & b;
+    }
+    public static int shiftLeft(int what, int much) {
+        return what << much;
+    }
+    public static int shiftArithmRight(int what, int much, boolean signed) {
+        if (signed) {
+            return what >> much;
+        } else {
+            return what >>> much;
+        }
+    }
+    public static long factRec(int n) {
+        if (n <= 1) {
+            return 1;
+        } else {
+            return n * factRec(n - 1);
+        }
+    }
+    public static long factIter(int n) {
+        long res = 1;
+        for (int i = 2; i <= n; i++) {
+            res *= i;
+        }
+        return res;
+    }
+    public static int inc4() {
+        cnt++;
+        cnt+=2;
+        cnt++;
+        return cnt;
+    }
+    
+    @JavaScriptBody(
+        args={"i","j"}, body="\n\r\treturn (i + j).toString();"
+    )
+    public static String i2s(int i, int j) {
+        throw new IllegalStateException();
+    }
+    
+    public static String castNull(boolean n) {
+        Object value = n ? null : "Ahoj";
+        return (String)value;
+    }
+    
+    public static String swtch(int what) {
+        switch (what) {
+            case 0: return "Jarda";
+            case 1: return "Darda";
+            case 2: return "Parda";
+            default: return "Marda";
+        }
+    }
+    public static String swtch2(int what) {
+        switch (what) {
+            case 0: return "Jarda";
+            case 11: return "Darda";
+            case 22: return "Parda";
+            default: return "Marda";
+        }
+    }
+    
+    static {
+        // check order of initializers
+        StaticUse.NON_NULL.equals(new Object());
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,343 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/** Checks the basic behavior of the translator.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class StaticMethodTest {
+    @Test public void threePlusFour() throws Exception {
+        assertExec(
+            "Should be seven", 
+            StaticMethod.class, "sum__III", 
+            Double.valueOf(7), 
+            3, 4
+        );
+    }
+
+    @Test public void checkReallyInitializedValues() throws Exception {
+        assertExec(
+            "Return true", 
+            StaticMethod.class, "isNull__Z", 
+            Double.valueOf(1)
+        );
+    }
+
+    @Test public void powerOfThree() throws Exception {
+        assertExec(
+            "Should be nine", 
+            StaticMethod.class, "power__FF", 
+            Double.valueOf(9),
+            3.0f
+        );
+    }
+
+    @Test public void minusOne() throws Exception {
+        assertExec(
+            "Should be minus one", 
+            StaticMethod.class, "minusOne__I", 
+            Double.valueOf(-1)
+        );
+    }
+
+    @Test public void doubleWithoutLong() throws Exception {
+        assertExec(
+            "Should be two",
+            StaticMethod.class, "minus__DDJ", 
+            Double.valueOf(2),
+            3.0d, 1l
+        );
+    }
+    
+    @Test public void rintNegativeUp() throws Exception {
+        final double cnts = -453904.634;
+        assertExec(
+            "Should round up to end with 5",
+            Math.class, "rint__DD", 
+            -453905.0, cnts
+        );
+    }
+
+    @Test public void rintNegativeDown() throws Exception {
+        final double cnts = -453904.434;
+        assertExec(
+            "Should round up to end with 4",
+            Math.class, "rint__DD", 
+            -453904.0, cnts
+        );
+    }
+
+    @Test public void rintPositiveUp() throws Exception {
+        final double cnts = 453904.634;
+        assertExec(
+            "Should round up to end with 5",
+            Math.class, "rint__DD", 
+            453905.0, cnts
+        );
+    }
+    @Test public void rintPositiveDown() throws Exception {
+        final double cnts = 453904.434;
+        assertExec(
+            "Should round up to end with 4",
+            Math.class, "rint__DD", 
+            453904.0, cnts
+        );
+    }
+    @Test public void rintOneHalf() throws Exception {
+        final double cnts = 1.5;
+        assertExec(
+            "Should round up to end with 2",
+            Math.class, "rint__DD", 
+            2.0, cnts
+        );
+    }
+    @Test public void rintNegativeOneHalf() throws Exception {
+        final double cnts = -1.5;
+        assertExec(
+            "Should round up to end with 2",
+            Math.class, "rint__DD", 
+            -2.0, cnts
+        );
+    }
+    @Test public void rintTwoAndHalf() throws Exception {
+        final double cnts = 2.5;
+        assertExec(
+            "Should round up to end with 2",
+            Math.class, "rint__DD", 
+            2.0, cnts
+        );
+    }
+    @Test public void rintNegativeTwoOneHalf() throws Exception {
+        final double cnts = -2.5;
+        assertExec(
+            "Should round up to end with 2",
+            Math.class, "rint__DD", 
+            -2.0, cnts
+        );
+    }
+
+    @Test public void ieeeReminder1() throws Exception {
+        assertExec(
+            "Same result 1",
+            Math.class, "IEEEremainder__DDD", 
+            Math.IEEEremainder(10.0, 4.5), 10.0, 4.5
+        );
+    }
+
+    @Test public void ieeeReminder2() throws Exception {
+        assertExec(
+            "Same result 1",
+            Math.class, "IEEEremainder__DDD", 
+            Math.IEEEremainder(Integer.MAX_VALUE, -4.5), Integer.MAX_VALUE, -4.5
+        );
+    }
+
+    @Test public void divAndRound() throws Exception {
+        assertExec(
+            "Should be rounded to one",
+            StaticMethod.class, "div__IBD", 
+            Double.valueOf(1),
+            3, 3.75
+        );
+    }
+    @Test public void mixedMethodFourParams() throws Exception {
+        assertExec(
+            "Should be two",
+            StaticMethod.class, "mix__IIJBD", 
+            Double.valueOf(20),
+            2, 10l, 5, 2.0
+        );
+    }
+    @Test public void factRec() throws Exception {
+        assertExec(
+            "Factorial of 5 is 120",
+            StaticMethod.class, "factRec__JI", 
+            Double.valueOf(120),
+            5
+        );
+    }
+    @Test public void factIter() throws Exception {
+        assertExec(
+            "Factorial of 5 is 120",
+            StaticMethod.class, "factIter__JI", 
+            Double.valueOf(120),
+            5
+        );
+    }
+    
+    @Test public void xor() throws Exception {
+        assertExec(
+            "Xor is 4",
+            StaticMethod.class, "xor__JIJ",
+            Double.valueOf(4),
+            7,
+            3
+        );
+    }
+    
+    @Test public void or() throws Exception {
+        assertExec(
+            "Or will be 7",
+            StaticMethod.class, "orOrAnd__JZII",
+            Double.valueOf(7),
+            true,
+            4,
+            3
+        );
+    }
+    @Test public void nullCheck() throws Exception {
+        assertExec(
+            "Returns nothing",
+            StaticMethod.class, "none__Ljava_lang_Object_2II",
+            null, 1, 3
+        );
+    }
+    @Test public void and() throws Exception {
+        assertExec(
+            "And will be 3",
+            StaticMethod.class, "orOrAnd__JZII",
+            Double.valueOf(3),
+            false,
+            7,
+            3
+        );
+    }
+    @Test public void inc4() throws Exception {
+        assertExec(
+            "It will be 4",
+            StaticMethod.class, "inc4__I",
+            Double.valueOf(4)
+        );
+    }
+    
+    @Test public void shiftLeftInJava() throws Exception {
+        int res = StaticMethod.shiftLeft(1, 8);
+        assertEquals(res, 256);
+    }
+
+    @Test public void shiftLeftInJS() throws Exception {
+        assertExec(
+            "Setting 9th bit",
+            StaticMethod.class, "shiftLeft__III",
+            Double.valueOf(256),
+            1, 8
+        );
+    }
+
+    @Test public void shiftRightInJava() throws Exception {
+        int res = StaticMethod.shiftArithmRight(-8, 3, true);
+        assertEquals(res, -1);
+    }
+
+    @Test public void shiftRightInJS() throws Exception {
+        assertExec(
+            "Get -1",
+            StaticMethod.class, "shiftArithmRight__IIIZ",
+            Double.valueOf(-1),
+            -8, 3, true
+        );
+    }
+    @Test public void unsignedShiftRightInJava() throws Exception {
+        int res = StaticMethod.shiftArithmRight(8, 3, false);
+        assertEquals(res, 1);
+    }
+
+    @Test public void unsignedShiftRightInJS() throws Exception {
+        assertExec(
+            "Get -1",
+            StaticMethod.class, "shiftArithmRight__IIIZ",
+            Double.valueOf(1),
+            8, 3, false
+        );
+    }
+    
+    @Test public void javaScriptBody() throws Exception {
+        assertExec(
+            "JavaScript string",
+            StaticMethod.class, "i2s__Ljava_lang_String_2II",
+            "333",
+            330, 3
+        );
+    }
+    
+    @Test public void switchJarda() throws Exception {
+        assertExec(
+            "The expected value",
+            StaticMethod.class, "swtch__Ljava_lang_String_2I",
+            "Jarda",
+            0
+        );
+    }
+    
+    @Test public void switchDarda() throws Exception {
+        assertExec(
+            "The expected value",
+            StaticMethod.class, "swtch__Ljava_lang_String_2I",
+            "Darda",
+            1
+        );
+    }
+    @Test public void switchParda() throws Exception {
+        assertExec(
+            "The expected value",
+            StaticMethod.class, "swtch2__Ljava_lang_String_2I",
+            "Parda",
+            22
+        );
+    }
+    @Test public void switchMarda() throws Exception {
+        assertExec(
+            "The expected value",
+            StaticMethod.class, "swtch__Ljava_lang_String_2I",
+            "Marda",
+            -433
+        );
+    }
+    
+    @Test public void checkNullCast() throws Exception {
+        assertExec("Null can be cast to any type",
+            StaticMethod.class, "castNull__Ljava_lang_String_2Z", 
+            null, true
+        );
+    }
+    
+    private static TestVM code;
+    
+    @BeforeClass 
+    public static void compileTheCode() throws Exception {
+        StringBuilder sb = new StringBuilder();
+        code = TestVM.compileClass(sb, "org/apidesign/vm4brwsr/StaticMethod");
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+
+    private void assertExec(
+        String msg, Class<?> clazz, String method, 
+        Object ret, Object... args
+    ) throws Exception {
+        code.assertExec(msg, clazz, method, ret, args);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticUse.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticUse.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,22 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+public class StaticUse {
+    public static final Object NON_NULL = new Object();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticUseSub.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticUseSub.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,24 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+public class StaticUseSub extends StaticUse {
+    public static String getNonNull() {
+        return NON_NULL.getClass().getName();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticUseSubTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticUseSubTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,48 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class StaticUseSubTest {
+    private static TestVM code;
+
+    @BeforeClass
+    public static void compileTheCode() throws Exception {
+        StringBuilder sb = new StringBuilder();
+        code = TestVM.compileClass(sb, "org/apidesign/vm4brwsr/StaticUseSub");
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    
+    @Test public void getInheritedStaticField() throws Exception {
+        code.assertExec(
+            "Obtains non-null", StaticUseSub.class, 
+            "getNonNull__Ljava_lang_String_2",
+            "java.lang.Object"
+        );
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/StringArrayTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StringArrayTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,50 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class StringArrayTest {
+    @Test public void deleteMinusIndex() throws Exception {
+        String[] arr = { "Ahoj", "Kluci" };
+        StringArray list = StringArray.asList(arr);
+        list.delete(-1);
+        assertEquals(list.toArray().length, 2, "No element removed");
+    }
+    @Test public void deleteTooHighIndex() throws Exception {
+        String[] arr = { "Ahoj", "Kluci" };
+        StringArray list = StringArray.asList(arr);
+        list.delete(5);
+        assertEquals(list.toArray().length, 2, "No element removed");
+    }
+    @Test public void deleteFirst() throws Exception {
+        String[] arr = { "Ahoj", "Kluci" };
+        StringArray list = StringArray.asList(arr);
+        list.delete(0);
+        assertEquals(list.toArray().length, 1, "First element removed");
+        assertEquals(list.toArray()[0], "Kluci");
+    }
+    @Test public void deleteSecond() throws Exception {
+        String[] arr = { "Ahoj", "Kluci" };
+        StringArray list = StringArray.asList(arr);
+        list.delete(1);
+        assertEquals(list.toArray().length, 1, "Second element removed");
+        assertEquals(list.toArray()[0], "Ahoj");
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/StringSample.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StringSample.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,132 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class StringSample {
+    public static final String HELLO = "Hello World!";
+    private static int counter;
+    
+    private final int cnt;
+    public StringSample() {
+        cnt = ++counter;
+    }
+    
+    
+    public static char sayHello(int indx) {
+        return HELLO.charAt(indx);
+    }
+    
+    public static boolean equalToHello(int from, int to) {
+        return "Hello".equals(HELLO.substring(from, to));
+    }
+    
+    public static String fromChars(char a, char b, char c) {
+        char[] arr = { a, b, c };
+        return new String(arr).toString();
+    }
+    
+    public static String charsFromNumbers() {
+        return chars((char)65, (char)66, (char)67);
+    }
+
+    public static String charsFromChars() {
+        return chars('A', 'B', 'C');
+    }
+
+    public static String chars(char a, char b, char c) {
+        return ("" + a + b +c).toString();
+    }
+    
+    public static String replace(String s, char a, char b) {
+        return s.replace(a, b);
+    }
+    
+    public static int hashCode(String h) {
+        return h.hashCode();
+    }
+    
+    public static boolean isStringInstance() {
+        return chars('a', (char)30, 'b') instanceof String;
+    }
+    
+    public static String getBytes(String s) throws UnsupportedEncodingException {
+        byte[] arr = s.getBytes("UTF-8");
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < arr.length; i++) {
+            sb.append(arr[i]).append(" ");
+        }
+        return sb.toString().toString();
+    }
+    
+    public static String insertBuffer() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Jardo!");
+        sb.insert(0, "Ahoj ");
+        sb.delete(4, 8);
+        return sb.toString().toString();
+    }
+    
+    public static int countAB(String txt) {
+        int cnt = 0;
+        for (int i = 0; i < txt.length(); i++) {
+            switch (txt.charAt(i)) {
+                case 'A': cnt++; break;
+                case 'B': cnt += 2; break;
+            }
+        }
+        return cnt;
+    }
+
+    public static int stringSwitch(String txt) {
+        switch (txt) {
+            case "jedna": return 1;
+            case "dve": return 2;
+            case "tri": return 3;
+            case "ctyri": return 4;
+        }
+        return -1;
+    }
+    
+    public static String toStringTest(int howMuch) {
+        counter = 0;
+        StringSample ss = null;
+        for (int i = 0; i < howMuch; i++) {
+            ss = new StringSample();
+        }
+        return ss.toString().toString();
+    }
+    
+    public static String concatStrings() {
+        return (toStringTest(1) + "\\\n\r\t").toString();
+    }
+    
+    public static int compare(String a, String b) {
+        return a.compareTo(b);
+    }
+
+    @Override
+    public String toString() {
+        return HELLO + cnt;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/StringTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StringTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,217 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class StringTest {
+    @Test public void firstChar() throws Exception {
+        assertExec(
+            "First char in Hello is H",
+            StringSample.class, "sayHello__CI",
+            72, 0
+        );
+    }
+
+    @Test public void fromChars() throws Exception {
+        assertExec(
+            "First char in Hello is ABC",
+            StringSample.class, "fromChars__Ljava_lang_String_2CCC",
+            "ABC", 'A', 'B', 'C'
+        );
+    }
+
+    @Test public void concatChars() throws Exception {
+        assertExec(
+            "Composing yields ABC",
+            StringSample.class, "chars__Ljava_lang_String_2CCC",
+            "ABC", 'A', 'B', 'C'
+        );
+    }
+
+    @Test public void concatCharsFromInts() throws Exception {
+        assertExec(
+            "Composing yields ABC",
+            StringSample.class, "charsFromNumbers__Ljava_lang_String_2",
+            "ABC"
+        );
+    }
+
+    @Test public void concatCharsFromChars() throws Exception {
+        assertExec(
+            "Composing yields ABC",
+            StringSample.class, "charsFromChars__Ljava_lang_String_2",
+            "ABC"
+        );
+    }
+
+    @Test public void instanceOfWorks() throws Exception {
+        assertExec(
+            "It is string",
+            StringSample.class, "isStringInstance__Z",
+            Double.valueOf(1.0)
+        );
+    }
+
+    @Test public void getBytes() throws Exception {
+        final String horse = "\u017dlu\u0165ou\u010dk\u00fd k\u016f\u0148";
+        final String expected = StringSample.getBytes(horse);
+        assertExec(
+            "Bytes look simplar",
+            StringSample.class, "getBytes__Ljava_lang_String_2Ljava_lang_String_2",
+            expected, horse
+        );
+    }
+
+    @Test(timeOut=10000) public void toStringConcatenation() throws Exception {
+        assertExec(
+            "Five executions should generate 5Hello World!",
+            StringSample.class, "toStringTest__Ljava_lang_String_2I",
+            "Hello World!5", 5
+        );
+    }
+    @Test public void toStringConcatenationJava() throws Exception {
+        assertEquals("Hello World!5", StringSample.toStringTest(5));
+    }
+    
+    @Test(timeOut=10000) public void stringStringConcat() throws Exception {
+        assertExec(
+            "Composes strings OK",
+            StringSample.class, "concatStrings__Ljava_lang_String_2",
+            "Hello World!1" + "\\\n\r\t"
+        );
+    }
+
+    @Test public void equalsAndSubstring() throws Exception {
+        assertExec(
+            "Composes are OK",
+            StringSample.class, "equalToHello__ZII",
+            true, 0, 5
+        );
+    }
+    @Test public void replaceChars() throws Exception {
+        assertExec(
+            "Can replace slashes by underscores",
+            StringSample.class, "replace__Ljava_lang_String_2Ljava_lang_String_2CC",
+            "x_y_z", "x/y/z", '/', '_'
+        );
+    }
+    @Test public void replaceIntChars() throws Exception {
+        assertExec(
+            "Can replace slashes by underscores",
+            StringSample.class, "replace__Ljava_lang_String_2Ljava_lang_String_2CC",
+            "x_y_z", "x/y/z", (int)'/', (int)'_'
+        );
+    }
+
+    @Test public void insertBuilder() throws Exception {
+        assertExec(
+            "Can insert something into a buffer?",
+            StringSample.class, "insertBuffer__Ljava_lang_String_2",
+            "Ahojdo!"
+        );
+    }
+    
+    @Test public void compareHashCodeHi() throws Exception {
+        String j = "Hi";
+        int jh = StringSample.hashCode(j);
+        assertExec(
+            "Hashcode is the same " +jh,
+            StringSample.class, "hashCode__ILjava_lang_String_2",
+            Double.valueOf(jh), j
+        );
+    }
+    @Test public void compareHashCode1() throws Exception {
+        String j = "Hello Java!";
+        int jh = StringSample.hashCode(j);
+        assertExec(
+            "Hashcode is the same " + jh,
+            StringSample.class, "hashCode__ILjava_lang_String_2",
+            Double.valueOf(jh), j
+        );
+    }
+    @Test public void stringSwitch1() throws Exception {
+        assertExec(
+            "Get one",
+            StringSample.class, "stringSwitch__ILjava_lang_String_2",
+            Double.valueOf(1), "jedna"
+        );
+    }
+    @Test public void stringSwitch2() throws Exception {
+        assertExec(
+            "Get two",
+            StringSample.class, "stringSwitch__ILjava_lang_String_2",
+            Double.valueOf(2), "dve"
+        );
+    }
+    @Test public void stringSwitchDefault() throws Exception {
+        assertExec(
+            "Get -1",
+            StringSample.class, "stringSwitch__ILjava_lang_String_2",
+            Double.valueOf(-1), "none"
+        );
+    }
+    
+    @Test public void countAB() throws Exception {
+        assertEquals(StringSample.countAB("Ahoj Bedo!"), 3, "Verify Java code is sane");
+        assertExec(
+            "One A and one B adds to 3",
+            StringSample.class, "countAB__ILjava_lang_String_2",
+            Double.valueOf(3), "Ahoj Bedo!"
+        );
+        
+    }
+
+    @Test public void compareStrings() throws Exception {
+        int res = StringSample.compare("Saab", "Volvo");
+        assertExec(
+            "Saab finished sooner than Volvo",
+            StringSample.class, "compare__ILjava_lang_String_2Ljava_lang_String_2",
+            Double.valueOf(res), "Saab", "Volvo"
+        );
+        
+    }
+    
+    private static TestVM code;
+    
+    @BeforeClass 
+    public static void compileTheCode() throws Exception {
+        code = TestVM.compileClass(
+            "org/apidesign/vm4brwsr/StringSample",
+            "java/lang/String"
+        );
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    
+    private static void assertExec(String msg, 
+        Class<?> clazz, String method, Object expRes, Object... args
+    ) throws Exception {
+        code.assertExec(msg, clazz, method, expRes, args);
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,61 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import org.testng.annotations.BeforeClass;
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class SystemTest {
+    private static TestVM code;
+    
+    @Test public void verifyJSTime() throws Exception {
+        long now = System.currentTimeMillis();
+        
+        Object js = code.execCode("Get js time", 
+            org.apidesign.bck2brwsr.emul.lang.System.class, "currentTimeMillisDouble__D",
+            null
+        );
+        
+        assertTrue(js instanceof Double, "Double " + js);
+        long time = ((Double)js).longValue();
+        
+        long later = System.currentTimeMillis();
+        
+        assertTrue(now <= time, "Lower bound is OK: " + now + " <= " + time);
+        assertTrue(time <= later, "Upper bound is OK: " + time + " <= " + later);
+    }
+    
+    
+    @BeforeClass 
+    public static void compileTheCode() throws Exception {
+        code = TestVM.compileClass(
+            "org/apidesign/bck2brwsr/emul/lang/System");
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    
+}
+
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,170 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import static org.testng.Assert.*;
+
+final class TestVM {
+    private final Invocable code;
+    private final CharSequence codeSeq;
+    private final Object bck2brwsr;
+    
+    
+    private TestVM(Invocable code, CharSequence codeSeq) throws ScriptException, NoSuchMethodException {
+        this.code = code;
+        this.codeSeq = codeSeq;
+        this.bck2brwsr = code.invokeFunction("bck2brwsr");
+    }
+    
+
+    public Object execCode(
+        String msg, Class<?> clazz, String method, 
+        Object expRes, Object... args
+    ) throws Exception {
+        Object ret = null;
+        try {
+            ret = code.invokeMethod(bck2brwsr, "loadClass", clazz.getName());
+            ret = code.invokeMethod(ret, method, args);
+        } catch (ScriptException ex) {
+            fail("Execution failed in " + dumpJS(codeSeq) + ": " + ex.getMessage(), ex);
+        } catch (NoSuchMethodException ex) {
+            fail("Cannot find method in " + dumpJS(codeSeq), ex);
+        }
+        if (ret == null && expRes == null) {
+            return null;
+        }
+        if (expRes != null && expRes.equals(ret)) {
+            return null;
+        }
+        if (expRes instanceof Number) {
+            // in case of Long it is necessary convert it to number
+            // since the Long is represented by two numbers in JavaScript
+            try {
+                ret = code.invokeMethod(ret, "toFP");
+                ret = code.invokeFunction("Number", ret);
+            } catch (ScriptException ex) {
+                fail("Conversion to number failed in " + dumpJS(codeSeq) + ": " + ex.getMessage(), ex);
+            } catch (NoSuchMethodException ex) {
+                fail("Cannot find global Number(x) function in " + dumpJS(codeSeq) + ": " + ex.getMessage(), ex);
+            }
+        }
+        return ret;
+    }
+    
+    void assertExec(
+        String msg, Class clazz, String method, Object expRes, Object... args
+    ) throws Exception {
+        Object ret = execCode(msg, clazz, method, expRes, args);
+        if (ret == null) {
+            return;
+        }
+        if (expRes != null && expRes.equals(ret)) {
+            return;
+        }
+        assertEquals(ret, expRes, msg + "was: " + ret + "\n" + dumpJS(codeSeq));
+    }    
+
+    static TestVM compileClass(String... names) throws ScriptException, IOException {
+        return compileClass(null, names);
+    }
+    
+    static TestVM compileClass(StringBuilder sb, String... names) throws ScriptException, IOException {
+        return compileClass(sb, null, names);
+    }
+
+    static TestVM compileClass(StringBuilder sb, ScriptEngine[] eng, String... names) throws ScriptException, IOException {
+        if (sb == null) {
+            sb = new StringBuilder();
+        }
+        Bck2Brwsr.generate(sb, new EmulationResources(), names);
+        ScriptEngineManager sem = new ScriptEngineManager();
+        ScriptEngine js = sem.getEngineByExtension("js");
+        if (eng != null) {
+            eng[0] = js;
+        }
+        try {
+            Object res = js.eval(sb.toString());
+            assertTrue(js instanceof Invocable, "It is invocable object: " + res);
+            return new TestVM((Invocable) js, sb);
+        } catch (Exception ex) {
+            if (sb.length() > 2000) {
+                sb = dumpJS(sb);
+            }
+            fail("Could not evaluate:" + ex.getClass() + ":" + ex.getMessage() + "\n" + sb, ex);
+            return null;
+        }
+    }
+
+    Object loadClass(String loadClass, String name) throws ScriptException, NoSuchMethodException {
+        return code.invokeMethod(bck2brwsr, "loadClass", Exceptions.class.getName());
+    }
+    
+    Object invokeMethod(Object obj, String method, Object... params) throws ScriptException, NoSuchMethodException {
+        return code.invokeMethod(obj, method, params);
+    }
+
+    Object invokeFunction(String methodName, Object... args) throws ScriptException, NoSuchMethodException {
+        return code.invokeFunction(methodName, args);
+    }
+
+    static StringBuilder dumpJS(CharSequence sb) throws IOException {
+        File f = File.createTempFile("execution", ".js");
+        FileWriter w = new FileWriter(f);
+        w.append(sb);
+        w.close();
+        return new StringBuilder(f.getPath());
+    }
+
+    @Override
+    public String toString() {
+        try {
+            return dumpJS(codeSeq).toString();
+        } catch (IOException ex) {
+            return ex.toString();
+        }
+    }
+    
+    
+    private static class EmulationResources implements Bck2Brwsr.Resources {
+        @Override
+        public InputStream get(String name) throws IOException {
+            Enumeration<URL> en = StaticMethodTest.class.getClassLoader().getResources(name);
+            URL u = null;
+            while (en.hasMoreElements()) {
+                u = en.nextElement();
+            }
+            if (u == null) {
+                throw new IOException("Can't find " + name);
+            }
+            if (u.toExternalForm().contains("rt.jar!")) {
+                throw new IOException("No emulation for " + u);
+            }
+            return u.openStream();
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/VMLazyTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/VMLazyTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,98 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+import org.testng.annotations.BeforeClass;
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+/** Implements loading class by class.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class VMLazyTest {
+    private static TestVM code;
+
+    @BeforeClass
+    public static void compileTheCode() throws Exception {
+        StringBuilder sb = new StringBuilder();
+        sb.append("\nvar data = {};");
+        sb.append("\nfunction test(clazz, method) {");
+        sb.append("\n  if (!data.bck2brwsr) data.bck2brwsr = bck2brwsr(function(name) { return loader.get(name); });");
+        sb.append("\n  var c = data.bck2brwsr.loadClass(clazz);");
+        sb.append("\n  return c[method]();");
+        sb.append("\n}");
+        
+        sb.append("\nfunction checkKO() {");
+        sb.append("\n  return ko !== null;");
+        sb.append("\n}");
+       
+        ScriptEngine[] arr = { null };
+        code = TestVM.compileClass(sb, arr,
+            new String[]{"org/apidesign/vm4brwsr/VM", "org/apidesign/vm4brwsr/StaticMethod"}
+        );
+        arr[0].getContext().setAttribute("loader", new BytesLoader(), ScriptContext.ENGINE_SCOPE);
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    
+    @Test public void invokeStaticMethod() throws Exception {
+        assertExec("Trying to get -1", "test", Double.valueOf(-1),
+            StaticMethod.class.getName(), "minusOne__I"
+        );
+    }
+
+    @Test public void loadDependantClass() throws Exception {
+        assertExec("Expecting zero", "test", Double.valueOf(0),
+            InstanceSub.class.getName(), "recallDbl__D"
+        );
+    }
+
+    @Test public void loadClassWithAssociatedScript() throws Exception {
+        assertExec("ko is defined", "test", true,
+            Script.class.getName(), "checkNotNull__Z"
+        );
+        
+        Object res = code.invokeFunction("checkKO");
+        assertEquals(res, true, "KO is defined on a global level");
+    }
+
+    private static void assertExec(String msg, String methodName, Object expRes, Object... args) throws Exception {
+        Object ret = null;
+        try {
+            ret = code.invokeFunction(methodName, args);
+        } catch (ScriptException ex) {
+            fail("Execution failed in\n" + code.toString(), ex);
+        } catch (NoSuchMethodException ex) {
+            fail("Cannot find method in\n" + code.toString(), ex);
+        }
+        if (ret == null && expRes == null) {
+            return;
+        }
+        if (expRes.equals(ret)) {
+            return;
+        }
+        assertEquals(ret, expRes, msg + "was: " + ret + "\n" + code.toString());
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/VMinVM.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/VMinVM.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,46 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+class VMinVM extends ByteCodeToJavaScript {
+    private VMinVM(Appendable out) {
+        super(out);
+    }
+    
+    static String toJavaScript(byte[] is) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        new VMinVM(sb).compile(new ByteArrayInputStream(is));
+        return sb.toString().toString();
+    }
+
+    @Override
+    protected boolean requireReference(String internalClassName) {
+        return false;
+    }
+
+    @Override
+    protected void requireScript(String resourcePath) {
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/java/org/apidesign/vm4brwsr/VMinVMTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/VMinVMTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,102 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import static org.testng.Assert.*;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class VMinVMTest {
+    private static TestVM code;
+    
+    @Test public void compareGeneratedCodeForArrayClass() throws Exception {
+        compareCode("org/apidesign/vm4brwsr/Array.class");
+    }
+
+    @Test public void compareGeneratedCodeForClassesClass() throws Exception {
+        compareCode("org/apidesign/vm4brwsr/Classes.class");
+    }
+
+    @Test public void compareGeneratedCodeForToolkitClass() throws Exception {
+        String genCode = compareCode("org/apidesign/vm4brwsr/Bck2BrwsrToolkit.class");
+        int indx = genCode.indexOf("gt = 65604");
+        if (indx >= 0) {
+            fail("Goto to an invalid label:\n...." + genCode.substring(indx - 30, indx + 30) + "....");
+        }
+    }
+
+    @BeforeClass
+    public static void compileTheCode() throws Exception {
+        code = TestVM.compileClass("org/apidesign/vm4brwsr/VMinVM");
+    }
+    @AfterClass
+    public static void releaseTheCode() {
+        code = null;
+    }
+    
+    private String compareCode(final String nm) throws Exception, IOException {
+        byte[] arr = BytesLoader.readClass(nm);
+        String ret1 = VMinVM.toJavaScript(arr);
+        
+        Object ret;
+        try {
+            ret = code.invokeFunction("bck2brwsr");
+            ret = code.invokeMethod(ret, "loadClass", VMinVM.class.getName());
+            ret = code.invokeMethod(ret, "toJavaScript__Ljava_lang_String_2_3B", arr);
+        } catch (Exception ex) {
+            File f = File.createTempFile("execution", ".js");
+            FileWriter w = new FileWriter(f);
+            w.append("var byteCode = [\n  ");
+            String sep = "";
+            for (int i = 0; i < arr.length; i++) {
+                w.append(sep).append(Integer.toString((arr[i] + 256) % 256));
+                sep = ", ";
+                if (i % 20 == 0) {
+                    w.append("\n  ");
+                }
+            }
+            w.append("\n];\n");
+            w.append(code.toString());
+            w.close();
+            throw new Exception(ex.getMessage() + " file: " + f, ex);
+        }
+
+        
+        assertTrue(ret instanceof String, "It is string: " + ret);
+        
+        if (!ret1.toString().equals(ret)) {
+            StringBuilder msg = new StringBuilder("Difference found between ");
+            msg.append(TestVM.dumpJS(ret1));
+            msg.append(" ");
+            msg.append(TestVM.dumpJS((CharSequence) ret));
+            msg.append(" compiled by ");
+            msg.append(code.toString());
+            fail(msg.toString());
+        }
+        
+        return ret1;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/resources/org/apidesign/vm4brwsr/Bck2BrwsrToolkit.class
Binary file rt/vm/src/test/resources/org/apidesign/vm4brwsr/Bck2BrwsrToolkit.class has changed
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vm/src/test/resources/org/apidesign/vm4brwsr/ko.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vm/src/test/resources/org/apidesign/vm4brwsr/ko.js	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,20 @@
+/*
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+this.ko = {};
+
+
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/pom.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/pom.xml	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apidesign.bck2brwsr</groupId>
+    <artifactId>rt</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apidesign.bck2brwsr</groupId>
+  <artifactId>vmtest</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  
+  <name>VM Testing APIs</name>
+  <url>http://bck2brwsr.apidesign.org</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <excludePackageNames>org.apidesign.bck2brwsr.vmtest.impl</excludePackageNames>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vm4brwsr</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>emul.mini</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>launcher</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.netbeans.api</groupId>
+      <artifactId>org-openide-util-lookup</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/BrwsrTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/BrwsrTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,38 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Annotation to indicate that given method should be executed
+ * in a browser environment. Has to be used in conjunction with {@link VMTest#create(java.lang.Class)}
+ * factory method. 
+ * <p>
+ * The browser to is by default executed via {@link java.awt.Desktop#browse(java.net.URI)},
+ * but one can change that by specifying <code>-Dvmtest.brwsrs=firefox,google-chrome</code>
+ * property.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface BrwsrTest {
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/Compare.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/Compare.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,45 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Can be applied on a method that yields a return value. 
+ * Together with {@link VMTest#create} it can be used to write
+ * methods which are executed in real VM as well as JavaScript VMs and
+ * their results are compared.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Compare {
+    /** Specifies whether the system should internal JavaScript interpreter
+     * as available via {@link javax.script.ScriptEngine}. Defaults to true,
+     * but in some situations (benchmarking comes to my mind), one may set this
+     * to <code>false</code>. In such case only browsers provided via
+     * <code>vmtest.brwsrs</code> property are used. For example
+     * <code>"vmtest.brwsrs=firefox,google-chrome"</code> would run the test
+     * in HotSpot VM, firefox and chrome and would compare the results.
+     * @return 
+     */
+    boolean scripting() default true;
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/HtmlFragment.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/HtmlFragment.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,38 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Allows to specify an HTML fragment for a given {@link BrwsrTest}. 
+ * Apply either to the method or to enclosing class. The fragment will be
+ * made available in the page that executes given test. Its elements shall
+ * be regularly accessible from the test.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE})
+public @interface HtmlFragment {
+    /** HTML code fragment to be exposed on the testing page.
+     */
+    String value();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/Http.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/Http.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,57 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Exposes an {@link Resource HTTP page} or a set of {@link #value() pages} to the running {@link BrwsrTest}.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+public @interface Http {
+    /** Set of pages to make available */
+    public Resource[] value();
+    
+    /** Describes single HTTP page to the running {@link BrwsrTest}, so it can be 
+     * accessed under the specified {@link #path() relative path}. The page
+     * content can either be specified inline via {@link #content()} or as
+     * an external {@link #resource() resource}.
+     *
+     * @author Jaroslav Tulach <jtulach@netbeans.org>
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({})
+    public @interface Resource {
+        /** path on the server that the test can use to access the exposed resource */
+        String path();
+        /** the content of the <code>Http.Resource</code> */
+        String content();
+        /** resource relative to the class that should be used instead of <code>content</code>.
+         * Leave content equal to empty string.
+         */
+        String resource() default "";
+        /** mime type of the resource */
+        String mimeType();
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/VMTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/VMTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,56 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest;
+
+import org.apidesign.bck2brwsr.launcher.Launcher;
+import org.apidesign.bck2brwsr.vmtest.impl.CompareCase;
+import org.testng.annotations.Factory;
+
+/** A TestNG {@link Factory} that seeks for {@link Compare} and {@link BrwsrTest} annotations
+ * in provided class and builds set of tests that verify the functionality of <b>Bck2Brwsr</b> 
+ * based system. Use as:
+ * <pre>
+ * {@code @}{@link Factory} public static create() {
+ *   return @{link VMTest}.{@link #create(java.lang.Class) create}(YourClass.class);
+ * }</pre>
+ * where <code>YourClass</code> contains methods annotated with
+ * {@link Compare} and {@link BrwsrTest} annotations.
+ * 
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class VMTest {
+    private VMTest() {
+    }
+    
+    /** Inspects <code>clazz</code> and for each method annotated by
+     * {@link Compare} or {@link BrwsrTest} creates
+     * instances of tests. 
+     * <p>
+     * Each {@link Compare} instance runs the test in different virtual
+     * machine and at the end they compare the results.
+     * <p>
+     * Each {@link BrwsrTest} annotated method is executed once in {@link Launcher started
+     * browser}.
+     * 
+     * @param clazz the class to inspect
+     * @return the set of created tests
+     */
+    public static Object[] create(Class<?> clazz) {
+        return CompareCase.create(clazz);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,137 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.apidesign.bck2brwsr.launcher.Launcher;
+import org.apidesign.bck2brwsr.launcher.InvocationContext;
+import org.apidesign.bck2brwsr.vmtest.HtmlFragment;
+import org.apidesign.bck2brwsr.vmtest.Http;
+import org.testng.ITest;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class Bck2BrwsrCase implements ITest {
+    private final Method m;
+    private final Launcher l;
+    private final String type;
+    private final boolean fail;
+    private final HtmlFragment html;
+    private final Http.Resource[] http;
+    Object value;
+
+    Bck2BrwsrCase(Method m, String type, Launcher l, boolean fail, HtmlFragment html, Http.Resource[] http) {
+        this.l = l;
+        this.m = m;
+        this.type = type;
+        this.fail = fail;
+        this.html = html;
+        this.http = http;
+    }
+
+    @Test(groups = "run")
+    public void executeCode() throws Throwable {
+        if (l != null) {
+            InvocationContext c = l.createInvocation(m.getDeclaringClass(), m.getName());
+            if (html != null) {
+                c.setHtmlFragment(html.value());
+            }
+            if (http != null) {
+                for (Http.Resource r : http) {
+                    if (!r.content().isEmpty()) {
+                        InputStream is = new ByteArrayInputStream(r.content().getBytes("UTF-8"));
+                        c.addHttpResource(r.path(), r.mimeType(), is);
+                    } else {
+                        InputStream is = m.getDeclaringClass().getResourceAsStream(r.resource());
+                        c.addHttpResource(r.path(), r.mimeType(), is);
+                    }
+                }
+            }
+            String res = c.invoke();
+            value = res;
+            if (fail) {
+                int idx = res.indexOf(':');
+                if (idx >= 0) {
+                    Class<? extends Throwable> thrwbl = null;
+                    try {
+                        Class<?> exCls = Class.forName(res.substring(0, idx));
+                        if (Throwable.class.isAssignableFrom(exCls)) {
+                            thrwbl = exCls.asSubclass(Throwable.class);
+                        }
+                    } catch (Exception ex) {
+                        // ignore
+                    }
+                    if (thrwbl != null) {
+                        Throwable t = null;
+                        try {
+                            for (Constructor<?> cnstr : thrwbl.getConstructors()) {
+                                if (cnstr.getParameterTypes().length == 1 && cnstr.getParameterTypes()[0].isAssignableFrom(String.class)) {
+                                    t = (Throwable) cnstr.newInstance(res.substring(idx + 1));
+                                    break;
+                                }
+                            }
+                        } catch (Throwable ex) {
+                            t = thrwbl.newInstance().initCause(ex);
+                        }
+                        if (t == null) {
+                            t = thrwbl.newInstance().initCause(new Exception(res.substring(idx)));
+                        }
+                        throw t;
+                    }
+                    throw new AssertionError(res);
+                }
+            }
+        } else {
+            try {
+                value = m.invoke(m.getDeclaringClass().newInstance());
+            } catch (InvocationTargetException ex) {
+                Throwable t = ex.getTargetException();
+                value = t.getClass().getName() + ":" + t.getMessage();
+                if (t instanceof AssertionError) {
+                    throw t;
+                }
+            }
+        }
+    }
+
+    @Override
+    public String getTestName() {
+        return m.getName() + "[" + typeName() + "]";
+    }
+
+    final String typeName() {
+        return type;
+    }
+    static void dumpJS(StringBuilder sb, Bck2BrwsrCase c) throws IOException {
+        File f = File.createTempFile(c.m.getName(), ".js");
+        try (final FileWriter w = new FileWriter(f)) {
+            w.append(c.l.toString());
+        }
+        sb.append("Path: ").append(f.getPath());
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,184 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest.impl;
+
+import org.apidesign.bck2brwsr.vmtest.*;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import org.apidesign.bck2brwsr.launcher.Launcher;
+import org.testng.Assert;
+import org.testng.ITest;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
+
+/** A TestNG {@link Factory} that seeks for {@link Compare} annotations
+ * in provided class and builds set of tests that compare the computations
+ * in real as well as JavaScript virtual machines. Use as:<pre>
+ * {@code @}{@link Factory} public static create() {
+ *   return @{link VMTest}.{@link #create(YourClass.class);
+ * }</pre>
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class CompareCase implements ITest {
+    private final Bck2BrwsrCase first, second;
+    private final Method m;
+    
+    private CompareCase(Method m, Bck2BrwsrCase first, Bck2BrwsrCase second) {
+        this.first = first;
+        this.second = second;
+        this.m = m;
+    }
+
+    /** Inspects <code>clazz</code> and for each {@lik Compare} method creates
+     * instances of tests. Each instance runs the test in different virtual
+     * machine and at the end they compare the results.
+     * 
+     * @param clazz the class to inspect
+     * @return the set of created tests
+     */
+    public static Object[] create(Class<?> clazz) {
+        Method[] arr = clazz.getMethods();
+        List<Object> ret = new ArrayList<>();
+        
+        final LaunchSetup l = LaunchSetup.INSTANCE;
+        ret.add(l);
+        
+        String[] brwsr;
+        {
+            String p = System.getProperty("vmtest.brwsrs");
+            if (p != null) {
+                brwsr = p.split(",");
+            } else {
+                brwsr = new String[0];
+            }
+        }
+        
+        for (Method m : arr) {
+            registerCompareCases(m, l, ret, brwsr);
+            registerBrwsrCases(m, l, ret, brwsr);
+        }
+        return ret.toArray();
+    }
+
+    /** Test that compares the previous results.
+     * @throws Throwable 
+     */
+    @Test(dependsOnGroups = "run") public void compareResults() throws Throwable {
+        Object v1 = first.value;
+        Object v2 = second.value;
+        if (v1 instanceof Integer || v1 instanceof Long || v1 instanceof Byte || v1 instanceof Short) {
+            try {
+                v1 = Long.parseLong(v1.toString());
+            } catch (NumberFormatException nfe) {
+                v1 = "Can't parse " + v1.toString();
+            }
+            try {
+                v2 = Long.parseLong(v2.toString());
+            } catch (NumberFormatException nfe) {
+                v2 = "Can't parse " + v2.toString();
+            }
+        } else if (v1 instanceof Number) {
+            try {
+                v1 = Double.parseDouble(v1.toString());
+            } catch (NumberFormatException nfe) {
+                v1 = "Can't parse " + v1.toString();
+            }
+            try {
+                v2 = Double.parseDouble(v2.toString());
+            } catch (NumberFormatException nfe) {
+                v2 = "Can't parse " + v2.toString();
+            }
+        } else {
+            if (v1 != null) {
+                v1 = v1.toString();
+            } else {
+                v1 = "null";
+            }
+        }
+        try {
+            Assert.assertEquals(v2, v1, "Comparing results");
+        } catch (AssertionError e) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(e.getMessage());
+            Bck2BrwsrCase.dumpJS(sb, second);
+            throw new AssertionError(sb.toString());
+        }
+    }
+    
+    /** Test name.
+     * @return name of the tested method followed by a suffix
+     */
+    @Override
+    public String getTestName() {
+        return m.getName() + "[Compare " + second.typeName() + "]";
+    }
+    
+    private static void registerCompareCases(Method m, final LaunchSetup l, List<Object> ret, String[] brwsr) {
+        Compare c = m.getAnnotation(Compare.class);
+        if (c == null) {
+            return;
+        }
+        final Bck2BrwsrCase real = new Bck2BrwsrCase(m, "Java", null, false, null, null);
+        ret.add(real);
+        if (c.scripting()) {
+            final Bck2BrwsrCase js = new Bck2BrwsrCase(m, "JavaScript", l.javaScript(), false, null, null);
+            ret.add(js);
+            ret.add(new CompareCase(m, real, js));
+        }
+        for (String b : brwsr) {
+            final Launcher s = l.brwsr(b);
+            ret.add(s);
+            final Bck2BrwsrCase cse = new Bck2BrwsrCase(m, b, s, false, null, null);
+            ret.add(cse);
+            ret.add(new CompareCase(m, real, cse));
+        }
+    }
+    private static void registerBrwsrCases(Method m, final LaunchSetup l, List<Object> ret, String[] brwsr) {
+        BrwsrTest c = m.getAnnotation(BrwsrTest.class);
+        if (c == null) {
+            return;
+        }
+        HtmlFragment f = m.getAnnotation(HtmlFragment.class);
+        if (f == null) {
+            f = m.getDeclaringClass().getAnnotation(HtmlFragment.class);
+        }
+        Http.Resource[] r = {};
+        Http h = m.getAnnotation(Http.class);
+        if (h == null) {
+            h = m.getDeclaringClass().getAnnotation(Http.class);
+            if (h != null) {
+                r = h.value();
+            }
+        } else {
+            r = h.value();
+        }
+        if (brwsr.length == 0) {
+            final Launcher s = l.brwsr(null);
+            ret.add(s);
+            ret.add(new Bck2BrwsrCase(m, "Brwsr", s, true, f, r));
+        } else {
+            for (String b : brwsr) {
+                final Launcher s = l.brwsr(b);
+                ret.add(s);
+                ret.add(new Bck2BrwsrCase(m, b, s, true, f, r));
+            }
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/GenerateZip.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/GenerateZip.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,36 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest.impl;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Annotation to generate a ZIP or JAR file during build.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.SOURCE)
+@interface GenerateZip {
+    String name();
+    
+    /** manifest for the file */
+    String manifest() default "";
+
+    /** Array of names (at odd positions) and their content (on even) */
+    String[] contents();
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/GenerateZipProcessor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/GenerateZipProcessor.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,101 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Filer;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic;
+import javax.tools.FileObject;
+import javax.tools.StandardLocation;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@ServiceProvider(service = Processor.class)
+@SupportedAnnotationTypes("org.apidesign.bck2brwsr.vmtest.impl.GenerateZip")
+public class GenerateZipProcessor extends AbstractProcessor {
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        for (Element e : roundEnv.getElementsAnnotatedWith(GenerateZip.class)) {
+            GenerateZip gz = e.getAnnotation(GenerateZip.class);
+            if (gz == null) {
+                continue;
+            }
+            PackageElement pe = findPackage(e);
+            try {
+                generateJar(pe, gz, e);
+            } catch (IOException ex) {
+                processingEnv.getMessager().printMessage(
+                    Diagnostic.Kind.ERROR, 
+                    "Can't generate JAR " + gz.name() + ": " + ex.getMessage()
+                );
+            }
+        }
+        return true;
+    }
+
+    private static PackageElement findPackage(Element e) {
+        while (e.getKind() != ElementKind.PACKAGE) {
+            e = e.getEnclosingElement();
+        }
+        return (PackageElement)e;
+    }
+
+    private void generateJar(PackageElement pe, GenerateZip gz, Element e) throws IOException {
+        final Filer filer = processingEnv.getFiler();
+        FileObject res = filer.createResource(
+            StandardLocation.CLASS_OUTPUT, 
+            pe.getQualifiedName().toString(), 
+            gz.name(), e
+        );
+        OutputStream os = res.openOutputStream();
+        JarOutputStream jar;
+        if (gz.manifest().isEmpty()) {
+            jar = new JarOutputStream(os);
+        } else {
+            Manifest mf = new Manifest(new ByteArrayInputStream(gz.manifest().getBytes("UTF-8")));
+            jar = new JarOutputStream(os, mf);
+        }
+        String[] arr = gz.contents();
+        for (int i = 0; i < arr.length; i += 2) {
+            JarEntry je = new JarEntry(arr[i]);
+            jar.putNextEntry(je);
+            jar.write(arr[i + 1].getBytes("UTF-8"));
+            jar.closeEntry();
+        }
+        jar.close();
+    }
+
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/LaunchSetup.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/LaunchSetup.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,85 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest.impl;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.apidesign.bck2brwsr.launcher.Launcher;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.BeforeGroups;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class LaunchSetup {
+    static LaunchSetup INSTANCE = new LaunchSetup();
+    
+    private Launcher js;
+    private final Map<String,Launcher> brwsrs = new LinkedHashMap<>();
+    
+    private LaunchSetup() {
+    }
+    
+    public Launcher javaScript() {
+        return js(true);
+    } 
+    private synchronized  Launcher js(boolean create) {
+        if (js == null && create) {
+            final String p = System.getProperty("vmtest.js", "script"); // NOI18N
+            switch (p) {
+                case "brwsr": js = Launcher.createBrowser(null); break; // NOI18N
+                case "script": js = Launcher.createJavaScript(); break; // NOI18N
+                default: throw new IllegalArgumentException(
+                    "Unknown value of vmtest.js property: " + p
+                );
+            }
+        }
+        return js;
+    } 
+    
+    public synchronized Launcher brwsr(String cmd) {
+        Launcher s = brwsrs.get(cmd);
+        if (s == null) {
+            s = Launcher.createBrowser(cmd);
+            brwsrs.put(cmd, s);
+        }
+        return s;
+    }
+
+    @BeforeGroups("run")
+    public void initializeLauncher() throws IOException {
+        if (js(false) != null) {
+            js(true).initialize();
+        }
+        for (Launcher launcher : brwsrs.values()) {
+            launcher.initialize();
+        }
+    }
+
+    @AfterGroups("run")
+    public void shutDownLauncher() throws IOException, InterruptedException {
+        if (js(false) != null) {
+            js(true).shutdown();
+        }
+        for (Launcher launcher : brwsrs.values()) {
+            launcher.shutdown();
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/AssertionTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/AssertionTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,43 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class AssertionTest {
+
+    @Compare public Object checkAssert() throws ClassNotFoundException {
+        try {
+            assert false : "Is assertion status on?";
+            return null;
+        } catch (AssertionError ex) {
+            return ex.getClass().getName();
+        }
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(AssertionTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/BrwsrCheckTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/BrwsrCheckTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,57 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
+import org.apidesign.bck2brwsr.vmtest.HtmlFragment;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class BrwsrCheckTest {
+
+    @BrwsrTest public void assertWindowObjectIsDefined() {
+        assert window() != null : "No window object found!";
+    }
+
+    
+    
+    
+    @HtmlFragment("<h1 id='hello'>\n"
+        + "Hello!\n"
+        + "</h1>\n")
+    @BrwsrTest public void accessProvidedFragment() {
+        assert getElementById("hello") != null : "Element with 'hello' ID found";
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(BrwsrCheckTest.class);
+    }
+    
+
+    @JavaScriptBody(args = {}, body = "return window;")
+    private static native Object window();
+
+    @JavaScriptBody(args = { "id" }, body = "return window.document.getElementById(id);")
+    private static native Object getElementById(String id);
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ByteArithmeticTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ByteArithmeticTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,147 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ByteArithmeticTest {
+    
+    private static byte add(byte x, byte y) {
+        return (byte)(x + y);
+    }
+    
+    private static byte sub(byte x, byte y) {
+        return (byte)(x - y);
+    }
+    
+    private static byte mul(byte x, byte y) {
+        return (byte)(x * y);
+    }
+    
+    private static byte div(byte x, byte y) {
+        return (byte)(x / y);
+    }
+    
+    private static byte mod(byte x, byte y) {
+        return (byte)(x % y);
+    }
+    
+    @Compare public byte conversion() {
+        return (byte)123456;
+    }
+    
+    @Compare public byte addOverflow() {
+        return add(Byte.MAX_VALUE, (byte)1);
+    }
+    
+    @Compare public byte subUnderflow() {
+        return sub(Byte.MIN_VALUE, (byte)1);
+    }
+    
+    @Compare public byte addMaxByteAndMaxByte() {
+        return add(Byte.MAX_VALUE, Byte.MAX_VALUE);
+    }
+    
+    @Compare public byte subMinByteAndMinByte() {
+        return sub(Byte.MIN_VALUE, Byte.MIN_VALUE);
+    }
+    
+    @Compare public byte multiplyMaxByte() {
+        return mul(Byte.MAX_VALUE, (byte)2);
+    }
+    
+    @Compare public byte multiplyMaxByteAndMaxByte() {
+        return mul(Byte.MAX_VALUE, Byte.MAX_VALUE);
+    }
+    
+    @Compare public byte multiplyMinByte() {
+        return mul(Byte.MIN_VALUE, (byte)2);
+    }
+    
+    @Compare public byte multiplyMinByteAndMinByte() {
+        return mul(Byte.MIN_VALUE, Byte.MIN_VALUE);
+    }
+    
+    @Compare public byte multiplyPrecision() {
+        return mul((byte)17638, (byte)1103);
+    }
+    
+    @Compare public byte division() {
+        return div((byte)1, (byte)2);
+    }
+    
+    @Compare public byte divisionReminder() {
+        return mod((byte)1, (byte)2);
+    }
+
+    private static int readShort(byte[] byteCodes, int offset) {
+        int signed = byteCodes[offset];
+        byte b0 = (byte)signed;
+        return (b0 << 8) | (byteCodes[offset + 1] & 0xff);
+    }
+    
+    private static int readShortArg(byte[] byteCodes, int offsetInstruction) {
+        return readShort(byteCodes, offsetInstruction + 1);
+    }
+    
+    @Compare public int readIntArgs255and156() {
+        final byte[] arr = new byte[] { (byte)0, (byte)255, (byte)156 };
+        
+        assert arr[1] == -1 : "First byte: " + arr[1];
+        assert arr[2] == -100 : "Second byte: " + arr[2];
+        final int ret = readShortArg(arr, 0);
+        assert ret < 65000: "Value: " + ret;
+        return ret;
+    }
+    
+    @JavaScriptBody(args = { "arr" }, body = "arr[1] = 255; arr[2] = 156; return arr;")
+    private static byte[] fill255and156(byte[] arr) {
+        arr[1] = (byte)255;
+        arr[2] = (byte)156;
+        return arr;
+    }
+
+    @Compare public int readIntArgs255and156JSArray() {
+        final byte[] arr = fill255and156(new byte[] { 0, 0, 0 });
+        
+        final int ret = readShortArg(arr, 0);
+        assert ret < 65000: "Value: " + ret;
+        return ret;
+    }
+    
+    @Compare public int readIntArgsMinus1andMinus100() {
+        final byte[] arr = new byte[] { (byte)0, (byte)-1, (byte)-100 };
+        
+        assert arr[1] == -1 : "First byte: " + arr[1];
+        assert arr[2] == -100 : "Second byte: " + arr[2];
+        
+        return readShortArg(arr, 0);
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(ByteArithmeticTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CloneTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CloneTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,73 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class CloneTest {
+    private int value;
+    
+    @Compare
+    public Object notSupported() throws CloneNotSupportedException {
+        return this.clone();
+    }
+
+    @Compare public String sameClass() throws CloneNotSupportedException {
+        return new Clnbl().clone().getClass().getName();
+    }
+
+    @Compare public boolean differentInstance() throws CloneNotSupportedException {
+        Clnbl orig = new Clnbl();
+        return orig == orig.clone();
+    }
+
+    @Compare public int sameReference() throws CloneNotSupportedException {
+        CloneTest self = this;
+        Clnbl orig = new Clnbl();
+        self.value = 33;
+        orig.ref = self;
+        return ((Clnbl)orig.clone()).ref.value;
+    }
+
+    @Compare public int sameValue() throws CloneNotSupportedException {
+        Clnbl orig = new Clnbl();
+        orig.value = 10;
+        return ((Clnbl)orig.clone()).value;
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(CloneTest.class);
+    }
+    
+    public static final class Clnbl implements Cloneable {
+        public CloneTest ref;
+        private int value;
+
+        @Override
+        public Object clone() throws CloneNotSupportedException {
+            return super.clone();
+        }
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareByteArrayTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareByteArrayTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,103 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class CompareByteArrayTest {
+    @Compare public int byteArraySum() {
+        byte[] arr = createArray();
+        return sumByteArr(arr);
+    }
+    
+    @Compare public int countZeros() {
+        int zeros = 0;
+        for (Byte b : createArray()) {
+            if (b == 0) {
+                zeros++;
+            }
+        }
+        return zeros;
+    }
+    
+    private static int sumByteArr(byte[] arr) {
+        int sum = 0;
+        for (int i = 0; i < arr.length; i++) {
+            sum += arr[i];
+        }
+        return sum;
+    }
+    
+    @Compare public String noOutOfBounds() {
+        return atIndex(1);
+    }
+
+    @Compare public String outOfBounds() {
+        return atIndex(5);
+    }
+
+    @Compare public String outOfBoundsMinus() {
+        return atIndex(-1);
+    }
+
+    @Compare public String toOfBounds() {
+        return toIndex(5);
+    }
+
+    @Compare public String toOfBoundsMinus() {
+        return toIndex(-1);
+    }
+    
+    @Compare public int multiArrayLength() {
+         int[][] arr = new int[1][0];
+         return arr[0].length;
+    }
+
+    @Compare public int multiObjectArrayLength() {
+         Object[][] arr = new Object[1][0];
+         return arr[0].length;
+    }
+
+    private static final int[] arr = { 0, 1, 2 };
+    public static String atIndex(int at) {
+        return "at@" + arr[at];
+    }
+    public static String toIndex(int at) {
+        arr[at] = 10;
+        return "ok";
+    }
+    
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(CompareByteArrayTest.class);
+    }
+
+    private byte[] createArray() {
+        byte[] arr = new byte[10];
+        arr[5] = 3;
+        arr[7] = 8;
+        return arr;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareHashTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareHashTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,50 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class CompareHashTest {
+    @Compare public int hashOfString() {
+        return "Ahoj".hashCode();
+    }
+    
+    @Compare public int hashRemainsYieldsZero() {
+        Object o = new Object();
+        return o.hashCode() - o.hashCode();
+    }
+    
+    @Compare public int initializeInStatic() {
+        return StaticUse.NON_NULL.hashCode() - StaticUse.NON_NULL.hashCode();
+    }
+    
+    @Compare public int hashOfInt() {
+        return Integer.valueOf(Integer.MAX_VALUE).hashCode();
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(CompareHashTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareIntArrayTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareIntArrayTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,63 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class CompareIntArrayTest {
+    @Compare public int integerArraySum() {
+        int[] arr = createArray();
+        return sumIntArr(arr);
+    }
+    
+    @Compare public int countZeros() {
+        int zeros = 0;
+        for (Integer i : createArray()) {
+            if (i == 0) {
+                zeros++;
+            }
+        }
+        return zeros;
+    }
+    
+    private static int sumIntArr(int[] arr) {
+        int sum = 0;
+        for (int i = 0; i < arr.length; i++) {
+            sum += arr[i];
+        }
+        return sum;
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(CompareIntArrayTest.class);
+    }
+
+    private int[] createArray() {
+        int[] arr = new int[10];
+        arr[5] = 3;
+        arr[7] = 8;
+        return arr;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareStringsTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareStringsTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,162 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class CompareStringsTest {
+    @Compare public String firstChar() {
+        return "" + ("Hello".toCharArray()[0]);
+    }
+    
+    @Compare public String classCast() {
+        Object o = firstChar();
+        return String.class.cast(o);
+    }
+
+    @Compare public String classCastThrown() {
+        Object o = null;
+        return String.class.cast(o);
+    }
+    
+    @Compare public boolean equalToNull() {
+        return "Ahoj".equals(null);
+    }
+    
+    @Compare public int highByteLenght() {
+        byte[] arr= { 77,97,110,105,102,101,115,116,45,86,101,114,115,105,111,110 };
+        return new String(arr, 0).length();
+    }
+    
+    @Compare public String highByte() {
+        byte[] arr= { 77,97,110,105,102,101,115,116,45,86,101,114,115,105,111,110 };
+        StringBuilder sb = new StringBuilder();
+        sb.append("pref:");
+        sb.append(new String(arr, 0));
+        return sb.toString();
+    }
+    
+    @Compare public static Object compareURLs() throws MalformedURLException {
+        return new URL("http://apidesign.org:8080/wiki/").toExternalForm().toString();
+    }
+    
+    @Compare public String deleteLastTwoCharacters() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("453.0");
+        if (sb.toString().endsWith(".0")) {
+            final int l = sb.length();
+            sb.delete(l - 2, l);
+        }
+        return sb.toString().toString();
+    }
+    
+    @Compare public String nameOfStringClass() throws Exception {
+        return Class.forName("java.lang.String").getName();
+    }
+    @Compare public String nameOfArrayClass() throws Exception {
+        return Class.forName("org.apidesign.bck2brwsr.tck.CompareHashTest").getName();
+    }
+    
+    @Compare public String lowerHello() {
+        return "HeLlO".toLowerCase();
+    }
+    
+    @Compare public String lowerA() {
+        return String.valueOf(Character.toLowerCase('A')).toString();
+    }
+    @Compare public String upperHello() {
+        return "hello".toUpperCase();
+    }
+    
+    @Compare public String upperA() {
+        return String.valueOf(Character.toUpperCase('a')).toString();
+    }
+    
+    @Compare public boolean matchRegExp() throws Exception {
+        return "58038503".matches("\\d*");
+    }
+
+    @Compare public boolean doesNotMatchRegExp() throws Exception {
+        return "58038503GH".matches("\\d*");
+    }
+
+    @Compare public boolean doesNotMatchRegExpFully() throws Exception {
+        return "Hello".matches("Hell");
+    }
+    
+    @Compare public String emptyCharArray() {
+        char[] arr = new char[10];
+        return new String(arr);
+    }
+    
+    @Compare public String variousCharacterTests() throws Exception {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append(Character.isUpperCase('a'));
+        sb.append(Character.isUpperCase('A'));
+        sb.append(Character.isLowerCase('a'));
+        sb.append(Character.isLowerCase('A'));
+        
+        sb.append(Character.isLetter('A'));
+        sb.append(Character.isLetterOrDigit('9'));
+        sb.append(Character.isLetterOrDigit('A'));
+        sb.append(Character.isLetter('0'));
+        
+        return sb.toString().toString();
+    }
+        
+    @Compare
+    public String nullFieldInitialized() {
+        NullField nf = new NullField();
+        return ("" + nf.name).toString();
+    }
+    @Compare
+    public String toUTFString() throws UnsupportedEncodingException {
+        byte[] arr = {
+            (byte) -59, (byte) -67, (byte) 108, (byte) 117, (byte) -59, (byte) -91,
+            (byte) 111, (byte) 117, (byte) -60, (byte) -115, (byte) 107, (byte) -61,
+            (byte) -67, (byte) 32, (byte) 107, (byte) -59, (byte) -81, (byte) -59,
+            (byte) -120
+        };
+        return new String(arr, "utf-8");
+    }
+
+    @Compare
+    public int stringToBytesLenght() throws UnsupportedEncodingException {
+        return "\u017dlu\u0165ou\u010dk\u00fd k\u016f\u0148".getBytes("utf8").length;
+    }
+
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(CompareStringsTest.class);
+    }
+
+    private static final class NullField {
+
+        String name;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/DoubleTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/DoubleTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,65 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class DoubleTest {
+    @Compare public String integerToString() {
+        return toStr(1);
+    }
+
+    @Compare public String integerAndHalfToString() {
+        return toStr(1.5);
+    }
+
+    @Compare public double longToAndBack() {
+        return Double.parseDouble(toStr(Long.MAX_VALUE / 10));
+    }
+
+    @Compare public String negativeIntToString() {
+        return toStr(-10);
+    }
+
+    @Compare public String negativeIntAndHalfToString() {
+        return toStr(-10.5);
+    }
+
+    @Compare public double negativeLongAndBack() {
+        return Double.parseDouble(toStr(Long.MIN_VALUE / 10));
+    }
+    
+    @Compare public double canParseExp() {
+        return Double.parseDouble(toStr(1.7976931348623157e+308));
+    }
+    
+    private static String toStr(double d) {
+        return Double.toString(d);
+    }
+    
+    @Factory 
+    public static Object[] create() {
+        return VMTest.create(DoubleTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/HttpResourceTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/HttpResourceTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,106 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import java.io.InputStream;
+import java.net.URL;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
+import org.apidesign.bck2brwsr.vmtest.Http;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class HttpResourceTest {
+    
+    @Http({
+        @Http.Resource(path = "/xhr", content = "Hello Brwsr!", mimeType = "text/plain")
+    })
+    @BrwsrTest
+    
+    
+    public String testReadContentViaXHR() throws Exception {
+        String msg = read("/xhr");
+        assert "Hello Brwsr!".equals(msg) : "The message was " + msg;
+        return msg;
+    }
+
+    @Http({
+        @Http.Resource(path = "/url", content = "Hello via URL!", mimeType = "text/plain")
+    })
+    @BrwsrTest
+    public String testReadContentViaURL() throws Exception {
+        URL url = new URL("http:/url");
+        String msg = (String) url.getContent();
+        assert "Hello via URL!".equals(msg) : "The message was " + msg;
+        return msg;
+    }
+    @Http({
+        @Http.Resource(path = "/url", content = "Hello via URL!", mimeType = "text/plain")
+    })
+    @BrwsrTest
+    public String testReadContentViaURLWithStringParam() throws Exception {
+        URL url = new URL("http:/url");
+        String msg = (String) url.getContent(new Class[] { String.class });
+        assert "Hello via URL!".equals(msg) : "The message was " + msg;
+        return msg;
+    }
+
+    @Http({
+        @Http.Resource(path = "/bytes", content = "", resource = "0xfe", mimeType = "x-application/binary")
+    })
+    @BrwsrTest
+    public void testReadByte() throws Exception {
+        URL url = new URL("http:/bytes");
+        final Object res = url.getContent(new Class[] { byte[].class });
+        assert res instanceof byte[] : "Expecting byte[]: " + res;
+        byte[] arr = (byte[]) res;
+        assert arr.length == 1 : "One byte " + arr.length;
+        assert arr[0] == 0xfe : "It is 0xfe: " + Integer.toHexString(arr[0]);
+    }
+
+    @Http({
+        @Http.Resource(path = "/bytes", content = "", resource = "0xfe", mimeType = "x-application/binary")
+    })
+    @BrwsrTest
+    public void testReadByteViaInputStream() throws Exception {
+        URL url = new URL("http:/bytes");
+        InputStream is = url.openStream();
+        byte[] arr = new byte[10];
+        int len = is.read(arr);
+        assert len == 1 : "One byte " + len;
+        assert arr[0] == 0xfe : "It is 0xfe: " + Integer.toHexString(arr[0]);
+    }
+    
+    @JavaScriptBody(args = { "url" }, body = 
+          "var req = new XMLHttpRequest();\n"
+        + "req.open('GET', url, false);\n"
+        + "req.send();\n"
+        + "return req.responseText;"
+    )
+    private static native String read(String url);
+    
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(HttpResourceTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceA.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceA.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,34 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class InheritanceA {
+    private String name;
+    
+    public void setA(String n) {
+        this.name = n;
+    }
+    
+    public String getA() {
+        return name;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceB.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceB.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,34 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class InheritanceB extends InheritanceA {
+    private String name;
+    
+    public void setB(String n) {
+        this.name = n;
+    }
+    
+    public String getB() {
+        return name;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,41 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class InheritanceTest {
+
+    @Compare public String checkFieldsIndependent() throws ClassNotFoundException {
+        InheritanceB ib = new InheritanceB();
+        ib.setA("A");
+        ib.setB("B");
+        return "A: " + ib.getA() + " B: " + ib.getB();
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(InheritanceTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/IntegerArithmeticTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/IntegerArithmeticTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,166 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class IntegerArithmeticTest {
+    
+    private static int add(int x, int y) {
+        return x + y;
+    }
+    
+    private static int sub(int x, int y) {
+        return x - y;
+    }
+    
+    private static int mul(int x, int y) {
+        return x * y;
+    }
+    
+    private static int div(int x, int y) {
+        return x / y;
+    }
+    
+    private static int mod(int x, int y) {
+        return x % y;
+    }
+    
+    private static int neg(int x) {
+        return (-x);
+    }
+
+    private static float fadd(float x, float y) {
+        return x + y;
+    }
+
+    private static double dadd(double x, double y) {
+        return x + y;
+    }
+    
+    @Compare public int addOverflow() {
+        return add(Integer.MAX_VALUE, 1);
+    }
+    
+    @Compare public int subUnderflow() {
+        return sub(Integer.MIN_VALUE, 1);
+    }
+    
+    @Compare public int addMaxIntAndMaxInt() {
+        return add(Integer.MAX_VALUE, Integer.MAX_VALUE);
+    }
+    
+    @Compare public int subMinIntAndMinInt() {
+        return sub(Integer.MIN_VALUE, Integer.MIN_VALUE);
+    }
+    
+    @Compare public int multiplyMaxInt() {
+        return mul(Integer.MAX_VALUE, 2);
+    }
+    
+    @Compare public int multiplyMaxIntAndMaxInt() {
+        return mul(Integer.MAX_VALUE, Integer.MAX_VALUE);
+    }
+    
+    @Compare public int multiplyMinInt() {
+        return mul(Integer.MIN_VALUE, 2);
+    }
+    
+    @Compare public int multiplyMinIntAndMinInt() {
+        return mul(Integer.MIN_VALUE, Integer.MIN_VALUE);
+    }
+    
+    @Compare public int multiplyPrecision() {
+        return mul(119106029, 1103515245);
+    }
+    
+    @Compare public int division() {
+        return div(1, 2);
+    }
+
+    @Compare public int divisionReminder() {
+        return mod(1, 2);
+    }
+
+    @Compare public int negativeDivision() {
+        return div(-7, 3);
+    }
+
+    @Compare public int negativeDivisionReminder() {
+        return mod(-7, 3);
+    }
+
+    @Compare public int conversionFromFloat() {
+        return (int) fadd(-2, -0.6f);
+    }
+
+    @Compare public int conversionFromDouble() {
+        return (int) dadd(-2, -0.6);
+    }
+
+    @Compare public boolean divByZeroThrowsArithmeticException() {
+        try {
+            div(1, 0);
+            return false;
+        } catch (final ArithmeticException e) {
+            return true;
+        }
+    }
+
+    @Compare public boolean modByZeroThrowsArithmeticException() {
+        try {
+            mod(1, 0);
+            return false;
+        } catch (final ArithmeticException e) {
+            return true;
+        }
+    }
+
+    @Compare public int negate() {
+        return neg(123456);
+    }
+    
+    @Compare public int negateMaxInt() {
+        return neg(Integer.MAX_VALUE);
+    }
+    
+    @Compare public int negateMinInt() {
+        return neg(Integer.MIN_VALUE);
+    }
+    
+    @Compare public int sumTwoDimensions() {
+        int[][] matrix = createMatrix(4, 3);
+        matrix[0][0] += 10;
+        return matrix[0][0];
+    }
+    
+    static int[][] createMatrix(int x, int y) {
+        return new int[x][y];
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(IntegerArithmeticTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,376 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class LongArithmeticTest {
+
+    private static long add(long x, long y) {
+        return (x + y);
+    }
+
+    private static long sub(long x, long y) {
+        return (x - y);
+    }
+
+    private static long mul(long x, long y) {
+        return (x * y);
+    }
+
+    private static long div(long x, long y) {
+        return (x / y);
+    }
+
+    private static long mod(long x, long y) {
+        return (x % y);
+    }
+
+    private static long neg(long x) {
+        return (-x);
+    }
+
+    private static long shl(long x, int b) {
+        return (x << b);
+    }
+
+    private static long shr(long x, int b) {
+        return (x >> b);
+    }
+
+    private static long ushr(long x, int b) {
+        return (x >>> b);
+    }
+
+    private static long and(long x, long y) {
+        return (x & y);
+    }
+
+    private static long or(long x, long y) {
+        return (x | y);
+    }
+
+    private static long xor(long x, long y) {
+        return (x ^ y);
+    }
+
+    private static float fadd(float x, float y) {
+        return x + y;
+    }
+
+    private static double dadd(double x, double y) {
+        return x + y;
+    }
+
+    public static int compare(long x, long y, int zero) {
+        final int xyResult = compareL(x, y, zero);
+        final int yxResult = compareL(y, x, zero);
+
+        return ((xyResult + yxResult) == 0) ? xyResult : -2;
+    }
+
+    private static int compareL(long x, long y, int zero) {
+        int result = -2;
+        int trueCount = 0;
+
+        x += zero;
+        if (x == y) {
+            result = 0;
+            ++trueCount;
+        }
+
+        x += zero;
+        if (x < y) {
+            result = -1;
+            ++trueCount;
+        }
+
+        x += zero;
+        if (x > y) {
+            result = 1;
+            ++trueCount;
+        }
+
+        return (trueCount == 1) ? result : -2;
+    }
+
+    @Compare public long conversion() {
+        return Long.MAX_VALUE;
+    }
+
+    @Compare public long negate1() {
+        return neg(0x00fa37d7763e0ca1l);
+    }
+
+    @Compare public long negate2() {
+        return neg(0x80fa37d7763e0ca1l);
+    }
+
+    @Compare public long negate3() {
+        return neg(0xfffffffffffffeddl);
+    }
+
+    @Compare public long addOverflow() {
+        return add(Long.MAX_VALUE, 1l);
+    }
+
+    @Compare public long subUnderflow() {
+        return sub(Long.MIN_VALUE, 1l);
+    }
+
+    @Compare public long addMaxLongAndMaxLong() {
+        return add(Long.MAX_VALUE, Long.MAX_VALUE);
+    }
+
+    @Compare public long subMinLongAndMinLong() {
+        return sub(Long.MIN_VALUE, Long.MIN_VALUE);
+    }
+
+    @Compare public long subMinLongAndMaxLong() {
+        return sub(Long.MIN_VALUE, Long.MAX_VALUE);
+    }
+
+    @Compare public long multiplyMaxLong() {
+        return mul(Long.MAX_VALUE, 2l);
+    }
+
+    @Compare public long multiplyMaxLongAndMaxLong() {
+        return mul(Long.MAX_VALUE, Long.MAX_VALUE);
+    }
+
+    @Compare public long multiplyMinLong() {
+        return mul(Long.MIN_VALUE, 2l);
+    }
+
+    @Compare public long multiplyMinLongAndMinLong() {
+        return mul(Long.MIN_VALUE, Long.MIN_VALUE);
+    }
+
+    @Compare public long multiplyPrecision() {
+        return mul(0x00fa37d7763e0ca1l, 0xa7b3432fff00123el);
+    }
+
+    @Compare public long divideSmallPositiveNumbers() {
+        return div(0xabcdef, 0x123);
+    }
+
+    @Compare public long divideSmallNegativeNumbers() {
+        return div(-0xabcdef, -0x123);
+    }
+
+    @Compare public long divideSmallMixedNumbers() {
+        return div(0xabcdef, -0x123);
+    }
+
+    @Compare public long dividePositiveNumbersOneDigitDenom() {
+        return div(0xabcdef0102ffffl, 0x654);
+    }
+
+    @Compare public long divideNegativeNumbersOneDigitDenom() {
+        return div(-0xabcdef0102ffffl, -0x654);
+    }
+
+    @Compare public long divideMixedNumbersOneDigitDenom() {
+        return div(-0xabcdef0102ffffl, 0x654);
+    }
+
+    @Compare public long dividePositiveNumbersMultiDigitDenom() {
+        return div(0x7ffefc003322aabbl, 0x89ab1000l);
+    }
+
+    @Compare public long divideNegativeNumbersMultiDigitDenom() {
+        return div(-0x7ffefc003322aabbl, -0x123489ab1001l);
+    }
+
+    @Compare public long divideMixedNumbersMultiDigitDenom() {
+        return div(0x7ffefc003322aabbl, -0x38f49b0b7574e36l);
+    }
+
+    @Compare public long divideWithOverflow() {
+        return div(0x8000fffe0000l, 0x8000ffffl);
+    }
+
+    @Compare public long divideWithCorrection() {
+        return div(0x7fff800000000000l, 0x800000000001l);
+    }
+
+    @Compare public long moduloSmallPositiveNumbers() {
+        return mod(0xabcdef, 0x123);
+    }
+
+    @Compare public long moduloSmallNegativeNumbers() {
+        return mod(-0xabcdef, -0x123);
+    }
+
+    @Compare public long moduloSmallMixedNumbers() {
+        return mod(0xabcdef, -0x123);
+    }
+
+    @Compare public long moduloPositiveNumbersOneDigitDenom() {
+        return mod(0xabcdef0102ffffl, 0x654);
+    }
+
+    @Compare public long moduloNegativeNumbersOneDigitDenom() {
+        return mod(-0xabcdef0102ffffl, -0x654);
+    }
+
+    @Compare public long moduloMixedNumbersOneDigitDenom() {
+        return mod(-0xabcdef0102ffffl, 0x654);
+    }
+
+    @Compare public long moduloPositiveNumbersMultiDigitDenom() {
+        return mod(0x7ffefc003322aabbl, 0x89ab1000l);
+    }
+
+    @Compare public long moduloNegativeNumbersMultiDigitDenom() {
+        return mod(-0x7ffefc003322aabbl, -0x123489ab1001l);
+    }
+
+    @Compare public long moduloMixedNumbersMultiDigitDenom() {
+        return mod(0x7ffefc003322aabbl, -0x38f49b0b7574e36l);
+    }
+
+    @Compare public long moduloWithOverflow() {
+        return mod(0x8000fffe0000l, 0x8000ffffl);
+    }
+
+    @Compare public long moduloWithCorrection() {
+        return mod(0x7fff800000000000l, 0x800000000001l);
+    }
+
+    @Compare public long conversionFromFloatPositive() {
+        return (long) fadd(2, 0.6f);
+    }
+
+    @Compare public long conversionFromFloatNegative() {
+        return (long) fadd(-2, -0.6f);
+    }
+
+    @Compare public long conversionFromDoublePositive() {
+        return (long) dadd(0x20ffff0000L, 0.6);
+    }
+
+    @Compare public long conversionFromDoubleNegative() {
+        return (long) dadd(-0x20ffff0000L, -0.6);
+    }
+
+    @Compare public boolean divByZeroThrowsArithmeticException() {
+        try {
+            div(1, 0);
+            return false;
+        } catch (final ArithmeticException e) {
+            return true;
+        }
+    }
+
+    @Compare public boolean modByZeroThrowsArithmeticException() {
+        try {
+            mod(1, 0);
+            return false;
+        } catch (final ArithmeticException e) {
+            return true;
+        }
+    }
+
+    @Compare public long shiftL1() {
+        return shl(0x00fa37d7763e0ca1l, 5);
+    }
+
+    @Compare public long shiftL2() {
+        return shl(0x00fa37d7763e0ca1l, 32);
+    }
+
+    @Compare public long shiftL3() {
+        return shl(0x00fa37d7763e0ca1l, 45);
+    }
+
+    @Compare public long shiftR1() {
+        return shr(0x00fa37d7763e0ca1l, 5);
+    }
+
+    @Compare public long shiftR2() {
+        return shr(0x00fa37d7763e0ca1l, 32);
+    }
+
+    @Compare public long shiftR3() {
+        return shr(0x00fa37d7763e0ca1l, 45);
+    }
+
+    @Compare public long uShiftR1() {
+        return ushr(0x00fa37d7763e0ca1l, 5);
+    }
+
+    @Compare public long uShiftR2() {
+        return ushr(0x00fa37d7763e0ca1l, 45);
+    }
+
+    @Compare public long uShiftR3() {
+        return ushr(0xf0fa37d7763e0ca1l, 5);
+    }
+
+    @Compare public long uShiftR4() {
+        return ushr(0xf0fa37d7763e0ca1l, 45);
+    }
+
+    @Compare public long and1() {
+        return and(0x00fa37d7763e0ca1l, 0xa7b3432fff00123el);
+    }
+
+    @Compare public long or1() {
+        return or(0x00fa37d7763e0ca1l, 0xa7b3432fff00123el);
+    }
+
+    @Compare public long xor1() {
+        return xor(0x00fa37d7763e0ca1l, 0xa7b3432fff00123el);
+    }
+
+    @Compare public long xor2() {
+        return xor(0x00fa37d7763e0ca1l, 0x00000000ff00123el);
+    }
+
+    @Compare public long xor3() {
+        return xor(0x00000000763e0ca1l, 0x00000000ff00123el);
+    }
+
+    @Compare public int compareSameNumbers() {
+        return compare(0x0000000000000000l, 0x0000000000000000l, 0);
+    }
+
+    @Compare public int comparePositiveNumbers() {
+        return compare(0x0000000000200000l, 0x0000000010000000l, 0);
+    }
+
+    @Compare public int compareNegativeNumbers() {
+        return compare(0xffffffffffffffffl, 0xffffffff00000000l, 0);
+    }
+
+    @Compare public int compareMixedNumbers() {
+        return compare(0x8000000000000000l, 0x7fffffffffffffffl, 0);
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(LongArithmeticTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionArrayTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionArrayTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,135 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import java.lang.reflect.Array;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ReflectionArrayTest {
+    @Compare public int lengthOfStringArray() {
+        String[] arr = (String[]) Array.newInstance(String.class, 10);
+        return arr.length;
+    }
+    
+    @Compare public int reflectiveLengthOfStringArray() {
+        Object arr = Array.newInstance(String.class, 10);
+        return Array.getLength(arr);
+    }
+
+    @Compare public int reflectiveLengthOneNonArray() {
+        Object arr = "non-array";
+        return Array.getLength(arr);
+    }
+
+    @Compare public String compTypeOfStringArray() {
+        String[] arr = (String[]) Array.newInstance(String.class, 10);
+        return arr.getClass().getComponentType().getName();
+    }
+
+    @Compare public Object negativeArrayExcp() {
+        return Array.newInstance(String.class, -5);
+    }
+    
+    @Compare public int lengthOfIntArray() {
+        int[] arr = (int[]) Array.newInstance(Integer.TYPE, 10);
+        return arr.length;
+    }
+
+    @Compare public int reflectiveLengthOfIntArray() {
+        Object arr = Array.newInstance(Integer.TYPE, 10);
+        return Array.getLength(arr);
+    }
+
+    @Compare public String compTypeOfIntArray() {
+        int[] arr = (int[]) Array.newInstance(int.class, 10);
+        return arr.getClass().getComponentType().getName();
+    }
+
+    @Compare public Object intNegativeArrayExcp() {
+        return Array.newInstance(int.class, -5);
+    }
+
+    @Compare public Integer verifyAutobox() {
+        int[] arr = (int[]) Array.newInstance(int.class, 5);
+        return (Integer) Array.get(arr, 0);
+    }
+    @Compare public String verifyObjectArray() {
+        String[] arr = (String[]) Array.newInstance(String.class, 5);
+        Array.set(arr, 0, "Hello");
+        return (String) Array.get(arr, 0);
+    }
+    @Compare public int verifyInt() {
+        int[] arr = (int[]) Array.newInstance(int.class, 5);
+        return Array.getInt(arr, 0);
+    }
+    @Compare public long verifyConvertToLong() {
+        int[] arr = (int[]) Array.newInstance(int.class, 5);
+        return Array.getLong(arr, 0);
+    }
+
+    @Compare public Object verifySetIntToObject() {
+        try {
+            Object[] arr = (Object[]) Array.newInstance(Object.class, 5);
+            Array.setInt(arr, 0, 10);
+            return Array.get(arr, 0);
+        } catch (Exception exception) {
+            return exception.getClass().getName();
+        }
+    }
+    @Compare public long verifySetShort() {
+        int[] arr = (int[]) Array.newInstance(int.class, 5);
+        Array.setShort(arr, 0, (short)10);
+        return Array.getLong(arr, 0);
+    }
+    @Compare public long verifyCantSetLong() {
+        int[] arr = (int[]) Array.newInstance(int.class, 5);
+        Array.setLong(arr, 0, 10);
+        return Array.getLong(arr, 0);
+    }
+    @Compare public float verifyLongToFloat() {
+        Object arr = Array.newInstance(float.class, 5);
+        Array.setLong(arr, 0, 10);
+        return Array.getFloat(arr, 0);
+    }
+
+    @Compare public double verifyConvertToDouble() {
+        int[] arr = (int[]) Array.newInstance(int.class, 5);
+        return Array.getDouble(arr, 0);
+    }
+    
+    @Compare public int multiIntArray() {
+        int[][][] arr = (int[][][]) Array.newInstance(int.class, 3, 3, 3);
+        return arr[0][1][2] + 5 + arr[2][2][0];
+    }
+
+    @Compare public String multiIntArrayCompType() {
+        return Array.newInstance(int.class, 3, 3, 3).getClass().getName();
+    }
+    
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(ReflectionArrayTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,242 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ReflectionTest {
+    @Compare public boolean nonNullThis() {
+        return this == null;
+    }
+    
+    @Compare public String intType() {
+        return Integer.TYPE.toString();
+    }
+
+    @Compare public String voidType() throws Exception {
+        return void.class.toString();
+    }
+
+    @Compare public String longClass() {
+        return long.class.toString();
+    }
+    
+    @Compare public boolean isRunnableInterface() {
+        return Runnable.class.isInterface();
+    }
+
+    @Compare public String isRunnableHasRunMethod() throws NoSuchMethodException {
+        return Runnable.class.getMethod("run").getName();
+    }
+    
+    @Compare public String namesOfMethods() {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = new String[20];
+        int i = 0;
+        for (Method m : StaticUse.class.getMethods()) {
+            arr[i++] = m.getName();
+        }
+        for (String s : sort(arr, i)) {
+            sb.append(s).append("\n");
+        }
+        return sb.toString();
+    }
+
+    @Compare public String namesOfDeclaringClassesOfMethods() {
+        StringBuilder sb = new StringBuilder();
+        String[] arr = new String[20];
+        int i = 0;
+        for (Method m : StaticUse.class.getMethods()) {
+            arr[i++] = m.getName() + "@" + m.getDeclaringClass().getName();
+        }
+        for (String s : sort(arr, i)) {
+            sb.append(s).append("\n");
+        }
+        return sb.toString();
+    }
+    
+    @Compare public String cannotCallNonStaticMethodWithNull() throws Exception {
+        StaticUse.class.getMethod("instanceMethod").invoke(null);
+        return "should not happen";
+    }
+
+    @Compare public Object voidReturnType() throws Exception {
+        return StaticUse.class.getMethod("instanceMethod").getReturnType();
+    }
+    
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface Ann {
+    }
+    
+    @Compare public String annoClass() throws Exception {
+        Retention r = Ann.class.getAnnotation(Retention.class);
+        assert r != null : "Annotation is present";
+        assert r.value() == RetentionPolicy.RUNTIME : "Policy value is OK: " + r.value();
+        return r.annotationType().getName();
+    }
+    
+    @Compare public boolean isAnnotation() {
+        return Ann.class.isAnnotation();
+    }
+    @Compare public boolean isNotAnnotation() {
+        return String.class.isAnnotation();
+    }
+    @Compare public boolean isNotAnnotationEnum() {
+        return E.class.isAnnotation();
+    }
+    enum E { A, B };
+    @Compare public boolean isEnum() {
+        return E.A.getClass().isEnum();
+    }
+
+    @Compare public boolean isNotEnum() {
+        return "".getClass().isEnum();
+    }
+    
+    @Compare public String newInstanceFails() throws InstantiationException {
+        try {
+            return "success: " + StaticUseSub.class.newInstance();
+        } catch (IllegalAccessException ex) {
+            return ex.getClass().getName();
+        }
+    }
+    
+    @Compare public String paramTypes() throws Exception {
+        Method plus = StaticUse.class.getMethod("plus", int.class, Integer.TYPE);
+        final Class[] pt = plus.getParameterTypes();
+        return pt[0].getName();
+    }
+    @Compare public String paramTypesNotFound() throws Exception {
+        return StaticUse.class.getMethod("plus", int.class, double.class).toString();
+    }
+    @Compare public int methodWithArgs() throws Exception {
+        Method plus = StaticUse.class.getMethod("plus", int.class, Integer.TYPE);
+        return (Integer)plus.invoke(null, 2, 3);
+    }
+    
+    @Compare public String classGetNameForByte() {
+         return byte.class.getName();
+    }
+    @Compare public String classGetNameForBaseObject() {
+        return newObject().getClass().getName();
+    }
+    @Compare public String classGetNameForJavaObject() {
+        return new Object().getClass().getName();
+    }
+    @Compare public String classGetNameForObjectArray() {
+        return (new Object[3]).getClass().getName();
+    }
+    @Compare public String classGetNameForSimpleIntArray() {
+        return (new int[3]).getClass().getName();
+    }
+    @Compare public boolean sameClassGetNameForSimpleCharArray() {
+        return (new char[3]).getClass() == (new char[34]).getClass();
+    }
+    @Compare public String classGetNameForMultiIntArray() {
+        return (new int[3][4][5][6][7][8][9]).getClass().getName();
+    }
+    @Compare public String classGetNameForMultiIntArrayInner() {
+        final int[][][][][][][] arr = new int[3][4][5][6][7][8][9];
+        int[][][][][][] subarr = arr[0];
+        int[][][][][] subsubarr = subarr[0];
+        return subsubarr.getClass().getName();
+    }
+    @Compare public String classGetNameForMultiStringArray() {
+        return (new String[3][4][5][6][7][8][9]).getClass().getName();
+    }
+    
+    @Compare public String classForByte() throws Exception {
+        return Class.forName("[Z").getName();
+    }
+
+    @Compare public String classForUnknownArray() {
+        try {
+            return Class.forName("[W").getName();
+        } catch (Exception ex) {
+            return ex.getClass().getName();
+        }
+    }
+    
+    @Compare public String classForUnknownDeepArray() {
+        try {
+            return Class.forName("[[[[[W").getName();
+        } catch (Exception ex) {
+            return ex.getClass().getName();
+        }
+    }
+    
+    @Compare public String componentGetNameForObjectArray() {
+        return (new Object[3]).getClass().getComponentType().getName();
+    }
+    @Compare public boolean sameComponentGetNameForObjectArray() {
+        return (new Object[3]).getClass().getComponentType() == Object.class;
+    }
+    @Compare public String componentGetNameForSimpleIntArray() {
+        return (new int[3]).getClass().getComponentType().getName();
+    }
+    @Compare public String componentGetNameForMultiIntArray() {
+        return (new int[3][4][5][6][7][8][9]).getClass().getComponentType().getName();
+    }
+    @Compare public String componentGetNameForMultiStringArray() {
+        Class<?> c = (new String[3][4][5][6][7][8][9]).getClass();
+        StringBuilder sb = new StringBuilder();
+        for (;;) {
+            sb.append(c.getName()).append("\n");
+            c = c.getComponentType();
+            if (c == null) {
+                break;
+            }
+        }
+        return sb.toString();
+    }
+    
+    @Compare public boolean isArray() {
+        return new Object[0].getClass().isArray();
+    }
+    
+    @JavaScriptBody(args = { "arr", "len" }, body="var a = arr.slice(0, len); a.sort(); return a;")
+    private static String[] sort(String[] arr, int len) {
+        List<String> list = Arrays.asList(arr).subList(0, len);
+        Collections.sort(list);
+        return list.toArray(new String[0]);
+    }
+    
+    @JavaScriptBody(args = {}, body = "return new Object();")
+    private static Object newObject() {
+        return new Object();
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(ReflectionTest.class);
+    }
+    
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ResourcesTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ResourcesTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,45 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import java.io.InputStream;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ResourcesTest {
+    
+    @Compare public String readResourceAsStream() throws Exception {
+        InputStream is = getClass().getResourceAsStream("Resources.txt");
+        byte[] b = new byte[30];
+        int len = is.read(b);
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < len; i++) {
+            sb.append((char)b[i]);
+        }
+        return sb.toString();
+    }
+    
+    @Factory public static Object[] create() {
+        return VMTest.create(ResourcesTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ShortArithmeticTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ShortArithmeticTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,102 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class ShortArithmeticTest {
+    
+    private static short add(short x, short y) {
+        return (short)(x + y);
+    }
+    
+    private static short sub(short x, short y) {
+        return (short)(x - y);
+    }
+    
+    private static short mul(short x, short y) {
+        return (short)(x * y);
+    }
+    
+    private static short div(short x, short y) {
+        return (short)(x / y);
+    }
+    
+    private static short mod(short x, short y) {
+        return (short)(x % y);
+    }
+    
+    @Compare public short conversion() {
+        return (short)123456;
+    }
+    
+    @Compare public short addOverflow() {
+        return add(Short.MAX_VALUE, (short)1);
+    }
+    
+    @Compare public short subUnderflow() {
+        return sub(Short.MIN_VALUE, (short)1);
+    }
+    
+    @Compare public short addMaxShortAndMaxShort() {
+        return add(Short.MAX_VALUE, Short.MAX_VALUE);
+    }
+    
+    @Compare public short subMinShortAndMinShort() {
+        return sub(Short.MIN_VALUE, Short.MIN_VALUE);
+    }
+    
+    @Compare public short multiplyMaxShort() {
+        return mul(Short.MAX_VALUE, (short)2);
+    }
+    
+    @Compare public short multiplyMaxShortAndMaxShort() {
+        return mul(Short.MAX_VALUE, Short.MAX_VALUE);
+    }
+    
+    @Compare public short multiplyMinShort() {
+        return mul(Short.MIN_VALUE, (short)2);
+    }
+    
+    @Compare public short multiplyMinShortAndMinShort() {
+        return mul(Short.MIN_VALUE, Short.MIN_VALUE);
+    }
+    
+    @Compare public short multiplyPrecision() {
+        return mul((short)17638, (short)1103);
+    }
+    
+    @Compare public short division() {
+        return div((short)1, (short)2);
+    }
+    
+    @Compare public short divisionReminder() {
+        return mod((short)1, (short)2);
+    }
+    
+    @Factory
+    public static Object[] create() {
+        return VMTest.create(ShortArithmeticTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUse.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUse.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,38 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+class StaticUse {
+    public static final Object NON_NULL = new Object();
+    public static int cnt;
+    static {
+        if (cnt++ != 0) {
+            throw new IllegalStateException("Multiple initialization of a <cinit>");
+        }
+    }
+    
+    StaticUse() {
+    }
+    
+    public void instanceMethod() {
+    }
+
+    public static int plus(int a, int b) {
+        return a + b;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUseSub.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUseSub.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,27 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+public class StaticUseSub extends StaticUse {
+    private StaticUseSub() {
+    }
+    
+    public static Object getNonNull() {
+        return NON_NULL;
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUseSubTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUseSubTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,37 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.tck;
+
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class StaticUseSubTest {
+    @Compare public String staticFieldInitializationInSuperClass() throws Exception {
+        Object ret = StaticUseSub.getNonNull();
+        return ret.getClass().getName();
+    }
+
+    @Factory public static Object[] create() {
+        return VMTest.create(StaticUseSubTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/CRC32Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/CRC32Test.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,41 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest.impl;
+
+import java.io.UnsupportedEncodingException;
+import java.util.zip.CRC32;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class CRC32Test {
+
+    @Compare public long crc1() throws UnsupportedEncodingException {
+        CRC32 crc = new CRC32();
+        crc.update("Hello World!".getBytes("UTF-8"));
+        return crc.getValue();
+    }
+    
+    @Factory public static Object[] create() {
+        return VMTest.create(CRC32Test.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/ZipEntryTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/ZipEntryTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,67 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apidesign.bck2brwsr.emul.zip.FastJar;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@GenerateZip(name = "five.zip", contents = {
+    "1.txt", "one",
+    "2.txt", "duo",
+    "3.txt", "three",
+    "4.txt", "four",
+    "5.txt", "five"
+})
+public class ZipEntryTest {
+    @Test
+    public void readEntriesEffectively() throws IOException {
+        InputStream is = ZipEntryTest.class.getResourceAsStream("five.zip");
+        byte[] arr = new byte[is.available()];
+        int len = is.read(arr);
+        assertEquals(len, arr.length, "Read fully");
+        
+        FastJar fj = new FastJar(arr);
+        FastJar.Entry[] entrs = fj.list();
+        
+        assertEquals(5, entrs.length, "Five entries");
+        
+        for (int i = 1; i <= 5; i++) {
+            FastJar.Entry en = entrs[i - 1];
+            assertEquals(en.name, i + ".txt");
+//            assertEquals(cis.cnt, 0, "Content of the file should be skipped, not read");
+        }
+        
+        assertContent("three", fj.getInputStream(entrs[3 - 1]), "read OK");
+        assertContent("five", fj.getInputStream(entrs[5 - 1]), "read OK");
+    }
+
+    private static void assertContent(String exp, InputStream is, String msg) throws IOException {
+        byte[] arr = new byte[512];
+        int len = is.read(arr);
+        String s = new String(arr, 0, len);
+        assertEquals(exp, s, msg);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/ZipFileTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/ZipFileTest.java	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,108 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.vmtest.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
+import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
+import org.apidesign.bck2brwsr.vmtest.Compare;
+import org.apidesign.bck2brwsr.vmtest.Http;
+import org.apidesign.bck2brwsr.vmtest.VMTest;
+import org.testng.annotations.Factory;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@GenerateZip(name = "readAnEntry.zip", contents = { 
+    "my/main/file.txt", "Hello World!"
+})
+public class ZipFileTest {
+    
+    @Compare public String readAnEntry() throws IOException {
+        InputStream is = ZipFileTest.class.getResourceAsStream("readAnEntry.zip");
+        ZipInputStream zip = new ZipInputStream(is);
+        ZipEntry entry = zip.getNextEntry();
+        assertEquals(entry.getName(), "my/main/file.txt", "Correct entry");
+
+        byte[] arr = new byte[4096];
+        int len = zip.read(arr);
+        
+        assertEquals(zip.getNextEntry(), null, "No next entry");
+        
+        final String ret = new String(arr, 0, len, "UTF-8");
+        return ret;
+    }
+    
+    @JavaScriptBody(args = { "res", "path" }, body = 
+          "var myvm = bck2brwsr.apply(null, path);\n"
+        + "var cls = myvm.loadClass('java.lang.String');\n"
+        + "return cls.getClass__Ljava_lang_Class_2().getResourceAsStream__Ljava_io_InputStream_2Ljava_lang_String_2(res);\n"
+    )
+    private static native Object loadVMResource(String res, String...path);
+
+    @Http({
+        @Http.Resource(path = "/readAnEntry.jar", mimeType = "x-application/zip", content = "", resource="readAnEntry.zip")
+    })
+    @BrwsrTest  public void canVmLoadResourceFromZip() throws IOException {
+        Object res = loadVMResource("/my/main/file.txt", "/readAnEntry.jar");
+        assert res instanceof InputStream : "Got array of bytes: " + res;
+        InputStream is = (InputStream)res;
+        
+        byte[] arr = new byte[4096];
+        int len = is.read(arr);
+        
+        final String ret = new String(arr, 0, len, "UTF-8");
+
+        assertEquals(ret, "Hello World!", "Can read the bytes");
+    }
+    
+    @GenerateZip(name = "cpattr.zip", contents = { 
+        "META-INF/MANIFEST.MF", "Manifest-Version: 1.0\n"
+        + "Created-By: hand\n"
+        + "Class-Path: realJar.jar\n\n\n"
+    })
+    @Http({
+        @Http.Resource(path = "/readComplexEntry.jar", mimeType = "x-application/zip", content = "", resource="cpattr.zip"),
+        @Http.Resource(path = "/realJar.jar", mimeType = "x-application/zip", content = "", resource="readAnEntry.zip"),
+    })
+    @BrwsrTest  public void understandsClassPathAttr() throws IOException {
+        Object res = loadVMResource("/my/main/file.txt", "/readComplexEntry.jar");
+        assert res instanceof InputStream : "Got array of bytes: " + res;
+        InputStream is = (InputStream)res;
+        
+        byte[] arr = new byte[4096];
+        int len = is.read(arr);
+        
+        final String ret = new String(arr, 0, len, "UTF-8");
+
+        assertEquals(ret, "Hello World!", "Can read the bytes from secondary JAR");
+    }
+    
+    private static void assertEquals(Object real, Object exp, String msg) {
+        assert Objects.equals(exp, real) : msg + " exp: " + exp + " real: " + real;
+    }
+    
+    @Factory public static Object[] create() {
+        return VMTest.create(ZipFileTest.class);
+    }
+}
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/resources/org/apidesign/bck2brwsr/tck/0xfe
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/resources/org/apidesign/bck2brwsr/tck/0xfe	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1 @@
+þ
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 rt/vmtest/src/test/resources/org/apidesign/bck2brwsr/tck/Resources.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rt/vmtest/src/test/resources/org/apidesign/bck2brwsr/tck/Resources.txt	Fri Mar 22 17:03:32 2013 +0100
@@ -0,0 +1,1 @@
+Ahoj
diff -r 3392f250c784 -r ecbd252fd3a7 vm/pom.xml
--- a/vm/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign</groupId>
-    <artifactId>bck2brwsr</artifactId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>vm4brwsr</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <name>Virtual Machine for Browser</name>
-  <url>http://bck2brwsr.apidesign.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <author.name>Jaroslav Tulach</author.name>
-    <author.email>jaroslav.tulach@apidesign.org</author.email>
-  </properties>
-  
-  <repositories>
-      <repository>
-          <id>netbeans</id>
-          <name>NetBeans</name>
-          <url>http://bits.netbeans.org/maven2/</url>
-      </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-        <id>mc-release</id>
-        <name>Local Maven repository of releases</name>
-        <url>http://mc-repo.googlecode.com/svn/maven2/releases</url>
-        <snapshots>
-            <enabled>false</enabled>
-        </snapshots>
-        <releases>
-            <enabled>true</enabled>
-        </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <scm>
-      <connection>scm:hg:http://source.apidesign.org/hg/bck2brwsr</connection>
-      <url>http://source.apidesign.org/hg/bck2brwsr</url>
-  </scm>
-  <build>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-jar-plugin</artifactId>
-              <version>2.4</version>
-              <configuration>
-                  <archive>
-                      <manifest>
-                          <mainClass>org.apidesign.vm4brwsr.Main</mainClass>
-                      </manifest>
-                  </archive>
-              </configuration>
-          </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
-            <configuration>
-               <source>1.7</source>
-               <target>1.7</target>
-            </configuration>
-         </plugin>
-         <plugin>
-             <groupId>org.codehaus.mojo</groupId>
-             <artifactId>exec-maven-plugin</artifactId>
-             <version>1.2.1</version>
-             <executions>
-                 <execution>
-                     <id>generate-js</id>
-                     <phase>process-classes</phase>
-                     <goals>
-                         <goal>java</goal>
-                     </goals>
-                 </execution>
-             </executions>
-             <configuration>
-                 <mainClass>org.apidesign.vm4brwsr.Main</mainClass>
-                 <arguments>
-                     <argument>${project.build.directory}/bck2brwsr.js</argument>
-                     <argument>org/apidesign/vm4brwsr/Bck2Brwsr</argument>
-                 </arguments>
-             </configuration>
-         </plugin>
-         <plugin>
-             <artifactId>maven-assembly-plugin</artifactId>
-             <version>2.4</version>
-             <executions>
-                 <execution>
-                     <id>js</id>
-                     <phase>package</phase>
-                     <goals>
-                         <goal>single</goal>
-                     </goals>
-                     <configuration>
-                         <descriptors>
-                             <descriptor>src/main/assembly/bck2brwsr.xml</descriptor>
-                         </descriptors>
-                     </configuration>
-                 </execution>
-             </executions>                
-         </plugin>      
-      </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>junit</artifactId>
-          <groupId>junit</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>core</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>emul.mini</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>javap</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/assembly/bck2brwsr.xml
--- a/vm/src/main/assembly/bck2brwsr.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    Back 2 Browser Bytecode Translator
-    Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, version 2 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. Look for COPYING file in the top folder.
-    If not, see http://opensource.org/licenses/GPL-2.0.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  
-  <id>js</id>
-  <formats>
-      <format>zip</format>
-  </formats>
-  <baseDirectory>/</baseDirectory>
-  <files>
-    <file>
-      <source>${project.build.directory}/bck2brwsr.js</source>
-      <outputDirectory>/</outputDirectory>
-    </file>
-  </files>
-
-</assembly>
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/Bck2Brwsr.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/Bck2Brwsr.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-
-/** Build your own virtual machine! Use methods in this class to generate
- * a skeleton JVM in JavaScript that contains pre-compiled classes of your
- * choice. The generated script defines one JavaScript method that can
- * be used to bootstrap and load the virtual machine: <pre>
- * var vm = bck2brwsr();
- * var main = vm.loadClass('org.your.pkg.Main');
- * main.main__V_3Ljava_lang_String_2(null);
- * </pre>
- * In case one wants to initialize the virtual machine with ability to
- * load classes lazily when needed, one can provide a loader function to
- * when creating the virtual machine: <pre>
- * var vm = bck2brwsr(function(resource) { 
- *   return null; // byte[] for the resource
- * });
- * </pre>
- * In this scenario, when a request for an unknown class is made, the loader
- * function is asked for its byte code and the system dynamically transforms
- * it to JavaScript.
- * <p>
- * Instead of a loader function, one can also provide a URL to a JAR file.
- * The <code>bck2brwsr</code> system will do its best to download the file
- * and provide loader function for it automatically.
- * <p>
- * One can provide as many loader functions and JAR URL references as necessary.
- * Then the initialization code would look like:<pre>
- * var vm = bck2brwsr(url1, url2, fnctn1, url3, functn2);
- * </pre>
- * The provided URLs and loader functions will be consulted one by one.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class Bck2Brwsr {
-    private Bck2Brwsr() {
-    }
-    
-    /** Generates virtual machine from bytes served by a <code>resources</code>
-     * provider.
-     * 
-     * @param out the output to write the generated JavaScript to
-     * @param resources provider of class files to use
-     * @param classes additional classes to include in the generated script
-     * @throws IOException I/O exception can be thrown when something goes wrong
-     */
-    public static void generate(Appendable out, Resources resources, String... classes) throws IOException {
-        StringArray arr = StringArray.asList(classes);
-        arr.add(VM.class.getName().replace('.', '/'));
-        VM.compile(resources, out, arr);
-    }
-    
-    /** Generates virtual machine from bytes served by a class loader.
-     * 
-     * @param out the output to write the generated JavaScript to
-     * @param loader class loader to load needed classes from
-     * @param classes additional classes to include in the generated script
-     * @throws IOException I/O exception can be thrown when something goes wrong
-     */
-    public static void generate(Appendable out, final ClassLoader loader, String... classes) throws IOException {
-        class R implements Resources {
-            @Override
-            public InputStream get(String name) throws IOException {
-                Enumeration<URL> en = loader.getResources(name);
-                URL u = null;
-                while (en.hasMoreElements()) {
-                    u = en.nextElement();
-                }
-                if (u == null) {
-                    throw new IOException("Can't find " + name);
-                }
-                return u.openStream();
-            }
-        }
-        generate(out, new R(), classes);
-    }
-    
-    /** Provider of resources (classes and other files). The 
-     * {@link #generate(java.lang.Appendable, org.apidesign.vm4brwsr.Bck2Brwsr.Resources, java.lang.String[]) 
-     * generator method} will call back here for all classes needed during
-     * translation to JavaScript.
-     */
-    public interface Resources {
-        /** Loads given resource (class or other file like image). The 
-         * resource name to load bytes for the {@link String} class
-         * would be <code>"java/lang/String.class"</code>.
-         * 
-         * @param resource path to resource to load
-         * @return the input stream for the resource 
-         * @throws IOException can be thrown if the loading fails on some error
-         *   or the file cannot be found
-         */
-        public InputStream get(String resource) throws IOException;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1858 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.javap.AnnotationParser;
-import org.apidesign.javap.ClassData;
-import org.apidesign.javap.FieldData;
-import org.apidesign.javap.MethodData;
-import org.apidesign.javap.StackMapIterator;
-import static org.apidesign.javap.RuntimeConstants.*;
-import org.apidesign.javap.TrapData;
-import org.apidesign.javap.TrapDataIterator;
-
-/** Translator of the code inside class files to JavaScript.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-abstract class ByteCodeToJavaScript {
-    private ClassData jc;
-    final Appendable out;
-
-    protected ByteCodeToJavaScript(Appendable out) {
-        this.out = out;
-    }
-    
-    /* Collects additional required resources.
-     * 
-     * @param internalClassName classes that were referenced and should be loaded in order the
-     *   generated JavaScript code works properly. The names are in internal 
-     *   JVM form so String is <code>java/lang/String</code>. 
-     */
-    protected abstract boolean requireReference(String internalClassName);
-    
-    /*
-     * @param resourcePath name of resources to read
-     */
-    protected abstract void requireScript(String resourcePath) throws IOException;
-    
-    /** Allows subclasses to redefine what field a function representing a
-     * class gets assigned. By default it returns the suggested name followed
-     * by <code>" = "</code>;
-     * 
-     * @param className suggested name of the class
-     */
-    /* protected */ String assignClass(String className) {
-        return className + " = ";
-    }
-    /* protected */ String accessClass(String classOperation) {
-        return classOperation;
-    }
-    
-    /** Prints out a debug message. 
-     * 
-     * @param msg the message
-     * @return true if the message has been printed
-     * @throws IOException 
-     */
-    boolean debug(String msg) throws IOException {
-        out.append(msg);
-        return true;
-    }
-
-    /**
-     * Converts a given class file to a JavaScript version.
-     *
-     * @param classFile input stream with code of the .class file
-     * @return the initialization code for this class, if any. Otherwise <code>null</code>
-     * 
-     * @throws IOException if something goes wrong during read or write or translating
-     */
-    
-    public String compile(InputStream classFile) throws IOException {
-        this.jc = new ClassData(classFile);
-        if (jc.getMajor_version() < 50) {
-            throw new IOException("Can't compile " + jc.getClassName() + ". Class file version " + jc.getMajor_version() + "."
-                + jc.getMinor_version() + " - recompile with -target 1.6 (at least)."
-            );
-        }
-        byte[] arrData = jc.findAnnotationData(true);
-        String[] arr = findAnnotation(arrData, jc, 
-            "org.apidesign.bck2brwsr.core.ExtraJavaScript", 
-            "resource", "processByteCode"
-        );
-        if (arr != null) {
-            requireScript(arr[0]);
-            if ("0".equals(arr[1])) {
-                return null;
-            }
-        }
-        String[] proto = findAnnotation(arrData, jc, 
-            "org.apidesign.bck2brwsr.core.JavaScriptPrototype", 
-            "container", "prototype"
-        );
-        StringArray toInitilize = new StringArray();
-        final String className = className(jc);
-        out.append("\n\n").append(assignClass(className));
-        out.append("function CLS() {");
-        out.append("\n  if (!CLS.$class) {");
-        if (proto == null) {
-            String sc = jc.getSuperClassName(); // with _
-            out.append("\n    var pp = ").
-                append(accessClass(sc.replace('/', '_'))).append("(true);");
-            out.append("\n    var p = CLS.prototype = pp;");
-            out.append("\n    var c = p;");
-            out.append("\n    var sprcls = pp.constructor.$class;");
-        } else {
-            out.append("\n    var p = CLS.prototype = ").append(proto[1]).append(";");
-            if (proto[0] == null) {
-                proto[0] = "p";
-            }
-            out.append("\n    var c = ").append(proto[0]).append(";");
-            out.append("\n    var sprcls = null;");
-        }
-        for (FieldData v : jc.getFields()) {
-            if (v.isStatic()) {
-                out.append("\n  CLS.").append(v.getName()).append(initField(v));
-            } else {
-                out.append("\n  c._").append(v.getName()).append(" = function (v) {")
-                   .append("  if (arguments.length == 1) this.fld_").
-                    append(className).append('_').append(v.getName())
-                   .append(" = v; return this.fld_").
-                    append(className).append('_').append(v.getName())
-                   .append("; };");
-            }
-        }
-        for (MethodData m : jc.getMethods()) {
-            byte[] onlyArr = m.findAnnotationData(true);
-            String[] only = findAnnotation(onlyArr, jc, 
-                "org.apidesign.bck2brwsr.core.JavaScriptOnly", 
-                "name", "value"
-            );
-            if (only != null) {
-                if (only[0] != null && only[1] != null) {
-                    out.append("\n    p.").append(only[0]).append(" = ")
-                        .append(only[1]).append(";");
-                }
-                continue;
-            }
-            String prefix;
-            String mn;
-            if (m.isStatic()) {
-                prefix = "\n    c.";
-                mn = generateStaticMethod(prefix, m, toInitilize);
-            } else {
-                if (m.isConstructor()) {
-                    prefix = "\n    CLS.";
-                    mn = generateInstanceMethod(prefix, m);
-                } else {
-                    prefix = "\n    c.";
-                    mn = generateInstanceMethod(prefix, m);
-                }
-            }
-            byte[] runAnno = m.findAnnotationData(false);
-            if (runAnno != null) {
-                out.append(prefix).append(mn).append(".anno = {");
-                generateAnno(jc, out, runAnno);
-                out.append("\n    };");
-            }
-            out.append(prefix).append(mn).append(".access = " + m.getAccess()).append(";");
-            out.append(prefix).append(mn).append(".cls = CLS;");
-        }
-        out.append("\n    c.constructor = CLS;");
-        out.append("\n    c.$instOf_").append(className).append(" = true;");
-        for (String superInterface : jc.getSuperInterfaces()) {
-            out.append("\n    c.$instOf_").append(superInterface.replace('/', '_')).append(" = true;");
-        }
-        out.append("\n    CLS.$class = 'temp';");
-        out.append("\n    CLS.$class = ");
-        out.append(accessClass("java_lang_Class(true);"));
-        out.append("\n    CLS.$class.jvmName = '").append(jc.getClassName()).append("';");
-        out.append("\n    CLS.$class.superclass = sprcls;");
-        out.append("\n    CLS.$class.access = ").append(jc.getAccessFlags()+";");
-        out.append("\n    CLS.$class.cnstr = CLS;");
-        byte[] classAnno = jc.findAnnotationData(false);
-        if (classAnno != null) {
-            out.append("\n    CLS.$class.anno = {");
-            generateAnno(jc, out, classAnno);
-            out.append("\n    };");
-        }
-        out.append("\n  }");
-        out.append("\n  if (arguments.length === 0) {");
-        out.append("\n    if (!(this instanceof CLS)) {");
-        out.append("\n      return new CLS();");
-        out.append("\n    }");
-        for (FieldData v : jc.getFields()) {
-            byte[] onlyArr = v.findAnnotationData(true);
-            String[] only = findAnnotation(onlyArr, jc, 
-                "org.apidesign.bck2brwsr.core.JavaScriptOnly", 
-                "name", "value"
-            );
-            if (only != null) {
-                if (only[0] != null && only[1] != null) {
-                    out.append("\n    p.").append(only[0]).append(" = ")
-                        .append(only[1]).append(";");
-                }
-                continue;
-            }
-            if (!v.isStatic()) {
-                out.append("\n    this.fld_").
-                    append(className).append('_').
-                    append(v.getName()).append(initField(v));
-            }
-        }
-        out.append("\n    return this;");
-        out.append("\n  }");
-        out.append("\n  return arguments[0] ? new CLS() : CLS.prototype;");
-        out.append("\n};");
-        StringBuilder sb = new StringBuilder();
-        for (String init : toInitilize.toArray()) {
-            sb.append("\n").append(init).append("();");
-        }
-        return sb.toString();
-    }
-    private String generateStaticMethod(String prefix, MethodData m, StringArray toInitilize) throws IOException {
-        String jsb = javaScriptBody(prefix, m, true);
-        if (jsb != null) {
-            return jsb;
-        }
-        final String mn = findMethodName(m, new StringBuilder());
-        if (mn.equals("class__V")) {
-            toInitilize.add(accessClass(className(jc)) + "(false)." + mn);
-        }
-        generateMethod(prefix, mn, m);
-        return mn;
-    }
-
-    private String generateInstanceMethod(String prefix, MethodData m) throws IOException {
-        String jsb = javaScriptBody(prefix, m, false);
-        if (jsb != null) {
-            return jsb;
-        }
-        final String mn = findMethodName(m, new StringBuilder());
-        generateMethod(prefix, mn, m);
-        return mn;
-    }
-
-    private void generateMethod(String prefix, String name, MethodData m)
-            throws IOException {
-        final StackMapIterator stackMapIterator = m.createStackMapIterator();
-        TrapDataIterator trap = m.getTrapDataIterator();
-        final LocalsMapper lmapper =
-                new LocalsMapper(stackMapIterator.getArguments());
-
-        out.append(prefix).append(name).append(" = function(");
-        lmapper.outputArguments(out, m.isStatic());
-        out.append(") {").append("\n");
-
-        final byte[] byteCodes = m.getCode();
-        if (byteCodes == null) {
-            out.append("  throw 'no code found for ")
-               .append(jc.getClassName()).append('.')
-               .append(m.getName()).append("';\n");
-            out.append("};");
-            return;
-        }
-
-        final StackMapper smapper = new StackMapper();
-
-        if (!m.isStatic()) {
-            out.append("  var ").append(" lcA0 = this;\n");
-        }
-
-        int lastStackFrame = -1;
-        TrapData[] previousTrap = null;
-        boolean wide = false;
-        
-        out.append("\n  var gt = 0;\n  for(;;) switch(gt) {\n");
-        for (int i = 0; i < byteCodes.length; i++) {
-            int prev = i;
-            stackMapIterator.advanceTo(i);
-            boolean changeInCatch = trap.advanceTo(i);
-            if (changeInCatch || lastStackFrame != stackMapIterator.getFrameIndex()) {
-                if (previousTrap != null) {
-                    generateCatch(previousTrap);
-                    previousTrap = null;
-                }
-            }
-            if (lastStackFrame != stackMapIterator.getFrameIndex()) {
-                lastStackFrame = stackMapIterator.getFrameIndex();
-                lmapper.syncWithFrameLocals(stackMapIterator.getFrameLocals());
-                smapper.syncWithFrameStack(stackMapIterator.getFrameStack());
-                out.append("    case " + i).append(": ");            
-                changeInCatch = true;
-            } else {
-                debug("    /* " + i + " */ ");
-            }
-            if (changeInCatch && trap.useTry()) {
-                out.append("try {");
-                previousTrap = trap.current();
-            }
-            final int c = readUByte(byteCodes, i);
-            switch (c) {
-                case opc_aload_0:
-                    emit(out, "var @1 = @2;", smapper.pushA(), lmapper.getA(0));
-                    break;
-                case opc_iload_0:
-                    emit(out, "var @1 = @2;", smapper.pushI(), lmapper.getI(0));
-                    break;
-                case opc_lload_0:
-                    emit(out, "var @1 = @2;", smapper.pushL(), lmapper.getL(0));
-                    break;
-                case opc_fload_0:
-                    emit(out, "var @1 = @2;", smapper.pushF(), lmapper.getF(0));
-                    break;
-                case opc_dload_0:
-                    emit(out, "var @1 = @2;", smapper.pushD(), lmapper.getD(0));
-                    break;
-                case opc_aload_1:
-                    emit(out, "var @1 = @2;", smapper.pushA(), lmapper.getA(1));
-                    break;
-                case opc_iload_1:
-                    emit(out, "var @1 = @2;", smapper.pushI(), lmapper.getI(1));
-                    break;
-                case opc_lload_1:
-                    emit(out, "var @1 = @2;", smapper.pushL(), lmapper.getL(1));
-                    break;
-                case opc_fload_1:
-                    emit(out, "var @1 = @2;", smapper.pushF(), lmapper.getF(1));
-                    break;
-                case opc_dload_1:
-                    emit(out, "var @1 = @2;", smapper.pushD(), lmapper.getD(1));
-                    break;
-                case opc_aload_2:
-                    emit(out, "var @1 = @2;", smapper.pushA(), lmapper.getA(2));
-                    break;
-                case opc_iload_2:
-                    emit(out, "var @1 = @2;", smapper.pushI(), lmapper.getI(2));
-                    break;
-                case opc_lload_2:
-                    emit(out, "var @1 = @2;", smapper.pushL(), lmapper.getL(2));
-                    break;
-                case opc_fload_2:
-                    emit(out, "var @1 = @2;", smapper.pushF(), lmapper.getF(2));
-                    break;
-                case opc_dload_2:
-                    emit(out, "var @1 = @2;", smapper.pushD(), lmapper.getD(2));
-                    break;
-                case opc_aload_3:
-                    emit(out, "var @1 = @2;", smapper.pushA(), lmapper.getA(3));
-                    break;
-                case opc_iload_3:
-                    emit(out, "var @1 = @2;", smapper.pushI(), lmapper.getI(3));
-                    break;
-                case opc_lload_3:
-                    emit(out, "var @1 = @2;", smapper.pushL(), lmapper.getL(3));
-                    break;
-                case opc_fload_3:
-                    emit(out, "var @1 = @2;", smapper.pushF(), lmapper.getF(3));
-                    break;
-                case opc_dload_3:
-                    emit(out, "var @1 = @2;", smapper.pushD(), lmapper.getD(3));
-                    break;
-                case opc_iload: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         smapper.pushI(), lmapper.getI(indx));
-                    break;
-                }
-                case opc_lload: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         smapper.pushL(), lmapper.getL(indx));
-                    break;
-                }
-                case opc_fload: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         smapper.pushF(), lmapper.getF(indx));
-                    break;
-                }
-                case opc_dload: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         smapper.pushD(), lmapper.getD(indx));
-                    break;
-                }
-                case opc_aload: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         smapper.pushA(), lmapper.getA(indx));
-                    break;
-                }
-                case opc_istore: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         lmapper.setI(indx), smapper.popI());
-                    break;
-                }
-                case opc_lstore: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         lmapper.setL(indx), smapper.popL());
-                    break;
-                }
-                case opc_fstore: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         lmapper.setF(indx), smapper.popF());
-                    break;
-                }
-                case opc_dstore: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         lmapper.setD(indx), smapper.popD());
-                    break;
-                }
-                case opc_astore: {
-                    ++i;
-                    final int indx = wide ? readUShort(byteCodes, i++)
-                                          : readUByte(byteCodes, i);
-                    wide = false;
-                    emit(out, "var @1 = @2;",
-                         lmapper.setA(indx), smapper.popA());
-                    break;
-                }
-                case opc_astore_0:
-                    emit(out, "var @1 = @2;", lmapper.setA(0), smapper.popA());
-                    break;
-                case opc_istore_0:
-                    emit(out, "var @1 = @2;", lmapper.setI(0), smapper.popI());
-                    break;
-                case opc_lstore_0:
-                    emit(out, "var @1 = @2;", lmapper.setL(0), smapper.popL());
-                    break;
-                case opc_fstore_0:
-                    emit(out, "var @1 = @2;", lmapper.setF(0), smapper.popF());
-                    break;
-                case opc_dstore_0:
-                    emit(out, "var @1 = @2;", lmapper.setD(0), smapper.popD());
-                    break;
-                case opc_astore_1:
-                    emit(out, "var @1 = @2;", lmapper.setA(1), smapper.popA());
-                    break;
-                case opc_istore_1:
-                    emit(out, "var @1 = @2;", lmapper.setI(1), smapper.popI());
-                    break;
-                case opc_lstore_1:
-                    emit(out, "var @1 = @2;", lmapper.setL(1), smapper.popL());
-                    break;
-                case opc_fstore_1:
-                    emit(out, "var @1 = @2;", lmapper.setF(1), smapper.popF());
-                    break;
-                case opc_dstore_1:
-                    emit(out, "var @1 = @2;", lmapper.setD(1), smapper.popD());
-                    break;
-                case opc_astore_2:
-                    emit(out, "var @1 = @2;", lmapper.setA(2), smapper.popA());
-                    break;
-                case opc_istore_2:
-                    emit(out, "var @1 = @2;", lmapper.setI(2), smapper.popI());
-                    break;
-                case opc_lstore_2:
-                    emit(out, "var @1 = @2;", lmapper.setL(2), smapper.popL());
-                    break;
-                case opc_fstore_2:
-                    emit(out, "var @1 = @2;", lmapper.setF(2), smapper.popF());
-                    break;
-                case opc_dstore_2:
-                    emit(out, "var @1 = @2;", lmapper.setD(2), smapper.popD());
-                    break;
-                case opc_astore_3:
-                    emit(out, "var @1 = @2;", lmapper.setA(3), smapper.popA());
-                    break;
-                case opc_istore_3:
-                    emit(out, "var @1 = @2;", lmapper.setI(3), smapper.popI());
-                    break;
-                case opc_lstore_3:
-                    emit(out, "var @1 = @2;", lmapper.setL(3), smapper.popL());
-                    break;
-                case opc_fstore_3:
-                    emit(out, "var @1 = @2;", lmapper.setF(3), smapper.popF());
-                    break;
-                case opc_dstore_3:
-                    emit(out, "var @1 = @2;", lmapper.setD(3), smapper.popD());
-                    break;
-                case opc_iadd:
-                    emit(out, "@1 = @1.add32(@2);", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_ladd:
-                    emit(out, "@1 = @1.add64(@2);", smapper.getL(1), smapper.popL());
-                    break;
-                case opc_fadd:
-                    emit(out, "@1 += @2;", smapper.getF(1), smapper.popF());
-                    break;
-                case opc_dadd:
-                    emit(out, "@1 += @2;", smapper.getD(1), smapper.popD());
-                    break;
-                case opc_isub:
-                    emit(out, "@1 = @1.sub32(@2);", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_lsub:
-                    emit(out, "@1 = @1.sub64(@2);", smapper.getL(1), smapper.popL());
-                    break;
-                case opc_fsub:
-                    emit(out, "@1 -= @2;", smapper.getF(1), smapper.popF());
-                    break;
-                case opc_dsub:
-                    emit(out, "@1 -= @2;", smapper.getD(1), smapper.popD());
-                    break;
-                case opc_imul:
-                    emit(out, "@1 = @1.mul32(@2);", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_lmul:
-                    emit(out, "@1 = @1.mul64(@2);", smapper.getL(1), smapper.popL());
-                    break;
-                case opc_fmul:
-                    emit(out, "@1 *= @2;", smapper.getF(1), smapper.popF());
-                    break;
-                case opc_dmul:
-                    emit(out, "@1 *= @2;", smapper.getD(1), smapper.popD());
-                    break;
-                case opc_idiv:
-                    emit(out, "@1 = Math.floor(@1 / @2);",
-                         smapper.getI(1), smapper.popI());
-                    break;
-                case opc_ldiv:
-                    emit(out, "@1 = @1.div64(@2);",
-                         smapper.getL(1), smapper.popL());
-                    break;
-                case opc_fdiv:
-                    emit(out, "@1 /= @2;", smapper.getF(1), smapper.popF());
-                    break;
-                case opc_ddiv:
-                    emit(out, "@1 /= @2;", smapper.getD(1), smapper.popD());
-                    break;
-                case opc_irem:
-                    emit(out, "@1 %= @2;", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_lrem:
-                    emit(out, "@1 = @1.mod64(@2);",
-                         smapper.getL(1), smapper.popL());
-                    break;
-                case opc_frem:
-                    emit(out, "@1 %= @2;", smapper.getF(1), smapper.popF());
-                    break;
-                case opc_drem:
-                    emit(out, "@1 %= @2;", smapper.getD(1), smapper.popD());
-                    break;
-                case opc_iand:
-                    emit(out, "@1 &= @2;", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_land:
-                    emit(out, "@1 = @1.and64(@2);", smapper.getL(1), smapper.popL());
-                    break;
-                case opc_ior:
-                    emit(out, "@1 |= @2;", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_lor:
-                    emit(out, "@1 = @1.or64(@2);", smapper.getL(1), smapper.popL());
-                    break;
-                case opc_ixor:
-                    emit(out, "@1 ^= @2;", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_lxor:
-                    emit(out, "@1 = @1.xor64(@2);", smapper.getL(1), smapper.popL());
-                    break;
-                case opc_ineg:
-                    emit(out, "@1 = @1.neg32();", smapper.getI(0));
-                    break;
-                case opc_lneg:
-                    emit(out, "@1 = @1.neg64();", smapper.getL(0));
-                    break;
-                case opc_fneg:
-                    emit(out, "@1 = -@1;", smapper.getF(0));
-                    break;
-                case opc_dneg:
-                    emit(out, "@1 = -@1;", smapper.getD(0));
-                    break;
-                case opc_ishl:
-                    emit(out, "@1 <<= @2;", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_lshl:
-                    emit(out, "@1 = @1.shl64(@2);", smapper.getL(1), smapper.popI());
-                    break;
-                case opc_ishr:
-                    emit(out, "@1 >>= @2;", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_lshr:
-                    emit(out, "@1 = @1.shr64(@2);", smapper.getL(1), smapper.popI());
-                    break;
-                case opc_iushr:
-                    emit(out, "@1 >>>= @2;", smapper.getI(1), smapper.popI());
-                    break;
-                case opc_lushr:
-                    emit(out, "@1 = @1.ushr64(@2);", smapper.getL(1), smapper.popI());
-                    break;
-                case opc_iinc: {
-                    ++i;
-                    final int varIndx = wide ? readUShort(byteCodes, i++)
-                                             : readUByte(byteCodes, i);
-                    ++i;
-                    final int incrBy = wide ? readShort(byteCodes, i++)
-                                            : byteCodes[i];
-                    wide = false;
-                    if (incrBy == 1) {
-                        emit(out, "@1++;", lmapper.getI(varIndx));
-                    } else {
-                        emit(out, "@1 += @2;",
-                             lmapper.getI(varIndx),
-                             Integer.toString(incrBy));
-                    }
-                    break;
-                }
-                case opc_return:
-                    emit(out, "return;");
-                    break;
-                case opc_ireturn:
-                    emit(out, "return @1;", smapper.popI());
-                    break;
-                case opc_lreturn:
-                    emit(out, "return @1;", smapper.popL());
-                    break;
-                case opc_freturn:
-                    emit(out, "return @1;", smapper.popF());
-                    break;
-                case opc_dreturn:
-                    emit(out, "return @1;", smapper.popD());
-                    break;
-                case opc_areturn:
-                    emit(out, "return @1;", smapper.popA());
-                    break;
-                case opc_i2l:
-                    emit(out, "var @2 = @1;", smapper.popI(), smapper.pushL());
-                    break;
-                case opc_i2f:
-                    emit(out, "var @2 = @1;", smapper.popI(), smapper.pushF());
-                    break;
-                case opc_i2d:
-                    emit(out, "var @2 = @1;", smapper.popI(), smapper.pushD());
-                    break;
-                case opc_l2i:
-                    emit(out, "var @2 = @1.toInt32();", smapper.popL(), smapper.pushI());
-                    break;
-                    // max int check?
-                case opc_l2f:
-                    emit(out, "var @2 = @1.toFP();", smapper.popL(), smapper.pushF());
-                    break;
-                case opc_l2d:
-                    emit(out, "var @2 = @1.toFP();", smapper.popL(), smapper.pushD());
-                    break;
-                case opc_f2d:
-                    emit(out, "var @2 = @1;", smapper.popF(), smapper.pushD());
-                    break;
-                case opc_d2f:
-                    emit(out, "var @2 = @1;", smapper.popD(), smapper.pushF());
-                    break;
-                case opc_f2i:
-                    emit(out, "var @2 = Math.floor(@1);",
-                         smapper.popF(), smapper.pushI());
-                    break;
-                case opc_f2l:
-                    emit(out, "var @2 = Math.floor(@1).toLong();",
-                         smapper.popF(), smapper.pushL());
-                    break;
-                case opc_d2i:
-                    emit(out, "var @2 = Math.floor(@1);",
-                         smapper.popD(), smapper.pushI());
-                    break;
-                case opc_d2l:
-                    emit(out, "var @2 = Math.floor(@1).toLong();",
-                         smapper.popD(), smapper.pushL());
-                    break;
-                case opc_i2b:
-                    emit(out, "var @1 = @1.toInt8();", smapper.getI(0));
-                    break;
-                case opc_i2c:
-                    out.append("{ /* number conversion */ }");
-                    break;
-                case opc_i2s:
-                    emit(out, "var @1 = @1.toInt16();", smapper.getI(0));
-                    break;
-                case opc_aconst_null:
-                    emit(out, "var @1 = null;", smapper.pushA());
-                    break;
-                case opc_iconst_m1:
-                    emit(out, "var @1 = -1;", smapper.pushI());
-                    break;
-                case opc_iconst_0:
-                    emit(out, "var @1 = 0;", smapper.pushI());
-                    break;
-                case opc_dconst_0:
-                    emit(out, "var @1 = 0;", smapper.pushD());
-                    break;
-                case opc_lconst_0:
-                    emit(out, "var @1 = 0;", smapper.pushL());
-                    break;
-                case opc_fconst_0:
-                    emit(out, "var @1 = 0;", smapper.pushF());
-                    break;
-                case opc_iconst_1:
-                    emit(out, "var @1 = 1;", smapper.pushI());
-                    break;
-                case opc_lconst_1:
-                    emit(out, "var @1 = 1;", smapper.pushL());
-                    break;
-                case opc_fconst_1:
-                    emit(out, "var @1 = 1;", smapper.pushF());
-                    break;
-                case opc_dconst_1:
-                    emit(out, "var @1 = 1;", smapper.pushD());
-                    break;
-                case opc_iconst_2:
-                    emit(out, "var @1 = 2;", smapper.pushI());
-                    break;
-                case opc_fconst_2:
-                    emit(out, "var @1 = 2;", smapper.pushF());
-                    break;
-                case opc_iconst_3:
-                    emit(out, "var @1 = 3;", smapper.pushI());
-                    break;
-                case opc_iconst_4:
-                    emit(out, "var @1 = 4;", smapper.pushI());
-                    break;
-                case opc_iconst_5:
-                    emit(out, "var @1 = 5;", smapper.pushI());
-                    break;
-                case opc_ldc: {
-                    int indx = readUByte(byteCodes, ++i);
-                    String v = encodeConstant(indx);
-                    int type = VarType.fromConstantType(jc.getTag(indx));
-                    emit(out, "var @1 = @2;", smapper.pushT(type), v);
-                    break;
-                }
-                case opc_ldc_w:
-                case opc_ldc2_w: {
-                    int indx = readIntArg(byteCodes, i);
-                    i += 2;
-                    String v = encodeConstant(indx);
-                    int type = VarType.fromConstantType(jc.getTag(indx));
-                    if (type == VarType.LONG) {
-                        final Long lv = new Long(v);
-                        final int low = (int)(lv.longValue() & 0xFFFFFFFF);
-                        final int hi = (int)(lv.longValue() >> 32);
-                        emit(out, "var @1 = 0x@3.next32(0x@2);", smapper.pushL(), 
-                                Integer.toHexString(low), Integer.toHexString(hi));
-                    } else {
-                        emit(out, "var @1 = @2;", smapper.pushT(type), v);
-                    }
-                    break;
-                }
-                case opc_lcmp:
-                    emit(out, "var @3 = @2.compare64(@1);",
-                         smapper.popL(), smapper.popL(), smapper.pushI());
-                    break;
-                case opc_fcmpl:
-                case opc_fcmpg:
-                    emit(out, "var @3 = (@2 == @1) ? 0 : ((@2 < @1) ? -1 : 1);",
-                         smapper.popF(), smapper.popF(), smapper.pushI());
-                    break;
-                case opc_dcmpl:
-                case opc_dcmpg:
-                    emit(out, "var @3 = (@2 == @1) ? 0 : ((@2 < @1) ? -1 : 1);",
-                         smapper.popD(), smapper.popD(), smapper.pushI());
-                    break;
-                case opc_if_acmpeq:
-                    i = generateIf(byteCodes, i, smapper.popA(), smapper.popA(),
-                                   "===");
-                    break;
-                case opc_if_acmpne:
-                    i = generateIf(byteCodes, i, smapper.popA(), smapper.popA(),
-                                   "!=");
-                    break;
-                case opc_if_icmpeq:
-                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
-                                   "==");
-                    break;
-                case opc_ifeq: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "if (@1 == 0) { gt = @2; continue; }",
-                         smapper.popI(), Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_ifne: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "if (@1 != 0) { gt = @2; continue; }",
-                         smapper.popI(), Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_iflt: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "if (@1 < 0) { gt = @2; continue; }",
-                         smapper.popI(), Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_ifle: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "if (@1 <= 0) { gt = @2; continue; }",
-                         smapper.popI(), Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_ifgt: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "if (@1 > 0) { gt = @2; continue; }",
-                         smapper.popI(), Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_ifge: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "if (@1 >= 0) { gt = @2; continue; }",
-                         smapper.popI(), Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_ifnonnull: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "if (@1 !== null) { gt = @2; continue; }",
-                         smapper.popA(), Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_ifnull: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "if (@1 === null) { gt = @2; continue; }",
-                         smapper.popA(), Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_if_icmpne:
-                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
-                                   "!=");
-                    break;
-                case opc_if_icmplt:
-                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
-                                   "<");
-                    break;
-                case opc_if_icmple:
-                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
-                                   "<=");
-                    break;
-                case opc_if_icmpgt:
-                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
-                                   ">");
-                    break;
-                case opc_if_icmpge:
-                    i = generateIf(byteCodes, i, smapper.popI(), smapper.popI(),
-                                   ">=");
-                    break;
-                case opc_goto: {
-                    int indx = i + readIntArg(byteCodes, i);
-                    emit(out, "gt = @1; continue;", Integer.toString(indx));
-                    i += 2;
-                    break;
-                }
-                case opc_lookupswitch: {
-                    int table = i / 4 * 4 + 4;
-                    int dflt = i + readInt4(byteCodes, table);
-                    table += 4;
-                    int n = readInt4(byteCodes, table);
-                    table += 4;
-                    out.append("switch (").append(smapper.popI()).append(") {\n");
-                    while (n-- > 0) {
-                        int cnstnt = readInt4(byteCodes, table);
-                        table += 4;
-                        int offset = i + readInt4(byteCodes, table);
-                        table += 4;
-                        out.append("  case " + cnstnt).append(": gt = " + offset).append("; continue;\n");
-                    }
-                    out.append("  default: gt = " + dflt).append("; continue;\n}");
-                    i = table - 1;
-                    break;
-                }
-                case opc_tableswitch: {
-                    int table = i / 4 * 4 + 4;
-                    int dflt = i + readInt4(byteCodes, table);
-                    table += 4;
-                    int low = readInt4(byteCodes, table);
-                    table += 4;
-                    int high = readInt4(byteCodes, table);
-                    table += 4;
-                    out.append("switch (").append(smapper.popI()).append(") {\n");
-                    while (low <= high) {
-                        int offset = i + readInt4(byteCodes, table);
-                        table += 4;
-                        out.append("  case " + low).append(": gt = " + offset).append("; continue;\n");
-                        low++;
-                    }
-                    out.append("  default: gt = " + dflt).append("; continue;\n}");
-                    i = table - 1;
-                    break;
-                }
-                case opc_invokeinterface: {
-                    i = invokeVirtualMethod(byteCodes, i, smapper) + 2;
-                    break;
-                }
-                case opc_invokevirtual:
-                    i = invokeVirtualMethod(byteCodes, i, smapper);
-                    break;
-                case opc_invokespecial:
-                    i = invokeStaticMethod(byteCodes, i, smapper, false);
-                    break;
-                case opc_invokestatic:
-                    i = invokeStaticMethod(byteCodes, i, smapper, true);
-                    break;
-                case opc_new: {
-                    int indx = readIntArg(byteCodes, i);
-                    String ci = jc.getClassName(indx);
-                    emit(out, "var @1 = new @2;",
-                         smapper.pushA(), accessClass(ci.replace('/', '_')));
-                    addReference(ci);
-                    i += 2;
-                    break;
-                }
-                case opc_newarray:
-                    int atype = readUByte(byteCodes, ++i);
-                    String jvmType;
-                    switch (atype) {
-                        case 4: jvmType = "[Z"; break;
-                        case 5: jvmType = "[C"; break;
-                        case 6: jvmType = "[F"; break;
-                        case 7: jvmType = "[D"; break;
-                        case 8: jvmType = "[B"; break;
-                        case 9: jvmType = "[S"; break;
-                        case 10: jvmType = "[I"; break;
-                        case 11: jvmType = "[J"; break;
-                        default: throw new IllegalStateException("Array type: " + atype);
-                    }
-                    emit(out, "var @2 = Array.prototype.newArray__Ljava_lang_Object_2ZLjava_lang_String_2I(true, '@3', @1);",
-                         smapper.popI(), smapper.pushA(), jvmType);
-                    break;
-                case opc_anewarray: {
-                    int type = readIntArg(byteCodes, i);
-                    i += 2;
-                    String typeName = jc.getClassName(type);
-                    if (typeName.startsWith("[")) {
-                        typeName = "[" + typeName;
-                    } else {
-                        typeName = "[L" + typeName + ";";
-                    }
-                    emit(out, "var @2 = Array.prototype.newArray__Ljava_lang_Object_2ZLjava_lang_String_2I(false, '@3', @1);",
-                         smapper.popI(), smapper.pushA(), typeName);
-                    break;
-                }
-                case opc_multianewarray: {
-                    int type = readIntArg(byteCodes, i);
-                    i += 2;
-                    String typeName = jc.getClassName(type);
-                    int dim = readUByte(byteCodes, ++i);
-                    StringBuilder dims = new StringBuilder();
-                    dims.append('[');
-                    for (int d = 0; d < dim; d++) {
-                        if (d != 0) {
-                            dims.append(",");
-                        }
-                        dims.append(smapper.popI());
-                    }
-                    dims.append(']');
-                    emit(out, "var @2 = Array.prototype.multiNewArray__Ljava_lang_Object_2Ljava_lang_String_2_3II('@3', @1, 0);",
-                         dims.toString(), smapper.pushA(), typeName);
-                    break;
-                }
-                case opc_arraylength:
-                    emit(out, "var @2 = @1.length;",
-                         smapper.popA(), smapper.pushI());
-                    break;
-                case opc_lastore:
-                    emit(out, "@3.at(@2, @1);",
-                         smapper.popL(), smapper.popI(), smapper.popA());
-                    break;
-                case opc_fastore:
-                    emit(out, "@3.at(@2, @1);",
-                         smapper.popF(), smapper.popI(), smapper.popA());
-                    break;
-                case opc_dastore:
-                    emit(out, "@3.at(@2, @1);",
-                         smapper.popD(), smapper.popI(), smapper.popA());
-                    break;
-                case opc_aastore:
-                    emit(out, "@3.at(@2, @1);",
-                         smapper.popA(), smapper.popI(), smapper.popA());
-                    break;
-                case opc_iastore:
-                case opc_bastore:
-                case opc_castore:
-                case opc_sastore:
-                    emit(out, "@3.at(@2, @1);",
-                         smapper.popI(), smapper.popI(), smapper.popA());
-                    break;
-                case opc_laload:
-                    emit(out, "var @3 = @2.at(@1);",
-                         smapper.popI(), smapper.popA(), smapper.pushL());
-                    break;
-                case opc_faload:
-                    emit(out, "var @3 = @2.at(@1);",
-                         smapper.popI(), smapper.popA(), smapper.pushF());
-                    break;
-                case opc_daload:
-                    emit(out, "var @3 = @2.at(@1);",
-                         smapper.popI(), smapper.popA(), smapper.pushD());
-                    break;
-                case opc_aaload:
-                    emit(out, "var @3 = @2.at(@1);",
-                         smapper.popI(), smapper.popA(), smapper.pushA());
-                    break;
-                case opc_iaload:
-                case opc_baload:
-                case opc_caload:
-                case opc_saload:
-                    emit(out, "var @3 = @2.at(@1);",
-                         smapper.popI(), smapper.popA(), smapper.pushI());
-                    break;
-                case opc_pop:
-                case opc_pop2:
-                    smapper.pop(1);
-                    debug("/* pop */");
-                    break;
-                case opc_dup: {
-                    final Variable v = smapper.get(0);
-                    emit(out, "var @1 = @2;", smapper.pushT(v.getType()), v);
-                    break;
-                }
-                case opc_dup2: {
-                    final Variable vi1 = smapper.get(0);
-
-                    if (vi1.isCategory2()) {
-                        emit(out, "var @1 = @2;",
-                             smapper.pushT(vi1.getType()), vi1);
-                    } else {
-                        final Variable vi2 = smapper.get(1);
-                        emit(out, "var @1 = @2, @3 = @4;",
-                             smapper.pushT(vi2.getType()), vi2,
-                             smapper.pushT(vi1.getType()), vi1);
-                    }
-                    break;
-                }
-                case opc_dup_x1: {
-                    final Variable vi1 = smapper.pop();
-                    final Variable vi2 = smapper.pop();
-                    final Variable vo3 = smapper.pushT(vi1.getType());
-                    final Variable vo2 = smapper.pushT(vi2.getType());
-                    final Variable vo1 = smapper.pushT(vi1.getType());
-
-                    emit(out, "var @1 = @2, @3 = @4, @5 = @6;",
-                         vo1, vi1, vo2, vi2, vo3, vo1);
-                    break;
-                }
-                case opc_dup2_x1: {
-                    final Variable vi1 = smapper.pop();
-                    final Variable vi2 = smapper.pop();
-
-                    if (vi1.isCategory2()) {
-                        final Variable vo3 = smapper.pushT(vi1.getType());
-                        final Variable vo2 = smapper.pushT(vi2.getType());
-                        final Variable vo1 = smapper.pushT(vi1.getType());
-
-                        emit(out, "var @1 = @2, @3 = @4, @5 = @6;",
-                             vo1, vi1, vo2, vi2, vo3, vo1);
-                    } else {
-                        final Variable vi3 = smapper.pop();
-                        final Variable vo5 = smapper.pushT(vi2.getType());
-                        final Variable vo4 = smapper.pushT(vi1.getType());
-                        final Variable vo3 = smapper.pushT(vi3.getType());
-                        final Variable vo2 = smapper.pushT(vi2.getType());
-                        final Variable vo1 = smapper.pushT(vi1.getType());
-
-                        emit(out, "var @1 = @2, @3 = @4, @5 = @6,",
-                             vo1, vi1, vo2, vi2, vo3, vi3);
-                        emit(out, " @1 = @2, @3 = @4;",
-                             vo4, vo1, vo5, vo2);
-                    }
-                    break;
-                }
-                case opc_dup_x2: {
-                    final Variable vi1 = smapper.pop();
-                    final Variable vi2 = smapper.pop();
-
-                    if (vi2.isCategory2()) {
-                        final Variable vo3 = smapper.pushT(vi1.getType());
-                        final Variable vo2 = smapper.pushT(vi2.getType());
-                        final Variable vo1 = smapper.pushT(vi1.getType());
-
-                        emit(out, "var @1 = @2, @3 = @4, @5 = @6;",
-                             vo1, vi1, vo2, vi2, vo3, vo1);
-                    } else {
-                        final Variable vi3 = smapper.pop();
-                        final Variable vo4 = smapper.pushT(vi1.getType());
-                        final Variable vo3 = smapper.pushT(vi3.getType());
-                        final Variable vo2 = smapper.pushT(vi2.getType());
-                        final Variable vo1 = smapper.pushT(vi1.getType());
-
-                        emit(out, "var @1 = @2, @3 = @4, @5 = @6, @7 = @8;",
-                             vo1, vi1, vo2, vi2, vo3, vi3, vo4, vo1);
-                    }
-                    break;
-                }
-                case opc_dup2_x2: {
-                    final Variable vi1 = smapper.pop();
-                    final Variable vi2 = smapper.pop();
-
-                    if (vi1.isCategory2()) {
-                        if (vi2.isCategory2()) {
-                            final Variable vo3 = smapper.pushT(vi1.getType());
-                            final Variable vo2 = smapper.pushT(vi2.getType());
-                            final Variable vo1 = smapper.pushT(vi1.getType());
-
-                            emit(out, "var @1 = @2, @3 = @4, @5 = @6;",
-                                 vo1, vi1, vo2, vi2, vo3, vo1);
-                        } else {
-                            final Variable vi3 = smapper.pop();
-                            final Variable vo4 = smapper.pushT(vi1.getType());
-                            final Variable vo3 = smapper.pushT(vi3.getType());
-                            final Variable vo2 = smapper.pushT(vi2.getType());
-                            final Variable vo1 = smapper.pushT(vi1.getType());
-
-                            emit(out, "var @1 = @2, @3 = @4, @5 = @6, @7 = @8;",
-                                 vo1, vi1, vo2, vi2, vo3, vi3, vo4, vo1);
-                        }
-                    } else {
-                        final Variable vi3 = smapper.pop();
-
-                        if (vi3.isCategory2()) {
-                            final Variable vo5 = smapper.pushT(vi2.getType());
-                            final Variable vo4 = smapper.pushT(vi1.getType());
-                            final Variable vo3 = smapper.pushT(vi3.getType());
-                            final Variable vo2 = smapper.pushT(vi2.getType());
-                            final Variable vo1 = smapper.pushT(vi1.getType());
-
-                            emit(out, "var @1 = @2, @3 = @4, @5 = @6,",
-                                 vo1, vi1, vo2, vi2, vo3, vi3);
-                            emit(out, " @1 = @2, @3 = @4;",
-                                 vo4, vo1, vo5, vo2);
-                        } else {
-                            final Variable vi4 = smapper.pop();
-                            final Variable vo6 = smapper.pushT(vi2.getType());
-                            final Variable vo5 = smapper.pushT(vi1.getType());
-                            final Variable vo4 = smapper.pushT(vi4.getType());
-                            final Variable vo3 = smapper.pushT(vi3.getType());
-                            final Variable vo2 = smapper.pushT(vi2.getType());
-                            final Variable vo1 = smapper.pushT(vi1.getType());
-                            
-                            emit(out, "var @1 = @2, @3 = @4, @5 = @6, @7 = @8,",
-                                 vo1, vi1, vo2, vi2, vo3, vi3, vo4, vi4);
-                            emit(out, " @1 = @2, @3 = @4;",
-                                 vo5, vo1, vo6, vo2);
-                        }
-                    }
-                    break;
-                }
-                case opc_swap: {
-                    final Variable vi1 = smapper.get(0);
-                    final Variable vi2 = smapper.get(1);
-
-                    if (vi1.getType() == vi2.getType()) {
-                        final Variable tmp = smapper.pushT(vi1.getType());
-
-                        emit(out, "var @1 = @2, @2 = @3, @3 = @1;",
-                             tmp, vi1, vi2);
-                        smapper.pop(1);
-                    } else {
-                        smapper.pop(2);
-                        smapper.pushT(vi1.getType());
-                        smapper.pushT(vi2.getType());
-                    }
-                    break;
-                }
-                case opc_bipush:
-                    emit(out, "var @1 = @2;",
-                         smapper.pushI(), Integer.toString(byteCodes[++i]));
-                    break;
-                case opc_sipush:
-                    emit(out, "var @1 = @2;",
-                         smapper.pushI(),
-                         Integer.toString(readIntArg(byteCodes, i)));
-                    i += 2;
-                    break;
-                case opc_getfield: {
-                    int indx = readIntArg(byteCodes, i);
-                    String[] fi = jc.getFieldInfoName(indx);
-                    final int type = VarType.fromFieldType(fi[2].charAt(0));
-                    final String mangleClass = mangleSig(fi[0]);
-                    final String mangleClassAccess = accessClass(mangleClass);
-                    emit(out, "var @2 = @4(false)._@3.call(@1);",
-                         smapper.popA(),
-                         smapper.pushT(type), fi[1], mangleClassAccess
-                    );
-                    i += 2;
-                    break;
-                }
-                case opc_putfield: {
-                    int indx = readIntArg(byteCodes, i);
-                    String[] fi = jc.getFieldInfoName(indx);
-                    final int type = VarType.fromFieldType(fi[2].charAt(0));
-                    final String mangleClass = mangleSig(fi[0]);
-                    final String mangleClassAccess = accessClass(mangleClass);
-                    emit(out, "@4(false)._@3.call(@2, @1);",
-                         smapper.popT(type),
-                         smapper.popA(), fi[1], 
-                         mangleClassAccess
-                    );
-                    i += 2;
-                    break;
-                }
-                case opc_getstatic: {
-                    int indx = readIntArg(byteCodes, i);
-                    String[] fi = jc.getFieldInfoName(indx);
-                    final int type = VarType.fromFieldType(fi[2].charAt(0));
-                    emit(out, "var @1 = @2(false).constructor.@3;",
-                         smapper.pushT(type),
-                         accessClass(fi[0].replace('/', '_')), fi[1]);
-                    i += 2;
-                    addReference(fi[0]);
-                    break;
-                }
-                case opc_putstatic: {
-                    int indx = readIntArg(byteCodes, i);
-                    String[] fi = jc.getFieldInfoName(indx);
-                    final int type = VarType.fromFieldType(fi[2].charAt(0));
-                    emit(out, "@1(false).constructor.@2 = @3;",
-                         accessClass(fi[0].replace('/', '_')), fi[1],
-                         smapper.popT(type));
-                    i += 2;
-                    addReference(fi[0]);
-                    break;
-                }
-                case opc_checkcast: {
-                    int indx = readIntArg(byteCodes, i);
-                    final String type = jc.getClassName(indx);
-                    if (!type.startsWith("[")) {
-                        emit(out,
-                             "if (@1 !== null && !@1.$instOf_@2) throw {};",
-                             smapper.getA(0), type.replace('/', '_'));
-                    } else {
-                        emit(out, "vm.java_lang_Class(false).forName__Ljava_lang_Class_2Ljava_lang_String_2('@2').cast__Ljava_lang_Object_2Ljava_lang_Object_2(@1);",
-                             smapper.getA(0), type
-                        );
-                    }
-                    i += 2;
-                    break;
-                }
-                case opc_instanceof: {
-                    int indx = readIntArg(byteCodes, i);
-                    final String type = jc.getClassName(indx);
-                    if (!type.startsWith("[")) {
-                        emit(out, "var @2 = @1 != null && @1.$instOf_@3 ? 1 : 0;",
-                             smapper.popA(), smapper.pushI(),
-                             type.replace('/', '_'));
-                    } else {
-                        emit(out, "var @2 = vm.java_lang_Class(false).forName__Ljava_lang_Class_2Ljava_lang_String_2('@3').isInstance__ZLjava_lang_Object_2(@1);",
-                            smapper.popA(), smapper.pushI(),
-                            type
-                        );
-                    }
-                    i += 2;
-                    break;
-                }
-                case opc_athrow: {
-                    final Variable v = smapper.popA();
-                    smapper.clear();
-
-                    emit(out, "{ var @1 = @2; throw @2; }",
-                         smapper.pushA(), v);
-                    break;
-                }
-
-                case opc_monitorenter: {
-                    out.append("/* monitor enter */");
-                    smapper.popA();
-                    break;
-                }
-
-                case opc_monitorexit: {
-                    out.append("/* monitor exit */");
-                    smapper.popA();
-                    break;
-                }
-
-                case opc_wide:
-                    wide = true;
-                    break;
-
-                default: {
-                    wide = false;
-                    emit(out, "throw 'unknown bytecode @1';",
-                         Integer.toString(c));
-                }
-            }
-            if (debug(" //")) {
-                for (int j = prev; j <= i; j++) {
-                    out.append(" ");
-                    final int cc = readUByte(byteCodes, j);
-                    out.append(Integer.toString(cc));
-                }
-            }
-            out.append("\n");            
-        }
-        if (previousTrap != null) {
-            generateCatch(previousTrap);
-        }
-        out.append("  }\n");
-        out.append("};");
-    }
-
-    private int generateIf(byte[] byteCodes, int i,
-                           final Variable v2, final Variable v1,
-                           final String test) throws IOException {
-        int indx = i + readIntArg(byteCodes, i);
-        out.append("if (").append(v1)
-           .append(' ').append(test).append(' ')
-           .append(v2).append(") { gt = " + indx)
-           .append("; continue; }");
-        return i + 2;
-    }
-
-    private int readIntArg(byte[] byteCodes, int offsetInstruction) {
-        final int indxHi = byteCodes[offsetInstruction + 1] << 8;
-        final int indxLo = byteCodes[offsetInstruction + 2];
-        return (indxHi & 0xffffff00) | (indxLo & 0xff);
-    }
-    private int readInt4(byte[] byteCodes, int offset) {
-        final int d = byteCodes[offset + 0] << 24;
-        final int c = byteCodes[offset + 1] << 16;
-        final int b = byteCodes[offset + 2] << 8;
-        final int a = byteCodes[offset + 3];
-        return (d & 0xff000000) | (c & 0xff0000) | (b & 0xff00) | (a & 0xff);
-    }
-    private int readUByte(byte[] byteCodes, int offset) {
-        return byteCodes[offset] & 0xff;
-    }
-
-    private int readUShort(byte[] byteCodes, int offset) {
-        return ((byteCodes[offset] & 0xff) << 8)
-                    | (byteCodes[offset + 1] & 0xff);
-    }
-
-    private int readShort(byte[] byteCodes, int offset) {
-        return (byteCodes[offset] << 8)
-                    | (byteCodes[offset + 1] & 0xff);
-    }
-
-    private static void countArgs(String descriptor, char[] returnType, StringBuilder sig, StringBuilder cnt) {
-        int i = 0;
-        Boolean count = null;
-        boolean array = false;
-        sig.append("__");
-        int firstPos = sig.length();
-        while (i < descriptor.length()) {
-            char ch = descriptor.charAt(i++);
-            switch (ch) {
-                case '(':
-                    count = true;
-                    continue;
-                case ')':
-                    count = false;
-                    continue;
-                case 'B': 
-                case 'C': 
-                case 'D': 
-                case 'F': 
-                case 'I': 
-                case 'J': 
-                case 'S': 
-                case 'Z': 
-                    if (count) {
-                        if (array) {
-                            sig.append("_3");
-                        }
-                        sig.append(ch);
-                        if (ch == 'J' || ch == 'D') {
-                            cnt.append('1');
-                        } else {
-                            cnt.append('0');
-                        }
-                    } else {
-                        sig.insert(firstPos, ch);
-                        if (array) {
-                            returnType[0] = '[';
-                            sig.insert(firstPos, "_3");
-                        } else {
-                            returnType[0] = ch;
-                        }
-                    }
-                    array = false;
-                    continue;
-                case 'V': 
-                    assert !count;
-                    returnType[0] = 'V';
-                    sig.insert(firstPos, 'V');
-                    continue;
-                case 'L':
-                    int next = descriptor.indexOf(';', i);
-                    String realSig = mangleSig(descriptor, i - 1, next + 1);
-                    if (count) {
-                        if (array) {
-                            sig.append("_3");
-                        }
-                        sig.append(realSig);
-                        cnt.append('0');
-                    } else {
-                        sig.insert(firstPos, realSig);
-                        if (array) {
-                            sig.insert(firstPos, "_3");
-                        }
-                        returnType[0] = 'L';
-                    }
-                    i = next + 1;
-                    array = false;
-                    continue;
-                case '[':
-                    array = true;
-                    continue;
-                default:
-                    throw new IllegalStateException("Invalid char: " + ch);
-            }
-        }
-    }
-    
-    static String mangleSig(String sig) {
-        return mangleSig(sig, 0, sig.length());
-    }
-    
-    private static String mangleSig(String txt, int first, int last) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = first; i < last; i++) {
-            final char ch = txt.charAt(i);
-            switch (ch) {
-                case '/': sb.append('_'); break;
-                case '_': sb.append("_1"); break;
-                case ';': sb.append("_2"); break;
-                case '[': sb.append("_3"); break;
-                default: sb.append(ch); break;
-            }
-        }
-        return sb.toString();
-    }
-
-    private static String findMethodName(MethodData m, StringBuilder cnt) {
-        StringBuilder name = new StringBuilder();
-        if ("<init>".equals(m.getName())) { // NOI18N
-            name.append("cons"); // NOI18N
-        } else if ("<clinit>".equals(m.getName())) { // NOI18N
-            name.append("class"); // NOI18N
-        } else {
-            name.append(m.getName());
-        } 
-        
-        countArgs(m.getInternalSig(), new char[1], name, cnt);
-        return name.toString();
-    }
-
-    static String findMethodName(String[] mi, StringBuilder cnt, char[] returnType) {
-        StringBuilder name = new StringBuilder();
-        String descr = mi[2];//mi.getDescriptor();
-        String nm= mi[1];
-        if ("<init>".equals(nm)) { // NOI18N
-            name.append("cons"); // NOI18N
-        } else {
-            name.append(nm);
-        }
-        countArgs(descr, returnType, name, cnt);
-        return name.toString();
-    }
-
-    private int invokeStaticMethod(byte[] byteCodes, int i, final StackMapper mapper, boolean isStatic)
-    throws IOException {
-        int methodIndex = readIntArg(byteCodes, i);
-        String[] mi = jc.getFieldInfoName(methodIndex);
-        char[] returnType = { 'V' };
-        StringBuilder cnt = new StringBuilder();
-        String mn = findMethodName(mi, cnt, returnType);
-
-        final int numArguments = isStatic ? cnt.length() : cnt.length() + 1;
-        final Variable[] vars = new Variable[numArguments];
-
-        for (int j = numArguments - 1; j >= 0; --j) {
-            vars[j] = mapper.pop();
-        }
-
-        if (returnType[0] != 'V') {
-            out.append("var ")
-               .append(mapper.pushT(VarType.fromFieldType(returnType[0])))
-               .append(" = ");
-        }
-
-        final String in = mi[0];
-        out.append(accessClass(in.replace('/', '_')));
-        out.append("(false).");
-        if (mn.startsWith("cons_")) {
-            out.append("constructor.");
-        }
-        out.append(mn);
-        if (isStatic) {
-            out.append('(');
-        } else {
-            out.append(".call(");
-        }
-        if (numArguments > 0) {
-            out.append(vars[0]);
-            for (int j = 1; j < numArguments; ++j) {
-                out.append(", ");
-                out.append(vars[j]);
-            }
-        }
-        out.append(");");
-        i += 2;
-        addReference(in);
-        return i;
-    }
-    private int invokeVirtualMethod(byte[] byteCodes, int i, final StackMapper mapper)
-    throws IOException {
-        int methodIndex = readIntArg(byteCodes, i);
-        String[] mi = jc.getFieldInfoName(methodIndex);
-        char[] returnType = { 'V' };
-        StringBuilder cnt = new StringBuilder();
-        String mn = findMethodName(mi, cnt, returnType);
-
-        final int numArguments = cnt.length() + 1;
-        final Variable[] vars = new Variable[numArguments];
-
-        for (int j = numArguments - 1; j >= 0; --j) {
-            vars[j] = mapper.pop();
-        }
-
-        if (returnType[0] != 'V') {
-            out.append("var ")
-               .append(mapper.pushT(VarType.fromFieldType(returnType[0])))
-               .append(" = ");
-        }
-
-        out.append(vars[0]).append('.');
-        out.append(mn);
-        out.append('(');
-        String sep = "";
-        for (int j = 1; j < numArguments; ++j) {
-            out.append(sep);
-            out.append(vars[j]);
-            sep = ", ";
-        }
-        out.append(");");
-        i += 2;
-        return i;
-    }
-
-    private void addReference(String cn) throws IOException {
-        if (requireReference(cn)) {
-            debug(" /* needs " + cn + " */");
-        }
-    }
-
-    private void outType(String d, StringBuilder out) {
-        int arr = 0;
-        while (d.charAt(0) == '[') {
-            out.append('A');
-            d = d.substring(1);
-        }
-        if (d.charAt(0) == 'L') {
-            assert d.charAt(d.length() - 1) == ';';
-            out.append(d.replace('/', '_').substring(0, d.length() - 1));
-        } else {
-            out.append(d);
-        }
-    }
-
-    private String encodeConstant(int entryIndex) throws IOException {
-        String[] classRef = { null };
-        String s = jc.stringValue(entryIndex, classRef);
-        if (classRef[0] != null) {
-            if (classRef[0].startsWith("[")) {
-                s = accessClass("java_lang_Class") + "(false).forName__Ljava_lang_Class_2Ljava_lang_String_2('" + classRef[0] + "');";
-            } else {
-                addReference(classRef[0]);
-                s = accessClass(s.replace('/', '_')) + "(false).constructor.$class";
-            }
-        }
-        return s;
-    }
-
-    private String javaScriptBody(String prefix, MethodData m, boolean isStatic) throws IOException {
-        byte[] arr = m.findAnnotationData(true);
-        if (arr == null) {
-            return null;
-        }
-        final String jvmType = "Lorg/apidesign/bck2brwsr/core/JavaScriptBody;";
-        class P extends AnnotationParser {
-            public P() {
-                super(false, true);
-            }
-            
-            int cnt;
-            String[] args = new String[30];
-            String body;
-            
-            @Override
-            protected void visitAttr(String type, String attr, String at, String value) {
-                if (type.equals(jvmType)) {
-                    if ("body".equals(attr)) {
-                        body = value;
-                    } else if ("args".equals(attr)) {
-                        args[cnt++] = value;
-                    } else {
-                        throw new IllegalArgumentException(attr);
-                    }
-                }
-            }
-        }
-        P p = new P();
-        p.parse(arr, jc);
-        if (p.body == null) {
-            return null;
-        }
-        StringBuilder cnt = new StringBuilder();
-        final String mn = findMethodName(m, cnt);
-        out.append(prefix).append(mn);
-        out.append(" = function(");
-        String space = "";
-        int index = 0;
-        for (int i = 0; i < cnt.length(); i++) {
-            out.append(space);
-            space = outputArg(out, p.args, index);
-            index++;
-        }
-        out.append(") {").append("\n");
-        out.append(p.body);
-        out.append("\n}\n");
-        return mn;
-    }
-    private static String className(ClassData jc) {
-        //return jc.getName().getInternalName().replace('/', '_');
-        return jc.getClassName().replace('/', '_');
-    }
-    
-    private static String[] findAnnotation(
-        byte[] arr, ClassData cd, final String className, 
-        final String... attrNames
-    ) throws IOException {
-        if (arr == null) {
-            return null;
-        }
-        final String[] values = new String[attrNames.length];
-        final boolean[] found = { false };
-        final String jvmType = "L" + className.replace('.', '/') + ";";
-        AnnotationParser ap = new AnnotationParser(false, true) {
-            @Override
-            protected void visitAttr(String type, String attr, String at, String value) {
-                if (type.equals(jvmType)) {
-                    found[0] = true;
-                    for (int i = 0; i < attrNames.length; i++) {
-                        if (attrNames[i].equals(attr)) {
-                            values[i] = value;
-                        }
-                    }
-                }
-            }
-            
-        };
-        ap.parse(arr, cd);
-        return found[0] ? values : null;
-    }
-
-    private CharSequence initField(FieldData v) {
-        final String is = v.getInternalSig();
-        if (is.length() == 1) {
-            switch (is.charAt(0)) {
-                case 'S':
-                case 'J':
-                case 'B':
-                case 'Z':
-                case 'C':
-                case 'I': return " = 0;";
-                case 'F': 
-                case 'D': return " = 0.0;";
-                default:
-                    throw new IllegalStateException(is);
-            }
-        }
-        return " = null;";
-    }
-
-    private void generateAnno(ClassData cd, final Appendable out, byte[] data) throws IOException {
-        AnnotationParser ap = new AnnotationParser(true, false) {
-            int[] cnt = new int[32];
-            int depth;
-            
-            @Override
-            protected void visitAnnotationStart(String attrType, boolean top) throws IOException {
-                final String slashType = attrType.substring(1, attrType.length() - 1);
-                requireReference(slashType);
-                
-                if (cnt[depth]++ > 0) {
-                    out.append(",");
-                }
-                if (top) {
-                    out.append('"').append(attrType).append("\" : ");
-                }
-                out.append("{\n");
-                cnt[++depth] = 0;
-            }
-
-            @Override
-            protected void visitAnnotationEnd(String type, boolean top) throws IOException {
-                out.append("\n}\n");
-                depth--;
-            }
-
-            @Override
-            protected void visitValueStart(String attrName, char type) throws IOException {
-                if (cnt[depth]++ > 0) {
-                    out.append(",\n");
-                }
-                cnt[++depth] = 0;
-                if (attrName != null) {
-                    out.append(attrName).append(" : ");
-                }
-                if (type == '[') {
-                    out.append("[");
-                }
-            }
-
-            @Override
-            protected void visitValueEnd(String attrName, char type) throws IOException {
-                if (type == '[') {
-                    out.append("]");
-                }
-                depth--;
-            }
-            
-            @Override
-            protected void visitAttr(String type, String attr, String attrType, String value) 
-            throws IOException {
-                if (attr == null && value == null) {
-                    return;
-                }
-                out.append(value);
-            }
-
-            @Override
-            protected void visitEnumAttr(String type, String attr, String attrType, String value) 
-            throws IOException {
-                final String slashType = attrType.substring(1, attrType.length() - 1);
-                requireReference(slashType);
-                
-                out.append(accessClass(slashType.replace('/', '_')))
-                   .append("(false).constructor.").append(value);
-            }
-        };
-        ap.parse(data, cd);
-    }
-
-    private static String outputArg(Appendable out, String[] args, int indx) throws IOException {
-        final String name = args[indx];
-        if (name == null) {
-            return "";
-        }
-        if (name.contains(",")) {
-            throw new IOException("Wrong parameter with ',': " + name);
-        }
-        out.append(name);
-        return ",";
-    }
-
-    private static void emit(final Appendable out,
-                             final String format,
-                             final CharSequence... params) throws IOException {
-        final int length = format.length();
-
-        int processed = 0;
-        int paramOffset = format.indexOf('@');
-        while ((paramOffset != -1) && (paramOffset < (length - 1))) {
-            final char paramChar = format.charAt(paramOffset + 1);
-            if ((paramChar >= '1') && (paramChar <= '9')) {
-                final int paramIndex = paramChar - '0' - 1;
-
-                out.append(format, processed, paramOffset);
-                out.append(params[paramIndex]);
-
-                ++paramOffset;
-                processed = paramOffset + 1;
-            }
-
-            paramOffset = format.indexOf('@', paramOffset + 1);
-        }
-
-        out.append(format, processed, length);
-    }
-
-    private void generateCatch(TrapData[] traps) throws IOException {
-        out.append("} catch (e) {\n");
-        int finallyPC = -1;
-        for (TrapData e : traps) {
-            if (e == null) {
-                break;
-            }
-            if (e.catch_cpx != 0) { //not finally
-                final String classInternalName = jc.getClassName(e.catch_cpx);
-                addReference(classInternalName);
-                if ("java/lang/Throwable".equals(classInternalName)) {
-                    out.append("if (e.$instOf_java_lang_Throwable) {");
-                    out.append("  var stA0 = e;");
-                    out.append("} else {");
-                    out.append("  var stA0 = vm.java_lang_Throwable(true);");
-                    out.append("  vm.java_lang_Throwable.cons__VLjava_lang_String_2.call(stA0, e.toString());");
-                    out.append("}");
-                    out.append("gt=" + e.handler_pc + "; continue;");
-                } else {
-                    out.append("if (e.$instOf_" + classInternalName.replace('/', '_') + ") {");
-                    out.append("gt=" + e.handler_pc + "; var stA0 = e; continue;");
-                    out.append("}\n");
-                }
-            } else {
-                finallyPC = e.handler_pc;
-            }
-        }
-        if (finallyPC == -1) {
-            out.append("throw e;");
-        } else {
-            out.append("gt=" + finallyPC + "; var stA0 = e; continue;");
-        }
-        out.append("\n}");
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/LocalsMapper.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/LocalsMapper.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.IOException;
-import org.apidesign.javap.RuntimeConstants;
-import org.apidesign.javap.TypeArray;
-
-final class LocalsMapper {
-    private final TypeArray argTypeRecords;
-    private final TypeArray localTypeRecords;
-
-    public LocalsMapper(final TypeArray stackMapArgs) {
-        final TypeArray initTypeRecords = new TypeArray();
-        updateRecords(initTypeRecords, stackMapArgs);
-
-        argTypeRecords = initTypeRecords;
-        localTypeRecords = new TypeArray(initTypeRecords);
-    }
-
-    public void outputArguments(final Appendable out, boolean isStatic) throws IOException {
-        final int argRecordCount = argTypeRecords.getSize();
-        int first = isStatic ? 0 : 1;
-        if (argRecordCount > first) {
-            Variable variable = getVariable(argTypeRecords, first);
-            out.append(variable);
-
-            int i = first + (variable.isCategory2() ? 2 : 1);
-            while (i < argRecordCount) {
-                variable = getVariable(argTypeRecords, i);
-                out.append(", ");
-                out.append(variable);
-                i += variable.isCategory2() ? 2 : 1;
-            }
-        }
-    }
-
-    public void syncWithFrameLocals(final TypeArray frameLocals) {
-        updateRecords(localTypeRecords, frameLocals);
-    }
-
-    public Variable setI(final int index) {
-        return setT(index, VarType.INTEGER);
-    }
-
-    public Variable setL(final int index) {
-        return setT(index, VarType.LONG);
-    }
-
-    public Variable setF(final int index) {
-        return setT(index, VarType.FLOAT);
-    }
-
-    public Variable setD(final int index) {
-        return setT(index, VarType.DOUBLE);
-    }
-
-    public Variable setA(final int index) {
-        return setT(index, VarType.REFERENCE);
-    }
-
-    public Variable setT(final int index, final int type) {
-        updateRecord(localTypeRecords, index, type);
-        return Variable.getLocalVariable(type, index);
-    }
-
-    public Variable getI(final int index) {
-        return getT(index, VarType.INTEGER);
-    }
-
-    public Variable getL(final int index) {
-        return getT(index, VarType.LONG);
-    }
-
-    public Variable getF(final int index) {
-        return getT(index, VarType.FLOAT);
-    }
-
-    public Variable getD(final int index) {
-        return getT(index, VarType.DOUBLE);
-    }
-
-    public Variable getA(final int index) {
-        return getT(index, VarType.REFERENCE);
-    }
-
-    public Variable getT(final int index, final int type) {
-        final int oldRecordValue = localTypeRecords.get(index);
-        if ((oldRecordValue & 0xff) != type) {
-            throw new IllegalStateException("Type mismatch");
-        }
-
-        return Variable.getLocalVariable(type, index);
-    }
-
-    private static void updateRecords(final TypeArray typeRecords,
-                                      final TypeArray stackMapTypes) {
-        final int srcSize = stackMapTypes.getSize();
-        for (int i = 0, dstIndex = 0; i < srcSize; ++i) {
-            final int smType = stackMapTypes.get(i);
-            if (smType == RuntimeConstants.ITEM_Bogus) {
-                ++dstIndex;
-                continue;
-            }
-            final int varType = VarType.fromStackMapType(smType);
-            updateRecord(typeRecords, dstIndex, varType);
-            dstIndex += VarType.isCategory2(varType) ? 2 : 1;
-        }
-    }
-
-    private static void updateRecord(final TypeArray typeRecords,
-                                     final int index, final int type) {
-        if (typeRecords.getSize() < (index + 1)) {
-            typeRecords.setSize(index + 1);
-        }
-
-        final int oldRecordValue = typeRecords.get(index);
-        final int usedTypesMask =
-                (oldRecordValue >> 8) | (1 << type);
-        typeRecords.set(index, (usedTypesMask << 8) | type);
-    }
-
-    private static Variable getVariable(final TypeArray typeRecords,
-                                        final int index) {
-        return Variable.getLocalVariable(typeRecords.get(index) & 0xff, index);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/Main.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/Main.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-
-/** Generator of JavaScript from bytecode of classes on classpath of the VM
- * with a Main method.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class Main {
-    private Main() {}
-    
-    public static void main(String... args) throws IOException {
-        if (args.length < 2) {
-            System.err.println("Bck2Brwsr Translator from Java(tm) to JavaScript, (c) Jaroslav Tulach 2012");
-            System.err.println("Usage: java -cp ... -jar ... <file_to_generate_js_code_to> java/lang/Class org/your/App ...");
-            return;
-        }
-        
-        Writer w = new BufferedWriter(new FileWriter(args[0]));
-        StringArray classes = StringArray.asList(args);
-        classes.delete(0);
-        try {
-            Bck2Brwsr.generate(w, Main.class.getClassLoader(),
-                               classes.toArray());
-        } finally {
-            w.close();
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/ParseMan.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/ParseMan.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.apidesign.bck2brwsr.emul.lang.ManifestInputStream;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class ParseMan extends ManifestInputStream {
-    private String cp;
-    private String mc;
-
-    public ParseMan(InputStream is) throws IOException {
-        super(is);
-        readAttributes(new byte[512]);
-    }
-
-    @Override
-    protected String putValue(String key, String value) {
-        if ("Class-Path".equals(key)) {
-            cp = value;
-        }
-        if ("Main-Class".equals(key)) {
-            mc = value;
-        }
-        return null;
-    }
-    
-    String getMainClass() {
-        return mc;
-    }
-
-    @Override
-    public String toString() {
-        return cp;
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/StackMapper.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/StackMapper.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.apidesign.javap.TypeArray;
-
-final class StackMapper {
-    private final TypeArray stackTypeIndexPairs;
-    private int[] typeCounters;
-    private int[] typeMaxCounters;
-
-    public StackMapper() {
-        stackTypeIndexPairs = new TypeArray();
-        typeCounters = new int[VarType.LAST + 1];
-        typeMaxCounters = new int[VarType.LAST + 1];
-    }
-
-    public void clear() {
-        for (int type = 0; type <= VarType.LAST; ++type) {
-            typeCounters[type] = 0;
-        }
-        stackTypeIndexPairs.clear();
-    }
-
-    public void syncWithFrameStack(final TypeArray frameStack) {
-        clear();
-
-        final int size = frameStack.getSize();
-        for (int i = 0; i < size; ++i) {
-            pushTypeImpl(VarType.fromStackMapType(frameStack.get(i)));
-        }
-    }
-
-    public Variable pushI() {
-        return pushT(VarType.INTEGER);
-    }
-
-    public Variable pushL() {
-        return pushT(VarType.LONG);
-    }
-
-    public Variable pushF() {
-        return pushT(VarType.FLOAT);
-    }
-
-    public Variable pushD() {
-        return pushT(VarType.DOUBLE);
-    }
-
-    public Variable pushA() {
-        return pushT(VarType.REFERENCE);
-    }
-
-    public Variable pushT(final int type) {
-        return getVariable(pushTypeImpl(type));
-    }
-
-    public Variable popI() {
-        return popT(VarType.INTEGER);
-    }
-
-    public Variable popL() {
-        return popT(VarType.LONG);
-    }
-
-    public Variable popF() {
-        return popT(VarType.FLOAT);
-    }
-
-    public Variable popD() {
-        return popT(VarType.DOUBLE);
-    }
-
-    public Variable popA() {
-        return popT(VarType.REFERENCE);
-    }
-
-    public Variable popT(final int type) {
-        final Variable variable = getT(0, type);
-        popImpl(1);
-        return variable;
-    }
-
-    public Variable pop() {
-        final Variable variable = get(0);
-        popImpl(1);
-        return variable;
-    }
-
-    public void pop(final int count) {
-        final int stackSize = stackTypeIndexPairs.getSize();
-        if (count > stackSize) {
-            throw new IllegalStateException("Stack underflow");
-        }
-        popImpl(count);
-    }
-
-    public Variable getI(final int indexFromTop) {
-        return getT(indexFromTop, VarType.INTEGER);
-    }
-
-    public Variable getL(final int indexFromTop) {
-        return getT(indexFromTop, VarType.LONG);
-    }
-
-    public Variable getF(final int indexFromTop) {
-        return getT(indexFromTop, VarType.FLOAT);
-    }
-
-    public Variable getD(final int indexFromTop) {
-        return getT(indexFromTop, VarType.DOUBLE);
-    }
-
-    public Variable getA(final int indexFromTop) {
-        return getT(indexFromTop, VarType.REFERENCE);
-    }
-
-    public Variable getT(final int indexFromTop, final int type) {
-        final int stackSize = stackTypeIndexPairs.getSize();
-        if (indexFromTop >= stackSize) {
-            throw new IllegalStateException("Stack underflow");
-        }
-        final int stackValue =
-                stackTypeIndexPairs.get(stackSize - indexFromTop - 1);
-        if ((stackValue & 0xff) != type) {
-            throw new IllegalStateException("Type mismatch");
-        }
-
-        return getVariable(stackValue);
-    }
-
-    public Variable get(final int indexFromTop) {
-        final int stackSize = stackTypeIndexPairs.getSize();
-        if (indexFromTop >= stackSize) {
-            throw new IllegalStateException("Stack underflow");
-        }
-        final int stackValue =
-                stackTypeIndexPairs.get(stackSize - indexFromTop - 1);
-
-        return getVariable(stackValue);
-    }
-
-    private int pushTypeImpl(final int type) {
-        final int count = typeCounters[type];
-        final int value = (count << 8) | (type & 0xff);
-        incCounter(type);
-        stackTypeIndexPairs.add(value);
-
-        return value;
-    }
-
-    private void popImpl(final int count) {
-        final int stackSize = stackTypeIndexPairs.getSize();
-        for (int i = stackSize - count; i < stackSize; ++i) {
-            final int value = stackTypeIndexPairs.get(i);
-            decCounter(value & 0xff);
-        }
-
-        stackTypeIndexPairs.setSize(stackSize - count);
-    }
-
-    private void incCounter(final int type) {
-        final int newValue = ++typeCounters[type];
-        if (typeMaxCounters[type] < newValue) {
-            typeMaxCounters[type] = newValue;
-        }
-    }
-
-    private void decCounter(final int type) {
-        --typeCounters[type];
-    }
-
-    public Variable getVariable(final int typeAndIndex) {
-        final int type = typeAndIndex & 0xff;
-        final int index = typeAndIndex >> 8;
-
-        return Variable.getStackVariable(type, index);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/StringArray.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/StringArray.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-class StringArray {
-    private String[] arr;
-
-    public StringArray() {
-    }
-
-    private StringArray(String[] arr) {
-        this.arr = arr;
-    }
-    
-    public void add(String s) {
-        if (arr == null) {
-            arr = new String[1];
-        } else {
-            String[] tmp = new String[arr.length + 1];
-            for (int i = 0; i < arr.length; i++) {
-                tmp[i] = arr[i];
-            }
-            arr = tmp;
-        }
-        arr[arr.length - 1] = s;
-    }
-    
-    public String[] toArray() {
-        return arr == null ? new String[0] : arr;
-    }
-    
-    static StringArray asList(String... names) {
-        return new StringArray(names);
-    }
-
-    void reverse() {
-        for (int i = 0, j = arr.length; i < j; i++) {
-            String s = arr[i];
-            arr[i] = arr[--j];
-            arr[j] = s;
-        }
-    }
-
-    boolean contains(String n) {
-        if (arr == null) {
-            return false;
-        }
-        for (int i = 0; i < arr.length; i++) {
-            if (n.equals(arr[i])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void delete(int indx) {
-        if (arr == null || indx < 0 || indx >= arr.length) {
-            return;
-        }
-        String[] tmp = new String[arr.length - 1];
-        for (int i = 0, j = 0; i < arr.length; i++) {
-            if (i != indx) {
-                tmp[j++] = arr[i];
-            }
-        }
-        arr = tmp;
-    }
-
-    int indexOf(String ic) {
-        for (int i = 0; i < arr.length; i++) {
-            if (ic.equals(arr[i])) {
-                return i;
-            }
-        }
-        return -1;
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/VM.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/** Generator of JavaScript from bytecode of classes on classpath of the VM.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-class VM extends ByteCodeToJavaScript {
-    public VM(Appendable out) {
-        super(out);
-    }
-    
-    static {
-        // uses VMLazy to load dynamic classes
-        boolean assertsOn = false;
-        assert assertsOn = true;
-        if (assertsOn) {
-            VMLazy.init();
-            Zips.init();
-        }
-    }
-
-    @Override
-    boolean debug(String msg) throws IOException {
-        return false;
-    }
-    
-    static void compile(Bck2Brwsr.Resources l, Appendable out, StringArray names) throws IOException {
-        new VM(out).doCompile(l, names);
-    }
-    protected void doCompile(Bck2Brwsr.Resources l, StringArray names) throws IOException {
-        out.append("(function VM(global) {var fillInVMSkeleton = function(vm) {");
-        StringArray processed = new StringArray();
-        StringArray initCode = new StringArray();
-        for (String baseClass : names.toArray()) {
-            references.add(baseClass);
-            for (;;) {
-                String name = null;
-                for (String n : references.toArray()) {
-                    if (processed.contains(n)) {
-                        continue;
-                    }
-                    name = n;
-                }
-                if (name == null) {
-                    break;
-                }
-                InputStream is = loadClass(l, name);
-                if (is == null) {
-                    throw new IOException("Can't find class " + name); 
-                }
-                try {
-                    String ic = compile(is);
-                    processed.add(name);
-                    initCode.add(ic == null ? "" : ic);
-                } catch (RuntimeException ex) {
-                    if (out instanceof CharSequence) {
-                        CharSequence seq = (CharSequence)out;
-                        int lastBlock = seq.length();
-                        while (lastBlock-- > 0) {
-                            if (seq.charAt(lastBlock) == '{') {
-                                break;
-                            }
-                        }
-                        throw new IOException("Error while compiling " + name + "\n" 
-                            + seq.subSequence(lastBlock + 1, seq.length()), ex
-                        );
-                    } else {
-                        throw new IOException("Error while compiling " + name + "\n" 
-                            + out, ex
-                        );
-                    }
-                }
-            }
-
-            for (String resource : scripts.toArray()) {
-                while (resource.startsWith("/")) {
-                    resource = resource.substring(1);
-                }
-                InputStream emul = l.get(resource);
-                if (emul == null) {
-                    throw new IOException("Can't find " + resource);
-                }
-                readResource(emul, out);
-            }
-            scripts = new StringArray();
-            
-            StringArray toInit = StringArray.asList(references.toArray());
-            toInit.reverse();
-
-            for (String ic : toInit.toArray()) {
-                int indx = processed.indexOf(ic);
-                if (indx >= 0) {
-                    out.append(initCode.toArray()[indx]).append("\n");
-                    initCode.toArray()[indx] = "";
-                }
-            }
-        }
-        out.append(
-              "  return vm;\n"
-            + "  };\n"
-            + "  global.bck2brwsr = function() {\n"
-            + "    var args = Array.prototype.slice.apply(arguments);\n"
-            + "    var vm = fillInVMSkeleton({});\n"
-            + "    var loader = {};\n"
-            + "    loader.vm = vm;\n"
-            + "    loader.loadClass = function(name) {\n"
-            + "      var attr = name.replace__Ljava_lang_String_2CC('.','_');\n"
-            + "      var fn = vm[attr];\n"
-            + "      if (fn) return fn(false);\n"
-            + "      return vm.org_apidesign_vm4brwsr_VMLazy(false).\n"
-            + "        load__Ljava_lang_Object_2Ljava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, name, args);\n"
-            + "    }\n"
-            + "    if (vm.loadClass) {\n"
-            + "      throw 'Cannot initialize the bck2brwsr VM twice!';\n"
-            + "    }\n"
-            + "    vm.loadClass = loader.loadClass;\n"
-            + "    vm.loadBytes = function(name) {\n"
-            + "      return vm.org_apidesign_vm4brwsr_VMLazy(false).\n"
-            + "        loadBytes___3BLjava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, name, args);\n"
-            + "    }\n"
-            + "    vm.java_lang_reflect_Array(false);\n"
-            + "    vm.org_apidesign_vm4brwsr_VMLazy(false).\n"
-            + "      loadBytes___3BLjava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, null, args);\n"
-            + "    return loader;\n"
-            + "  };\n");
-        out.append("}(this));");
-    }
-    private static void readResource(InputStream emul, Appendable out) throws IOException {
-        try {
-            int state = 0;
-            for (;;) {
-                int ch = emul.read();
-                if (ch == -1) {
-                    break;
-                }
-                if (ch < 0 || ch > 255) {
-                    throw new IOException("Invalid char in emulation " + ch);
-                }
-                switch (state) {
-                    case 0: 
-                        if (ch == '/') {
-                            state = 1;
-                        } else {
-                            out.append((char)ch);
-                        }
-                        break;
-                    case 1:
-                        if (ch == '*') {
-                            state = 2;
-                        } else {
-                            out.append('/').append((char)ch);
-                            state = 0;
-                        }
-                        break;
-                    case 2:
-                        if (ch == '*') {
-                            state = 3;
-                        }
-                        break;
-                    case 3:
-                        if (ch == '/') {
-                            state = 0;
-                        } else {
-                            state = 2;
-                        }
-                        break;
-                }
-            }
-        } finally {
-            emul.close();
-        }
-    }
-
-    private static InputStream loadClass(Bck2Brwsr.Resources l, String name) throws IOException {
-        return l.get(name + ".class"); // NOI18N
-    }
-
-    static String toString(String name) throws IOException {
-        StringBuilder sb = new StringBuilder();
-//        compile(sb, name);
-        return sb.toString().toString();
-    }
-
-    private StringArray scripts = new StringArray();
-    private StringArray references = new StringArray();
-    
-    @Override
-    protected boolean requireReference(String cn) {
-        if (references.contains(cn)) {
-            return false;
-        }
-        references.add(cn);
-        return true;
-    }
-
-    @Override
-    protected void requireScript(String resourcePath) {
-        scripts.add(resourcePath);
-    }
-
-    @Override
-    String assignClass(String className) {
-        return "vm." + className + " = ";
-    }
-    
-    @Override
-    String accessClass(String className) {
-        return "vm." + className;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/VMLazy.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/VMLazy.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Array;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class VMLazy {
-    private final Object loader;
-    private final Object[] args;
-    
-    private VMLazy(Object loader, Object[] args) {
-        this.loader = loader;
-        this.args = args;
-    }
-    
-    static void init() {
-    }
-    
-    static Object load(Object loader, String name, Object[] arguments) 
-    throws IOException, ClassNotFoundException {
-        return new VMLazy(loader, arguments).load(name, false);
-    }
-    
-    static byte[] loadBytes(Object loader, String name, Object[] arguments) throws Exception {
-        return Zips.loadFromCp(arguments, name);
-    }
-    
-    private Object load(String name, boolean instance)
-    throws IOException, ClassNotFoundException {
-        String res = name.replace('.', '/') + ".class";
-        byte[] arr = Zips.loadFromCp(args, res);
-        if (arr == null) {
-            throw new ClassNotFoundException(name);
-        }
-//        beingDefined(loader, name);
-        StringBuilder out = new StringBuilder();
-        out.append("var loader = arguments[0];\n");
-        out.append("var vm = loader.vm;\n");
-        int prelude = out.length();
-        String initCode = new Gen(this, out).compile(new ByteArrayInputStream(arr));
-        String code = out.toString().toString();
-//        dump("Loading " + name);
-        dump(code);
-        String under = name.replace('.', '_');
-        Object fn = applyCode(loader, under, code, instance);
-        
-        if (!initCode.isEmpty()) {
-            out.setLength(prelude);
-            out.append(initCode);
-            code = out.toString().toString();
-            dump(code);
-            applyCode(loader, null, code, false);
-        }            
-        
-        return fn;
-    }
-
-//    @JavaScriptBody(args = "s", body = "java.lang.System.out.println(s.toString());")
-    static void dump(String s) {
-    }
-
-/* possibly not needed:
-    @JavaScriptBody(args = {"loader", "n" }, body =
-        "var cls = n.replace__Ljava_lang_String_2CC(n, '.','_').toString();" +
-        "loader.vm[cls] = true;\n"
-    )
-    private static native void beingDefined(Object loader, String name);
-*/
-    
-
-    @JavaScriptBody(args = {"loader", "name", "script", "instance" }, body =
-        "try {\n" +
-        "  new Function(script)(loader, name);\n" +
-        "} catch (ex) {\n" +
-        "  throw 'Cannot compile ' + name + ' ' + ex + ' line: ' + ex.lineNumber + ' script:\\n' + script;\n" +
-        "}\n" +
-        "return name != null ? vm[name](instance) : null;\n"
-    )
-    private static native Object applyCode(Object loader, String name, String script, boolean instance);
-    
-    
-    private static final class Gen extends ByteCodeToJavaScript {
-        private final VMLazy lazy;
-
-        public Gen(VMLazy vm, Appendable out) {
-            super(out);
-            this.lazy = vm;
-        }
-        
-        @JavaScriptBody(args = {"n"},
-        body =
-        "var cls = n.replace__Ljava_lang_String_2CC('/','_').toString();"
-        + "\nvar dot = n.replace__Ljava_lang_String_2CC('/','.').toString();"
-        + "\nvar lazy = this._lazy();"
-        + "\nvar loader = lazy._loader();"
-        + "\nvar vm = loader.vm;"
-        + "\nif (vm[cls]) return false;"
-        + "\nvm[cls] = function() {"
-        + "\n  var instance = arguments.length == 0 || arguments[0] === true;"
-        + "\n  return lazy.load__Ljava_lang_Object_2Ljava_lang_String_2Z(dot, instance);"
-        + "\n};"
-        + "\nreturn true;")
-        @Override
-        protected boolean requireReference(String internalClassName) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        protected void requireScript(String resourcePath) throws IOException {
-            InputStream is = getClass().getResourceAsStream(resourcePath);
-            StringBuilder sb = new StringBuilder();
-            for (;;) {
-                int ch = is.read();
-                if (ch == -1) {
-                    break;
-                }
-                sb.append((char)ch);
-            }
-            applyCode(lazy.loader, null, sb.toString(), false);
-        }
-
-        @Override
-        String assignClass(String className) {
-            return "vm[arguments[1]]=";
-        }
-
-        @Override
-        String accessClass(String classOperation) {
-            return "vm." + classOperation;
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/VarType.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/VarType.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.apidesign.javap.RuntimeConstants;
-
-final class VarType {
-    public static final int INTEGER = 0;
-    public static final int LONG = 1;
-    public static final int FLOAT = 2;
-    public static final int DOUBLE = 3;
-    public static final int REFERENCE = 4;
-
-    public static final int LAST = REFERENCE;
-
-    private VarType() {
-    }
-
-    public static boolean isCategory2(final int varType) {
-        return (varType == LONG) || (varType == DOUBLE);
-    }
-
-    public static int fromStackMapType(final int smType) {
-        switch (smType & 0xff) {
-            case RuntimeConstants.ITEM_Integer:
-                return VarType.INTEGER;
-            case RuntimeConstants.ITEM_Float:
-                return VarType.FLOAT;
-            case RuntimeConstants.ITEM_Double:
-                return VarType.DOUBLE;
-            case RuntimeConstants.ITEM_Long:
-                return VarType.LONG;
-            case RuntimeConstants.ITEM_Null:
-            case RuntimeConstants.ITEM_InitObject:
-            case RuntimeConstants.ITEM_Object:
-            case RuntimeConstants.ITEM_NewObject:
-                return VarType.REFERENCE;
-
-            case RuntimeConstants.ITEM_Bogus:
-                /* unclear how to handle for now */
-            default:
-                throw new IllegalStateException("Unhandled stack map type");
-        }
-    }
-
-    public static int fromConstantType(final byte constantTag) {
-        switch (constantTag) {
-            case RuntimeConstants.CONSTANT_INTEGER:
-                return VarType.INTEGER;
-            case RuntimeConstants.CONSTANT_FLOAT:
-                return VarType.FLOAT;
-            case RuntimeConstants.CONSTANT_LONG:
-                return VarType.LONG;
-            case RuntimeConstants.CONSTANT_DOUBLE:
-                return VarType.DOUBLE;
-
-            case RuntimeConstants.CONSTANT_CLASS:
-            case RuntimeConstants.CONSTANT_UTF8:
-            case RuntimeConstants.CONSTANT_UNICODE:
-            case RuntimeConstants.CONSTANT_STRING:
-                return VarType.REFERENCE;
-
-            case RuntimeConstants.CONSTANT_FIELD:
-            case RuntimeConstants.CONSTANT_METHOD:
-            case RuntimeConstants.CONSTANT_INTERFACEMETHOD:
-            case RuntimeConstants.CONSTANT_NAMEANDTYPE:
-                /* unclear how to handle for now */
-            default:
-                throw new IllegalStateException("Unhandled constant tag");
-        }
-    }
-
-    public static int fromFieldType(final char fieldType) {
-        switch (fieldType) {
-            case 'B':
-            case 'C':
-            case 'S':
-            case 'Z':
-            case 'I':
-                return VarType.INTEGER;
-            case 'J':
-                return VarType.LONG;
-            case 'F':
-                return VarType.FLOAT;
-            case 'D':
-                return VarType.DOUBLE;
-            case 'L':
-            case '[':
-                return VarType.REFERENCE;
-
-            default:
-                throw new IllegalStateException("Unhandled field type");
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/Variable.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/Variable.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-final class Variable implements CharSequence {
-    private static final String STACK_VAR_PREFIX = "st";
-    private static final String LOCAL_VAR_PREFIX = "lc";
-
-    private final String name;
-    private final int type;
-    private final int index;
-
-    private static final char[] TYPE_IDS = { 'I', 'L', 'F', 'D', 'A' };
-
-    private Variable(final String prefix, final int type, final int index) {
-        this.name = prefix + TYPE_IDS[type] + index;
-        this.type = type;
-        this.index = index;
-    }
-
-    public static Variable getStackVariable(
-            final int type, final int index) {
-        // TODO: precreate frequently used variables
-        return new Variable(STACK_VAR_PREFIX, type, index);
-    }
-
-    public static Variable getLocalVariable(
-            final int type, final int index) {
-        // TODO: precreate frequently used variables
-        return new Variable(LOCAL_VAR_PREFIX, type, index);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public int getIndex() {
-        return index;
-    }
-
-    public boolean isCategory2() {
-        return VarType.isCategory2(type);
-    }
-
-    @Override
-    public int length() {
-        return name.length();
-    }
-
-    @Override
-    public char charAt(final int index) {
-        return name.charAt(index);
-    }
-
-    @Override
-    public CharSequence subSequence(final int start, final int end) {
-        return name.subSequence(start, end);
-    }
-
-    @Override
-    public int hashCode() {
-        return name.hashCode();
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-        if (this == other) {
-            return true;
-        }
-        if (!(other instanceof Variable)) {
-            return false;
-        }
-
-        return name.equals(((Variable) other).name);
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/main/java/org/apidesign/vm4brwsr/Zips.java
--- a/vm/src/main/java/org/apidesign/vm4brwsr/Zips.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.emul.zip.FastJar;
-
-/** Conversion from classpath to load function.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-final class Zips {
-    private final FastJar fj;
-
-    private Zips(String path, byte[] zipData) throws IOException {
-        long bef = timeNow();
-        fj = new FastJar(zipData);
-        for (FastJar.Entry e : fj.list()) {
-            putRes(e.name, e);
-        }
-        log("Iterating thru " + path + " took " + (timeNow() - bef) + "ms");
-    }
-    
-    public static void init() {
-    }
-    @JavaScriptBody(args = { "arr" }, body = "return arr.length;")
-    private static native int length(Object arr);
-    @JavaScriptBody(args = { "arr", "index" }, body = "return arr[index];")
-    private static native Object at(Object arr, int index);
-    @JavaScriptBody(args = { "arr", "index", "value" }, body = "arr[index] = value; return value;")
-    private static native Object set(Object arr, int index, Object value);
-    
-    public static byte[] loadFromCp(Object classpath, String res) 
-    throws IOException, ClassNotFoundException {
-        for (int i = 0; i < length(classpath); i++) {
-            Object c = at(classpath, i);
-            if (c instanceof String) {
-                try {
-                    String url = (String)c;
-                    final Zips z = toZip(url);
-                    c = set(classpath, i, z);
-                    final byte[] man = z.findRes("META-INF/MANIFEST.MF");
-                    if (man != null) {
-                        String mainClass = processClassPathAttr(man, url, classpath);
-//                        if (mainClass != null) {
-//                            Class.forName(mainClass);
-//                        }
-                    }
-                } catch (IOException ex) {
-                    set(classpath, i, ex);
-                    log("Cannot load " + c + " - " + ex.getClass().getName() + ":" + ex.getMessage());
-                }
-            }
-            if (res != null) {
-                byte[] checkRes;
-                if (c instanceof Zips) {
-                    checkRes = ((Zips)c).findRes(res);
-                } else {
-                    checkRes = callFunction(c, res);
-                }
-                if (checkRes != null) {
-                    return checkRes;
-                }
-            }
-        }
-        return null;
-    }
-    
-    @JavaScriptBody(args = { "fn", "res" }, body = 
-        "if (typeof fn === 'function') return fn(res);\n"
-      + "return null;"
-    )
-    private static native byte[] callFunction(Object fn, String res);
-    
-    @JavaScriptBody(args = { "msg" }, body = "console.log(msg.toString());")
-    private static native void log(String msg);
-
-    private byte[] findRes(String res) throws IOException {
-        Object arr = findResImpl(res);
-        if (arr instanceof FastJar.Entry) {
-            long bef = timeNow();
-            InputStream zip = fj.getInputStream((FastJar.Entry)arr);
-            arr = readFully(new byte[512], zip);
-            putRes(res, arr);
-            log("Reading " + res + " took " + (timeNow() - bef) + "ms");
-        }
-        return (byte[]) arr;
-    }
-
-    @JavaScriptBody(args = { "res" }, body = "var r = this[res]; return r ? r : null;")
-    private native Object findResImpl(String res);
-
-    @JavaScriptBody(args = { "res", "arr" }, body = "this[res] = arr;")
-    private native void putRes(String res, Object arr);
-    
-    private static Zips toZip(String path) throws IOException {
-        URL u = new URL(path);
-        byte[] zipData = (byte[]) u.getContent(new Class[] { byte[].class });
-        return new Zips(path, zipData);
-    }
-
-    private static String processClassPathAttr(final byte[] man, String url, Object classpath) throws IOException {
-        try (ParseMan is = new ParseMan(new ByteArrayInputStream(man))) {
-            String cp = is.toString();
-            if (cp != null) {
-                cp = cp.trim();
-                for (int p = 0; p < cp.length();) {
-                    int n = cp.indexOf(' ', p);
-                    if (n == -1) {
-                        n = cp.length();
-                    }
-                    String el = cp.substring(p, n);
-                    URL u = new URL(new URL(url), el);
-                    classpath = addToArray(classpath, u.toString());
-                    p = n + 1;
-                }
-            }
-            return is.getMainClass();
-        }
-    }
-
-    private static Object addToArray(Object arr, String value) {
-        final int last = length(arr);
-        Object ret = enlargeArray(arr, last + 1);
-        set(ret, last, value);
-        return ret;
-    }
-
-    @JavaScriptBody(args = { "arr", "len" }, body = "while (arr.length < len) arr.push(null); return arr;")
-    private static native Object enlargeArray(Object arr, int len);
-    @JavaScriptBody(args = { "arr", "len" }, body = "while (arr.length < len) arr.push(0);")
-    private static native void enlargeBytes(byte[] arr, int len);
-
-    @JavaScriptBody(args = { "arr", "len" }, body = "arr.splice(len, arr.length - len);")
-    private static native void sliceArray(byte[] arr, int len);
-
-    private static Object readFully(byte[] arr, InputStream zip) throws IOException {
-        int offset = 0;
-        for (;;) {
-            int len = zip.read(arr, offset, arr.length - offset);
-            if (len == -1) {
-                break;
-            }
-            offset += len;
-            if (offset == arr.length) {
-                enlargeBytes(arr, arr.length + 4096);
-            }
-        }
-        sliceArray(arr, offset);
-        return arr;
-    }
-
-    private static long timeNow() {
-        double time = m();
-        if (time >= 0) {
-            return (long)time;
-        }
-        return org.apidesign.bck2brwsr.emul.lang.System.currentTimeMillis();
-    }
-    @JavaScriptBody(args = {}, body = 
-        "if (typeof window.performance === 'undefined') return -1;\n"
-      + "if (typeof window.performance.now === 'undefined') return -1;\n"
-      + "return window.performance.now();"
-    )
-    private static native double m();
-    
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/Array.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/Array.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class Array {
-    byte[] bytes = { 1 };
-    short[] shorts = { 2, 3 };
-    int[] ints = { 4, 5, 6 };
-    float[] floats = { 7, 8, 9, 10 };
-    double[][] doubles = { {11}, {12}, {13}, {14}, {15} };
-    char[] chars = { 'a', 'b' };
-    
-    private Array() {
-    }
-    
-    byte bytes() {
-        return bytes[0];
-    }
-    short shorts() {
-        return shorts[1];
-    }
-    
-    int[] ints() {
-        return ints;
-    }
-    
-    float floats() {
-        return floats[3];
-    }
-    
-    double doubles() {
-        return doubles[4][0];
-    }
-    
-    static double[][] dbls = new double[1][2];
-    public static double twoDoubles() {
-        return dbls[0][0] + dbls[0][0];
-    }
-
-    static int[][] tints = new int[1][2];
-    public static int twoInts() {
-        return tints[0][0] + tints[0][0];
-    }
-    
-    private static final Array[] ARR = { new Array(), new Array(), new Array() };
-    
-    private static Array[][] arr() {
-        Array[][] matrix = new Array[3][3];
-        for (int i = 0; i < ARR.length; i++) {
-            matrix[i][i] = ARR[i];
-        }
-        return matrix;
-    }
-    private static <T> T[] filter(T[] in) {
-        return in;
-    }
-    
-    public static double sum() {
-        double sum = 0.0;
-        for (Array[] row : arr()) {
-            int indx = -1;
-            for (Array a : row) {
-                indx++;
-                if (a == null) {
-                    continue;
-                }
-                sum += a.bytes();
-                sum += a.shorts();
-                sum += a.ints()[2];
-                sum += a.floats();
-                sum += filter(row)[indx].doubles();
-            }
-        }
-        return sum;
-    }
-    private static final int[] arr = { 0, 1, 2, 3, 4, 5 };
-    public static int simple(boolean clone) {
-        int[] ar;
-        if (clone) {
-            ar = arr.clone();
-        } else {
-            ar = arr;
-        }
-        
-        int sum = 0;
-        for (int a : ar) {
-            sum += a;
-        }
-        return sum;
-    }
-    
-    public static String objectArrayClass() {
-        return Object[].class.getName();
-    }
-    
-    public static boolean instanceOfArray(Object obj) {
-        return obj instanceof Object[];
-    }
-    
-    public static int sum(int size) {
-        int[] arr = new int[size];
-        return arr[0] + arr[1];
-    }
-    
-    static void arraycopy(char[] value, int srcBegin, char[] dst, int dstBegin, int count) {
-        while (count-- > 0) {
-            dst[dstBegin++] = value[srcBegin++];
-        }
-    }
-
-    public static char copyArray() {
-        char[] arr = { '0' };
-        arraycopy(arr()[0][0].chars, 0, arr, 0, 1);
-        return arr[0];
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/ArrayTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ArrayTest {
-    @Test public void intArrayShouldBeFilledWithZeroes() throws Exception {
-            assertExec("0 + 0", Array.class, "sum__II", 
-            Double.valueOf(0), 2
-        );
-    }
-    @Test public void verifySimpleIntOperation() throws Exception {
-            assertExec("CheckTheSum", Array.class, "simple__IZ", 
-            Double.valueOf(15), false
-        );
-    }
-    
-    @Test public void cloneOnArray() throws Exception {
-            assertExec("CheckTheSum on clone", Array.class, "simple__IZ", 
-            Double.valueOf(15), true
-        );
-    }
-    
-    @Test public void realOperationOnArrays() throws Exception {
-        assertEquals(Array.sum(), 105.0, "Computes to 105");
-    }
-    
-    @Test public void verifyOperationsOnArrays() throws Exception {
-        assertExec("The sum is 105", Array.class, "sum__D", 
-            Double.valueOf(105)
-        );
-    }
-
-    @Test public void twoDoubles() throws Exception {
-        assertExec("Elements are initialized", Array.class, "twoDoubles__D", 
-            Double.valueOf(0)
-        );
-    }
-    @Test public void twoInts() throws Exception {
-        assertExec("Elements are initialized", Array.class, "twoInts__I", 
-            Double.valueOf(0)
-        );
-    }
-    
-    @Test public void doesCopyArrayWork() throws Exception {
-        assertExec("Returns 'a'", Array.class, "copyArray__C", Double.valueOf('a'));
-    }
-
-    @Test public void verifyObjectArrayClass() throws Exception {
-        assertExec("Returns 'Object[]'", Array.class, "objectArrayClass__Ljava_lang_String_2", Array.objectArrayClass());
-    }
-    @Test public void verifyInstanceOfArray() throws Exception {
-        assertExec("Returns 'false'", Array.class, "instanceOfArray__ZLjava_lang_Object_2", Double.valueOf(0), "non-array");
-    }
-    
-    private static TestVM code;
-    
-    @BeforeClass 
-    public void compileTheCode() throws Exception {
-        code = TestVM.compileClass("org/apidesign/vm4brwsr/Array");
-    }
-    private static void assertExec(String msg, Class clazz, String method, Object expRes, Object... args) throws Exception {
-        code.assertExec(msg, clazz, method, expRes, args);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/ByteCodeToJavaScriptTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/ByteCodeToJavaScriptTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ByteCodeToJavaScriptTest {
-    
-    public ByteCodeToJavaScriptTest() {
-    }
-
-    @Test
-    public void findMethodNameManglesObjectsCorrectly() {
-        StringBuilder cnt = new StringBuilder();
-        char[] returnType = { 'V' };
-        String ret = ByteCodeToJavaScript.findMethodName(new String[] { 
-            "StringTest", "replace", "(Ljava/lang/String;CC)Ljava/lang/String;"
-        }, cnt, returnType);
-        assertEquals(cnt.toString(), "000", "No doubles or longs");
-        assertTrue(returnType[0] != 'V', "Returns string");
-        assertEquals(ret, "replace__Ljava_lang_String_2Ljava_lang_String_2CC");
-    }
-
-    @Test
-    public void manglingArrays() {
-        StringBuilder cnt = new StringBuilder();
-        char[] returnType = { 'V' };
-        String ret = ByteCodeToJavaScript.findMethodName(new String[] { 
-            "VMinVM", "toJavaScript", "([B)Ljava/lang/String;"
-        }, cnt, returnType);
-        assertEquals(cnt.toString(), "0", "No doubles or longs");
-        assertTrue(returnType[0] != 'V', "Returns string");
-        assertEquals(ret, "toJavaScript__Ljava_lang_String_2_3B");
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/BytesLoader.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/BytesLoader.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class BytesLoader {
-    private static Set<String> requested = new TreeSet<String>();
-
-    public byte[] get(String name) throws IOException {
-        if (!requested.add(name)) {
-            throw new IllegalStateException("Requested for second time: " + name);
-        }
-        byte[] arr = readClass(name);
-        /*
-        System.err.print("loader['" + name + "'] = [");
-        for (int i = 0; i < arr.length; i++) {
-        if (i > 0) {
-        System.err.print(", ");
-        }
-        System.err.print(arr[i]);
-        }
-        System.err.println("]");
-         */
-        return arr;
-    }
-
-    static byte[] readClass(String name) throws IOException {
-        URL u = null;
-        Enumeration<URL> en = BytesLoader.class.getClassLoader().getResources(name);
-        while (en.hasMoreElements()) {
-            u = en.nextElement();
-        }
-        if (u == null) {
-            throw new IOException("Can't find " + name);
-        }
-        try (InputStream is = u.openStream()) {
-            byte[] arr;
-            arr = new byte[is.available()];
-            int offset = 0;
-            while (offset < arr.length) {
-                int len = is.read(arr, offset, arr.length - offset);
-                if (len == -1) {
-                    throw new IOException("Can't read " + name);
-                }
-                offset += len;
-            }
-            return arr;
-        }
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ClassTest {
-
-    @Test public void superClassEqualsGetSuperclass() {
-        assertTrue(Classes.equalsClassesOfExceptions(), "Classes are equal");
-    }
-
-    @Test public void jsSuperClassEqualsGetSuperclass() throws Exception {
-        assertExec("Classes are equal", Classes.class, "equalsClassesOfExceptions__Z", Double.valueOf(1.0));
-    }
-
-    @Test public void classesAreDifferent() {
-        assertTrue(Classes.differenceInClasses(), "Classes are not equal");
-    }
-
-    @Test public void jsClassesAreDifferent() throws Exception {
-        assertExec("Classes are not equal", Classes.class, "differenceInClasses__Z", Double.valueOf(1.0));
-    }
-
-    @Test public void javaInstanceName() throws Exception {
-        assertEquals(Classes.classForInstance(), "java.io.IOException");
-    }
-    @Test public void jsInstanceName() throws Exception {
-        assertExec("I/O name", Classes.class, "classForInstance__Ljava_lang_String_2", "java.io.IOException");
-    }
-    @Test public void javaName() throws Exception {
-        assertEquals(Classes.name(), "java.io.IOException");
-    }
-    @Test public void jsName() throws Exception {
-        assertExec("I/O name", Classes.class, "name__Ljava_lang_String_2", "java.io.IOException");
-    }
-    @Test public void javaSimpleName() throws Exception {
-        assertEquals(Classes.simpleName(), "IOException");
-    }
-    @Test public void jsGetsSimpleName() throws Exception {
-        assertExec("I/O simple name", Classes.class, "simpleName__Ljava_lang_String_2", "IOException");
-    }
-    @Test public void javaCanonicalName() {
-        assertEquals(Classes.canonicalName(), "java.io.IOException");
-    }
-    @Test public void jsCanonicalName() throws Exception {
-        assertExec("I/O simple name", Classes.class, "canonicalName__Ljava_lang_String_2", "java.io.IOException");
-    }
-    @Test public void javaNewInstance() throws Exception {
-        assertTrue(Classes.newInstance());
-    }
-    @Test public void jsNewInstance() throws Exception {
-        assertExec("Check new instance", Classes.class, "newInstance__Z", Double.valueOf(1));
-    }
-    @Test public void javaNoNewInstance() throws Exception {
-        assertEquals("java.lang.InstantiationException:java.lang.Float", 
-            Classes.newInstanceNoPubConstructor()
-        );
-    }
-    @Test public void jsNoNewInstance() throws Exception {
-        assertExec("Check problems with new instance", Classes.class, "newInstanceNoPubConstructor__Ljava_lang_String_2", 
-            "java.lang.InstantiationException:java.lang.Float"
-        );
-    }
-    @Test public void jsAnnotation() throws Exception {
-        assertExec("Check class annotation", Classes.class, "getMarker__I", Double.valueOf(10));
-    }
-    @Test public void jsArrayAnnotation() throws Exception {
-        assertExec("Check array annotation", Classes.class, "getMarkerNicknames__Ljava_lang_String_2", Classes.getMarkerNicknames());
-    }
-    @Test public void jsEnumAnnotation() throws Exception {
-        assertExec("Check enum annotation", Classes.class, "getMarkerE__Ljava_lang_String_2", Classes.getMarkerE());
-    }
-    @Test public void jsRetentionAnnotation() throws Exception {
-        assertExec("Check enum annotation", Classes.class, "getRetention__Ljava_lang_String_2", Classes.getRetention());
-    }
-    @Test public void jsStringAnnotation() throws Exception {
-        assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", true);
-    }
-    @Test public void jsStringAnnotationFromArray() throws Exception {
-        assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", false);
-    }
-    @Test public void jsInnerAnnotation() throws Exception {
-        assertExec("Check inner annotation", Classes.class, "getInnerNamer__I", Double.valueOf(Classes.getInnerNamer()));
-    }
-    @Test public void jsInnerAnnotationFromArray() throws Exception {
-        assertExec("Check inner annotation", Classes.class, "getInnerNamers__I", Double.valueOf(Classes.getInnerNamers()));
-    }
-    @Test public void javaInvokeMethod() throws Exception {
-        assertEquals(Classes.reflectiveMethodCall(true, "name"), "java.io.IOException", "Calls the name() method via reflection");
-    }
-    @Test public void jsInvokeMethod() throws Exception {
-        assertExec("Calls the name() method via reflection", Classes.class, 
-            "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", 
-            "java.io.IOException", true, "name"
-        );
-    }
-    
-    @Test public void jsMethodDeclaredInObject() throws Exception {
-        assertExec("Defined in Object", Classes.class, 
-            "objectName__Ljava_lang_String_2", 
-            "java.lang.Object"
-        );
-    }
-    
-    @Test public void jsInvokeParamMethod() throws Exception {
-        assertExec("sums two numbers via reflection", Classes.class, 
-            "reflectiveSum__III", Double.valueOf(5), 2, 3
-        );
-    }
-    @Test public void javaFindMethod() throws Exception {
-        assertEquals(Classes.reflectiveMethodCall(false, "name"), "java.io.IOException", "Calls the name() method via reflection");
-    }
-    @Test public void jsFindMethod() throws Exception {
-        assertExec("Calls the name() method via reflection", Classes.class, 
-            "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", 
-            "java.io.IOException", false, "name"
-        );
-    }
-    @Test public void primitiveReturnType() throws Exception {
-        assertExec("Tries to get an integer via reflection", Classes.class, 
-            "primitiveType__Ljava_lang_String_2Ljava_lang_String_2", 
-            Classes.primitiveType("primitive"), "primitive"
-        );
-    }
-    @Test public void primitiveBoolReturnType() throws Exception {
-        assertExec("Tries to get an integer via reflection", Classes.class, 
-            "primitiveType__Ljava_lang_String_2Ljava_lang_String_2", 
-            Classes.primitiveType("primitiveB"), "primitiveB"
-        );
-    }
-    @Test public void javaAnnotatedMethod() throws Exception {
-        assertEquals(Classes.reflectiveMethodCall(false, null), "java.io.IOException", "Calls the name() method via reflection");
-    }
-    @Test public void jsAnnotatedMethod() throws Exception {
-        assertExec("Calls the name() method via reflection", Classes.class, 
-            "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", 
-            "java.io.IOException", false, null
-        );
-    }
-    @Test public void jsClassParam() throws Exception {
-        assertExec("Calls the nameOfIO()", Classes.class, 
-            "nameOfIO__Ljava_lang_String_2", 
-            "java.io.IOException"
-        );
-    }
-    @Test public void noInterface() throws Exception {
-        assertExec("Calls Class.isInterface", Classes.class, 
-            "isInterface__ZLjava_lang_String_2", 
-            0.0, "java.lang.String"
-        );
-    }
-    @Test public void isInterface() throws Exception {
-        assertExec("Calls Class.isInterface", Classes.class, 
-            "isInterface__ZLjava_lang_String_2", 
-            1.0, "java.lang.Runnable"
-        );
-    }
-    @Test public void integerType() throws Exception {
-        assertExec("Computes the type", Classes.class, 
-            "intType__Ljava_lang_String_2", 
-            Classes.intType()
-        );
-    }
-    
-    private static TestVM code;
-    
-    @BeforeClass
-    public void compileTheCode() throws Exception {
-        code = TestVM.compileClass("org/apidesign/vm4brwsr/Classes");
-    }
-    
-    private void assertExec(
-        String msg, Class clazz, String method, Object expRes, Object... args
-    ) throws Exception {
-        code.assertExec(msg, clazz, method, expRes, args);
-    }
-    @Test public void isClassAssignable() throws Exception {
-        assertExec("isAssignable works on subclasses", Classes.class, 
-            "isClassAssignable__Z", 
-            true
-        );
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/Classes.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/Classes.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ClassesMarker(number = 10, nicknames = { "Ten", "Deset" }, count = ClassesMarker.E.TWO, subs = {
-    @ClassesMarker.Anno(Integer.SIZE),
-    @ClassesMarker.Anno(Integer.MIN_VALUE)
-})
-@ClassesNamer(name = "my text", anno = @ClassesMarker.Anno(333))
-public class Classes {
-    public static String nameOfIO() {
-        return nameFor(IOException.class);
-    }
-    
-    private static String nameFor(Class<?> c) {
-        return c.getName();
-    }
-    
-    private static final Class<?> PRELOAD = Runnable.class;
-    
-    public static boolean isInterface(String s) throws ClassNotFoundException {
-        return Class.forName(s).isInterface();
-    }
-    
-    public static boolean equalsClassesOfExceptions() {
-        return MalformedURLException.class.getSuperclass() == IOException.class;
-    }
-    public static boolean differenceInClasses() {
-        Class<?> c1 = MalformedURLException.class;
-        Class<?> c2 = IOException.class;
-        return c1 != c2;
-    }
-    
-    public static String classForInstance() {
-        return new IOException().getClass().getName().toString();
-    }
-    
-    @ClassesMarker(number = 1, nicknames = { "One", "Jedna" } )
-    public static String name() {
-        return IOException.class.getName().toString();
-    }
-    public static String simpleName() {
-        return IOException.class.getSimpleName();
-    }
-    public static String canonicalName() {
-        return IOException.class.getCanonicalName();
-    }
-    
-    public static String objectName() throws NoSuchMethodException {
-        return IOException.class.getMethod("wait").getDeclaringClass().getName();
-    }
-    
-    public static boolean newInstance() throws Exception {
-        IOException ioe = IOException.class.newInstance();
-        if (ioe instanceof IOException) {
-            return ioe.getClass() == IOException.class;
-        }
-        throw new IllegalStateException("Not a subtype: " + ioe);
-    }
-    public static String newInstanceNoPubConstructor() throws Exception {
-        try {
-            Float f = Float.class.newInstance();
-            return "wrong, can't instantiate: " + f;
-        } catch (Exception ex) {
-            return (ex.getClass().getName() + ":" + ex.getMessage()).toString().toString();
-        }
-    }
-    public static int getMarker() {
-        if (!Classes.class.isAnnotationPresent(ClassesMarker.class)) {
-            return -2;
-        }
-        ClassesMarker cm = Classes.class.getAnnotation(ClassesMarker.class);
-        assert cm instanceof Object : "Is object " + cm;
-        assert cm instanceof Annotation : "Is annotation " + cm;
-        assert !((Object)cm instanceof Class) : "Is not Class " + cm;
-        return cm == null ? -1 : cm.number();
-    }
-    public static String getMarkerNicknames() {
-        ClassesMarker cm = Classes.class.getAnnotation(ClassesMarker.class);
-        if (cm == null) {
-            return null;
-        }
-        
-        final Object[] arr = cm.nicknames();
-        assert arr instanceof Object[] : "Instance of Object array: " + arr;
-        assert arr instanceof String[] : "Instance of String array: " + arr;
-        assert !(arr instanceof Integer[]) : "Not instance of Integer array: " + arr;
-        
-        StringBuilder sb = new StringBuilder();
-        for (String s : cm.nicknames()) {
-            sb.append(s).append("\n");
-        }
-        return sb.toString().toString();
-    }
-    @Retention(RetentionPolicy.CLASS)
-    @interface Ann {
-    }
-    
-    public static String getRetention() throws Exception {
-        Retention r = Ann.class.getAnnotation(Retention.class);
-        assert r != null : "Annotation is present";
-        assert r.value() == RetentionPolicy.CLASS : "Policy value is OK: " + r.value();
-        return r.annotationType().getName();
-    }
-    public static String getMarkerE() {
-        ClassesMarker cm = Classes.class.getAnnotation(ClassesMarker.class);
-        if (cm == null) {
-            return null;
-        }
-        return cm.count().name();
-    }
-    public static String getNamer(boolean direct) {
-        if (direct) {
-            ClassesNamer cm = Classes.class.getAnnotation(ClassesNamer.class);
-            return cm == null ? null : cm.name();
-        }
-        for (Annotation a : Classes.class.getAnnotations()) {
-            if (a instanceof ClassesNamer) {
-                return ((ClassesNamer)a).name();
-            }
-        }
-        return null;
-    }
-    public static int getInnerNamer() {
-        ClassesNamer cm = Classes.class.getAnnotation(ClassesNamer.class);
-        assert cm != null : "ClassesNamer is present";
-        return cm.anno().value();
-    }
-    public static int getInnerNamers() {
-        ClassesMarker cm = Classes.class.getAnnotation(ClassesMarker.class);
-        assert cm != null : "ClassesNamer is present";
-        int sum = 0;
-        for (ClassesMarker.Anno anno : cm.subs()) {
-            sum += anno.value();
-        }
-        return sum;
-    }
-    
-    public static String intType() {
-        return Integer.TYPE.getName();
-    }
-    
-    public static int primitive() {
-        return 1;
-    }
-    public static boolean primitiveB() {
-        return true;
-    }
-    
-    public static String primitiveType(String method) throws Exception {
-        return reflectiveMethodCall(false, method).getClass().getName();
-    }
-    
-    @JavaScriptBody(args = "msg", body = "throw msg;")
-    private static native void thrw(String msg);
-    
-    public static Object reflectiveMethodCall(boolean direct, String mn) throws Exception {
-        Method find = null;
-        StringBuilder sb = new StringBuilder();
-        if (!direct) {
-            final Class<? extends Annotation> v = ClassesMarker.class;
-            for (Method m : Classes.class.getMethods()) {
-                sb.append("\n").append(m.getName());
-                if (mn != null) {
-                    if (m.getName().equals(mn)) {
-                        find = m;
-                        break;
-                    }
-                } else {
-                    if (m.getAnnotation(v) != null) {
-                        find = m;
-                        break;
-                    }
-                }
-            }
-        } else {
-            find = Classes.class.getMethod(mn);
-        }
-        if (find == null) {
-            thrw(sb.toString());
-            throw new NullPointerException(sb.toString());
-        }
-        return find.invoke(null);
-    }
-    
-    public static int reflectiveSum(int a, int b) throws Exception {
-        Method m = StaticMethod.class.getMethod("sum", int.class, int.class);
-        return (int) m.invoke(null, a, b);
-    }
-    
-    private abstract class Application {
-        public abstract int getID();
-    }
-
-    private class MyApplication extends Application {
-        @Override
-        public int getID() {
-            return 1;
-        }
-    }
-
-    public static boolean isClassAssignable() {
-        return Application.class.isAssignableFrom(MyApplication.class);
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/ClassesMarker.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/ClassesMarker.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ClassesMarker {
-    int number();
-    String[] nicknames();
-    E count() default E.ONE;
-    
-    enum E {
-        ONE, TWO;
-    }
-    
-    Anno[] subs() default {};
-    
-    public @interface Anno {
-        int value();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/ClassesNamer.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/ClassesNamer.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ClassesNamer {
-    String name();
-    ClassesMarker.Anno anno();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/Exceptions.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/Exceptions.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- *
- * @author tom
- */
-public class Exceptions {
-    private Exceptions() {
-    }
-
-    public static int methodWithTryCatchNoThrow() {
-        int res = 0;
-        try {
-            res = 1;
-        } catch (IllegalArgumentException e) {
-            res = 2;
-        }
-        //join point
-        return res;
-    }
-
-    public static int methodWithTryCatchThrow() {
-        int res = 0;
-        try {
-            res = 1;
-            throw new IllegalArgumentException();
-        } catch (IllegalArgumentException e) {
-            res = 2;
-        }
-        //join point
-        return res;
-    }
-    
-    @JavaScriptBody(args = "msg", body = "throw msg;")
-    public static void thrw(String msg) {}
-    
-    public static String catchThrowableCatchesAll() {
-        try {
-            thrw("Hello!");
-            return "Not here!";
-        } catch (Throwable ex) {
-            return ex.getMessage();
-        }
-    }
-
-    public static String newInstance(String n) {
-        try {
-            Class c;
-            try {
-                c = Class.forName(n);
-            } catch (ClassNotFoundException ex) {
-                return ("CNFE:" + ex.getMessage()).toString();
-            }
-            return c.newInstance().getClass().getName();
-        } catch (InstantiationException | IllegalAccessException ex) {
-            return ex.getMessage();
-        }
-    }
-    
-    private static int counter;
-    public static int readCounter(String n) throws ClassNotFoundException {
-        try {
-            Class.forName(n);
-        } finally {
-            counter++;
-        }
-        return counter;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/ExceptionsTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/ExceptionsTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import javax.script.ScriptException;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Tomas Zezula <tzezula@netbeans.org>
- */
-public class ExceptionsTest {
-    @Test
-    public void verifyMethodWithTryCatchNoThrow() throws Exception {
-            assertExec(
-                    "No throw",
-                    Exceptions.class,
-                    "methodWithTryCatchNoThrow__I",
-                    new Double(1.0));
-    }
-
-    @Test
-    public void catchJavaScriptStringAsThrowable() throws Exception {
-        assertExec(
-            "Throw hello!",
-            Exceptions.class,
-            "catchThrowableCatchesAll__Ljava_lang_String_2",
-            "Hello!"
-        );
-    }
-
-    @Test
-    public void verifyMethodWithTryCatchThrow() throws Exception {
-            assertExec(
-                    "Throw",
-                    Exceptions.class,
-                    "methodWithTryCatchThrow__I",
-                    new Double(2.0));
-    }
-    
-    @Test public void createObject() throws Exception {
-        assertExec("Object created", Exceptions.class, 
-            "newInstance__Ljava_lang_String_2Ljava_lang_String_2",
-            "java.lang.Object",
-            "java.lang.Object"
-        );
-    }
-
-    @Test public void createFloatFails() throws Exception {
-        assertExec("Float not created", Exceptions.class, 
-            "newInstance__Ljava_lang_String_2Ljava_lang_String_2",
-            "java.lang.Float",
-            "java.lang.Float"
-        );
-    }
-
-    @Test public void createUnknownFails() throws Exception {
-        assertExec("Object created", Exceptions.class, 
-            "newInstance__Ljava_lang_String_2Ljava_lang_String_2",
-            "CNFE:org.apidesign.Unknown",
-            "org.apidesign.Unknown"
-        );
-    }
-    
-    @Test public void testThreeCalls() throws Exception {
-        Object clazz = code.loadClass("loadClass", Exceptions.class.getName());
-        
-        String method = "readCounter__ILjava_lang_String_2";
-        
-        try {
-            Object ret = code.invokeMethod(clazz, method, "org.apidesign.Unknown");
-            fail("We expect an CNFE!");
-        } catch (ScriptException scriptException) {
-            // script exception should be OK
-        }
-        {
-            // 2nd invocation
-            Object ret = code.invokeMethod(clazz, method, "java.lang.String");
-            assertEquals(ret, Double.valueOf(2));
-        }
-        {
-            // 3rd invocation
-            Object ret = code.invokeMethod(clazz, method, "java.lang.Integer");
-            assertEquals(ret, Double.valueOf(3));
-        }
-    }
-    
-    private static TestVM code;
-    
-    @BeforeClass 
-    public void compileTheCode() throws Exception {
-        code = TestVM.compileClass("org/apidesign/vm4brwsr/Exceptions");
-    }
-    private static void assertExec(String msg, Class clazz, String method, Object expRes, Object... args) throws Exception {
-        code.assertExec(msg, clazz, method, expRes, args);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/GetByte.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/GetByte.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-public interface GetByte {
-    public byte getByte();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/Instance.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/Instance.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class Instance {
-    private int in;
-    protected short s;
-    public double d;
-    private float f;
-    protected byte b = (byte)31;
-    
-    private Instance() {
-    }
-
-    public Instance(int i, double d) {
-        this.in = i;
-        this.d = d;
-    }
-    public byte getByte() {
-        return b;
-    }
-    
-    public void setByte(byte b) {
-        this.b = b;
-    }
-    public static double defaultDblValue() {
-        Instance create = new Instance();
-        return create.d;
-    }
-    
-    public static byte assignedByteValue() {
-        return new Instance().b;
-    }
-    public static double magicOne() {
-        Instance i = new Instance(10, 3.3d);
-        i.b = (byte)0x09;
-        return (i.in - i.b) * i.d;
-    }
-    public static int virtualBytes() {
-        Instance i = new InstanceSub(7, 2.2d);
-        i.setByte((byte)0x0a);
-        Instance i2 = new Instance(3, 333.0d);
-        i2.setByte((byte)44);
-        return i.getByte() + i2.getByte();
-    }
-    public static float interfaceBytes() {
-        GetByte i = new InstanceSub(7, 2.2d);
-        return i.getByte();
-    }
-    public static boolean instanceOf(int sub) {
-        Instance i = createInstance(sub);
-        return isInstanceSubOf(i);
-    }
-    public static int castsWork(boolean interfc) {
-        Instance i = createInstance(2);
-        if (interfc) {
-            GetByte b = (GetByte)i;
-        } else {
-            InstanceSub s = (InstanceSub)i;
-        }
-        return 5;
-    }
-    
-    private static boolean isInstanceSubOf(Instance instance) {
-        return instance instanceof InstanceSub;
-    }
-    private static Instance createInstance(int type) {
-        switch (type) {
-            case 0: return null;
-            case 1: return new Instance();
-            case 2: return new InstanceSub(3, 0);
-        }
-        throw new IllegalArgumentException();
-    }
-    private static boolean isNull() {
-        return createInstance(2) == null;
-    }
-    
-    @JavaScriptBody(args = "obj", body = "return obj.constructor;")
-    static Object constructor(Object obj) {
-        return obj;
-    }
-    
-    public static boolean sharedConstructor() {
-        class X {
-        }
-        
-        X x1 = new X();
-        X x2 = new X();
-        
-        return constructor(x1) == constructor(x2);
-    }
-    public static boolean differentConstructor() {
-        class X {
-        }
-        class Y {
-        }
-        
-        X x = new X();
-        Y y = new Y();
-        
-        return constructor(x) == constructor(y);
-    }
-    @JavaScriptBody(args = {}, body = "return {};")
-    private static Object jsObj() {
-        return null;
-    }
-    
-    public static boolean iofObject() {
-        return jsObj() instanceof Object;
-    }
-    
-    public static int jscall() {
-        return jsgetbytes(new Instance());
-    }
-    
-    @JavaScriptBody(args = { "instance" }, body = "return instance.getByte__B();")
-    private static native int jsgetbytes(Instance instance);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/InstanceSub.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/InstanceSub.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class InstanceSub extends Instance implements GetByte {
-    private double in;
-    
-    public InstanceSub(int i, double d) {
-        super(i, d);
-        in = 555.55;
-    }
-    
-    @Override
-    public void setByte(byte b) {
-        super.setByte((byte) (b + 1));
-    }
-    
-    public static double recallDbl() {
-        return defaultDblValue();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/InstanceSubTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/InstanceSubTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-/** Checks if everything works OK, when we switch the
- * order of loaded classes.
- * 
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class InstanceSubTest extends InstanceTest {
-
-    @Override
-    protected String startCompilationWith() {
-        return "org/apidesign/vm4brwsr/InstanceSub";
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/InstanceTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/InstanceTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeClass;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class InstanceTest {
-    @Test public void verifyDefaultDoubleValue() throws Exception {
-        assertExec(
-            "Will be zero",
-            Instance.class, "defaultDblValue__D",
-            Double.valueOf(0)
-        );
-    }
-    @Test public void verifyStaticMethodCall() throws Exception {
-        assertExec(
-            "Will be zero",
-            InstanceSub.class, "recallDbl__D",
-            Double.valueOf(0)
-        );
-    }
-    @Test public void verifyAssignedByteValue() throws Exception {
-        assertExec(
-            "Will one thirty one",
-            Instance.class, "assignedByteValue__B",
-            Double.valueOf(31)
-        );
-    }
-    @Test public void verifyMagicOne() throws Exception {
-        assertExec(
-            "Should be three and something",
-            Instance.class, "magicOne__D",
-            Double.valueOf(3.3)
-        );
-    }
-    @Test public void verifyInstanceMethods() throws Exception {
-        assertExec(
-            "Should be eleven as we invoke overwritten method, plus 44",
-            Instance.class, "virtualBytes__I",
-            Double.valueOf(55)
-        );
-    }
-    @Test public void verifyInterfaceMethods() throws Exception {
-        assertExec(
-            "Retruns default value",
-            Instance.class, "interfaceBytes__F",
-            Double.valueOf(31)
-        );
-    }
-
-    @Test public void isNull() throws Exception {
-        assertExec(
-            "Yes, we are instance",
-            Instance.class, "isNull__Z",
-            Double.valueOf(0.0)
-        );
-    }
-
-    @Test public void isInstanceOf() throws Exception {
-        assertExec(
-            "Yes, we are instance",
-            Instance.class, "instanceOf__ZI",
-            Double.valueOf(1.0), 2
-        );
-    }
-
-    @Test public void notInstanceOf() throws Exception {
-        assertExec(
-            "No, we are not an instance",
-            Instance.class, "instanceOf__ZI",
-            Double.valueOf(0.0), 1
-        );
-    }
-    @Test public void nullInstanceOf() throws Exception {
-        assertExec(
-            "No, null is not an instance",
-            Instance.class, "instanceOf__ZI",
-            Double.valueOf(0.0), 0
-        );
-    }
-    
-    @Test public void verifyCastToClass() throws Exception {
-        assertExec(
-            "Five signals all is good",
-            Instance.class, "castsWork__IZ",
-            Double.valueOf(5.0), false
-        );
-    }
-    @Test public void verifyCastToInterface() throws Exception {
-        assertExec(
-            "Five signals all is good",
-            Instance.class, "castsWork__IZ",
-            Double.valueOf(5.0), true
-        );
-    }
-    
-    @Test public void sharedConstructor() throws Exception {
-        assertExec(
-            "Constructor of first and 2nd instance should be the same",
-            Instance.class, "sharedConstructor__Z",
-            Double.valueOf(1.0)
-        );
-    }
-
-    @Test public void differentConstructor() throws Exception {
-        assertExec(
-            "Constructor of X and Y should be the different",
-            Instance.class, "differentConstructor__Z",
-            Double.valueOf(0)
-        );
-    }
-
-    @Test public void jsObjectIsLikeJavaObject() throws Exception {
-        assertExec(
-            "JavaScript object is instance of Java Object",
-            Instance.class, "iofObject__Z",
-            Double.valueOf(1)
-        );
-    }
-
-    @Test public void jsCallingConvention() throws Exception {
-        assertExec(
-            "Pointer to 'this' is passed automatically (and not as a first argument)",
-            Instance.class, "jscall__I",
-            Double.valueOf(31)
-        );
-    }
-    
-    protected String startCompilationWith() {
-        return "org/apidesign/vm4brwsr/Instance";
-    }
-    
-    private static TestVM code;
-    
-    @BeforeClass
-    public void compileTheCode() throws Exception {
-        code = TestVM.compileClass(startCompilationWith());
-    }
-    
-    private void assertExec(
-        String msg, Class clazz, String method, Object expRes, Object... args
-    ) throws Exception {
-        code.assertExec(msg, clazz, method, expRes, args);
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class NumberTest {
-    @Test public void integerFromString() throws Exception {
-        assertExec("Can convert string to integer", Integer.class, "parseInt__ILjava_lang_String_2",
-            Double.valueOf(333), "333"
-        );
-    }
-
-    @Test public void doubleFromString() throws Exception {
-        assertExec("Can convert string to double", Double.class, "parseDouble__DLjava_lang_String_2",
-            Double.valueOf(33.3), "33.3"
-        );
-    }
-
-    @Test public void autoboxDouble() throws Exception {
-        assertExec("Autoboxing of doubles is OK", Numbers.class, "autoboxDblToString__Ljava_lang_String_2",
-            "3.3"
-        );
-    }
-    
-    @Test public void javalog1000() throws Exception {
-        assertEquals(3.0, Math.log10(1000.0), 0.00003, "log_10(1000) == 3");
-    }
-
-    @Test public void jslog1000() throws Exception {
-        assertExec("log_10(1000) == 3", Math.class, "log10__DD", 
-            Double.valueOf(3.0), 1000.0
-        );
-    }
-    
-    @Test public void javaRem() {
-        assertEquals(3, Numbers.rem(303, 10));
-    }
-    @Test public void jsRem() throws Exception {
-        assertExec("Should be three", Numbers.class, "rem__III", 
-            Double.valueOf(3.0), 303, 10
-        );
-    }
-    
-    @Test public void deserializeInt() throws Exception {
-        int exp = Numbers.deserInt();
-        assertExec("Should be the same", Numbers.class, "deserInt__I", 
-            Double.valueOf(exp)
-        );
-    }
-
-    @Test public void deserializeSimpleLong() throws Exception {
-        assertExec("Should be 3454", Numbers.class, "deserLong__J_3B", 
-            Double.valueOf(3454), 
-            new byte[] { (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)13, (byte)126 }
-        );
-    }
-    /* XXX: JavaScript cannot represent as big longs as Java. 
-    @Test public void deserializeLargeLong() throws Exception {
-        final byte[] arr = new byte[] {
-            (byte)64, (byte)8, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0
-        };
-        long exp = Numbers.deserLong(arr);
-        assertExec("Should be " + exp, "org_apidesign_vm4brwsr_Numbers_deserLong__JAB", 
-            Double.valueOf(exp), arr);
-    }
-    */
-    
-    @Test public void deserializeFloatInJava() throws Exception {
-        float f = 54324.32423f;
-        float r = Numbers.deserFloat();
-        assertEquals(r, f, "Floats are the same");
-    }
-    
-    @Test public void deserializeFloatInJS() throws Exception {
-        float f = 54324.32423f;
-        assertExec("Should be the same", Numbers.class, "deserFloat__F", 
-            Double.valueOf(f)
-        );
-    }
-
-    @Test public void deserializeDoubleInJava() throws Exception {
-        double f = 3.0;
-        double r = Numbers.deserDouble();
-        assertEquals(r, f, 0.001, "Doubles are the same");
-    }
-    
-    @Test public void deserializeDoubleInJS() throws Exception {
-        double f = 3.0;
-        assertExec("Should be the same", Numbers.class, "deserDouble__D", f);
-    }
-    /*
-    @Test public void serDouble() throws IOException {
-        double f = 3.0;
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        DataOutputStream d = new DataOutputStream(os);
-        d.writeLong(3454);
-        d.close();
-        
-        StringBuilder sb = new StringBuilder();
-        byte[] arr = os.toByteArray();
-        for (int i = 0; i < arr.length; i++) {
-            sb.append("(byte)").append(arr[i]).append(", ");
-        }
-        fail("" + sb);
-    }
-*/    
-    @Test public void fiveInStringJS() throws Exception {
-        String s = Numbers.intToString();
-        assertExec("Should be the same: " + s, 
-            Numbers.class, "intToString__Ljava_lang_String_2", 
-            s
-        );
-    }
-
-    @Test public void sevenInStringJS() throws Exception {
-        String s = Numbers.floatToString();
-        assertExec("Should be the same: " + s, 
-            Numbers.class, "floatToString__Ljava_lang_String_2", 
-            s
-        );
-    }
-
-    private static TestVM code;
-
-    @BeforeClass
-    public void compileTheCode() throws Exception {
-        code = TestVM.compileClass("org/apidesign/vm4brwsr/Numbers");
-    }
-
-    private static void assertExec(
-        String msg, Class<?> clazz, String method, Object expRes, Object... args) throws Exception
-    {
-        Object ret = code.execCode(msg, clazz, method, expRes, args);
-        if (ret == null) {
-            return;
-        }
-        if (expRes instanceof Double && ret instanceof Double) {
-            double expD = ((Double)expRes).doubleValue();
-            double retD = ((Double)ret).doubleValue();
-            assertEquals(retD, expD, 0.000004, msg + " "
-                    + code.toString());
-            return;
-        }
-        assertEquals(ret, expRes, msg + " " + code.toString());
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/Numbers.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/Numbers.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class Numbers {
-    private static Double autoboxDbl() {
-        return 3.3;
-    }
-    public static String autoboxDblToString() {
-        return autoboxDbl().toString().toString();
-    }
-    public static int rem(int a, int b) {
-        return a % b;
-    }
-
-    static float deserFloat() throws IOException {
-        byte[] arr = {(byte) 71, (byte) 84, (byte) 52, (byte) 83};
-        ByteArrayInputStream is = new ByteArrayInputStream(arr);
-        DataInputStream dis = new DataInputStream(is);
-        float r = dis.readFloat();
-        return r;
-    }
-    static double deserDouble() throws IOException {
-        byte[] arr = {(byte)64, (byte)8, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0};
-        ByteArrayInputStream is = new ByteArrayInputStream(arr);
-        DataInputStream dis = new DataInputStream(is);
-        return dis.readDouble();
-    }
-    static long deserLong(byte[] arr) throws IOException {
-        ByteArrayInputStream is = new ByteArrayInputStream(arr);
-        DataInputStream dis = new DataInputStream(is);
-        return dis.readLong();
-    }
-    static int deserInt() throws IOException {
-        byte[] arr = {(byte) 71, (byte) 84, (byte) 52, (byte) 83};
-        ByteArrayInputStream is = new ByteArrayInputStream(arr);
-        DataInputStream dis = new DataInputStream(is);
-        return dis.readInt();
-    }
-
-    static String intToString() {
-        return new Integer(5).toString().toString();
-    }
-    static String floatToString() {
-        return new Float(7.0).toString().toString();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/Script.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/Script.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.apidesign.bck2brwsr.core.ExtraJavaScript;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/** Test to verify external scripts are processed in lazy mode.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ExtraJavaScript(resource = "/org/apidesign/vm4brwsr/ko.js")
-public class Script {
-    @JavaScriptBody(args = {  }, body = "return ko !== null;")
-    public static native boolean checkNotNull();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class StaticMethod {
-    private static int cnt;
-    private static Object NULL;
-
-    public static int minusOne() {
-        return -1;
-    }
-    
-    public static Object none(int x, int y) {
-        Object toRet = null;
-        for (int i = x; i < y; i++) {
-            if (i == 2) {
-                toRet = null;
-            } else {
-                toRet = new Object();
-            }
-        }
-        return toRet;
-    }
-    
-    public static boolean isNull() {
-        return NULL == null;
-    }
-    
-    public static int sum(int x, int y) {
-        return x + y;
-    }
-    public static float power(float x) {
-        return x * x;
-    }
-    public static double minus(double x, long y) {
-        return x - y;
-    }
-    public static int div(byte c, double d) {
-        return (int)(d / c);
-    }
-    public static int mix(int a, long b, byte c, double d) {
-        return (int)((b / a + c) * d);
-    }
-    public static long xor(int a, long b) {
-        return a ^ b;
-    }
-    public static long orOrAnd(boolean doOr, int a, int b) {
-        return doOr ? a | b : a & b;
-    }
-    public static int shiftLeft(int what, int much) {
-        return what << much;
-    }
-    public static int shiftArithmRight(int what, int much, boolean signed) {
-        if (signed) {
-            return what >> much;
-        } else {
-            return what >>> much;
-        }
-    }
-    public static long factRec(int n) {
-        if (n <= 1) {
-            return 1;
-        } else {
-            return n * factRec(n - 1);
-        }
-    }
-    public static long factIter(int n) {
-        long res = 1;
-        for (int i = 2; i <= n; i++) {
-            res *= i;
-        }
-        return res;
-    }
-    public static int inc4() {
-        cnt++;
-        cnt+=2;
-        cnt++;
-        return cnt;
-    }
-    
-    @JavaScriptBody(
-        args={"i","j"}, body="\n\r\treturn (i + j).toString();"
-    )
-    public static String i2s(int i, int j) {
-        throw new IllegalStateException();
-    }
-    
-    public static String castNull(boolean n) {
-        Object value = n ? null : "Ahoj";
-        return (String)value;
-    }
-    
-    public static String swtch(int what) {
-        switch (what) {
-            case 0: return "Jarda";
-            case 1: return "Darda";
-            case 2: return "Parda";
-            default: return "Marda";
-        }
-    }
-    public static String swtch2(int what) {
-        switch (what) {
-            case 0: return "Jarda";
-            case 11: return "Darda";
-            case 22: return "Parda";
-            default: return "Marda";
-        }
-    }
-    
-    static {
-        // check order of initializers
-        StaticUse.NON_NULL.equals(new Object());
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,338 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/** Checks the basic behavior of the translator.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class StaticMethodTest {
-    @Test public void threePlusFour() throws Exception {
-        assertExec(
-            "Should be seven", 
-            StaticMethod.class, "sum__III", 
-            Double.valueOf(7), 
-            3, 4
-        );
-    }
-
-    @Test public void checkReallyInitializedValues() throws Exception {
-        assertExec(
-            "Return true", 
-            StaticMethod.class, "isNull__Z", 
-            Double.valueOf(1)
-        );
-    }
-
-    @Test public void powerOfThree() throws Exception {
-        assertExec(
-            "Should be nine", 
-            StaticMethod.class, "power__FF", 
-            Double.valueOf(9),
-            3.0f
-        );
-    }
-
-    @Test public void minusOne() throws Exception {
-        assertExec(
-            "Should be minus one", 
-            StaticMethod.class, "minusOne__I", 
-            Double.valueOf(-1)
-        );
-    }
-
-    @Test public void doubleWithoutLong() throws Exception {
-        assertExec(
-            "Should be two",
-            StaticMethod.class, "minus__DDJ", 
-            Double.valueOf(2),
-            3.0d, 1l
-        );
-    }
-    
-    @Test public void rintNegativeUp() throws Exception {
-        final double cnts = -453904.634;
-        assertExec(
-            "Should round up to end with 5",
-            Math.class, "rint__DD", 
-            -453905.0, cnts
-        );
-    }
-
-    @Test public void rintNegativeDown() throws Exception {
-        final double cnts = -453904.434;
-        assertExec(
-            "Should round up to end with 4",
-            Math.class, "rint__DD", 
-            -453904.0, cnts
-        );
-    }
-
-    @Test public void rintPositiveUp() throws Exception {
-        final double cnts = 453904.634;
-        assertExec(
-            "Should round up to end with 5",
-            Math.class, "rint__DD", 
-            453905.0, cnts
-        );
-    }
-    @Test public void rintPositiveDown() throws Exception {
-        final double cnts = 453904.434;
-        assertExec(
-            "Should round up to end with 4",
-            Math.class, "rint__DD", 
-            453904.0, cnts
-        );
-    }
-    @Test public void rintOneHalf() throws Exception {
-        final double cnts = 1.5;
-        assertExec(
-            "Should round up to end with 2",
-            Math.class, "rint__DD", 
-            2.0, cnts
-        );
-    }
-    @Test public void rintNegativeOneHalf() throws Exception {
-        final double cnts = -1.5;
-        assertExec(
-            "Should round up to end with 2",
-            Math.class, "rint__DD", 
-            -2.0, cnts
-        );
-    }
-    @Test public void rintTwoAndHalf() throws Exception {
-        final double cnts = 2.5;
-        assertExec(
-            "Should round up to end with 2",
-            Math.class, "rint__DD", 
-            2.0, cnts
-        );
-    }
-    @Test public void rintNegativeTwoOneHalf() throws Exception {
-        final double cnts = -2.5;
-        assertExec(
-            "Should round up to end with 2",
-            Math.class, "rint__DD", 
-            -2.0, cnts
-        );
-    }
-
-    @Test public void ieeeReminder1() throws Exception {
-        assertExec(
-            "Same result 1",
-            Math.class, "IEEEremainder__DDD", 
-            Math.IEEEremainder(10.0, 4.5), 10.0, 4.5
-        );
-    }
-
-    @Test public void ieeeReminder2() throws Exception {
-        assertExec(
-            "Same result 1",
-            Math.class, "IEEEremainder__DDD", 
-            Math.IEEEremainder(Integer.MAX_VALUE, -4.5), Integer.MAX_VALUE, -4.5
-        );
-    }
-
-    @Test public void divAndRound() throws Exception {
-        assertExec(
-            "Should be rounded to one",
-            StaticMethod.class, "div__IBD", 
-            Double.valueOf(1),
-            3, 3.75
-        );
-    }
-    @Test public void mixedMethodFourParams() throws Exception {
-        assertExec(
-            "Should be two",
-            StaticMethod.class, "mix__IIJBD", 
-            Double.valueOf(20),
-            2, 10l, 5, 2.0
-        );
-    }
-    @Test public void factRec() throws Exception {
-        assertExec(
-            "Factorial of 5 is 120",
-            StaticMethod.class, "factRec__JI", 
-            Double.valueOf(120),
-            5
-        );
-    }
-    @Test public void factIter() throws Exception {
-        assertExec(
-            "Factorial of 5 is 120",
-            StaticMethod.class, "factIter__JI", 
-            Double.valueOf(120),
-            5
-        );
-    }
-    
-    @Test public void xor() throws Exception {
-        assertExec(
-            "Xor is 4",
-            StaticMethod.class, "xor__JIJ",
-            Double.valueOf(4),
-            7,
-            3
-        );
-    }
-    
-    @Test public void or() throws Exception {
-        assertExec(
-            "Or will be 7",
-            StaticMethod.class, "orOrAnd__JZII",
-            Double.valueOf(7),
-            true,
-            4,
-            3
-        );
-    }
-    @Test public void nullCheck() throws Exception {
-        assertExec(
-            "Returns nothing",
-            StaticMethod.class, "none__Ljava_lang_Object_2II",
-            null, 1, 3
-        );
-    }
-    @Test public void and() throws Exception {
-        assertExec(
-            "And will be 3",
-            StaticMethod.class, "orOrAnd__JZII",
-            Double.valueOf(3),
-            false,
-            7,
-            3
-        );
-    }
-    @Test public void inc4() throws Exception {
-        assertExec(
-            "It will be 4",
-            StaticMethod.class, "inc4__I",
-            Double.valueOf(4)
-        );
-    }
-    
-    @Test public void shiftLeftInJava() throws Exception {
-        int res = StaticMethod.shiftLeft(1, 8);
-        assertEquals(res, 256);
-    }
-
-    @Test public void shiftLeftInJS() throws Exception {
-        assertExec(
-            "Setting 9th bit",
-            StaticMethod.class, "shiftLeft__III",
-            Double.valueOf(256),
-            1, 8
-        );
-    }
-
-    @Test public void shiftRightInJava() throws Exception {
-        int res = StaticMethod.shiftArithmRight(-8, 3, true);
-        assertEquals(res, -1);
-    }
-
-    @Test public void shiftRightInJS() throws Exception {
-        assertExec(
-            "Get -1",
-            StaticMethod.class, "shiftArithmRight__IIIZ",
-            Double.valueOf(-1),
-            -8, 3, true
-        );
-    }
-    @Test public void unsignedShiftRightInJava() throws Exception {
-        int res = StaticMethod.shiftArithmRight(8, 3, false);
-        assertEquals(res, 1);
-    }
-
-    @Test public void unsignedShiftRightInJS() throws Exception {
-        assertExec(
-            "Get -1",
-            StaticMethod.class, "shiftArithmRight__IIIZ",
-            Double.valueOf(1),
-            8, 3, false
-        );
-    }
-    
-    @Test public void javaScriptBody() throws Exception {
-        assertExec(
-            "JavaScript string",
-            StaticMethod.class, "i2s__Ljava_lang_String_2II",
-            "333",
-            330, 3
-        );
-    }
-    
-    @Test public void switchJarda() throws Exception {
-        assertExec(
-            "The expected value",
-            StaticMethod.class, "swtch__Ljava_lang_String_2I",
-            "Jarda",
-            0
-        );
-    }
-    
-    @Test public void switchDarda() throws Exception {
-        assertExec(
-            "The expected value",
-            StaticMethod.class, "swtch__Ljava_lang_String_2I",
-            "Darda",
-            1
-        );
-    }
-    @Test public void switchParda() throws Exception {
-        assertExec(
-            "The expected value",
-            StaticMethod.class, "swtch2__Ljava_lang_String_2I",
-            "Parda",
-            22
-        );
-    }
-    @Test public void switchMarda() throws Exception {
-        assertExec(
-            "The expected value",
-            StaticMethod.class, "swtch__Ljava_lang_String_2I",
-            "Marda",
-            -433
-        );
-    }
-    
-    @Test public void checkNullCast() throws Exception {
-        assertExec("Null can be cast to any type",
-            StaticMethod.class, "castNull__Ljava_lang_String_2Z", 
-            null, true
-        );
-    }
-    
-    private static TestVM code;
-    
-    @BeforeClass 
-    public void compileTheCode() throws Exception {
-        StringBuilder sb = new StringBuilder();
-        code = TestVM.compileClass(sb, "org/apidesign/vm4brwsr/StaticMethod");
-    }
-
-    private void assertExec(
-        String msg, Class<?> clazz, String method, 
-        Object ret, Object... args
-    ) throws Exception {
-        code.assertExec(msg, clazz, method, ret, args);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/StaticUse.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticUse.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-public class StaticUse {
-    public static final Object NON_NULL = new Object();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/StringArrayTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/StringArrayTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-
-public class StringArrayTest {
-    @Test public void deleteMinusIndex() throws Exception {
-        String[] arr = { "Ahoj", "Kluci" };
-        StringArray list = StringArray.asList(arr);
-        list.delete(-1);
-        assertEquals(list.toArray().length, 2, "No element removed");
-    }
-    @Test public void deleteTooHighIndex() throws Exception {
-        String[] arr = { "Ahoj", "Kluci" };
-        StringArray list = StringArray.asList(arr);
-        list.delete(5);
-        assertEquals(list.toArray().length, 2, "No element removed");
-    }
-    @Test public void deleteFirst() throws Exception {
-        String[] arr = { "Ahoj", "Kluci" };
-        StringArray list = StringArray.asList(arr);
-        list.delete(0);
-        assertEquals(list.toArray().length, 1, "First element removed");
-        assertEquals(list.toArray()[0], "Kluci");
-    }
-    @Test public void deleteSecond() throws Exception {
-        String[] arr = { "Ahoj", "Kluci" };
-        StringArray list = StringArray.asList(arr);
-        list.delete(1);
-        assertEquals(list.toArray().length, 1, "Second element removed");
-        assertEquals(list.toArray()[0], "Ahoj");
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/StringSample.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/StringSample.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.UnsupportedEncodingException;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class StringSample {
-    public static final String HELLO = "Hello World!";
-    private static int counter;
-    
-    private final int cnt;
-    public StringSample() {
-        cnt = ++counter;
-    }
-    
-    
-    public static char sayHello(int indx) {
-        return HELLO.charAt(indx);
-    }
-    
-    public static boolean equalToHello(int from, int to) {
-        return "Hello".equals(HELLO.substring(from, to));
-    }
-    
-    public static String fromChars(char a, char b, char c) {
-        char[] arr = { a, b, c };
-        return new String(arr).toString();
-    }
-    
-    public static String charsFromNumbers() {
-        return chars((char)65, (char)66, (char)67);
-    }
-
-    public static String charsFromChars() {
-        return chars('A', 'B', 'C');
-    }
-
-    public static String chars(char a, char b, char c) {
-        return ("" + a + b +c).toString();
-    }
-    
-    public static String replace(String s, char a, char b) {
-        return s.replace(a, b);
-    }
-    
-    public static int hashCode(String h) {
-        return h.hashCode();
-    }
-    
-    public static boolean isStringInstance() {
-        return chars('a', (char)30, 'b') instanceof String;
-    }
-    
-    public static String getBytes(String s) throws UnsupportedEncodingException {
-        byte[] arr = s.getBytes("UTF-8");
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < arr.length; i++) {
-            sb.append(arr[i]).append(" ");
-        }
-        return sb.toString().toString();
-    }
-    
-    public static String insertBuffer() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Jardo!");
-        sb.insert(0, "Ahoj ");
-        sb.delete(4, 8);
-        return sb.toString().toString();
-    }
-    
-    public static int countAB(String txt) {
-        int cnt = 0;
-        for (int i = 0; i < txt.length(); i++) {
-            switch (txt.charAt(i)) {
-                case 'A': cnt++; break;
-                case 'B': cnt += 2; break;
-            }
-        }
-        return cnt;
-    }
-
-    public static int stringSwitch(String txt) {
-        switch (txt) {
-            case "jedna": return 1;
-            case "dve": return 2;
-            case "tri": return 3;
-            case "ctyri": return 4;
-        }
-        return -1;
-    }
-    
-    public static String toStringTest(int howMuch) {
-        counter = 0;
-        StringSample ss = null;
-        for (int i = 0; i < howMuch; i++) {
-            ss = new StringSample();
-        }
-        return ss.toString().toString();
-    }
-    
-    public static String concatStrings() {
-        return (toStringTest(1) + "\\\n\r\t").toString();
-    }
-    
-    public static int compare(String a, String b) {
-        return a.compareTo(b);
-    }
-
-    @Override
-    public String toString() {
-        return HELLO + cnt;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/StringTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/StringTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class StringTest {
-    @Test public void firstChar() throws Exception {
-        assertExec(
-            "First char in Hello is H",
-            StringSample.class, "sayHello__CI",
-            72, 0
-        );
-    }
-
-    @Test public void fromChars() throws Exception {
-        assertExec(
-            "First char in Hello is ABC",
-            StringSample.class, "fromChars__Ljava_lang_String_2CCC",
-            "ABC", 'A', 'B', 'C'
-        );
-    }
-
-    @Test public void concatChars() throws Exception {
-        assertExec(
-            "Composing yields ABC",
-            StringSample.class, "chars__Ljava_lang_String_2CCC",
-            "ABC", 'A', 'B', 'C'
-        );
-    }
-
-    @Test public void concatCharsFromInts() throws Exception {
-        assertExec(
-            "Composing yields ABC",
-            StringSample.class, "charsFromNumbers__Ljava_lang_String_2",
-            "ABC"
-        );
-    }
-
-    @Test public void concatCharsFromChars() throws Exception {
-        assertExec(
-            "Composing yields ABC",
-            StringSample.class, "charsFromChars__Ljava_lang_String_2",
-            "ABC"
-        );
-    }
-
-    @Test public void instanceOfWorks() throws Exception {
-        assertExec(
-            "It is string",
-            StringSample.class, "isStringInstance__Z",
-            Double.valueOf(1.0)
-        );
-    }
-
-    @Test public void getBytes() throws Exception {
-        final String horse = "\u017dlu\u0165ou\u010dk\u00fd k\u016f\u0148";
-        final String expected = StringSample.getBytes(horse);
-        assertExec(
-            "Bytes look simplar",
-            StringSample.class, "getBytes__Ljava_lang_String_2Ljava_lang_String_2",
-            expected, horse
-        );
-    }
-
-    @Test(timeOut=10000) public void toStringConcatenation() throws Exception {
-        assertExec(
-            "Five executions should generate 5Hello World!",
-            StringSample.class, "toStringTest__Ljava_lang_String_2I",
-            "Hello World!5", 5
-        );
-    }
-    @Test public void toStringConcatenationJava() throws Exception {
-        assertEquals("Hello World!5", StringSample.toStringTest(5));
-    }
-    
-    @Test(timeOut=10000) public void stringStringConcat() throws Exception {
-        assertExec(
-            "Composes strings OK",
-            StringSample.class, "concatStrings__Ljava_lang_String_2",
-            "Hello World!1" + "\\\n\r\t"
-        );
-    }
-
-    @Test public void equalsAndSubstring() throws Exception {
-        assertExec(
-            "Composes are OK",
-            StringSample.class, "equalToHello__ZII",
-            true, 0, 5
-        );
-    }
-    @Test public void replaceChars() throws Exception {
-        assertExec(
-            "Can replace slashes by underscores",
-            StringSample.class, "replace__Ljava_lang_String_2Ljava_lang_String_2CC",
-            "x_y_z", "x/y/z", '/', '_'
-        );
-    }
-    @Test public void replaceIntChars() throws Exception {
-        assertExec(
-            "Can replace slashes by underscores",
-            StringSample.class, "replace__Ljava_lang_String_2Ljava_lang_String_2CC",
-            "x_y_z", "x/y/z", (int)'/', (int)'_'
-        );
-    }
-
-    @Test public void insertBuilder() throws Exception {
-        assertExec(
-            "Can insert something into a buffer?",
-            StringSample.class, "insertBuffer__Ljava_lang_String_2",
-            "Ahojdo!"
-        );
-    }
-    
-    @Test public void compareHashCodeHi() throws Exception {
-        String j = "Hi";
-        int jh = StringSample.hashCode(j);
-        assertExec(
-            "Hashcode is the same " +jh,
-            StringSample.class, "hashCode__ILjava_lang_String_2",
-            Double.valueOf(jh), j
-        );
-    }
-    @Test public void compareHashCode1() throws Exception {
-        String j = "Hello Java!";
-        int jh = StringSample.hashCode(j);
-        assertExec(
-            "Hashcode is the same " + jh,
-            StringSample.class, "hashCode__ILjava_lang_String_2",
-            Double.valueOf(jh), j
-        );
-    }
-    @Test public void stringSwitch1() throws Exception {
-        assertExec(
-            "Get one",
-            StringSample.class, "stringSwitch__ILjava_lang_String_2",
-            Double.valueOf(1), "jedna"
-        );
-    }
-    @Test public void stringSwitch2() throws Exception {
-        assertExec(
-            "Get two",
-            StringSample.class, "stringSwitch__ILjava_lang_String_2",
-            Double.valueOf(2), "dve"
-        );
-    }
-    @Test public void stringSwitchDefault() throws Exception {
-        assertExec(
-            "Get -1",
-            StringSample.class, "stringSwitch__ILjava_lang_String_2",
-            Double.valueOf(-1), "none"
-        );
-    }
-    
-    @Test public void countAB() throws Exception {
-        assertEquals(StringSample.countAB("Ahoj Bedo!"), 3, "Verify Java code is sane");
-        assertExec(
-            "One A and one B adds to 3",
-            StringSample.class, "countAB__ILjava_lang_String_2",
-            Double.valueOf(3), "Ahoj Bedo!"
-        );
-        
-    }
-
-    @Test public void compareStrings() throws Exception {
-        int res = StringSample.compare("Saab", "Volvo");
-        assertExec(
-            "Saab finished sooner than Volvo",
-            StringSample.class, "compare__ILjava_lang_String_2Ljava_lang_String_2",
-            Double.valueOf(res), "Saab", "Volvo"
-        );
-        
-    }
-    
-    private static TestVM code;
-    
-    @BeforeClass 
-    public void compileTheCode() throws Exception {
-        code = TestVM.compileClass(
-            "org/apidesign/vm4brwsr/StringSample",
-            "java/lang/String"
-        );
-    }
-    
-    private static void assertExec(String msg, 
-        Class<?> clazz, String method, Object expRes, Object... args
-    ) throws Exception {
-        code.assertExec(msg, clazz, method, expRes, args);
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import org.testng.annotations.BeforeClass;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class SystemTest {
-    private static TestVM code;
-    
-    @Test public void verifyJSTime() throws Exception {
-        long now = System.currentTimeMillis();
-        
-        Object js = code.execCode("Get js time", 
-            org.apidesign.bck2brwsr.emul.lang.System.class, "currentTimeMillis__J",
-            null
-        );
-        
-        assertTrue(js instanceof Double, "Double " + js);
-        long time = ((Double)js).longValue();
-        
-        long later = System.currentTimeMillis();
-        
-        assertTrue(now <= time, "Lower bound is OK: " + now + " <= " + time);
-        assertTrue(time <= later, "Upper bound is OK: " + time + " <= " + later);
-    }
-    
-    
-    @BeforeClass 
-    public static void compileTheCode() throws Exception {
-        code = TestVM.compileClass(
-            "org/apidesign/bck2brwsr/emul/lang/System");
-    }
-    
-}
-
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import static org.testng.Assert.*;
-
-final class TestVM {
-    private final Invocable code;
-    private final CharSequence codeSeq;
-    private final Object bck2brwsr;
-    
-    
-    private TestVM(Invocable code, CharSequence codeSeq) throws ScriptException, NoSuchMethodException {
-        this.code = code;
-        this.codeSeq = codeSeq;
-        this.bck2brwsr = code.invokeFunction("bck2brwsr");
-    }
-    
-
-    public Object execCode(
-        String msg, Class<?> clazz, String method, 
-        Object expRes, Object... args
-    ) throws Exception {
-        Object ret = null;
-        try {
-            ret = code.invokeMethod(bck2brwsr, "loadClass", clazz.getName());
-            ret = code.invokeMethod(ret, method, args);
-        } catch (ScriptException ex) {
-            fail("Execution failed in " + dumpJS(codeSeq), ex);
-        } catch (NoSuchMethodException ex) {
-            fail("Cannot find method in " + dumpJS(codeSeq), ex);
-        }
-        if (ret == null && expRes == null) {
-            return null;
-        }
-        if (expRes != null && expRes.equals(ret)) {
-            return null;
-        }
-        if (expRes instanceof Number) {
-            // in case of Long it is necessary convert it to number
-            // since the Long is represented by two numbers in JavaScript
-            try {
-                ret = code.invokeMethod(ret, "toFP");
-                ret = code.invokeFunction("Number", ret);
-            } catch (ScriptException ex) {
-                fail("Conversion to number failed in " + dumpJS(codeSeq), ex);
-            } catch (NoSuchMethodException ex) {
-                fail("Cannot find global Number(x) function in " + dumpJS(codeSeq), ex);
-            }
-        }
-        return ret;
-    }
-    
-    void assertExec(
-        String msg, Class clazz, String method, Object expRes, Object... args
-    ) throws Exception {
-        Object ret = execCode(msg, clazz, method, expRes, args);
-        if (ret == null) {
-            return;
-        }
-        if (expRes != null && expRes.equals(ret)) {
-            return;
-        }
-        assertEquals(ret, expRes, msg + "was: " + ret + "\n" + dumpJS(codeSeq));
-    }    
-
-    static TestVM compileClass(String... names) throws ScriptException, IOException {
-        return compileClass(null, names);
-    }
-    
-    static TestVM compileClass(StringBuilder sb, String... names) throws ScriptException, IOException {
-        return compileClass(sb, null, names);
-    }
-
-    static TestVM compileClass(StringBuilder sb, ScriptEngine[] eng, String... names) throws ScriptException, IOException {
-        if (sb == null) {
-            sb = new StringBuilder();
-        }
-        Bck2Brwsr.generate(sb, new EmulationResources(), names);
-        ScriptEngineManager sem = new ScriptEngineManager();
-        ScriptEngine js = sem.getEngineByExtension("js");
-        if (eng != null) {
-            eng[0] = js;
-        }
-        try {
-            Object res = js.eval(sb.toString());
-            assertTrue(js instanceof Invocable, "It is invocable object: " + res);
-            return new TestVM((Invocable) js, sb);
-        } catch (Exception ex) {
-            if (sb.length() > 2000) {
-                sb = dumpJS(sb);
-            }
-            fail("Could not evaluate:\n" + sb, ex);
-            return null;
-        }
-    }
-
-    Object loadClass(String loadClass, String name) throws ScriptException, NoSuchMethodException {
-        return code.invokeMethod(bck2brwsr, "loadClass", Exceptions.class.getName());
-    }
-    
-    Object invokeMethod(Object obj, String method, Object... params) throws ScriptException, NoSuchMethodException {
-        return code.invokeMethod(obj, method, params);
-    }
-
-    Object invokeFunction(String methodName, Object... args) throws ScriptException, NoSuchMethodException {
-        return code.invokeFunction(methodName, args);
-    }
-
-    static StringBuilder dumpJS(CharSequence sb) throws IOException {
-        File f = File.createTempFile("execution", ".js");
-        FileWriter w = new FileWriter(f);
-        w.append(sb);
-        w.close();
-        return new StringBuilder(f.getPath());
-    }
-
-    @Override
-    public String toString() {
-        try {
-            return dumpJS(codeSeq).toString();
-        } catch (IOException ex) {
-            return ex.toString();
-        }
-    }
-    
-    
-    private static class EmulationResources implements Bck2Brwsr.Resources {
-        @Override
-        public InputStream get(String name) throws IOException {
-            Enumeration<URL> en = StaticMethodTest.class.getClassLoader().getResources(name);
-            URL u = null;
-            while (en.hasMoreElements()) {
-                u = en.nextElement();
-            }
-            if (u == null) {
-                throw new IOException("Can't find " + name);
-            }
-            if (u.toExternalForm().contains("rt.jar!")) {
-                throw new IOException("No emulation for " + u);
-            }
-            return u.openStream();
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/VMLazyTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/VMLazyTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-import org.testng.annotations.BeforeClass;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
-
-/** Implements loading class by class.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class VMLazyTest {
-    private static TestVM code;
-
-    @BeforeClass
-    public void compileTheCode() throws Exception {
-        StringBuilder sb = new StringBuilder();
-        sb.append("\nvar data = {};");
-        sb.append("\nfunction test(clazz, method) {");
-        sb.append("\n  if (!data.bck2brwsr) data.bck2brwsr = bck2brwsr(function(name) { return loader.get(name); });");
-        sb.append("\n  var c = data.bck2brwsr.loadClass(clazz);");
-        sb.append("\n  return c[method]();");
-        sb.append("\n}");
-        
-        sb.append("\nfunction checkKO() {");
-        sb.append("\n  return ko !== null;");
-        sb.append("\n}");
-       
-        ScriptEngine[] arr = { null };
-        code = TestVM.compileClass(sb, arr,
-            new String[]{"org/apidesign/vm4brwsr/VM", "org/apidesign/vm4brwsr/StaticMethod"}
-        );
-        arr[0].getContext().setAttribute("loader", new BytesLoader(), ScriptContext.ENGINE_SCOPE);
-    }
-    
-    @Test public void invokeStaticMethod() throws Exception {
-        assertExec("Trying to get -1", "test", Double.valueOf(-1),
-            StaticMethod.class.getName(), "minusOne__I"
-        );
-    }
-
-    @Test public void loadDependantClass() throws Exception {
-        assertExec("Expecting zero", "test", Double.valueOf(0),
-            InstanceSub.class.getName(), "recallDbl__D"
-        );
-    }
-
-    @Test public void loadClassWithAssociatedScript() throws Exception {
-        assertExec("ko is defined", "test", true,
-            Script.class.getName(), "checkNotNull__Z"
-        );
-        
-        Object res = code.invokeFunction("checkKO");
-        assertEquals(res, true, "KO is defined on a global level");
-    }
-
-    private static void assertExec(String msg, String methodName, Object expRes, Object... args) throws Exception {
-        Object ret = null;
-        try {
-            ret = code.invokeFunction(methodName, args);
-        } catch (ScriptException ex) {
-            fail("Execution failed in\n" + code.toString(), ex);
-        } catch (NoSuchMethodException ex) {
-            fail("Cannot find method in\n" + code.toString(), ex);
-        }
-        if (ret == null && expRes == null) {
-            return;
-        }
-        if (expRes.equals(ret)) {
-            return;
-        }
-        assertEquals(ret, expRes, msg + "was: " + ret + "\n" + code.toString());
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/VMinVM.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/VMinVM.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-class VMinVM extends ByteCodeToJavaScript {
-    private VMinVM(Appendable out) {
-        super(out);
-    }
-    
-    static String toJavaScript(byte[] is) throws IOException {
-        StringBuilder sb = new StringBuilder();
-        new VMinVM(sb).compile(new ByteArrayInputStream(is));
-        return sb.toString().toString();
-    }
-
-    @Override
-    protected boolean requireReference(String internalClassName) {
-        return false;
-    }
-
-    @Override
-    protected void requireScript(String resourcePath) {
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/java/org/apidesign/vm4brwsr/VMinVMTest.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/VMinVMTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.vm4brwsr;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class VMinVMTest {
-    private static TestVM code;
-    
-    @Test public void compareGeneratedCodeForArrayClass() throws Exception {
-        compareCode("org/apidesign/vm4brwsr/Array.class");
-    }
-
-    @Test public void compareGeneratedCodeForClassesClass() throws Exception {
-        compareCode("org/apidesign/vm4brwsr/Classes.class");
-    }
-
-    @BeforeClass
-    public void compileTheCode() throws Exception {
-        code = TestVM.compileClass("org/apidesign/vm4brwsr/VMinVM");
-    }
-    
-    private void compareCode(final String nm) throws Exception, IOException {
-        byte[] arr = BytesLoader.readClass(nm);
-        String ret1 = VMinVM.toJavaScript(arr);
-        
-        Object ret;
-        try {
-            ret = code.invokeFunction("bck2brwsr");
-            ret = code.invokeMethod(ret, "loadClass", VMinVM.class.getName());
-            ret = code.invokeMethod(ret, "toJavaScript__Ljava_lang_String_2_3B", arr);
-        } catch (Exception ex) {
-            File f = File.createTempFile("execution", ".js");
-            FileWriter w = new FileWriter(f);
-            w.append("var byteCode = [\n  ");
-            String sep = "";
-            for (int i = 0; i < arr.length; i++) {
-                w.append(sep).append(Integer.toString((arr[i] + 256) % 256));
-                sep = ", ";
-                if (i % 20 == 0) {
-                    w.append("\n  ");
-                }
-            }
-            w.append("\n];\n");
-            w.append(code.toString());
-            w.close();
-            throw new Exception(ex.getMessage() + " file: " + f, ex);
-        }
-
-        
-        assertTrue(ret instanceof String, "It is string: " + ret);
-        
-        if (!ret1.toString().equals(ret)) {
-            StringBuilder msg = new StringBuilder("Difference found between ");
-            msg.append(TestVM.dumpJS(ret1));
-            msg.append(" ");
-            msg.append(TestVM.dumpJS((CharSequence) ret));
-            msg.append(" compiled by ");
-            msg.append(code.toString());
-            fail(msg.toString());
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vm/src/test/resources/org/apidesign/vm4brwsr/ko.js
--- a/vm/src/test/resources/org/apidesign/vm4brwsr/ko.js	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/*
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-this.ko = {};
-
-
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/pom.xml
--- a/vmtest/pom.xml	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apidesign</groupId>
-    <artifactId>bck2brwsr</artifactId>
-    <version>0.3-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apidesign.bck2brwsr</groupId>
-  <artifactId>vmtest</artifactId>
-  <version>0.3-SNAPSHOT</version>
-  
-  <name>VM Testing APIs</name>
-  <url>http://bck2brwsr.apidesign.org</url>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>junit</artifactId>
-          <groupId>junit</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vm4brwsr</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>emul.mini</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>launcher</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.netbeans.api</groupId>
-      <artifactId>org-openide-util-lookup</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/BrwsrTest.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/BrwsrTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Annotation to indicate that given method should be executed
- * in a browser environment. Has to be used in conjunction with {@link VMTest#create(java.lang.Class)}
- * factory method. 
- * <p>
- * The browser to is by default executed via {@link java.awt.Desktop#browse(java.net.URI)},
- * but one can change that by specifying <code>-Dvmtest.brwsrs=firefox,google-chrome</code>
- * property.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface BrwsrTest {
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/Compare.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/Compare.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Can be applied on a method that yields a return value. 
- * Together with {@link VMTest#create} it can be used to write
- * methods which are executed in real VM as well as JavaScript VMs and
- * their results are compared.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Compare {
-    /** Specifies whether the system should internal JavaScript interpreter
-     * as available via {@link javax.script.ScriptEngine}. Defaults to true,
-     * but in some situations (benchmarking comes to my mind), one may set this
-     * to <code>false</code>. In such case only browsers provided via
-     * <code>vmtest.brwsrs</code> property are used. For example
-     * <code>"vmtest.brwsrs=firefox,google-chrome"</code> would run the test
-     * in HotSpot VM, firefox and chrome and would compare the results.
-     * @return 
-     */
-    boolean scripting() default true;
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/HtmlFragment.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/HtmlFragment.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Allows to specify an HTML fragment for a given {@link BrwsrTest}. 
- * Apply either to the method or to enclosing class. The fragment will be
- * made available in the page that executes given test. Its elements shall
- * be regularly accessible from the test.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.TYPE})
-public @interface HtmlFragment {
-    /** HTML code fragment to be exposed on the testing page.
-     */
-    String value();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/Http.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/Http.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Exposes HTTP page or pages to the running {@link BrwsrTest}, so it can access under
- * the relative path.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Http {
-    /** Set of pages to make available */
-    public Resource[] value();
-    
-    /** Exposes an HTTP page to the running {@link BrwsrTest}, so it can access
-     * under the relative path.
-     *
-     * @author Jaroslav Tulach <jtulach@netbeans.org>
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target({})
-    public @interface Resource {
-        /** path on the server that the test can use to access the exposed resource */
-        String path();
-        /** the content of the HttpResource */
-        String content();
-        /** resource relative to the class that should be used instead of <code>content</code>.
-         * Leave content equal to empty string.
-         */
-        String resource() default "";
-        /** mime type of the resource */
-        String mimeType();
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/VMTest.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/VMTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest;
-
-import org.apidesign.bck2brwsr.vmtest.impl.CompareCase;
-import org.testng.annotations.Factory;
-
-/** A TestNG {@link Factory} that seeks for {@link Compare} annotations
- * in provided class and builds set of tests that compare the computations
- * in real as well as JavaScript virtual machines. Use as:<pre>
- * {@code @}{@link Factory} public static create() {
- *   return @{link VMTest}.{@link #create(YourClass.class);
- * }</pre>
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class VMTest {
-    /** Inspects <code>clazz</code> and for each {@lik Compare} method creates
-     * instances of tests. Each instance runs the test in different virtual
-     * machine and at the end they compare the results.
-     * 
-     * @param clazz the class to inspect
-     * @return the set of created tests
-     */
-    public static Object[] create(Class<?> clazz) {
-        return CompareCase.create(clazz);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/Bck2BrwsrCase.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import org.apidesign.bck2brwsr.launcher.Launcher;
-import org.apidesign.bck2brwsr.launcher.InvocationContext;
-import org.apidesign.bck2brwsr.vmtest.HtmlFragment;
-import org.apidesign.bck2brwsr.vmtest.Http;
-import org.testng.ITest;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class Bck2BrwsrCase implements ITest {
-    private final Method m;
-    private final Launcher l;
-    private final String type;
-    private final boolean fail;
-    private final HtmlFragment html;
-    private final Http.Resource[] http;
-    Object value;
-
-    Bck2BrwsrCase(Method m, String type, Launcher l, boolean fail, HtmlFragment html, Http.Resource[] http) {
-        this.l = l;
-        this.m = m;
-        this.type = type;
-        this.fail = fail;
-        this.html = html;
-        this.http = http;
-    }
-
-    @Test(groups = "run")
-    public void executeCode() throws Throwable {
-        if (l != null) {
-            InvocationContext c = l.createInvocation(m.getDeclaringClass(), m.getName());
-            if (html != null) {
-                c.setHtmlFragment(html.value());
-            }
-            if (http != null) {
-                for (Http.Resource r : http) {
-                    if (!r.content().isEmpty()) {
-                        InputStream is = new ByteArrayInputStream(r.content().getBytes("UTF-8"));
-                        c.addHttpResource(r.path(), r.mimeType(), is);
-                    } else {
-                        InputStream is = m.getDeclaringClass().getResourceAsStream(r.resource());
-                        c.addHttpResource(r.path(), r.mimeType(), is);
-                    }
-                }
-            }
-            String res = c.invoke();
-            value = res;
-            if (fail) {
-                int idx = res.indexOf(':');
-                if (idx >= 0) {
-                    Class<? extends Throwable> thrwbl = null;
-                    try {
-                        Class<?> exCls = Class.forName(res.substring(0, idx));
-                        if (Throwable.class.isAssignableFrom(exCls)) {
-                            thrwbl = exCls.asSubclass(Throwable.class);
-                        }
-                    } catch (Exception ex) {
-                        // ignore
-                    }
-                    if (thrwbl != null) {
-                        Throwable t = null;
-                        try {
-                            for (Constructor<?> cnstr : thrwbl.getConstructors()) {
-                                if (cnstr.getParameterTypes().length == 1 && cnstr.getParameterTypes()[0].isAssignableFrom(String.class)) {
-                                    t = (Throwable) cnstr.newInstance(res.substring(idx + 1));
-                                    break;
-                                }
-                            }
-                        } catch (Throwable ex) {
-                            t = thrwbl.newInstance().initCause(ex);
-                        }
-                        if (t == null) {
-                            t = thrwbl.newInstance().initCause(new Exception(res.substring(idx)));
-                        }
-                        throw t;
-                    }
-                    throw new AssertionError(res);
-                }
-            }
-        } else {
-            try {
-                value = m.invoke(m.getDeclaringClass().newInstance());
-            } catch (InvocationTargetException ex) {
-                Throwable t = ex.getTargetException();
-                value = t.getClass().getName() + ":" + t.getMessage();
-                if (t instanceof AssertionError) {
-                    throw t;
-                }
-            }
-        }
-    }
-
-    @Override
-    public String getTestName() {
-        return m.getName() + "[" + typeName() + "]";
-    }
-
-    final String typeName() {
-        return type;
-    }
-    static void dumpJS(StringBuilder sb, Bck2BrwsrCase c) throws IOException {
-        File f = File.createTempFile(c.m.getName(), ".js");
-        try (final FileWriter w = new FileWriter(f)) {
-            w.append(c.l.toString());
-        }
-        sb.append("Path: ").append(f.getPath());
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest.impl;
-
-import org.apidesign.bck2brwsr.vmtest.*;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import org.apidesign.bck2brwsr.launcher.Launcher;
-import org.testng.Assert;
-import org.testng.ITest;
-import org.testng.annotations.Factory;
-import org.testng.annotations.Test;
-
-/** A TestNG {@link Factory} that seeks for {@link Compare} annotations
- * in provided class and builds set of tests that compare the computations
- * in real as well as JavaScript virtual machines. Use as:<pre>
- * {@code @}{@link Factory} public static create() {
- *   return @{link VMTest}.{@link #create(YourClass.class);
- * }</pre>
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class CompareCase implements ITest {
-    private final Bck2BrwsrCase first, second;
-    private final Method m;
-    
-    private CompareCase(Method m, Bck2BrwsrCase first, Bck2BrwsrCase second) {
-        this.first = first;
-        this.second = second;
-        this.m = m;
-    }
-
-    /** Inspects <code>clazz</code> and for each {@lik Compare} method creates
-     * instances of tests. Each instance runs the test in different virtual
-     * machine and at the end they compare the results.
-     * 
-     * @param clazz the class to inspect
-     * @return the set of created tests
-     */
-    public static Object[] create(Class<?> clazz) {
-        Method[] arr = clazz.getMethods();
-        List<Object> ret = new ArrayList<>();
-        
-        final LaunchSetup l = LaunchSetup.INSTANCE;
-        ret.add(l);
-        
-        String[] brwsr;
-        {
-            String p = System.getProperty("vmtest.brwsrs");
-            if (p != null) {
-                brwsr = p.split(",");
-            } else {
-                brwsr = new String[0];
-            }
-        }
-        
-        for (Method m : arr) {
-            registerCompareCases(m, l, ret, brwsr);
-            registerBrwsrCases(m, l, ret, brwsr);
-        }
-        return ret.toArray();
-    }
-
-    /** Test that compares the previous results.
-     * @throws Throwable 
-     */
-    @Test(dependsOnGroups = "run") public void compareResults() throws Throwable {
-        Object v1 = first.value;
-        Object v2 = second.value;
-        if (v1 != null) {
-            v1 = v1.toString();
-        } else {
-            v1 = "null";
-        }
-        try {
-            Assert.assertEquals(v2, v1, "Comparing results");
-        } catch (AssertionError e) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(e.getMessage());
-            Bck2BrwsrCase.dumpJS(sb, second);
-            throw new AssertionError(sb.toString());
-        }
-    }
-    
-    /** Test name.
-     * @return name of the tested method followed by a suffix
-     */
-    @Override
-    public String getTestName() {
-        return m.getName() + "[Compare " + second.typeName() + "]";
-    }
-    
-    private static void registerCompareCases(Method m, final LaunchSetup l, List<Object> ret, String[] brwsr) {
-        Compare c = m.getAnnotation(Compare.class);
-        if (c == null) {
-            return;
-        }
-        final Bck2BrwsrCase real = new Bck2BrwsrCase(m, "Java", null, false, null, null);
-        ret.add(real);
-        if (c.scripting()) {
-            final Bck2BrwsrCase js = new Bck2BrwsrCase(m, "JavaScript", l.javaScript(), false, null, null);
-            ret.add(js);
-            ret.add(new CompareCase(m, real, js));
-        }
-        for (String b : brwsr) {
-            final Launcher s = l.brwsr(b);
-            ret.add(s);
-            final Bck2BrwsrCase cse = new Bck2BrwsrCase(m, b, s, false, null, null);
-            ret.add(cse);
-            ret.add(new CompareCase(m, real, cse));
-        }
-    }
-    private static void registerBrwsrCases(Method m, final LaunchSetup l, List<Object> ret, String[] brwsr) {
-        BrwsrTest c = m.getAnnotation(BrwsrTest.class);
-        if (c == null) {
-            return;
-        }
-        HtmlFragment f = m.getAnnotation(HtmlFragment.class);
-        if (f == null) {
-            f = m.getDeclaringClass().getAnnotation(HtmlFragment.class);
-        }
-        Http.Resource[] r = {};
-        Http h = m.getAnnotation(Http.class);
-        if (h == null) {
-            h = m.getDeclaringClass().getAnnotation(Http.class);
-            if (h != null) {
-                r = h.value();
-            }
-        } else {
-            r = h.value();
-        }
-        if (brwsr.length == 0) {
-            final Launcher s = l.brwsr(null);
-            ret.add(s);
-            ret.add(new Bck2BrwsrCase(m, "Brwsr", s, true, f, r));
-        } else {
-            for (String b : brwsr) {
-                final Launcher s = l.brwsr(b);
-                ret.add(s);
-                ret.add(new Bck2BrwsrCase(m, b, s, true, f, r));
-            }
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/GenerateZip.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/GenerateZip.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest.impl;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/** Annotation to generate a ZIP or JAR file during build.
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@Retention(RetentionPolicy.SOURCE)
-@interface GenerateZip {
-    String name();
-    
-    /** manifest for the file */
-    String manifest() default "";
-
-    /** Array of names (at odd positions) and their content (on even) */
-    String[] contents();
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/GenerateZipProcessor.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/GenerateZipProcessor.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Filer;
-import javax.annotation.processing.Processor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.PackageElement;
-import javax.lang.model.element.TypeElement;
-import javax.tools.Diagnostic;
-import javax.tools.FileObject;
-import javax.tools.StandardLocation;
-import org.openide.util.lookup.ServiceProvider;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@ServiceProvider(service = Processor.class)
-@SupportedAnnotationTypes("org.apidesign.bck2brwsr.vmtest.impl.GenerateZip")
-public class GenerateZipProcessor extends AbstractProcessor {
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        for (Element e : roundEnv.getElementsAnnotatedWith(GenerateZip.class)) {
-            GenerateZip gz = e.getAnnotation(GenerateZip.class);
-            if (gz == null) {
-                continue;
-            }
-            PackageElement pe = findPackage(e);
-            try {
-                generateJar(pe, gz, e);
-            } catch (IOException ex) {
-                processingEnv.getMessager().printMessage(
-                    Diagnostic.Kind.ERROR, 
-                    "Can't generate JAR " + gz.name() + ": " + ex.getMessage()
-                );
-            }
-        }
-        return true;
-    }
-
-    private static PackageElement findPackage(Element e) {
-        while (e.getKind() != ElementKind.PACKAGE) {
-            e = e.getEnclosingElement();
-        }
-        return (PackageElement)e;
-    }
-
-    private void generateJar(PackageElement pe, GenerateZip gz, Element e) throws IOException {
-        final Filer filer = processingEnv.getFiler();
-        FileObject res = filer.createResource(
-            StandardLocation.CLASS_OUTPUT, 
-            pe.getQualifiedName().toString(), 
-            gz.name(), e
-        );
-        OutputStream os = res.openOutputStream();
-        JarOutputStream jar;
-        if (gz.manifest().isEmpty()) {
-            jar = new JarOutputStream(os);
-        } else {
-            Manifest mf = new Manifest(new ByteArrayInputStream(gz.manifest().getBytes("UTF-8")));
-            jar = new JarOutputStream(os, mf);
-        }
-        String[] arr = gz.contents();
-        for (int i = 0; i < arr.length; i += 2) {
-            JarEntry je = new JarEntry(arr[i]);
-            jar.putNextEntry(je);
-            jar.write(arr[i + 1].getBytes("UTF-8"));
-            jar.closeEntry();
-        }
-        jar.close();
-    }
-
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/LaunchSetup.java
--- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/LaunchSetup.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest.impl;
-
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.apidesign.bck2brwsr.launcher.Launcher;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public final class LaunchSetup {
-    static LaunchSetup INSTANCE = new LaunchSetup();
-    
-    private Launcher js;
-    private final Map<String,Launcher> brwsrs = new LinkedHashMap<>();
-    
-    private LaunchSetup() {
-    }
-    
-    public Launcher javaScript() {
-        return js(true);
-    } 
-    private synchronized  Launcher js(boolean create) {
-        if (js == null && create) {
-            js = Launcher.createJavaScript();
-        }
-        return js;
-    } 
-    
-    public synchronized Launcher brwsr(String cmd) {
-        Launcher s = brwsrs.get(cmd);
-        if (s == null) {
-            s = Launcher.createBrowser(cmd);
-            brwsrs.put(cmd, s);
-        }
-        return s;
-    }
-
-    @BeforeGroups("run")
-    public void initializeLauncher() throws IOException {
-        if (js(false) != null) {
-            js(true).initialize();
-        }
-        for (Launcher launcher : brwsrs.values()) {
-            launcher.initialize();
-        }
-    }
-
-    @AfterGroups("run")
-    public void shutDownLauncher() throws IOException, InterruptedException {
-        if (js(false) != null) {
-            js(true).shutdown();
-        }
-        for (Launcher launcher : brwsrs.values()) {
-            launcher.shutdown();
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/AssertionTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/AssertionTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class AssertionTest {
-
-    @Compare public Object checkAssert() throws ClassNotFoundException {
-        try {
-            assert false : "Is assertion status on?";
-            return null;
-        } catch (AssertionError ex) {
-            return ex.getClass().getName();
-        }
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(AssertionTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/BrwsrCheckTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/BrwsrCheckTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
-import org.apidesign.bck2brwsr.vmtest.HtmlFragment;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class BrwsrCheckTest {
-
-    @BrwsrTest public void assertWindowObjectIsDefined() {
-        assert window() != null : "No window object found!";
-    }
-
-    
-    
-    
-    @HtmlFragment("<h1 id='hello'>\n"
-        + "Hello!\n"
-        + "</h1>\n")
-    @BrwsrTest public void accessProvidedFragment() {
-        assert getElementById("hello") != null : "Element with 'hello' ID found";
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(BrwsrCheckTest.class);
-    }
-    
-
-    @JavaScriptBody(args = {}, body = "return window;")
-    private static native Object window();
-
-    @JavaScriptBody(args = { "id" }, body = "return window.document.getElementById(id);")
-    private static native Object getElementById(String id);
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ByteArithmeticTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ByteArithmeticTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ByteArithmeticTest {
-    
-    private static byte add(byte x, byte y) {
-        return (byte)(x + y);
-    }
-    
-    private static byte sub(byte x, byte y) {
-        return (byte)(x - y);
-    }
-    
-    private static byte mul(byte x, byte y) {
-        return (byte)(x * y);
-    }
-    
-    private static byte div(byte x, byte y) {
-        return (byte)(x / y);
-    }
-    
-    private static byte mod(byte x, byte y) {
-        return (byte)(x % y);
-    }
-    
-    @Compare public byte conversion() {
-        return (byte)123456;
-    }
-    
-    @Compare public byte addOverflow() {
-        return add(Byte.MAX_VALUE, (byte)1);
-    }
-    
-    @Compare public byte subUnderflow() {
-        return sub(Byte.MIN_VALUE, (byte)1);
-    }
-    
-    @Compare public byte addMaxByteAndMaxByte() {
-        return add(Byte.MAX_VALUE, Byte.MAX_VALUE);
-    }
-    
-    @Compare public byte subMinByteAndMinByte() {
-        return sub(Byte.MIN_VALUE, Byte.MIN_VALUE);
-    }
-    
-    @Compare public byte multiplyMaxByte() {
-        return mul(Byte.MAX_VALUE, (byte)2);
-    }
-    
-    @Compare public byte multiplyMaxByteAndMaxByte() {
-        return mul(Byte.MAX_VALUE, Byte.MAX_VALUE);
-    }
-    
-    @Compare public byte multiplyMinByte() {
-        return mul(Byte.MIN_VALUE, (byte)2);
-    }
-    
-    @Compare public byte multiplyMinByteAndMinByte() {
-        return mul(Byte.MIN_VALUE, Byte.MIN_VALUE);
-    }
-    
-    @Compare public byte multiplyPrecision() {
-        return mul((byte)17638, (byte)1103);
-    }
-    
-    @Compare public byte division() {
-        return div((byte)1, (byte)2);
-    }
-    
-    @Compare public byte divisionReminder() {
-        return mod((byte)1, (byte)2);
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(ByteArithmeticTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CloneTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CloneTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class CloneTest {
-    private int value;
-    
-    @Compare
-    public Object notSupported() throws CloneNotSupportedException {
-        return this.clone();
-    }
-
-    @Compare public String sameClass() throws CloneNotSupportedException {
-        return new Clnbl().clone().getClass().getName();
-    }
-
-    @Compare public boolean differentInstance() throws CloneNotSupportedException {
-        Clnbl orig = new Clnbl();
-        return orig == orig.clone();
-    }
-
-    @Compare public int sameReference() throws CloneNotSupportedException {
-        CloneTest self = this;
-        Clnbl orig = new Clnbl();
-        self.value = 33;
-        orig.ref = self;
-        return ((Clnbl)orig.clone()).ref.value;
-    }
-
-    @Compare public int sameValue() throws CloneNotSupportedException {
-        Clnbl orig = new Clnbl();
-        orig.value = 10;
-        return ((Clnbl)orig.clone()).value;
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(CloneTest.class);
-    }
-    
-    public static final class Clnbl implements Cloneable {
-        public CloneTest ref;
-        private int value;
-
-        @Override
-        public Object clone() throws CloneNotSupportedException {
-            return super.clone();
-        }
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareByteArrayTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareByteArrayTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class CompareByteArrayTest {
-    @Compare public int byteArraySum() {
-        byte[] arr = createArray();
-        return sumByteArr(arr);
-    }
-    
-    @Compare public int countZeros() {
-        int zeros = 0;
-        for (Byte b : createArray()) {
-            if (b == 0) {
-                zeros++;
-            }
-        }
-        return zeros;
-    }
-    
-    private static int sumByteArr(byte[] arr) {
-        int sum = 0;
-        for (int i = 0; i < arr.length; i++) {
-            sum += arr[i];
-        }
-        return sum;
-    }
-    
-    @Compare public String noOutOfBounds() {
-        return atIndex(1);
-    }
-
-    @Compare public String outOfBounds() {
-        return atIndex(5);
-    }
-
-    @Compare public String outOfBoundsMinus() {
-        return atIndex(-1);
-    }
-
-    @Compare public String toOfBounds() {
-        return toIndex(5);
-    }
-
-    @Compare public String toOfBoundsMinus() {
-        return toIndex(-1);
-    }
-
-    private static final int[] arr = { 0, 1, 2 };
-    public static String atIndex(int at) {
-        return "at@" + arr[at];
-    }
-    public static String toIndex(int at) {
-        arr[at] = 10;
-        return "ok";
-    }
-    
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(CompareByteArrayTest.class);
-    }
-
-    private byte[] createArray() {
-        byte[] arr = new byte[10];
-        arr[5] = 3;
-        arr[7] = 8;
-        return arr;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareHashTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareHashTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class CompareHashTest {
-    @Compare public int hashOfString() {
-        return "Ahoj".hashCode();
-    }
-    
-    @Compare public int hashRemainsYieldsZero() {
-        Object o = new Object();
-        return o.hashCode() - o.hashCode();
-    }
-    
-    @Compare public int initializeInStatic() {
-        return StaticUse.NON_NULL.hashCode() - StaticUse.NON_NULL.hashCode();
-    }
-    
-    @Compare public int hashOfInt() {
-        return Integer.valueOf(Integer.MAX_VALUE).hashCode();
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(CompareHashTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareIntArrayTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareIntArrayTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class CompareIntArrayTest {
-    @Compare public int integerArraySum() {
-        int[] arr = createArray();
-        return sumIntArr(arr);
-    }
-    
-    @Compare public int countZeros() {
-        int zeros = 0;
-        for (Integer i : createArray()) {
-            if (i == 0) {
-                zeros++;
-            }
-        }
-        return zeros;
-    }
-    
-    private static int sumIntArr(int[] arr) {
-        int sum = 0;
-        for (int i = 0; i < arr.length; i++) {
-            sum += arr[i];
-        }
-        return sum;
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(CompareIntArrayTest.class);
-    }
-
-    private int[] createArray() {
-        int[] arr = new int[10];
-        arr[5] = 3;
-        arr[7] = 8;
-        return arr;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareStringsTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/CompareStringsTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class CompareStringsTest {
-    @Compare public String firstChar() {
-        return "" + ("Hello".toCharArray()[0]);
-    }
-    
-    @Compare public String classCast() {
-        Object o = firstChar();
-        return String.class.cast(o);
-    }
-
-    @Compare public String classCastThrown() {
-        Object o = null;
-        return String.class.cast(o);
-    }
-    
-    @Compare public boolean equalToNull() {
-        return "Ahoj".equals(null);
-    }
-    
-    @Compare public int highByteLenght() {
-        byte[] arr= { 77,97,110,105,102,101,115,116,45,86,101,114,115,105,111,110 };
-        return new String(arr, 0).length();
-    }
-    
-    @Compare public String highByte() {
-        byte[] arr= { 77,97,110,105,102,101,115,116,45,86,101,114,115,105,111,110 };
-        StringBuilder sb = new StringBuilder();
-        sb.append("pref:");
-        sb.append(new String(arr, 0));
-        return sb.toString();
-    }
-    
-    @Compare public static Object compareURLs() throws MalformedURLException {
-        return new URL("http://apidesign.org:8080/wiki/").toExternalForm().toString();
-    }
-    
-    @Compare public String deleteLastTwoCharacters() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("453.0");
-        if (sb.toString().endsWith(".0")) {
-            final int l = sb.length();
-            sb.delete(l - 2, l);
-        }
-        return sb.toString().toString();
-    }
-    
-    @Compare public String nameOfStringClass() throws Exception {
-        return Class.forName("java.lang.String").getName();
-    }
-    @Compare public String nameOfArrayClass() throws Exception {
-        return Class.forName("org.apidesign.bck2brwsr.tck.CompareHashTest").getName();
-    }
-    
-    @Compare public String lowerHello() {
-        return "HeLlO".toLowerCase();
-    }
-    
-    @Compare public String lowerA() {
-        return String.valueOf(Character.toLowerCase('A')).toString();
-    }
-    @Compare public String upperHello() {
-        return "hello".toUpperCase();
-    }
-    
-    @Compare public String upperA() {
-        return String.valueOf(Character.toUpperCase('a')).toString();
-    }
-    
-    @Compare public boolean matchRegExp() throws Exception {
-        return "58038503".matches("\\d*");
-    }
-
-    @Compare public boolean doesNotMatchRegExp() throws Exception {
-        return "58038503GH".matches("\\d*");
-    }
-
-    @Compare public boolean doesNotMatchRegExpFully() throws Exception {
-        return "Hello".matches("Hell");
-    }
-    
-    @Compare public String emptyCharArray() {
-        char[] arr = new char[10];
-        return new String(arr);
-    }
-    
-    @Compare public String variousCharacterTests() throws Exception {
-        StringBuilder sb = new StringBuilder();
-        
-        sb.append(Character.isUpperCase('a'));
-        sb.append(Character.isUpperCase('A'));
-        sb.append(Character.isLowerCase('a'));
-        sb.append(Character.isLowerCase('A'));
-        
-        sb.append(Character.isLetter('A'));
-        sb.append(Character.isLetterOrDigit('9'));
-        sb.append(Character.isLetterOrDigit('A'));
-        sb.append(Character.isLetter('0'));
-        
-        return sb.toString().toString();
-    }
-        
-    @Compare
-    public String nullFieldInitialized() {
-        NullField nf = new NullField();
-        return ("" + nf.name).toString();
-    }
-    @Compare
-    public String toUTFString() throws UnsupportedEncodingException {
-        byte[] arr = {
-            (byte) -59, (byte) -67, (byte) 108, (byte) 117, (byte) -59, (byte) -91,
-            (byte) 111, (byte) 117, (byte) -60, (byte) -115, (byte) 107, (byte) -61,
-            (byte) -67, (byte) 32, (byte) 107, (byte) -59, (byte) -81, (byte) -59,
-            (byte) -120
-        };
-        return new String(arr, "utf-8");
-    }
-
-    @Compare
-    public int stringToBytesLenght() throws UnsupportedEncodingException {
-        return "\u017dlu\u0165ou\u010dk\u00fd k\u016f\u0148".getBytes("utf8").length;
-    }
-
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(CompareStringsTest.class);
-    }
-
-    private static final class NullField {
-
-        String name;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/HttpResourceTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/HttpResourceTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import java.io.InputStream;
-import java.net.URL;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
-import org.apidesign.bck2brwsr.vmtest.Http;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class HttpResourceTest {
-    
-    @Http({
-        @Http.Resource(path = "/xhr", content = "Hello Brwsr!", mimeType = "text/plain")
-    })
-    @BrwsrTest
-    
-    
-    public String testReadContentViaXHR() throws Exception {
-        String msg = read("/xhr");
-        assert "Hello Brwsr!".equals(msg) : "The message was " + msg;
-        return msg;
-    }
-
-    @Http({
-        @Http.Resource(path = "/url", content = "Hello via URL!", mimeType = "text/plain")
-    })
-    @BrwsrTest
-    public String testReadContentViaURL() throws Exception {
-        URL url = new URL("http:/url");
-        String msg = (String) url.getContent();
-        assert "Hello via URL!".equals(msg) : "The message was " + msg;
-        return msg;
-    }
-    @Http({
-        @Http.Resource(path = "/url", content = "Hello via URL!", mimeType = "text/plain")
-    })
-    @BrwsrTest
-    public String testReadContentViaURLWithStringParam() throws Exception {
-        URL url = new URL("http:/url");
-        String msg = (String) url.getContent(new Class[] { String.class });
-        assert "Hello via URL!".equals(msg) : "The message was " + msg;
-        return msg;
-    }
-
-    @Http({
-        @Http.Resource(path = "/bytes", content = "", resource = "0xfe", mimeType = "x-application/binary")
-    })
-    @BrwsrTest
-    public void testReadByte() throws Exception {
-        URL url = new URL("http:/bytes");
-        final Object res = url.getContent(new Class[] { byte[].class });
-        assert res instanceof byte[] : "Expecting byte[]: " + res;
-        byte[] arr = (byte[]) res;
-        assert arr.length == 1 : "One byte " + arr.length;
-        assert arr[0] == 0xfe : "It is 0xfe: " + Integer.toHexString(arr[0]);
-    }
-
-    @Http({
-        @Http.Resource(path = "/bytes", content = "", resource = "0xfe", mimeType = "x-application/binary")
-    })
-    @BrwsrTest
-    public void testReadByteViaInputStream() throws Exception {
-        URL url = new URL("http:/bytes");
-        InputStream is = url.openStream();
-        byte[] arr = new byte[10];
-        int len = is.read(arr);
-        assert len == 1 : "One byte " + len;
-        assert arr[0] == 0xfe : "It is 0xfe: " + Integer.toHexString(arr[0]);
-    }
-    
-    @JavaScriptBody(args = { "url" }, body = 
-          "var req = new XMLHttpRequest();\n"
-        + "req.open('GET', url, false);\n"
-        + "req.send();\n"
-        + "return req.responseText;"
-    )
-    private static native String read(String url);
-    
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(HttpResourceTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceA.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceA.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class InheritanceA {
-    private String name;
-    
-    public void setA(String n) {
-        this.name = n;
-    }
-    
-    public String getA() {
-        return name;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceB.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceB.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class InheritanceB extends InheritanceA {
-    private String name;
-    
-    public void setB(String n) {
-        this.name = n;
-    }
-    
-    public String getB() {
-        return name;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/InheritanceTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class InheritanceTest {
-
-    @Compare public String checkFieldsIndependent() throws ClassNotFoundException {
-        InheritanceB ib = new InheritanceB();
-        ib.setA("A");
-        ib.setB("B");
-        return "A: " + ib.getA() + " B: " + ib.getB();
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(InheritanceTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/IntegerArithmeticTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/IntegerArithmeticTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class IntegerArithmeticTest {
-    
-    private static int add(int x, int y) {
-        return x + y;
-    }
-    
-    private static int sub(int x, int y) {
-        return x - y;
-    }
-    
-    private static int mul(int x, int y) {
-        return x * y;
-    }
-    
-    private static int div(int x, int y) {
-        return x / y;
-    }
-    
-    private static int mod(int x, int y) {
-        return x % y;
-    }
-    
-    private static int neg(int x) {
-        return (-x);
-    }
-    
-    @Compare public int addOverflow() {
-        return add(Integer.MAX_VALUE, 1);
-    }
-    
-    @Compare public int subUnderflow() {
-        return sub(Integer.MIN_VALUE, 1);
-    }
-    
-    @Compare public int addMaxIntAndMaxInt() {
-        return add(Integer.MAX_VALUE, Integer.MAX_VALUE);
-    }
-    
-    @Compare public int subMinIntAndMinInt() {
-        return sub(Integer.MIN_VALUE, Integer.MIN_VALUE);
-    }
-    
-    @Compare public int multiplyMaxInt() {
-        return mul(Integer.MAX_VALUE, 2);
-    }
-    
-    @Compare public int multiplyMaxIntAndMaxInt() {
-        return mul(Integer.MAX_VALUE, Integer.MAX_VALUE);
-    }
-    
-    @Compare public int multiplyMinInt() {
-        return mul(Integer.MIN_VALUE, 2);
-    }
-    
-    @Compare public int multiplyMinIntAndMinInt() {
-        return mul(Integer.MIN_VALUE, Integer.MIN_VALUE);
-    }
-    
-    @Compare public int multiplyPrecision() {
-        return mul(119106029, 1103515245);
-    }
-    
-    @Compare public int division() {
-        return div(1, 2);
-    }
-    
-    @Compare public int divisionReminder() {
-        return mod(1, 2);
-    }
-    
-    @Compare public int negate() {
-        return neg(123456);
-    }
-    
-    @Compare public int negateMaxInt() {
-        return neg(Integer.MAX_VALUE);
-    }
-    
-    @Compare public int negateMinInt() {
-        return neg(Integer.MIN_VALUE);
-    }
-    
-    @Compare public int sumTwoDimensions() {
-        int[][] matrix = createMatrix(4, 3);
-        matrix[0][0] += 10;
-        return matrix[0][0];
-    }
-    
-    static int[][] createMatrix(int x, int y) {
-        return new int[x][y];
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(IntegerArithmeticTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/LongArithmeticTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,334 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class LongArithmeticTest {
-    
-    private static long add(long x, long y) {
-        return (x + y);
-    }
-    
-    private static long sub(long x, long y) {
-        return (x - y);
-    }
-    
-    private static long mul(long x, long y) {
-        return (x * y);
-    }
-    
-    private static long div(long x, long y) {
-        return (x / y);
-    }
-    
-    private static long mod(long x, long y) {
-        return (x % y);
-    }
-    
-    private static long neg(long x) {
-        return (-x);
-    }
-    
-    private static long shl(long x, int b) {
-        return (x << b);
-    }
-    
-    private static long shr(long x, int b) {
-        return (x >> b);
-    }
-    
-    private static long ushr(long x, int b) {
-        return (x >>> b);
-    }
-    
-    private static long and(long x, long y) {
-        return (x & y);
-    }
-    
-    private static long or(long x, long y) {
-        return (x | y);
-    }
-    
-    private static long xor(long x, long y) {
-        return (x ^ y);
-    }
-    
-    public static int compare(long x, long y, int zero) {
-        final int xyResult = compareL(x, y, zero);
-        final int yxResult = compareL(y, x, zero);
-
-        return ((xyResult + yxResult) == 0) ? xyResult : -2;
-    }
-
-    private static int compareL(long x, long y, int zero) {
-        int result = -2;
-        int trueCount = 0;
-
-        x += zero;
-        if (x == y) {
-            result = 0;
-            ++trueCount;
-        }
-
-        x += zero;
-        if (x < y) {
-            result = -1;
-            ++trueCount;
-        }
-
-        x += zero;
-        if (x > y) {
-            result = 1;
-            ++trueCount;
-        }
-
-        return (trueCount == 1) ? result : -2;
-    }
-    
-    @Compare public long conversion() {
-        return Long.MAX_VALUE;
-    }
-    
-    @Compare public long negate1() {
-        return neg(0x00fa37d7763e0ca1l);
-    }
-    
-    @Compare public long negate2() {
-        return neg(0x80fa37d7763e0ca1l);
-    }
-
-    @Compare public long negate3() {
-        return neg(0xfffffffffffffeddl);
-    }
-
-    @Compare public long addOverflow() {
-        return add(Long.MAX_VALUE, 1l);
-    }
-
-    @Compare public long subUnderflow() {
-        return sub(Long.MIN_VALUE, 1l);
-    }
-
-    @Compare public long addMaxLongAndMaxLong() {
-        return add(Long.MAX_VALUE, Long.MAX_VALUE);
-    }
-    
-    @Compare public long subMinLongAndMinLong() {
-        return sub(Long.MIN_VALUE, Long.MIN_VALUE);
-    }
-    
-    @Compare public long subMinLongAndMaxLong() {
-        return sub(Long.MIN_VALUE, Long.MAX_VALUE);
-    }
-
-    @Compare public long multiplyMaxLong() {
-        return mul(Long.MAX_VALUE, 2l);
-    }
-    
-    @Compare public long multiplyMaxLongAndMaxLong() {
-        return mul(Long.MAX_VALUE, Long.MAX_VALUE);
-    }
-    
-    @Compare public long multiplyMinLong() {
-        return mul(Long.MIN_VALUE, 2l);
-    }
-    
-    @Compare public long multiplyMinLongAndMinLong() {
-        return mul(Long.MIN_VALUE, Long.MIN_VALUE);
-    }
-    
-    @Compare public long multiplyPrecision() {
-        return mul(0x00fa37d7763e0ca1l, 0xa7b3432fff00123el);
-    }
-    
-    @Compare public long divideSmallPositiveNumbers() {
-        return div(0xabcdef, 0x123);
-    }
-
-    @Compare public long divideSmallNegativeNumbers() {
-        return div(-0xabcdef, -0x123);
-    }
-
-    @Compare public long divideSmallMixedNumbers() {
-        return div(0xabcdef, -0x123);
-    }
-
-    @Compare public long dividePositiveNumbersOneDigitDenom() {
-        return div(0xabcdef0102ffffl, 0x654);
-    }
-
-    @Compare public long divideNegativeNumbersOneDigitDenom() {
-        return div(-0xabcdef0102ffffl, -0x654);
-    }
-
-    @Compare public long divideMixedNumbersOneDigitDenom() {
-        return div(-0xabcdef0102ffffl, 0x654);
-    }
-
-    @Compare public long dividePositiveNumbersMultiDigitDenom() {
-        return div(0x7ffefc003322aabbl, 0x89ab1000l);
-    }
-
-    @Compare public long divideNegativeNumbersMultiDigitDenom() {
-        return div(-0x7ffefc003322aabbl, -0x123489ab1001l);
-    }
-
-    @Compare public long divideMixedNumbersMultiDigitDenom() {
-        return div(0x7ffefc003322aabbl, -0x38f49b0b7574e36l);
-    }
-
-    @Compare public long divideWithOverflow() {
-        return div(0x8000fffe0000l, 0x8000ffffl);
-    }
-
-    @Compare public long divideWithCorrection() {
-        return div(0x7fff800000000000l, 0x800000000001l);
-    }
-
-    @Compare public long moduloSmallPositiveNumbers() {
-        return mod(0xabcdef, 0x123);
-    }
-
-    @Compare public long moduloSmallNegativeNumbers() {
-        return mod(-0xabcdef, -0x123);
-    }
-
-    @Compare public long moduloSmallMixedNumbers() {
-        return mod(0xabcdef, -0x123);
-    }
-
-    @Compare public long moduloPositiveNumbersOneDigitDenom() {
-        return mod(0xabcdef0102ffffl, 0x654);
-    }
-
-    @Compare public long moduloNegativeNumbersOneDigitDenom() {
-        return mod(-0xabcdef0102ffffl, -0x654);
-    }
-
-    @Compare public long moduloMixedNumbersOneDigitDenom() {
-        return mod(-0xabcdef0102ffffl, 0x654);
-    }
-
-    @Compare public long moduloPositiveNumbersMultiDigitDenom() {
-        return mod(0x7ffefc003322aabbl, 0x89ab1000l);
-    }
-
-    @Compare public long moduloNegativeNumbersMultiDigitDenom() {
-        return mod(-0x7ffefc003322aabbl, -0x123489ab1001l);
-    }
-
-    @Compare public long moduloMixedNumbersMultiDigitDenom() {
-        return mod(0x7ffefc003322aabbl, -0x38f49b0b7574e36l);
-    }
-
-    @Compare public long moduloWithOverflow() {
-        return mod(0x8000fffe0000l, 0x8000ffffl);
-    }
-
-    @Compare public long moduloWithCorrection() {
-        return mod(0x7fff800000000000l, 0x800000000001l);
-    }
-    
-    @Compare public long shiftL1() {
-        return shl(0x00fa37d7763e0ca1l, 5);
-    }
-    
-    @Compare public long shiftL2() {
-        return shl(0x00fa37d7763e0ca1l, 32);
-    }
-    
-    @Compare public long shiftL3() {
-        return shl(0x00fa37d7763e0ca1l, 45);
-    }
-    
-    @Compare public long shiftR1() {
-        return shr(0x00fa37d7763e0ca1l, 5);
-    }
-    
-    @Compare public long shiftR2() {
-        return shr(0x00fa37d7763e0ca1l, 32);
-    }
-    
-    @Compare public long shiftR3() {
-        return shr(0x00fa37d7763e0ca1l, 45);
-    }
-    
-    @Compare public long uShiftR1() {
-        return ushr(0x00fa37d7763e0ca1l, 5);
-    }
-    
-    @Compare public long uShiftR2() {
-        return ushr(0x00fa37d7763e0ca1l, 45);
-    }
-    
-    @Compare public long uShiftR3() {
-        return ushr(0xf0fa37d7763e0ca1l, 5);
-    }
-    
-    @Compare public long uShiftR4() {
-        return ushr(0xf0fa37d7763e0ca1l, 45);
-    }
-    
-    @Compare public long and1() {
-        return and(0x00fa37d7763e0ca1l, 0xa7b3432fff00123el);
-    }
-    
-    @Compare public long or1() {
-        return or(0x00fa37d7763e0ca1l, 0xa7b3432fff00123el);
-    }
-    
-    @Compare public long xor1() {
-        return xor(0x00fa37d7763e0ca1l, 0xa7b3432fff00123el);
-    }
-    
-    @Compare public long xor2() {
-        return xor(0x00fa37d7763e0ca1l, 0x00000000ff00123el);
-    }
-    
-    @Compare public long xor3() {
-        return xor(0x00000000763e0ca1l, 0x00000000ff00123el);
-    }
-    
-    @Compare public int compareSameNumbers() {
-        return compare(0x0000000000000000l, 0x0000000000000000l, 0);
-    }
-
-    @Compare public int comparePositiveNumbers() {
-        return compare(0x0000000000200000l, 0x0000000010000000l, 0);
-    }
-
-    @Compare public int compareNegativeNumbers() {
-        return compare(0xffffffffffffffffl, 0xffffffff00000000l, 0);
-    }
-
-    @Compare public int compareMixedNumbers() {
-        return compare(0x8000000000000000l, 0x7fffffffffffffffl, 0);
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(LongArithmeticTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionArrayTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionArrayTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import java.lang.reflect.Array;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ReflectionArrayTest {
-    @Compare public int lengthOfStringArray() {
-        String[] arr = (String[]) Array.newInstance(String.class, 10);
-        return arr.length;
-    }
-    
-    @Compare public int reflectiveLengthOfStringArray() {
-        Object arr = Array.newInstance(String.class, 10);
-        return Array.getLength(arr);
-    }
-
-    @Compare public int reflectiveLengthOneNonArray() {
-        Object arr = "non-array";
-        return Array.getLength(arr);
-    }
-
-    @Compare public String compTypeOfStringArray() {
-        String[] arr = (String[]) Array.newInstance(String.class, 10);
-        return arr.getClass().getComponentType().getName();
-    }
-
-    @Compare public Object negativeArrayExcp() {
-        return Array.newInstance(String.class, -5);
-    }
-    
-    @Compare public int lengthOfIntArray() {
-        int[] arr = (int[]) Array.newInstance(Integer.TYPE, 10);
-        return arr.length;
-    }
-
-    @Compare public int reflectiveLengthOfIntArray() {
-        Object arr = Array.newInstance(Integer.TYPE, 10);
-        return Array.getLength(arr);
-    }
-
-    @Compare public String compTypeOfIntArray() {
-        int[] arr = (int[]) Array.newInstance(int.class, 10);
-        return arr.getClass().getComponentType().getName();
-    }
-
-    @Compare public Object intNegativeArrayExcp() {
-        return Array.newInstance(int.class, -5);
-    }
-
-    @Compare public Integer verifyAutobox() {
-        int[] arr = (int[]) Array.newInstance(int.class, 5);
-        return (Integer) Array.get(arr, 0);
-    }
-    @Compare public String verifyObjectArray() {
-        String[] arr = (String[]) Array.newInstance(String.class, 5);
-        Array.set(arr, 0, "Hello");
-        return (String) Array.get(arr, 0);
-    }
-    @Compare public int verifyInt() {
-        int[] arr = (int[]) Array.newInstance(int.class, 5);
-        return Array.getInt(arr, 0);
-    }
-    @Compare public long verifyConvertToLong() {
-        int[] arr = (int[]) Array.newInstance(int.class, 5);
-        return Array.getLong(arr, 0);
-    }
-
-    @Compare public Object verifySetIntToObject() {
-        try {
-            Object[] arr = (Object[]) Array.newInstance(Object.class, 5);
-            Array.setInt(arr, 0, 10);
-            return Array.get(arr, 0);
-        } catch (Exception exception) {
-            return exception.getClass().getName();
-        }
-    }
-    @Compare public long verifySetShort() {
-        int[] arr = (int[]) Array.newInstance(int.class, 5);
-        Array.setShort(arr, 0, (short)10);
-        return Array.getLong(arr, 0);
-    }
-    @Compare public long verifyCantSetLong() {
-        int[] arr = (int[]) Array.newInstance(int.class, 5);
-        Array.setLong(arr, 0, 10);
-        return Array.getLong(arr, 0);
-    }
-    @Compare public float verifyLongToFloat() {
-        Object arr = Array.newInstance(float.class, 5);
-        Array.setLong(arr, 0, 10);
-        return Array.getFloat(arr, 0);
-    }
-
-    @Compare public double verifyConvertToDouble() {
-        int[] arr = (int[]) Array.newInstance(int.class, 5);
-        return Array.getDouble(arr, 0);
-    }
-    
-    @Compare public int multiIntArray() {
-        int[][][] arr = (int[][][]) Array.newInstance(int.class, 3, 3, 3);
-        return arr[0][1][2] + 5 + arr[2][2][0];
-    }
-
-    @Compare public String multiIntArrayCompType() {
-        return Array.newInstance(int.class, 3, 3, 3).getClass().getName();
-    }
-    
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(ReflectionArrayTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ReflectionTest {
-    @Compare public boolean nonNullThis() {
-        return this == null;
-    }
-    
-    @Compare public String intType() {
-        return Integer.TYPE.toString();
-    }
-
-    @Compare public String voidType() throws Exception {
-        return void.class.toString();
-    }
-
-    @Compare public String longClass() {
-        return long.class.toString();
-    }
-    
-    @Compare public boolean isRunnableInterface() {
-        return Runnable.class.isInterface();
-    }
-
-    @Compare public String isRunnableHasRunMethod() throws NoSuchMethodException {
-        return Runnable.class.getMethod("run").getName();
-    }
-    
-    @Compare public String namesOfMethods() {
-        StringBuilder sb = new StringBuilder();
-        String[] arr = new String[20];
-        int i = 0;
-        for (Method m : StaticUse.class.getMethods()) {
-            arr[i++] = m.getName();
-        }
-        for (String s : sort(arr, i)) {
-            sb.append(s).append("\n");
-        }
-        return sb.toString();
-    }
-
-    @Compare public String namesOfDeclaringClassesOfMethods() {
-        StringBuilder sb = new StringBuilder();
-        String[] arr = new String[20];
-        int i = 0;
-        for (Method m : StaticUse.class.getMethods()) {
-            arr[i++] = m.getName() + "@" + m.getDeclaringClass().getName();
-        }
-        for (String s : sort(arr, i)) {
-            sb.append(s).append("\n");
-        }
-        return sb.toString();
-    }
-    
-    @Compare public String cannotCallNonStaticMethodWithNull() throws Exception {
-        StaticUse.class.getMethod("instanceMethod").invoke(null);
-        return "should not happen";
-    }
-
-    @Compare public Object voidReturnType() throws Exception {
-        return StaticUse.class.getMethod("instanceMethod").getReturnType();
-    }
-    
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface Ann {
-    }
-    
-    @Compare public String annoClass() throws Exception {
-        Retention r = Ann.class.getAnnotation(Retention.class);
-        assert r != null : "Annotation is present";
-        assert r.value() == RetentionPolicy.RUNTIME : "Policy value is OK: " + r.value();
-        return r.annotationType().getName();
-    }
-    
-    @Compare public boolean isAnnotation() {
-        return Ann.class.isAnnotation();
-    }
-    @Compare public boolean isNotAnnotation() {
-        return String.class.isAnnotation();
-    }
-    @Compare public boolean isNotAnnotationEnum() {
-        return E.class.isAnnotation();
-    }
-    enum E { A, B };
-    @Compare public boolean isEnum() {
-        return E.A.getClass().isEnum();
-    }
-
-    @Compare public boolean isNotEnum() {
-        return "".getClass().isEnum();
-    }
-    
-    @Compare public String newInstanceFails() throws InstantiationException {
-        try {
-            return "success: " + StaticUse.class.newInstance();
-        } catch (IllegalAccessException ex) {
-            return ex.getClass().getName();
-        }
-    }
-    
-    @Compare public String paramTypes() throws Exception {
-        Method plus = StaticUse.class.getMethod("plus", int.class, Integer.TYPE);
-        final Class[] pt = plus.getParameterTypes();
-        return pt[0].getName();
-    }
-    @Compare public String paramTypesNotFound() throws Exception {
-        return StaticUse.class.getMethod("plus", int.class, double.class).toString();
-    }
-    @Compare public int methodWithArgs() throws Exception {
-        Method plus = StaticUse.class.getMethod("plus", int.class, Integer.TYPE);
-        return (Integer)plus.invoke(null, 2, 3);
-    }
-    
-    @Compare public String classGetNameForByte() {
-         return byte.class.getName();
-    }
-    @Compare public String classGetNameForBaseObject() {
-        return newObject().getClass().getName();
-    }
-    @Compare public String classGetNameForJavaObject() {
-        return new Object().getClass().getName();
-    }
-    @Compare public String classGetNameForObjectArray() {
-        return (new Object[3]).getClass().getName();
-    }
-    @Compare public String classGetNameForSimpleIntArray() {
-        return (new int[3]).getClass().getName();
-    }
-    @Compare public boolean sameClassGetNameForSimpleCharArray() {
-        return (new char[3]).getClass() == (new char[34]).getClass();
-    }
-    @Compare public String classGetNameForMultiIntArray() {
-        return (new int[3][4][5][6][7][8][9]).getClass().getName();
-    }
-    @Compare public String classGetNameForMultiIntArrayInner() {
-        final int[][][][][][][] arr = new int[3][4][5][6][7][8][9];
-        int[][][][][][] subarr = arr[0];
-        int[][][][][] subsubarr = subarr[0];
-        return subsubarr.getClass().getName();
-    }
-    @Compare public String classGetNameForMultiStringArray() {
-        return (new String[3][4][5][6][7][8][9]).getClass().getName();
-    }
-    
-    @Compare public String classForByte() throws Exception {
-        return Class.forName("[Z").getName();
-    }
-
-    @Compare public String classForUnknownArray() {
-        try {
-            return Class.forName("[W").getName();
-        } catch (Exception ex) {
-            return ex.getClass().getName();
-        }
-    }
-    
-    @Compare public String classForUnknownDeepArray() {
-        try {
-            return Class.forName("[[[[[W").getName();
-        } catch (Exception ex) {
-            return ex.getClass().getName();
-        }
-    }
-    
-    @Compare public String componentGetNameForObjectArray() {
-        return (new Object[3]).getClass().getComponentType().getName();
-    }
-    @Compare public boolean sameComponentGetNameForObjectArray() {
-        return (new Object[3]).getClass().getComponentType() == Object.class;
-    }
-    @Compare public String componentGetNameForSimpleIntArray() {
-        return (new int[3]).getClass().getComponentType().getName();
-    }
-    @Compare public String componentGetNameForMultiIntArray() {
-        return (new int[3][4][5][6][7][8][9]).getClass().getComponentType().getName();
-    }
-    @Compare public String componentGetNameForMultiStringArray() {
-        Class<?> c = (new String[3][4][5][6][7][8][9]).getClass();
-        StringBuilder sb = new StringBuilder();
-        for (;;) {
-            sb.append(c.getName()).append("\n");
-            c = c.getComponentType();
-            if (c == null) {
-                break;
-            }
-        }
-        return sb.toString();
-    }
-    
-    @Compare public boolean isArray() {
-        return new Object[0].getClass().isArray();
-    }
-    
-    @JavaScriptBody(args = { "arr", "len" }, body="var a = arr.slice(0, len); a.sort(); return a;")
-    private static String[] sort(String[] arr, int len) {
-        List<String> list = Arrays.asList(arr).subList(0, len);
-        Collections.sort(list);
-        return list.toArray(new String[0]);
-    }
-    
-    @JavaScriptBody(args = {}, body = "return new Object();")
-    private static Object newObject() {
-        return new Object();
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(ReflectionTest.class);
-    }
-    
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ResourcesTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ResourcesTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import java.io.InputStream;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ResourcesTest {
-    
-    @Compare public String readResourceAsStream() throws Exception {
-        InputStream is = getClass().getResourceAsStream("Resources.txt");
-        byte[] b = new byte[30];
-        int len = is.read(b);
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < len; i++) {
-            sb.append((char)b[i]);
-        }
-        return sb.toString();
-    }
-    
-    @Factory public static Object[] create() {
-        return VMTest.create(ResourcesTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ShortArithmeticTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ShortArithmeticTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class ShortArithmeticTest {
-    
-    private static short add(short x, short y) {
-        return (short)(x + y);
-    }
-    
-    private static short sub(short x, short y) {
-        return (short)(x - y);
-    }
-    
-    private static short mul(short x, short y) {
-        return (short)(x * y);
-    }
-    
-    private static short div(short x, short y) {
-        return (short)(x / y);
-    }
-    
-    private static short mod(short x, short y) {
-        return (short)(x % y);
-    }
-    
-    @Compare public short conversion() {
-        return (short)123456;
-    }
-    
-    @Compare public short addOverflow() {
-        return add(Short.MAX_VALUE, (short)1);
-    }
-    
-    @Compare public short subUnderflow() {
-        return sub(Short.MIN_VALUE, (short)1);
-    }
-    
-    @Compare public short addMaxShortAndMaxShort() {
-        return add(Short.MAX_VALUE, Short.MAX_VALUE);
-    }
-    
-    @Compare public short subMinShortAndMinShort() {
-        return sub(Short.MIN_VALUE, Short.MIN_VALUE);
-    }
-    
-    @Compare public short multiplyMaxShort() {
-        return mul(Short.MAX_VALUE, (short)2);
-    }
-    
-    @Compare public short multiplyMaxShortAndMaxShort() {
-        return mul(Short.MAX_VALUE, Short.MAX_VALUE);
-    }
-    
-    @Compare public short multiplyMinShort() {
-        return mul(Short.MIN_VALUE, (short)2);
-    }
-    
-    @Compare public short multiplyMinShortAndMinShort() {
-        return mul(Short.MIN_VALUE, Short.MIN_VALUE);
-    }
-    
-    @Compare public short multiplyPrecision() {
-        return mul((short)17638, (short)1103);
-    }
-    
-    @Compare public short division() {
-        return div((short)1, (short)2);
-    }
-    
-    @Compare public short divisionReminder() {
-        return mod((short)1, (short)2);
-    }
-    
-    @Factory
-    public static Object[] create() {
-        return VMTest.create(ShortArithmeticTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUse.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/StaticUse.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.tck;
-
-class StaticUse {
-    public static final Object NON_NULL = new Object();
-    private StaticUse() {
-    }
-    
-    public void instanceMethod() {
-    }
-
-    public static int plus(int a, int b) {
-        return a + b;
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/CRC32Test.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/CRC32Test.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest.impl;
-
-import java.io.UnsupportedEncodingException;
-import java.util.zip.CRC32;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-public class CRC32Test {
-
-    @Compare public long crc1() throws UnsupportedEncodingException {
-        CRC32 crc = new CRC32();
-        crc.update("Hello World!".getBytes("UTF-8"));
-        return crc.getValue();
-    }
-    
-    @Factory public static Object[] create() {
-        return VMTest.create(CRC32Test.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/ZipEntryTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/ZipEntryTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import org.apidesign.bck2brwsr.emul.zip.FastJar;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@GenerateZip(name = "five.zip", contents = {
-    "1.txt", "one",
-    "2.txt", "duo",
-    "3.txt", "three",
-    "4.txt", "four",
-    "5.txt", "five"
-})
-public class ZipEntryTest {
-    @Test
-    public void readEntriesEffectively() throws IOException {
-        InputStream is = ZipEntryTest.class.getResourceAsStream("five.zip");
-        byte[] arr = new byte[is.available()];
-        int len = is.read(arr);
-        assertEquals(len, arr.length, "Read fully");
-        
-        FastJar fj = new FastJar(arr);
-        FastJar.Entry[] entrs = fj.list();
-        
-        assertEquals(5, entrs.length, "Five entries");
-        
-        for (int i = 1; i <= 5; i++) {
-            FastJar.Entry en = entrs[i - 1];
-            assertEquals(en.name, i + ".txt");
-//            assertEquals(cis.cnt, 0, "Content of the file should be skipped, not read");
-        }
-        
-        assertContent("three", fj.getInputStream(entrs[3 - 1]), "read OK");
-        assertContent("five", fj.getInputStream(entrs[5 - 1]), "read OK");
-    }
-
-    private static void assertContent(String exp, InputStream is, String msg) throws IOException {
-        byte[] arr = new byte[512];
-        int len = is.read(arr);
-        String s = new String(arr, 0, len);
-        assertEquals(exp, s, msg);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/ZipFileTest.java
--- a/vmtest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/ZipFileTest.java	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-/**
- * Back 2 Browser Bytecode Translator
- * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. Look for COPYING file in the top folder.
- * If not, see http://opensource.org/licenses/GPL-2.0.
- */
-package org.apidesign.bck2brwsr.vmtest.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Objects;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import org.apidesign.bck2brwsr.core.JavaScriptBody;
-import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
-import org.apidesign.bck2brwsr.vmtest.Compare;
-import org.apidesign.bck2brwsr.vmtest.Http;
-import org.apidesign.bck2brwsr.vmtest.VMTest;
-import org.testng.annotations.Factory;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach@netbeans.org>
- */
-@GenerateZip(name = "readAnEntry.zip", contents = { 
-    "my/main/file.txt", "Hello World!"
-})
-public class ZipFileTest {
-    
-    @Compare public String readAnEntry() throws IOException {
-        InputStream is = ZipFileTest.class.getResourceAsStream("readAnEntry.zip");
-        ZipInputStream zip = new ZipInputStream(is);
-        ZipEntry entry = zip.getNextEntry();
-        assertEquals(entry.getName(), "my/main/file.txt", "Correct entry");
-
-        byte[] arr = new byte[4096];
-        int len = zip.read(arr);
-        
-        assertEquals(zip.getNextEntry(), null, "No next entry");
-        
-        final String ret = new String(arr, 0, len, "UTF-8");
-        return ret;
-    }
-    
-    @JavaScriptBody(args = { "res", "path" }, body = 
-          "var myvm = bck2brwsr.apply(null, path);\n"
-        + "var cls = myvm.loadClass('java.lang.String');\n"
-        + "return cls.getClass__Ljava_lang_Class_2().getResourceAsStream__Ljava_io_InputStream_2Ljava_lang_String_2(res);\n"
-    )
-    private static native Object loadVMResource(String res, String...path);
-
-    @Http({
-        @Http.Resource(path = "/readAnEntry.jar", mimeType = "x-application/zip", content = "", resource="readAnEntry.zip")
-    })
-    @BrwsrTest  public void canVmLoadResourceFromZip() throws IOException {
-        Object res = loadVMResource("/my/main/file.txt", "/readAnEntry.jar");
-        assert res instanceof InputStream : "Got array of bytes: " + res;
-        InputStream is = (InputStream)res;
-        
-        byte[] arr = new byte[4096];
-        int len = is.read(arr);
-        
-        final String ret = new String(arr, 0, len, "UTF-8");
-
-        assertEquals(ret, "Hello World!", "Can read the bytes");
-    }
-    
-    @GenerateZip(name = "cpattr.zip", contents = { 
-        "META-INF/MANIFEST.MF", "Manifest-Version: 1.0\n"
-        + "Created-By: hand\n"
-        + "Class-Path: realJar.jar\n\n\n"
-    })
-    @Http({
-        @Http.Resource(path = "/readComplexEntry.jar", mimeType = "x-application/zip", content = "", resource="cpattr.zip"),
-        @Http.Resource(path = "/realJar.jar", mimeType = "x-application/zip", content = "", resource="readAnEntry.zip"),
-    })
-    @BrwsrTest  public void understandsClassPathAttr() throws IOException {
-        Object res = loadVMResource("/my/main/file.txt", "/readComplexEntry.jar");
-        assert res instanceof InputStream : "Got array of bytes: " + res;
-        InputStream is = (InputStream)res;
-        
-        byte[] arr = new byte[4096];
-        int len = is.read(arr);
-        
-        final String ret = new String(arr, 0, len, "UTF-8");
-
-        assertEquals(ret, "Hello World!", "Can read the bytes from secondary JAR");
-    }
-    
-    private static void assertEquals(Object real, Object exp, String msg) {
-        assert Objects.equals(exp, real) : msg + " exp: " + exp + " real: " + real;
-    }
-    
-    @Factory public static Object[] create() {
-        return VMTest.create(ZipFileTest.class);
-    }
-}
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/resources/org/apidesign/bck2brwsr/tck/0xfe
--- a/vmtest/src/test/resources/org/apidesign/bck2brwsr/tck/0xfe	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-þ
\ No newline at end of file
diff -r 3392f250c784 -r ecbd252fd3a7 vmtest/src/test/resources/org/apidesign/bck2brwsr/tck/Resources.txt
--- a/vmtest/src/test/resources/org/apidesign/bck2brwsr/tck/Resources.txt	Fri Mar 22 16:59:47 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Ahoj